September 2010 - Wine-Commits

Mariusz Pluciński : gameux/tests: Add verification of registry content for InstallGame and UninstallGame.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: c84cf4189c094a398a6a30c24005f6dce1ca7709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84cf4189c094a398a6a30c24… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Sep 15 01:21:37 2010 +0200 gameux/tests: Add verification of registry content for InstallGame and UninstallGame. --- dlls/gameux/tests/gameexplorer.c | 156 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 148 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 3a72d20..8553890 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -33,6 +33,9 @@ #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. @@ -68,7 +71,8 @@ static BOOL _loadDynamicRoutines(void) * * Parameters: * installScope [I] the scope which was used in AddGame/InstallGame call - * gameInstanceId [I] game instance GUID + * gameInstanceId [I] game instance GUID. If NULL, then only + * path to scope is returned * lpRegistryPath [O] pointer which will receive address to string * containing expected registry path. Path * is relative to HKLM registry key. It @@ -138,14 +142,17 @@ static HRESULT _buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, else hr = E_INVALIDARG; - /* put game's instance id on the end of path */ - if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); - - if(SUCCEEDED(hr)) + /* put game's instance id on the end of path, but only if id was passes */ + if(gameInstanceId) { - lstrcatW(sRegistryPath, sBackslash); - lstrcatW(sRegistryPath, sInstanceId); + if(SUCCEEDED(hr)) + hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + + if(SUCCEEDED(hr)) + { + lstrcatW(sRegistryPath, sBackslash); + lstrcatW(sRegistryPath, sInstanceId); + } } if(SUCCEEDED(hr)) @@ -366,6 +373,128 @@ static void _validateGameRegistryKey(int line, } /******************************************************************************* + * _LoadRegistryString + * + * Helper function, loads string from registry value and allocates buffer for it + * + * Parameters: + * hRootKey [I] base key for reading. Should be opened + * with KEY_READ permission + * lpRegistryKey [I] name of registry key, subkey of root key + * lpRegistryValue [I] name of registry value + * lpValue [O] pointer where address of received + * value will be stored. Value should be + * freed by CoTaskMemFree call + */ +static HRESULT _LoadRegistryString(HKEY hRootKey, + LPCWSTR lpRegistryKey, + LPCWSTR lpRegistryValue, + LPWSTR* lpValue) +{ + HRESULT hr; + DWORD dwSize; + + *lpValue = NULL; + + hr = HRESULT_FROM_WIN32(_RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, + RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + + if(SUCCEEDED(hr)) + { + *lpValue = CoTaskMemAlloc(dwSize); + if(!*lpValue) + hr = E_OUTOFMEMORY; + } + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(_RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, + RRF_RT_REG_SZ, NULL, *lpValue, &dwSize)); + + return hr; +} +/******************************************************************************* + * _findGameInstanceId + * + * Helper funtion. Searches for instance identifier of given game in given + * installation scope. + * + * Parameters: + * line [I] line to display messages + * sGDFBinaryPath [I] path to binary containing GDF + * installScope [I] game install scope to search in + * pInstanceId [O] instance identifier of given game + */ +static void _findGameInstanceId(int line, + LPWSTR sGDFBinaryPath, + GAME_INSTALL_SCOPE installScope, + GUID* pInstanceId) +{ + static const WCHAR sConfigGDFBinaryPath[] = + {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; + + HRESULT hr; + BOOL found = FALSE; + LPWSTR lpRegistryPath = NULL; + HKEY hRootKey; + DWORD dwSubKeys, dwSubKeyLen, dwMaxSubKeyLen, i; + LPWSTR lpName = NULL, lpValue = NULL; + + hr = _buildGameRegistryPath(installScope, NULL, &lpRegistryPath); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot get registry path to given scope: %d\n", installScope); + + if(SUCCEEDED(hr)) + /* enumerate all subkeys of received one and search them for value "ConfigGGDFBinaryPath" */ + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, + lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hRootKey)); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot open key registry key: %s\n", wine_dbgstr_w(lpRegistryPath)); + + if(SUCCEEDED(hr)) + { + hr = HRESULT_FROM_WIN32(RegQueryInfoKeyW(hRootKey, NULL, NULL, NULL, + &dwSubKeys, &dwMaxSubKeyLen, NULL, NULL, NULL, NULL, NULL, NULL)); + + if(SUCCEEDED(hr)) + { + ++dwMaxSubKeyLen; /* for string terminator */ + lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); + if(!lpName) hr = E_OUTOFMEMORY; + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name"); + } + + if(SUCCEEDED(hr)) + { + for(i=0; i<dwSubKeys && !found; ++i) + { + dwSubKeyLen = dwMaxSubKeyLen; + hr = HRESULT_FROM_WIN32(RegEnumKeyExW(hRootKey, i, lpName, &dwSubKeyLen, + NULL, NULL, NULL, NULL)); + + if(SUCCEEDED(hr)) + hr = _LoadRegistryString(hRootKey, lpName, + sConfigGDFBinaryPath, &lpValue); + + if(SUCCEEDED(hr)) + if(lstrcmpW(lpValue, sGDFBinaryPath)==0) + { + /* key found, let's copy instance id and exit */ + hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + ok(SUCCEEDED(hr), "cannot convert subkey to guid: %s\n", + wine_dbgstr_w(lpName)); + + found = TRUE; + } + CoTaskMemFree(lpValue); + } + } + + CoTaskMemFree(lpName); + RegCloseKey(hRootKey); + } + + CoTaskMemFree(lpRegistryPath); + todo_wine ok_(__FILE__, line)(found==TRUE, "cannot find game with GDF path %s in scope %d\n", + wine_dbgstr_w(sGDFBinaryPath), installScope); +} +/******************************************************************************* * Test routines */ static void test_create(BOOL* gameExplorerAvailable, BOOL* gameExplorer2Available) @@ -480,12 +609,16 @@ static void test_add_remove_game(void) } void test_install_uninstall_game(void) { + static const GUID applicationId = { 0x17A6558E, 0x60BE, 0x4078, + { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 }}; + HRESULT hr; IGameExplorer2* ge2 = NULL; WCHAR sExeName[MAX_PATH]; WCHAR sExePath[MAX_PATH]; DWORD dwExeNameLen; + GUID guid; hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer2, (LPVOID*)&ge2); ok(ge2 != NULL, "cannot create coclass IGameExplorer2\n"); @@ -504,13 +637,20 @@ void test_install_uninstall_game(void) hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); + /* in comparision to AddGame, InstallGame does not return instance ID, + * so we need to find it manually */ + _findGameInstanceId(__LINE__, sExeName, GIS_CURRENT_USER, &guid); if(SUCCEEDED(hr)) { + todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); + hr = IGameExplorer2_UninstallGame(ge2, sExeName); todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); } + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); + IGameExplorer2_Release(ge2); } }

1 0

Mariusz Pluciński : gameux/tests: Add basic test for InstallGame and UninstallGame.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 7c121d53aef1d6027c108f600dfcaf1fabb3f015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c121d53aef1d6027c108f600… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Sep 15 00:57:02 2010 +0200 gameux/tests: Add basic test for InstallGame and UninstallGame. --- dlls/gameux/tests/gameexplorer.c | 45 ++++++++++++++++++++++++++++++++++++- dlls/gameux/tests/test.gdf.xml | 9 +++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 3e86239..3a72d20 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -368,7 +368,7 @@ static void _validateGameRegistryKey(int line, /******************************************************************************* * Test routines */ -static void test_create(BOOL* gameExplorerAvailable) +static void test_create(BOOL* gameExplorerAvailable, BOOL* gameExplorer2Available) { HRESULT hr; @@ -391,6 +391,7 @@ static void test_create(BOOL* gameExplorerAvailable) if(ge2) { ok( hr == S_OK, "IGameExplorer2 creating failed (result false)\n"); + *gameExplorer2Available = TRUE; IGameExplorer2_Release(ge2); } else @@ -477,21 +478,61 @@ static void test_add_remove_game(void) IGameExplorer_Release(ge); } } +void test_install_uninstall_game(void) +{ + HRESULT hr; + + IGameExplorer2* ge2 = NULL; + WCHAR sExeName[MAX_PATH]; + WCHAR sExePath[MAX_PATH]; + DWORD dwExeNameLen; + + hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer2, (LPVOID*)&ge2); + ok(ge2 != NULL, "cannot create coclass IGameExplorer2\n"); + ok(hr == S_OK, "cannot create coclass IGameExplorer2\n"); + + if(ge2) + { + /* prepare path to binary */ + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); + lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); + + trace("prepared EXE name: %s\n", wine_dbgstr_w(sExeName)); + trace("prepared EXE path: %s\n", wine_dbgstr_w(sExePath)); + + + hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); + + if(SUCCEEDED(hr)) + { + hr = IGameExplorer2_UninstallGame(ge2, sExeName); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); + } + + IGameExplorer2_Release(ge2); + } +} START_TEST(gameexplorer) { HRESULT r; BOOL gameExplorerAvailable = FALSE; + BOOL gameExplorer2Available = FALSE; if(_loadDynamicRoutines()) { r = CoInitialize( NULL ); ok( r == S_OK, "failed to init COM\n"); - test_create(&gameExplorerAvailable); + test_create(&gameExplorerAvailable, &gameExplorer2Available); if(gameExplorerAvailable) test_add_remove_game(); + + if(gameExplorer2Available) + test_install_uninstall_game(); } else /* this is not a failure, because both procedures loaded by address diff --git a/dlls/gameux/tests/test.gdf.xml b/dlls/gameux/tests/test.gdf.xml index 981abd3..c8959fc 100644 --- a/dlls/gameux/tests/test.gdf.xml +++ b/dlls/gameux/tests/test.gdf.xml @@ -27,5 +27,14 @@ xmlns="urn:schemas-microsoft-com:GameDescription.v1"> <Version> <VersionNumber versionNumber="1.0.0.0"/> </Version> + <ExtendedProperties> + <GameTasks> + <Play> + <Primary> + <FileTask path="gameux_crosstest.exe" arguments="" /> + </Primary> + </Play> + </GameTasks> + </ExtendedProperties> </GameDefinition> </GameDefinitionFile>

1 0

Andrew Nguyen : msxml3: Correct the prototype of DOMDocument_create when compiling without libxml2 .
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: c858e583cdb4c4cecd77d93895891a4028a2b48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c858e583cdb4c4cecd77d9389… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Sep 15 11:16:30 2010 -0500 msxml3: Correct the prototype of DOMDocument_create when compiling without libxml2. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8aa5332..f086e80 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2521,7 +2521,7 @@ IUnknown* create_domdoc( xmlNodePtr document ) #else -HRESULT DOMDocument_create(IUnknown *pUnkOuter, void **ppObj) +HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj) { MESSAGE("This program tried to use a DOMDocument object, but\n" "libxml2 support was not present at compile time.\n");

1 0

Alexander Morozov : crypt32/tests: Add a test for CryptSignMessage.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 665ede7517a8a1cabfd82dad09e28bda42951abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=665ede7517a8a1cabfd82dad0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jul 1 16:23:00 2010 +0400 crypt32/tests: Add a test for CryptSignMessage. --- dlls/crypt32/tests/message.c | 401 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 401 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=665ede7517a8a1cabfd82…

1 0

Alexandre Julliard : ntdll/tests: Fix the image protection test on Mac OS where the image limits are only approximative .
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: e317b6068e8b9b303fe9e07df58306984477b73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e317b6068e8b9b303fe9e07df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 15 10:58:00 2010 -0500 ntdll/tests: Fix the image protection test on Mac OS where the image limits are only approximative. --- dlls/ntdll/tests/info.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ffeb22a..ee3d0c6 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1077,11 +1077,14 @@ static void test_queryvirtualmemory(void) static char rwtestbuf[42]; MEMORY_BASIC_INFORMATION mbi; char stackbuf[42]; + HMODULE module; trace("Check flags of a function entry in NTDLL.DLL at %p\n", pNtQueryVirtualMemory); + module = GetModuleHandle( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); @@ -1105,9 +1108,11 @@ static void test_queryvirtualmemory(void) ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); trace("Check flags of read-only data at %p\n", teststring); + module = GetModuleHandle( NULL ); status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); if (mbi.Protect != PAGE_READONLY) @@ -1117,6 +1122,7 @@ static void test_queryvirtualmemory(void) status = pNtQueryVirtualMemory(NtCurrentProcess(), datatestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); @@ -1125,9 +1131,13 @@ static void test_queryvirtualmemory(void) status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); - ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + if (mbi.AllocationBase == module) + { + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + } + else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ } static void test_affinity(void)

1 0

Mariusz Pluciński : gameux: IGameExplorer:: UpdateGame implementation.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: d02a6ab2b156ea84aeefc7f155acadb3d986d8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02a6ab2b156ea84aeefc7f15… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Sep 15 00:51:54 2010 +0200 gameux: IGameExplorer::UpdateGame implementation. --- dlls/gameux/gameexplorer.c | 143 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index aabadcd..2619857 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -110,6 +110,9 @@ static HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, TRACE("(0x%x, %s, %p)\n", installScope, debugstr_guid(gameInstanceId), lpRegistryPath); + /* this will make freeing it easier for user */ + *lpRegistryPath = NULL; + lstrcpyW(sRegistryPath, sGameUxRegistryPath); lstrcatW(sRegistryPath, sBackslash); @@ -551,6 +554,143 @@ HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, return hr; } /******************************************************************************* + * GAMEUX_IsGameKeyExist + * + * Helper function, checks if game's registry ath exists in given scope + * + * Parameters: + * installScope [I] scope to search game in + * InstanceID [I] game instance identifier + * lpRegistryPath [O] place to store address of registry path to + * the game. It is filled only if key exists. + * It must be freed by HeapFree(GetProcessHeap(), 0, ...) + * + * Returns: + * S_OK key was found properly + * S_FALSE key does not exists + * + */ +static HRESULT GAMEUX_IsGameKeyExist(GAME_INSTALL_SCOPE installScope, + LPCGUID InstanceID, + LPWSTR* lpRegistryPath) { + + HRESULT hr; + HKEY hKey; + + hr = GAMEUX_buildGameRegistryPath(installScope, InstanceID, lpRegistryPath); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, *lpRegistryPath, + 0, KEY_WOW64_64KEY, &hKey)); + + if(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + hr = S_FALSE; + + if(hr == S_OK) + RegCloseKey(hKey); + else + { + /* if key does not exist or other error occured, do not return the path */ + HeapFree(GetProcessHeap(), 0, *lpRegistryPath); + *lpRegistryPath = NULL; + } + + return hr; +} +/******************************************************************************* + * GAMEUX_LoadRegistryString + * + * Helper function, loads string from registry value and allocates buffer for it + */ +static HRESULT GAMEUX_LoadRegistryString(HKEY hRootKey, + LPCWSTR lpRegistryKey, + LPCWSTR lpRegistryValue, + LPWSTR* lpValue) +{ + HRESULT hr; + DWORD dwSize; + + *lpValue = NULL; + + hr = HRESULT_FROM_WIN32(RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, + RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + + if(SUCCEEDED(hr)) + { + *lpValue = HeapAlloc(GetProcessHeap(), 0, dwSize); + if(!*lpValue) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, + RRF_RT_REG_SZ, NULL, *lpValue, &dwSize)); + + return hr; +} +/******************************************************************************* + * GAMEUX_UpdateGame + * + * Helper function, updates stored data about game with given InstanceID + */ +static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { + static const WCHAR sConfigGDFBinaryPath[] = {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; + static const WCHAR sConfigApplicationPath[] = {'C','o','n','f','i','g','A','p','p','l','i','c','a','t','i','o','n','P','a','t','h',0}; + + HRESULT hr; + GAME_INSTALL_SCOPE installScope; + LPWSTR lpRegistryPath; + LPWSTR lpGDFBinaryPath, lpGameInstallDirectory; + + TRACE("(%p)\n", debugstr_guid(InstanceID)); + + /* first, check is game exists in CURRENT_USER scope */ + installScope = GIS_CURRENT_USER; + hr = GAMEUX_IsGameKeyExist(installScope, InstanceID, &lpRegistryPath); + + if(hr == S_FALSE) + { + /* game not found in CURRENT_USER scope, let's check in ALL_USERS */ + installScope = GIS_ALL_USERS; + hr = GAMEUX_IsGameKeyExist(installScope, InstanceID, &lpRegistryPath); + } + + if(hr == S_FALSE) + /* still not found? let's inform user that game does not exists */ + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + if(SUCCEEDED(hr)) + { + /* game found, it's registry path is in lpRegistryPath and install + * scope in installScope */ + TRACE("game found in registry (path %s), updating\n", debugstr_w(lpRegistryPath)); + + /* first, read required data about game */ + hr = GAMEUX_LoadRegistryString(HKEY_LOCAL_MACHINE, lpRegistryPath, + sConfigGDFBinaryPath, &lpGDFBinaryPath); + + if(SUCCEEDED(hr)) + hr = GAMEUX_LoadRegistryString(HKEY_LOCAL_MACHINE, lpRegistryPath, + sConfigApplicationPath, &lpGameInstallDirectory); + + /* now remove currently existing registry key */ + if(SUCCEEDED(hr)) + hr = GAMEUX_RemoveRegistryRecord(InstanceID); + + /* and add it again, it will cause in reparsing of whole GDF */ + if(SUCCEEDED(hr)) + hr = GAMEUX_RegisterGame(lpGDFBinaryPath, lpGameInstallDirectory, + installScope, InstanceID); + + HeapFree(GetProcessHeap(), 0, lpGDFBinaryPath); + HeapFree(GetProcessHeap(), 0, lpGameInstallDirectory); + } + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + TRACE("returning 0x%x\n", hr); + return hr; +} +/******************************************************************************* * GameExplorer implementation */ @@ -668,8 +808,7 @@ static HRESULT WINAPI GameExplorerImpl_UpdateGame( GameExplorerImpl *This = impl_from_IGameExplorer(iface); TRACE("(%p, %s)\n", This, debugstr_guid(&instanceID)); - FIXME("stub\n"); - return E_NOTIMPL; + return GAMEUX_UpdateGame(&instanceID); } static HRESULT WINAPI GameExplorerImpl_VerifyAccess(

1 0

Henri Verbeet : wined3d: Move the scissor rect to wined3d_state.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 937eb7e600b963e77a8e9ba3182b52d6b7ab6283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=937eb7e600b963e77a8e9ba31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:05 2010 +0200 wined3d: Move the scissor rect to wined3d_state. --- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 5 ++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb9bcdb..3bf1eac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -567,7 +567,7 @@ void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) if (stateblock->state.render_states[WINED3DRS_SCISSORTESTENABLE]) { - IntersectRect(rect, rect, &stateblock->scissorRect); + IntersectRect(rect, rect, &stateblock->state.scissor_rect); } } @@ -3138,11 +3138,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, C IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; This->updateStateBlock->changed.scissorRect = TRUE; - if(EqualRect(&This->updateStateBlock->scissorRect, pRect)) { - TRACE("App is setting the old scissor rectangle over, nothing to do\n"); + if (EqualRect(&This->updateStateBlock->state.scissor_rect, pRect)) + { + TRACE("App is setting the old scissor rectangle over, nothing to do.\n"); return WINED3D_OK; } - CopyRect(&This->updateStateBlock->scissorRect, pRect); + CopyRect(&This->updateStateBlock->state.scissor_rect, pRect); if(This->isRecordingState) { TRACE("Recording... not performing anything\n"); @@ -3157,7 +3158,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, C static HRESULT WINAPI IWineD3DDeviceImpl_GetScissorRect(IWineD3DDevice *iface, RECT* pRect) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *pRect = This->updateStateBlock->scissorRect; + *pRect = This->updateStateBlock->state.scissor_rect; TRACE("(%p)Returning a Scissor Rect of %d:%d-%d:%d\n", This, pRect->left, pRect->top, pRect->right, pRect->bottom); return WINED3D_OK; } @@ -5759,10 +5760,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, device->stateBlock->viewport.MinZ = 0.0f; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_VIEWPORT); - device->stateBlock->scissorRect.top = 0; - device->stateBlock->scissorRect.left = 0; - device->stateBlock->scissorRect.right = device->stateBlock->viewport.Width; - device->stateBlock->scissorRect.bottom = device->stateBlock->viewport.Height; + device->stateBlock->state.scissor_rect.top = 0; + device->stateBlock->state.scissor_rect.left = 0; + device->stateBlock->state.scissor_rect.right = device->stateBlock->viewport.Width; + device->stateBlock->state.scissor_rect.bottom = device->stateBlock->viewport.Height; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SCISSORRECT); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4d17cf3..ebd89b3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4880,7 +4880,7 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3 static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { IWineD3DSurfaceImpl *target = stateblock->device->render_targets[0]; - RECT *pRect = &stateblock->scissorRect; + RECT *pRect = &stateblock->state.scissor_rect; UINT height; UINT width; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6eb4713..3f20ae5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -755,12 +755,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->viewport = targetStateBlock->viewport; } - if(This->changed.scissorRect - && memcmp(&targetStateBlock->scissorRect, &This->scissorRect, sizeof(This->scissorRect))) + if (This->changed.scissorRect && memcmp(&targetStateBlock->state.scissor_rect, + &This->state.scissor_rect, sizeof(This->state.scissor_rect))) { TRACE("Updating scissor rect.\n"); - This->scissorRect = targetStateBlock->scissorRect; + This->state.scissor_rect = targetStateBlock->state.scissor_rect; } map = This->changed.streamSource; @@ -1000,7 +1000,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (This->changed.scissorRect) { - IWineD3DDevice_SetScissorRect(device, &This->scissorRect); + IWineD3DDevice_SetScissorRect(device, &This->state.scissor_rect); } map = This->changed.streamSource; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd357c2..ed8ea55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,8 @@ struct wined3d_stream_state struct wined3d_state { + RECT scissor_rect; + DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; @@ -2425,9 +2427,6 @@ struct IWineD3DStateBlockImpl /* Sampler States */ DWORD samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - /* Scissor test rectangle */ - RECT scissorRect; - /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; unsigned int num_contained_render_states;

1 0

Henri Verbeet : ntdll: Do not return STATUS_SUCCESS on failure in NtQueryObject().
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 689c45b9b9f1815e9567d26570a491f6692d61d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689c45b9b9f1815e9567d2657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:03 2010 +0200 ntdll: Do not return STATUS_SUCCESS on failure in NtQueryObject(). --- dlls/ntdll/om.c | 8 +++++--- dlls/ntdll/tests/om.c | 22 +++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 0e64ddd..85ac0bf 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -95,18 +95,20 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, if (!(status = server_get_unix_name( handle, &unix_name ))) { UNICODE_STRING nt_name; - NTSTATUS status; if (!(status = wine_unix_to_nt_file_name( &unix_name, &nt_name ))) { - if (sizeof(*p) + nt_name.MaximumLength <= len) + if (len < sizeof(*p)) + status = STATUS_INFO_LENGTH_MISMATCH; + else if (len < sizeof(*p) + nt_name.MaximumLength) + status = STATUS_BUFFER_OVERFLOW; + else { p->Name.Buffer = (WCHAR *)(p + 1); p->Name.Length = nt_name.Length; p->Name.MaximumLength = nt_name.MaximumLength; memcpy( p->Name.Buffer, nt_name.Buffer, nt_name.MaximumLength ); } - else status = STATUS_INFO_LENGTH_MISMATCH; if (used_len) *used_len = sizeof(*p) + nt_name.MaximumLength; RtlFreeUnicodeString( &nt_name ); } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c6a3cbf..7c03886 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -661,7 +661,7 @@ static void test_query_object(void) HANDLE handle; char buffer[1024]; NTSTATUS status; - ULONG len; + ULONG len, expected_len; UNICODE_STRING *str; char dir[MAX_PATH]; @@ -713,10 +713,26 @@ static void test_query_object(void) ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; - ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len || - broken(sizeof(UNICODE_STRING) + str->Length == len), /* NT4 */ + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ "unexpected len %u\n", len ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INSUFFICIENT_RESOURCES), + "NtQueryObject failed %x\n", status ); + ok( len == expected_len || broken(!len || len == sizeof(UNICODE_STRING)), + "unexpected len %u\n", len ); + + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); + ok( status == STATUS_BUFFER_OVERFLOW || broken(status == STATUS_INSUFFICIENT_RESOURCES + || status == STATUS_INFO_LENGTH_MISMATCH), + "NtQueryObject failed %x\n", status ); + ok( len == expected_len || broken(!len), + "unexpected len %u\n", len ); + pNtClose( handle ); }

1 0

Luca Bennati : shell32: Update Italian translation.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: d6e7d44e5086e2ac38724326bbc7b23ba74b9a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e7d44e5086e2ac38724326b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Sep 15 09:10:11 2010 +0200 shell32: Update Italian translation. --- dlls/shell32/shell32_It.rc | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index a4db90a..7ce3e66 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -258,7 +258,7 @@ STRINGTABLE IDS_RUNDLG_ERROR "Impossibile mostrare la finestra Esegui File (errore interno)" IDS_RUNDLG_BROWSE_ERROR "Impossibile mostrare la finestra Sfoglia (errore interno)" IDS_RUNDLG_BROWSE_CAPTION "Sfoglia" - IDS_RUNDLG_BROWSE_FILTER "File eseguibili\0*.exe\0Tutti i files\0*.*\0\0" + IDS_RUNDLG_BROWSE_FILTER "File eseguibili\0*.exe\0Tutti i file\0*.*\0\0" /* shell folder path default values */ IDS_STARTMENU "Start Menu" @@ -290,10 +290,28 @@ STRINGTABLE IDS_APPDATA "Applicazioni" IDS_PRINTHOOD "Stampanti condivise" IDS_COOKIES "Cookie" + IDS_CONTACTS "Contatti" + IDS_LINKS "Collegamenti" + IDS_PHOTO_ALBUMS "Immagini\\Slide Shows" + IDS_PLAYLISTS "Musica\\Playlists" + IDS_PUBLIC_DOWNLOADS "Download" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Librerie" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Suonerie" + IDS_SAMPLE_MUSIC "Musica\\Sample Music" + IDS_SAMPLE_PICTURES "Immagini\\Sample Pictures" + IDS_SAMPLE_PLAYLISTS "Musica\\Sample Playlists" + IDS_SAMPLE_VIDEOS "Video\\Sample Videos" + IDS_SAVED_GAMES "Giochi salvati" + IDS_SAVED_SEARCHES "Ricerche" + IDS_USER_PROFILES "Utenti" + IDS_COMMON_OEM_LINKS "Collegamenti OEM" + IDS_DOCUMENTS "Documenti" + IDS_DOWNLOADS "Download" - IDS_NEWFOLDER "Nuova cartella" + IDS_NEWFOLDER "Nuova cartella" - IDS_CPANEL_TITLE "Pannello di Controllo di Wine" + IDS_CPANEL_TITLE "Pannello di controllo di Wine" IDS_CPANEL_NAME "Nome" IDS_CPANEL_DESCRIPTION "Descrizione"

1 0

Alexandre Julliard : winemp3.acm: Fix a couple of compiler warnings on Mac OS.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 6dc12cdb31b185f913c0ad5d92b5fe5ef257b5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc12cdb31b185f913c0ad5d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 14 18:03:41 2010 -0500 winemp3.acm: Fix a couple of compiler warnings on Mac OS. --- dlls/winemp3.acm/mpegl3.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 3c60fff..2ee8430 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -290,7 +290,7 @@ static const unsigned short Mp3SampleRates[2][4] = typedef struct tagAcmMpeg3Data { - LRESULT (*convert)(PACMDRVSTREAMINSTANCE adsi, const unsigned char*, + LRESULT (*convert)(PACMDRVSTREAMINSTANCE adsi, unsigned char*, LPDWORD, unsigned char*, LPDWORD); AudioConverterRef acr; AudioStreamBasicDescription in,out; @@ -395,7 +395,7 @@ static SInt32 Mp3GetPacketLength(const unsigned char* src) and *nsrc to the length of the unwanted data and return no error. */ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, + unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) { OSStatus err; @@ -406,7 +406,7 @@ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, TRACE("ndst %u %p <- %u %p\n", *ndst, dst, *nsrc, src); - TRACE("First 16 bytes to input: %s\n", wine_dbgstr_an(src, 16)); + TRACE("First 16 bytes to input: %s\n", wine_dbgstr_an((const char *)src, 16)); /* Parse ID3 tag */ if (!memcmp(src, "ID3", 3) && amd->tagBytesLeft == -1) @@ -429,7 +429,7 @@ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, { src += amd->tagBytesLeft; *nsrc -= amd->tagBytesLeft; - TRACE("Skipping %d for ID3 tag\n", amd->tagBytesLeft); + TRACE("Skipping %ld for ID3 tag\n", amd->tagBytesLeft); } /* @@ -460,7 +460,7 @@ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, syncSkip = psrc - src; src += syncSkip; *nsrc -= syncSkip; - TRACE("Skipping %d for frame sync\n", syncSkip); + TRACE("Skipping %ld for frame sync\n", syncSkip); } break; }

1 0