Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-08 10:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Pump COM messages while initializing propsheet from IDataObject (#7571)

Browse source 
CORE-19933
This commit is contained in:
Whindmar Saksit 2025-01-03 20:16:56 +01:00 committed by GitHub
parent faf6123150
commit afc130ff3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dll/win32/shell32/dialogs/item_prop.cpp
View file

@ -27,7 +27,7 @@ struct ShellPropSheetDialog
HKEY *hKeys, UINT *cKeys); HKEY *hKeys, UINT *cKeys);
static HRESULT Show(const CLSID *pClsidDefault, IDataObject *pDO, static HRESULT Show(const CLSID *pClsidDefault, IDataObject *pDO,
PFNINITIALIZE InitFunc, LPCWSTR InitString) PFNINITIALIZE InitFunc, LPCWSTR InitString, HANDLE hEvent = NULL)
{ {
HRESULT hr; HRESULT hr;
CRegKeyHandleArray keys; CRegKeyHandleArray keys;
@ -36,6 +36,8 @@ struct ShellPropSheetDialog
WCHAR szCaption[MAX_PATH], *pszCaption = NULL; WCHAR szCaption[MAX_PATH], *pszCaption = NULL;
if (SUCCEEDED(SHELL_GetCaptionFromDataObject(pDO, szCaption, _countof(szCaption)))) if (SUCCEEDED(SHELL_GetCaptionFromDataObject(pDO, szCaption, _countof(szCaption))))
pszCaption = szCaption; pszCaption = szCaption;
if (hEvent)
SetEvent(hEvent);
hr = SHOpenPropSheetW(pszCaption, keys, keys, pClsidDefault, pDO, NULL, NULL) ? S_OK : E_FAIL; hr = SHOpenPropSheetW(pszCaption, keys, keys, pClsidDefault, pDO, NULL, NULL) ? S_OK : E_FAIL;
return hr; return hr;
} }
@ -47,6 +49,7 @@ struct ShellPropSheetDialog
CLSID ClsidDefault; CLSID ClsidDefault;
const CLSID *pClsidDefault; const CLSID *pClsidDefault;
IStream *pObjStream; IStream *pObjStream;
HANDLE hEvent;
}; };
static void FreeData(DATA *pData) static void FreeData(DATA *pData)
@ -74,6 +77,7 @@ struct ShellPropSheetDialog
pData->ClsidDefault = *pClsidDefault; pData->ClsidDefault = *pClsidDefault;
pData->pClsidDefault = &pData->ClsidDefault; pData->pClsidDefault = &pData->ClsidDefault;
} }
HANDLE hEvent = pData->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
HRESULT hr = S_OK; HRESULT hr = S_OK;
if (pDO) if (pDO)
@ -86,8 +90,21 @@ struct ShellPropSheetDialog
pData->pObjStream->Release(); pData->pObjStream->Release();
hr = E_FAIL; hr = E_FAIL;
} }
if (FAILED(hr))
if (SUCCEEDED(hr))
{
if (hEvent)
{
DWORD index;
// Pump COM messages until InitFunc is done (for CORE-19933)
CoWaitForMultipleHandles(COWAIT_DEFAULT, INFINITE, 1, &hEvent, &index);
CloseHandle(hEvent);
}
}
else
{
FreeData(pData); FreeData(pData);
}
return hr; return hr;
} }
@ -97,7 +114,7 @@ struct ShellPropSheetDialog
CComPtr<IDataObject> pDO; CComPtr<IDataObject> pDO;
if (pData->pObjStream) if (pData->pObjStream)
CoGetInterfaceAndReleaseStream(pData->pObjStream, IID_PPV_ARG(IDataObject, &pDO)); CoGetInterfaceAndReleaseStream(pData->pObjStream, IID_PPV_ARG(IDataObject, &pDO));
Show(pData->pClsidDefault, pDO, pData->InitFunc, pData->InitString); Show(pData->pClsidDefault, pDO, pData->InitFunc, pData->InitString, pData->hEvent);
FreeData(pData); FreeData(pData);
return 0; return 0;
} }