gameux: Use CLSIDFromString() instead of shell32 equivalent.

This commit is contained in:
Nikolay Sivov 2014-04-14 22:53:29 +04:00 committed by Alexandre Julliard
parent d721eee1dd
commit febb3974b5
2 changed files with 2 additions and 8 deletions

View file

@ -35,9 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(gameux);
/* function from Shell32, not defined in header */
extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid);
/*******************************************************************************
* GameUX helper functions
*/
@ -780,7 +777,7 @@ HRESULT GAMEUX_FindGameInstanceId(
if(lstrcmpW(lpValue, sGDFBinaryPath)==0)
{
/* key found, let's copy instance id and exit */
hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL);
hr = CLSIDFromString(lpName, pInstanceId);
found = TRUE;
}
HeapFree(GetProcessHeap(), 0, lpValue);

View file

@ -33,9 +33,6 @@
#include "wine/test.h"
/* function from Shell32, not defined in header */
extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid);
/*******************************************************************************
* Pointers used instead of direct calls. These procedures are not available on
* older system, which causes problem while loading test binary.
@ -476,7 +473,7 @@ static void _findGameInstanceId(int line,
if(lstrcmpW(lpValue, sGDFBinaryPath)==0)
{
/* key found, let's copy instance id and exit */
hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL);
hr = CLSIDFromString(lpName, pInstanceId);
ok(SUCCEEDED(hr), "cannot convert subkey to guid: %s\n",
wine_dbgstr_w(lpName));