Commit ef087934 authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

gameux/tests: Drop game stats test workarounds for Windows <= 2000.

parent be8534d3
TESTDLL = gameux.dll TESTDLL = gameux.dll
IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 shell32
C_SRCS = \ C_SRCS = \
gameexplorer.c \ gameexplorer.c \
......
...@@ -32,25 +32,6 @@ ...@@ -32,25 +32,6 @@
*/ */
static WCHAR sExeName[MAX_PATH] = {0}; static WCHAR sExeName[MAX_PATH] = {0};
static GUID gameInstanceId; static GUID gameInstanceId;
static HRESULT WINAPI (*pSHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR);
/*******************************************************************************
*_loadDynamicRoutines
*
* Helper function, prepares pointers to system procedures which may be not
* available on older operating systems.
*
* Returns:
* TRUE procedures were loaded successfully
* FALSE procedures were not loaded successfully
*/
static BOOL _loadDynamicRoutines(void)
{
HMODULE hModule = LoadLibraryA( "shell32.dll" );
pSHGetFolderPathW = (LPVOID)GetProcAddress(hModule, "SHGetFolderPathW");
if (!pSHGetFolderPathW) return FALSE;
return TRUE;
}
/******************************************************************************* /*******************************************************************************
* Registers test suite executable as game in Games Explorer. Required to test * Registers test suite executable as game in Games Explorer. Required to test
...@@ -117,7 +98,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta ...@@ -117,7 +98,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta
HRESULT hr; HRESULT hr;
WCHAR sGuid[49], sPath[MAX_PATH]; WCHAR sGuid[49], sPath[MAX_PATH];
hr = pSHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL);
...@@ -396,14 +377,6 @@ START_TEST(gamestatistics) ...@@ -396,14 +377,6 @@ START_TEST(gamestatistics)
IGameStatisticsMgr* gsm; IGameStatisticsMgr* gsm;
IGameExplorer *ge; IGameExplorer *ge;
if (!_loadDynamicRoutines())
{
/* this is not a failure, because a procedure loaded by address
* is always available on systems which has gameux.dll */
win_skip("too old system, cannot load required dynamic procedures\n");
return;
}
hr = CoInitialize( NULL ); hr = CoInitialize( NULL );
ok(hr == S_OK, "failed to init COM\n"); ok(hr == S_OK, "failed to init COM\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment