ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gameux: Parse GDFs in a separate thread.

Browse Source 
The res protocol handler dislikes running from a multithreaded apartment.
This commit is contained in:
Henri Verbeet 2011-10-11 17:24:51 +02:00 committed by Alexandre Julliard
parent 5bd304bd0e
commit 95ede76673
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/gameux/gameexplorer.c
View File

@ -387,6 +387,13 @@ static HRESULT GAMEUX_ParseGameDefinition(
return hr; return hr;
} }
struct parse_gdf_thread_param
{
struct GAMEUX_GAME_DATA *GameData;
HRESULT hr;
};
/******************************************************************************* /*******************************************************************************
* GAMEUX_ParseGDFBinary * GAMEUX_ParseGDFBinary
* *
@ -399,8 +406,10 @@ static HRESULT GAMEUX_ParseGameDefinition(
* GDF will be stored in other fields of this * GDF will be stored in other fields of this
* structure. * structure.
*/ */
static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData) static DWORD WINAPI GAMEUX_ParseGDFBinary(void *thread_param)
{ {
struct parse_gdf_thread_param *ctx = thread_param;
struct GAMEUX_GAME_DATA *GameData = ctx->GameData;
static const WCHAR sRes[] = {'r','e','s',':','/','/',0}; static const WCHAR sRes[] = {'r','e','s',':','/','/',0};
static const WCHAR sDATA[] = {'D','A','T','A',0}; static const WCHAR sDATA[] = {'D','A','T','A',0};
static const WCHAR sSlash[] = {'/',0}; static const WCHAR sSlash[] = {'/',0};
@ -423,6 +432,8 @@ static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData)
lstrcatW(sResourcePath, sSlash); lstrcatW(sResourcePath, sSlash);
lstrcatW(sResourcePath, ID_GDF_XML_STR); lstrcatW(sResourcePath, ID_GDF_XML_STR);
CoInitialize(NULL);
hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER,
&IID_IXMLDOMDocument, (void**)&document); &IID_IXMLDOMDocument, (void**)&document);
@ -474,8 +485,11 @@ static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData)
IXMLDOMDocument_Release(document); IXMLDOMDocument_Release(document);
} }
return hr; CoUninitialize();
ctx->hr = hr;
return 0;
} }
/******************************************************************* /*******************************************************************
* GAMEUX_RemoveRegistryRecord * GAMEUX_RemoveRegistryRecord
* *
@ -548,12 +562,35 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath,
/* load data from GDF binary */ /* load data from GDF binary */
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
hr = GAMEUX_ParseGDFBinary(&GameData); {
struct parse_gdf_thread_param thread_param;
HANDLE thread;
HRESULT hr;
DWORD ret;
thread_param.GameData = &GameData;
if(!(thread = CreateThread(NULL, 0, GAMEUX_ParseGDFBinary, &thread_param, 0, &ret)))
{
ERR("Failed to create thread.\n");
hr = E_FAIL;
goto done;
}
ret = WaitForSingleObject(thread, INFINITE);
CloseHandle(thread);
if(ret != WAIT_OBJECT_0)
{
ERR("Wait failed (%#x).\n", ret);
hr = E_FAIL;
goto done;
}
hr = thread_param.hr;
}
/* save data to registry */ /* save data to registry */
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
hr = GAMEUX_WriteRegistryRecord(&GameData); hr = GAMEUX_WriteRegistryRecord(&GameData);
done:
GAMEUX_uninitGameData(&GameData); GAMEUX_uninitGameData(&GameData);
TRACE("returning 0x%08x\n", hr); TRACE("returning 0x%08x\n", hr);
return hr; return hr;