nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[misc] don't overdo CoUninitialize calls

Browse source 
* 2e1833e91e introduced issues with VDS since, despite what
  Microsoft's documentation says, balancing CoInitialize with CoUninitialize
  leads to VDS not properly relinquishing disk access.
This commit is contained in:
Pete Batard 2021-04-14 18:13:36 +01:00
parent c9a0fcd0bf
commit d77a825ffd
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/appstore/Package.appxmanifest
View file

@ -11,7 +11,7 @@
<Identity <Identity
Name="19453.net.Rufus" Name="19453.net.Rufus"
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740" Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
Version="3.14.1773.0" /> Version="3.14.1774.0" />
<Properties> <Properties>
<DisplayName>Rufus</DisplayName> <DisplayName>Rufus</DisplayName>

4
src/drive.c
View file

@ -517,7 +517,6 @@ out:
IVdsService_Release(pService); IVdsService_Release(pService);
if (pLoader != NULL) if (pLoader != NULL)
IVdsServiceLoader_Release(pLoader); IVdsServiceLoader_Release(pLoader);
CoUninitialize();
VDS_SET_ERROR(hr); VDS_SET_ERROR(hr);
return (hr == S_OK); return (hr == S_OK);
} }
@ -674,7 +673,6 @@ static BOOL GetVdsDiskInterface(DWORD DriveIndex, const IID* InterfaceIID, void*
IEnumVdsObject_Release(pEnum); IEnumVdsObject_Release(pEnum);
out: out:
CoUninitialize();
VDS_SET_ERROR(hr); VDS_SET_ERROR(hr);
return (hr == S_OK); return (hr == S_OK);
} }
@ -741,7 +739,6 @@ BOOL VdsRescan(DWORD dwRescanType, DWORD dwSleepTime, BOOL bSilent)
if (dwSleepTime != 0) if (dwSleepTime != 0)
Sleep(dwSleepTime); Sleep(dwSleepTime);
CoUninitialize();
return ret; return ret;
} }
@ -948,7 +945,6 @@ BOOL ListVdsVolumes(BOOL bSilent)
IEnumVdsObject_Release(pEnum); IEnumVdsObject_Release(pEnum);
out: out:
CoUninitialize();
VDS_SET_ERROR(hr); VDS_SET_ERROR(hr);
return (hr == S_OK); return (hr == S_OK);
} }

1
src/net.c
View file

@ -308,7 +308,6 @@ static HINTERNET GetInternetSession(BOOL bRetry)
pfInternetSetOptionA(hSession, INTERNET_OPTION_ENABLE_HTTP_PROTOCOL, (LPVOID)&dwProtocolSupport, sizeof(dwProtocolSupport)); pfInternetSetOptionA(hSession, INTERNET_OPTION_ENABLE_HTTP_PROTOCOL, (LPVOID)&dwProtocolSupport, sizeof(dwProtocolSupport));
out: out:
CoUninitialize();
return hSession; return hSession;
} }

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.14.1773" CAPTION "Rufus 3.14.1774"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,14,1773,0 FILEVERSION 3,14,1774,0
PRODUCTVERSION 3,14,1773,0 PRODUCTVERSION 3,14,1774,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.14.1773" VALUE "FileVersion", "3.14.1774"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.14.exe" VALUE "OriginalFilename", "rufus-3.14.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.14.1773" VALUE "ProductVersion", "3.14.1774"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"