September 2010 - Wine-commits

Joris Huizer : msxml3/tests: Add lastChild tests.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 33042ed137a5dc655434774f11d0298fb8e994a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33042ed137a5dc655434774f1… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Thu Sep 9 13:56:58 2010 +0200 msxml3/tests: Add lastChild tests. --- dlls/msxml3/tests/domdoc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4317c52..a3ab55e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2558,6 +2558,48 @@ static void test_get_firstChild(void) IXMLDOMDocument_Release( doc ); } +static void test_get_lastChild(void) +{ + static WCHAR lcW[] = {'l','c',0}; + static WCHAR foW[] = {'f','o',0}; + IXMLDOMDocument *doc; + IXMLDOMNode *node, *child; + VARIANT_BOOL b; + HRESULT r; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + r = IXMLDOMDocument_get_lastChild( doc, &node ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNode_get_nodeName( node, &str ); + ok( r == S_OK, "ret %08x\n", r); + + ok(memcmp(str, lcW, sizeof(lcW)) == 0, "expected \"lc\" node name\n"); + SysFreeString(str); + + r = IXMLDOMNode_get_lastChild( node, &child ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNode_get_nodeName( child, &str ); + ok( r == S_OK, "ret %08x\n", r); + + ok(memcmp(str, foW, sizeof(foW)) == 0, "expected \"fo\" node name\n"); + SysFreeString(str); + + IXMLDOMNode_Release( child ); + IXMLDOMNode_Release( node ); + IXMLDOMDocument_Release( doc ); +} + static void test_removeChild(void) { HRESULT r; @@ -6013,6 +6055,7 @@ START_TEST(domdoc) test_get_text(); test_get_childNodes(); test_get_firstChild(); + test_get_lastChild(); test_removeChild(); test_replaceChild(); test_removeNamedItem();

1 0

Mikko Rasa : wined3d: Recognize GeForce GTX 460.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: b46183a2b458c37ea24848ebd156f9832eef9100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46183a2b458c37ea24848ebd… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Tue Sep 7 18:42:51 2010 +0300 wined3d: Recognize GeForce GTX 460. --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2f4fd55..4269052 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1071,6 +1071,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6 }, /* ATI cards */ @@ -1390,6 +1391,13 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_GTX470; } + /* Geforce 400 - midend */ + if (strstr(gl_renderer, "GTX 460")) + { + *vidmem = 768; /* 1024MB model also available */ + return CARD_NVIDIA_GEFORCE_GTX460; + } + /* Geforce 300 highend mobile */ if (strstr(gl_renderer, "GTS 350M") || strstr(gl_renderer, "GTS 360M")) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9edc83a..61a97f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1354,6 +1354,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0

Mariusz Pluciński : gameux: Initial implementation of IGameExplorer::AddGame.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 0949e083eccb460dd3a64496fd8ddb872e0bd15b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0949e083eccb460dd3a64496f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Sep 7 15:34:41 2010 +0200 gameux: Initial implementation of IGameExplorer::AddGame. --- dlls/gameux/Makefile.in | 2 +- dlls/gameux/gameexplorer.c | 254 +++++++++++++++++++++++++++++++++++++- dlls/gameux/gameux_private.h | 63 ++++++++++ dlls/gameux/tests/gameexplorer.c | 18 ++-- 4 files changed, 322 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0949e083eccb460dd3a64…

1 0

Mariusz Pluciński : gameux: Add support of loading Application Id into registry.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 180ac750bba09a7dab8af4041e6e65dfd80e78bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=180ac750bba09a7dab8af4041… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Sep 7 15:36:30 2010 +0200 gameux: Add support of loading Application Id into registry. --- dlls/gameux/Makefile.in | 2 +- dlls/gameux/gameexplorer.c | 152 +++++++++++++++++++++++++++++++++++++- dlls/gameux/gameux_private.h | 1 + dlls/gameux/tests/gameexplorer.c | 2 +- 4 files changed, 154 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index b90698c..bf8f9ab 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = gameux.dll -IMPORTS = uuid ole32 user32 advapi32 oleaut32 +IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 C_SRCS = \ factory.c \ diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 9df9a23..a4c37a7 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -23,15 +23,22 @@ #include "ole2.h" #include "sddl.h" +#include "xmldom.h" #include "gameux.h" #include "gameux_private.h" +#include "initguid.h" +#include "msxml2.h" + #include "wine/debug.h" #include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(gameux); +/* function from Shell32, not defined in header */ +extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); + /******************************************************************************* * GameUX helper functions */ @@ -186,12 +193,15 @@ static HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, * * List of registry keys associated with structure fields: * Key Field in GAMEUX_GAME_DATA structure + * ApplicationId guidApplicationId * ConfigApplicationPath sGameInstallDirectory * ConfigGDFBinaryPath sGDFBinaryPath * */ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) { + static const WCHAR sApplicationId[] = + {'A','p','p','l','i','c','a','t','i','o','n','I','d',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}; static const WCHAR sConfigGDFBinaryPath[] = @@ -200,12 +210,16 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) HRESULT hr, hr2; LPWSTR lpRegistryKey; HKEY hKey; + WCHAR sGameApplicationId[40]; TRACE("(%p)\n", GameData); hr = GAMEUX_buildGameRegistryPath(GameData->installScope, &GameData->guidInstanceId, &lpRegistryKey); if(SUCCEEDED(hr)) + hr = (StringFromGUID2(&GameData->guidApplicationId, sGameApplicationId, sizeof(sGameApplicationId)/sizeof(sGameApplicationId[0])) ? S_OK : E_FAIL); + + if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegCreateKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, NULL)); @@ -222,6 +236,11 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) REG_SZ, (LPBYTE)(GameData->sGDFBinaryPath), (lstrlenW(GameData->sGDFBinaryPath)+1)*sizeof(WCHAR))); + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sApplicationId, 0, + REG_SZ, (LPBYTE)(sGameApplicationId), + (lstrlenW(sGameApplicationId)+1)*sizeof(WCHAR))); + RegCloseKey(hKey); if(FAILED(hr)) @@ -239,6 +258,135 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) return hr; } /******************************************************************************* + * GAMEUX_ParseGameDefinition + * + * Helper function, loads data from given XML element into fields of GAME_DATA + * structure + * + * Parameters: + * lpXMLGameDefinitionElement [I] Game Definition XML element + * GameData [O] structure where data loaded from + * XML element will be stored in + */ +static HRESULT GAMEUX_ParseGameDefinition( + IXMLDOMElement *gdElement, + struct GAMEUX_GAME_DATA *GameData) +{ + static const WCHAR sGameId[] = {'g','a','m','e','I','D',0}; + + HRESULT hr = S_OK; + BSTR bstrAttribute; + VARIANT variant; + + TRACE("(%p, %p)\n", gdElement, GameData); + + bstrAttribute = SysAllocString(sGameId); + if(!bstrAttribute) + hr = E_OUTOFMEMORY; + + hr = IXMLDOMElement_getAttribute(gdElement, bstrAttribute, &variant); + + if(SUCCEEDED(hr)) + { + hr = ( GUIDFromStringW(V_BSTR(&variant), &GameData->guidApplicationId)==TRUE ? S_OK : E_FAIL); + + SysFreeString(V_BSTR(&variant)); + } + + SysFreeString(bstrAttribute); + + return hr; +} +/******************************************************************************* + * GAMEUX_ParseGDFBinary + * + * Helper funtion, loads given binary and parses embed GDF if there's any. + * + * Parameters: + * GameData [I/O] Structure with game's data. Content of field + * sGDFBinaryPath defines path to binary, from + * which embed GDF will be loaded. Data from + * GDF will be stored in other fields of this + * structure. + */ +static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData) +{ + static const WCHAR sRes[] = {'r','e','s',':','/','/',0}; + static const WCHAR sDATA[] = {'D','A','T','A',0}; + static const WCHAR sSlash[] = {'/',0}; + + HRESULT hr = S_OK; + WCHAR sResourcePath[MAX_PATH]; + VARIANT variant; + VARIANT_BOOL isSuccessful; + IXMLDOMDocument *document; + IXMLDOMNode *gdNode; + IXMLDOMElement *root, *gdElement; + + TRACE("(%p)->sGDFBinaryPath = %s\n", GameData, debugstr_w(GameData->sGDFBinaryPath)); + + /* prepare path to GDF, using res:// prefix */ + lstrcpyW(sResourcePath, sRes); + lstrcatW(sResourcePath, GameData->sGDFBinaryPath); + lstrcatW(sResourcePath, sSlash); + lstrcatW(sResourcePath, sDATA); + lstrcatW(sResourcePath, sSlash); + lstrcatW(sResourcePath, ID_GDF_XML_STR); + + hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void**)&document); + + if(SUCCEEDED(hr)) + { + /* load GDF into MSXML */ + V_VT(&variant) = VT_BSTR; + V_BSTR(&variant) = SysAllocString(sResourcePath); + if(!V_BSTR(&variant)) + hr = E_OUTOFMEMORY; + + if(SUCCEEDED(hr)) + { + hr = IXMLDOMDocument_load(document, variant, &isSuccessful); + if(hr == S_FALSE || isSuccessful == VARIANT_FALSE) + hr = E_FAIL; + } + + SysFreeString(V_BSTR(&variant)); + + if(SUCCEEDED(hr)) + { + hr = IXMLDOMDocument_get_documentElement(document, &root); + if(hr == S_FALSE) + hr = E_FAIL; + } + + if(SUCCEEDED(hr)) + { + hr = IXMLDOMElement_get_firstChild(root, &gdNode); + if(hr == S_FALSE) + hr = E_FAIL; + + if(SUCCEEDED(hr)) + { + hr = IXMLDOMNode_QueryInterface(gdNode, &IID_IXMLDOMElement, (LPVOID*)&gdElement); + if(SUCCEEDED(hr)) + { + hr = GAMEUX_ParseGameDefinition(gdElement, GameData); + IXMLDOMElement_Release(gdElement); + } + + IXMLDOMNode_Release(gdNode); + } + + IXMLDOMElement_Release(root); + } + + IXMLDOMDocument_Release(document); + } + + return hr; +} +/******************************************************************************* * GAMEUX_RegisterGame * * Internal helper function. Description available in gameux_private.h file @@ -266,7 +414,9 @@ HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, GameData.guidInstanceId = *pInstanceID; - FIXME("loading game data from GDF file not yet implemented\n"); + /* load data from GDF binary */ + if(SUCCEEDED(hr)) + hr = GAMEUX_ParseGDFBinary(&GameData); /* save data to registry */ if(SUCCEEDED(hr)) diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index 3ff28ec..4beb500 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -41,6 +41,7 @@ struct GAMEUX_GAME_DATA LPWSTR sGameInstallDirectory; /* directory passed to AddGame/InstallGame methods */ GAME_INSTALL_SCOPE installScope;/* game's installation scope */ GUID guidInstanceId; /* game installation instance identifier */ + GUID guidApplicationId; /* game's application identifier */ }; /******************************************************************************* * GAMEUX_initGameData diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 4a0f241..4367ab3 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -295,7 +295,7 @@ static void _validateGameRegistryValues(int line, /* these values exist up from Vista */ hr = _validateRegistryValue(hKey, keyPath, sApplicationId, RRF_RT_REG_SZ, sGameApplicationId); - todo_wine ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); + ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); hr = _validateRegistryValue(hKey, keyPath, sConfigApplicationPath, RRF_RT_REG_SZ, gameExePath); ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); hr = _validateRegistryValue(hKey, keyPath, sConfigGDFBinaryPath, RRF_RT_REG_SZ, gameExeName);

1 0

Mariusz Pluciński : gameux: Add storing Title registry value.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 3c68877bc5c20e61ffa34b3d0e999be6a1ea9638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c68877bc5c20e61ffa34b3d0… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Sep 7 16:05:25 2010 +0200 gameux: Add storing Title registry value. --- dlls/gameux/gameexplorer.c | 80 ++++++++++++++++++++++++++++++++++++++ dlls/gameux/gameux_private.h | 1 + dlls/gameux/tests/gameexplorer.c | 2 +- 3 files changed, 82 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index a4c37a7..f792333 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -51,6 +51,7 @@ void GAMEUX_initGameData(struct GAMEUX_GAME_DATA *GameData) { GameData->sGDFBinaryPath = NULL; GameData->sGameInstallDirectory = NULL; + GameData->bstrName = NULL; } /******************************************************************************* * GAMEUX_uninitGameData @@ -61,6 +62,7 @@ void GAMEUX_uninitGameData(struct GAMEUX_GAME_DATA *GameData) { HeapFree(GetProcessHeap(), 0, GameData->sGDFBinaryPath); HeapFree(GetProcessHeap(), 0, GameData->sGameInstallDirectory); + SysFreeString(GameData->bstrName); } /******************************************************************************* * GAMEUX_buildGameRegistryPath @@ -196,6 +198,7 @@ static HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, * ApplicationId guidApplicationId * ConfigApplicationPath sGameInstallDirectory * ConfigGDFBinaryPath sGDFBinaryPath + * Title bstrName * */ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) @@ -206,6 +209,8 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) {'C','o','n','f','i','g','A','p','p','l','i','c','a','t','i','o','n','P','a','t','h',0}; 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 sTitle[] = + {'T','i','t','l','e',0}; HRESULT hr, hr2; LPWSTR lpRegistryKey; @@ -241,6 +246,11 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) REG_SZ, (LPBYTE)(sGameApplicationId), (lstrlenW(sGameApplicationId)+1)*sizeof(WCHAR))); + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sTitle, 0, + REG_SZ, (LPBYTE)(GameData->bstrName), + (lstrlenW(GameData->bstrName)+1)*sizeof(WCHAR))); + RegCloseKey(hKey); if(FAILED(hr)) @@ -258,6 +268,43 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) return hr; } /******************************************************************************* + * GAMEUX_ProcessGameDefinitionElement + * + * Helper function, parses single element from Game Definition + * + * Parameters: + * lpXMLElement [I] game definition element + * GameData [O] structure, where parsed + * data will be stored + */ +static HRESULT GAMEUX_ProcessGameDefinitionElement( + IXMLDOMElement *element, + struct GAMEUX_GAME_DATA *GameData) +{ + static const WCHAR sName[] = + {'N','a','m','e',0}; + + HRESULT hr; + BSTR bstrElementName; + + TRACE("(%p, %p)\n", element, GameData); + + hr = IXMLDOMElement_get_nodeName(element, &bstrElementName); + if(SUCCEEDED(hr)) + { + /* check element name */ + if(lstrcmpW(bstrElementName, sName) == 0) + hr = IXMLDOMElement_get_text(element, &GameData->bstrName); + + else + FIXME("entry %s in Game Definition File not yet supported\n", debugstr_w(bstrElementName)); + + SysFreeString(bstrElementName); + } + + return hr; +} +/******************************************************************************* * GAMEUX_ParseGameDefinition * * Helper function, loads data from given XML element into fields of GAME_DATA @@ -277,6 +324,9 @@ static HRESULT GAMEUX_ParseGameDefinition( HRESULT hr = S_OK; BSTR bstrAttribute; VARIANT variant; + IXMLDOMNodeList *childrenList; + IXMLDOMNode *nextNode; + IXMLDOMElement *nextElement; TRACE("(%p, %p)\n", gdElement, GameData); @@ -295,6 +345,36 @@ static HRESULT GAMEUX_ParseGameDefinition( SysFreeString(bstrAttribute); + /* browse subnodes */ + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_get_childNodes(gdElement, &childrenList); + + if(SUCCEEDED(hr)) + { + do + { + hr = IXMLDOMNodeList_nextNode(childrenList, &nextNode); + + if(hr == S_OK) + { + hr = IXMLDOMNode_QueryInterface(nextNode, &IID_IXMLDOMElement, + (LPVOID*)&nextElement); + + if(SUCCEEDED(hr)) + { + hr = GAMEUX_ProcessGameDefinitionElement(nextElement, GameData); + IXMLDOMElement_Release(nextElement); + } + + IXMLDOMElement_Release(nextNode); + } + } + while(hr == S_OK); + hr = S_OK; + + IXMLDOMNodeList_Release(childrenList); + } + return hr; } /******************************************************************************* diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index 4beb500..5b6e80d 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -42,6 +42,7 @@ struct GAMEUX_GAME_DATA GAME_INSTALL_SCOPE installScope;/* game's installation scope */ GUID guidInstanceId; /* game installation instance identifier */ GUID guidApplicationId; /* game's application identifier */ + BSTR bstrName; /* game's title */ }; /******************************************************************************* * GAMEUX_initGameData diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 4367ab3..a538d35 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -301,7 +301,7 @@ static void _validateGameRegistryValues(int line, hr = _validateRegistryValue(hKey, keyPath, sConfigGDFBinaryPath, RRF_RT_REG_SZ, gameExeName); ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); hr = _validateRegistryValue(hKey, keyPath, sTitle, RRF_RT_REG_SZ, sExampleGame); - todo_wine ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); + ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); /* this value exists up from Win7 */ hr = _validateRegistryValue(hKey, keyPath, sDescription, RRF_RT_REG_SZ, sGameDescription);

1 0

Austin English : mmdevapi: Remove an unused variable.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: f74944d21054c9e5026cd5944e72abc22a65bb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74944d21054c9e5026cd5944… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 8 16:48:22 2010 -0500 mmdevapi: Remove an unused variable. --- dlls/mmdevapi/audio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index ea9305a..0433b84 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -1370,7 +1370,7 @@ static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UIN ACCapture *This = (ACCapture*)iface; HRESULT hr; DWORD block = This->parent->pwfx->nBlockAlign; - DWORD ofs, bufsize; + DWORD ofs; TRACE("(%p)->(%p,%p,%p,%p,%p)\n", This, data, frames, flags, devpos, qpcpos); if (!data) @@ -1387,7 +1387,6 @@ static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UIN goto out; IAudioCaptureClient_GetNextPacketSize(iface, frames); ofs = This->parent->ofs; - bufsize = This->parent->bufsize; if ( (ofs*block) % This->parent->psize) ERR("Unaligned offset %u with %u\n", ofs*block, This->parent->psize); *data = This->parent->buffer + ofs * block;

1 0

Anders Jonsson : ipconfig: Update Swedish translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: d94d32dd3ce03444c4cdca9552b966fd6d48e104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94d32dd3ce03444c4cdca955… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Sep 8 23:23:36 2010 +0200 ipconfig: Update Swedish translation. --- programs/ipconfig/Sv.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Sv.rc b/programs/ipconfig/Sv.rc index 1268d25..7f36db2 100644 --- a/programs/ipconfig/Sv.rc +++ b/programs/ipconfig/Sv.rc @@ -44,4 +44,6 @@ STRINGTABLE STRING_DESCRIPTION, "Beskrivning" STRING_PHYS_ADDR, "Fysisk adress" STRING_DHCP_ENABLED, "DHCP aktiverat" + STRING_YES, "Ja" + STRING_NO, "Nej" }

1 0

Thomas Mullaly : urlmon: Fixed bug in IUriBuilder_GetUserName.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: dfa7c7e8e65a28067b6699b895f70969b050373b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa7c7e8e65a28067b6699b89… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 7 20:38:38 2010 -0400 urlmon: Fixed bug in IUriBuilder_GetUserName. --- dlls/urlmon/uri.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index dbe6d72..50944bd 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4605,8 +4605,7 @@ static HRESULT WINAPI UriBuilder_GetUserName(IUriBuilder *iface, DWORD *pcchUser UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchUserName, ppwzUserName); - if(!This->uri || This->uri->userinfo_start == -1 || - This->uri->userinfo_start == This->uri->userinfo_split || + if(!This->uri || This->uri->userinfo_start == -1 || This->uri->userinfo_split == 0 || This->modified_props & Uri_HAS_USER_NAME) return get_builder_component(&This->username, &This->username_len, NULL, 0, ppwzUserName, pcchUserName); else {

1 0

Thomas Mullaly : urlmon/tests: Removed no longer needed todo_wine's.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 84987e05b5936ce00805ad9d155412fd0af6a4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84987e05b5936ce00805ad9d1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 7 20:46:34 2010 -0400 urlmon/tests: Removed no longer needed todo_wine's. --- dlls/urlmon/tests/uri.c | 318 +++++++++++++++++------------------------------ 1 files changed, 114 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84987e05b5936ce00805a…

1 0

Thomas Mullaly : urlmon/tests: Restructured IUriBuilder tests so they can accept IUriBuilders which don' t have a base IUri.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: dd0ea1cc294ecb5977a888e72dabff664c02ba08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0ea1cc294ecb5977a888e72… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 7 21:22:24 2010 -0400 urlmon/tests: Restructured IUriBuilder tests so they can accept IUriBuilders which don't have a base IUri. Turns out an IUriBuilder doesn't need a valid IUri set as its IUri property for the CreateUri* functions to succeed. --- dlls/urlmon/tests/uri.c | 634 ++++++++++++++++++++++++++++------------------- 1 files changed, 381 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd0ea1cc294ecb5977a88…

1 0