mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[misc] don't overdo CoUninitialize calls
* 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:
parent
c9a0fcd0bf
commit
d77a825ffd
4 changed files with 6 additions and 11 deletions
|
@ -11,7 +11,7 @@
|
|||
<Identity
|
||||
Name="19453.net.Rufus"
|
||||
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
|
||||
Version="3.14.1773.0" />
|
||||
Version="3.14.1774.0" />
|
||||
|
||||
<Properties>
|
||||
<DisplayName>Rufus</DisplayName>
|
||||
|
|
|
@ -517,7 +517,6 @@ out:
|
|||
IVdsService_Release(pService);
|
||||
if (pLoader != NULL)
|
||||
IVdsServiceLoader_Release(pLoader);
|
||||
CoUninitialize();
|
||||
VDS_SET_ERROR(hr);
|
||||
return (hr == S_OK);
|
||||
}
|
||||
|
@ -674,7 +673,6 @@ static BOOL GetVdsDiskInterface(DWORD DriveIndex, const IID* InterfaceIID, void*
|
|||
IEnumVdsObject_Release(pEnum);
|
||||
|
||||
out:
|
||||
CoUninitialize();
|
||||
VDS_SET_ERROR(hr);
|
||||
return (hr == S_OK);
|
||||
}
|
||||
|
@ -741,7 +739,6 @@ BOOL VdsRescan(DWORD dwRescanType, DWORD dwSleepTime, BOOL bSilent)
|
|||
if (dwSleepTime != 0)
|
||||
Sleep(dwSleepTime);
|
||||
|
||||
CoUninitialize();
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -948,7 +945,6 @@ BOOL ListVdsVolumes(BOOL bSilent)
|
|||
IEnumVdsObject_Release(pEnum);
|
||||
|
||||
out:
|
||||
CoUninitialize();
|
||||
VDS_SET_ERROR(hr);
|
||||
return (hr == S_OK);
|
||||
}
|
||||
|
|
|
@ -308,7 +308,6 @@ static HINTERNET GetInternetSession(BOOL bRetry)
|
|||
pfInternetSetOptionA(hSession, INTERNET_OPTION_ENABLE_HTTP_PROTOCOL, (LPVOID)&dwProtocolSupport, sizeof(dwProtocolSupport));
|
||||
|
||||
out:
|
||||
CoUninitialize();
|
||||
return hSession;
|
||||
}
|
||||
|
||||
|
|
10
src/rufus.rc
10
src/rufus.rc
|
@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_ACCEPTFILES
|
||||
CAPTION "Rufus 3.14.1773"
|
||||
CAPTION "Rufus 3.14.1774"
|
||||
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
||||
BEGIN
|
||||
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
||||
|
@ -395,8 +395,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,14,1773,0
|
||||
PRODUCTVERSION 3,14,1773,0
|
||||
FILEVERSION 3,14,1774,0
|
||||
PRODUCTVERSION 3,14,1774,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
@ -414,13 +414,13 @@ BEGIN
|
|||
VALUE "Comments", "https://rufus.ie"
|
||||
VALUE "CompanyName", "Akeo Consulting"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "3.14.1773"
|
||||
VALUE "FileVersion", "3.14.1774"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||
VALUE "OriginalFilename", "rufus-3.14.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "3.14.1773"
|
||||
VALUE "ProductVersion", "3.14.1774"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
Loading…
Reference in a new issue