Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] CoUninitialize only if CoInitialize* is successful

Browse source 
Technically CoUninitialize should be called only if CoInitializeEx succeeded (including S_FALSE).
CORE-1419
This commit is contained in:
Katayama Hirofumi MZ 2020-09-28 20:13:28 +09:00
parent 467feb9996
commit a822eadce6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/shell32/dialogs/dialogs.cpp
View file

@ -29,6 +29,7 @@ typedef struct
LPCWSTR lpstrTitle;
LPCWSTR lpstrDescription;
UINT uFlags;
BOOL bCoInited;
} RUNFILEDLGPARAMS;
typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *);
@ -549,14 +550,17 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
hwndEdit = ComboInfo.hwndItem;
ASSERT(::IsWindow(hwndEdit));
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); // SHAutoComplete needs co init
// SHAutoComplete needs co init
prfdp->bCoInited = SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED));
SHAutoComplete(hwndEdit, SHACF_FILESYSTEM | SHACF_FILESYS_ONLY | SHACF_URLALL);
SetFocus(hwndCombo);
return TRUE;
case WM_DESTROY:
CoUninitialize();
if (prfdp->bCoInited)
CoUninitialize();
break;
case WM_COMMAND: