September 2010 - Wine-Commits

Mikko Rasa : wined3d: Recognize GeForce GTX 460.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

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

Paul Vriens : dlls: Fix some specfiles with respect to 'str' and 'wstr' usage.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: 75c5484174462a521856b01c17abb18e2684bc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c5484174462a521856b01c1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 9 11:30:40 2010 +0200 dlls: Fix some specfiles with respect to 'str' and 'wstr' usage. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/msi/msi.spec | 4 ++-- dlls/odbccp32/odbccp32.spec | 4 ++-- dlls/rasapi32/rasapi32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/shell32/shell32.spec | 2 +- dlls/winspool.drv/winspool.drv.spec | 2 +- dlls/wldap32/wldap32.spec | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ac69d3c..11a335b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -95,7 +95,7 @@ # @ stub CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserSecure -@ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @@ -314,7 +314,7 @@ @ stdcall InitiateSystemShutdownA(str str long long long) @ stdcall InitiateSystemShutdownExA(str str long long long long) @ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) -@ stdcall InitiateSystemShutdownW(str str long long long) +@ stdcall InitiateSystemShutdownW(wstr wstr long long long) @ stub InstallApplication @ stub IsProcessRestricted @ stdcall IsTextUnicode(ptr long ptr) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index f0e3238..fd047f8 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -174,7 +174,7 @@ 178 stdcall MsiGetPatchInfoA(str str ptr ptr) 179 stdcall MsiGetPatchInfoW(wstr wstr ptr ptr) 180 stdcall MsiEnumPatchesA(str long ptr ptr ptr) -181 stdcall MsiEnumPatchesW(str long ptr ptr ptr) +181 stdcall MsiEnumPatchesW(wstr long ptr ptr ptr) 182 stdcall -private DllGetVersion(ptr) 183 stub MsiGetProductCodeFromPackageCodeA 184 stub MsiGetProductCodeFromPackageCodeW @@ -214,7 +214,7 @@ 218 stdcall MsiGetFileHashA(str long ptr) 219 stdcall MsiGetFileHashW(wstr long ptr) 220 stub MsiEnumComponentCostsA -221 stdcall MsiEnumComponentCostsW(long str long long ptr ptr ptr ptr) +221 stdcall MsiEnumComponentCostsW(long wstr long long ptr ptr ptr ptr) 222 stdcall MsiCreateAndVerifyInstallerDirectory(long) 223 stdcall MsiGetFileSignatureInformationA(str long ptr ptr ptr) 224 stdcall MsiGetFileSignatureInformationW(wstr long ptr ptr ptr) diff --git a/dlls/odbccp32/odbccp32.spec b/dlls/odbccp32/odbccp32.spec index e01da6a..3d85d75 100644 --- a/dlls/odbccp32/odbccp32.spec +++ b/dlls/odbccp32/odbccp32.spec @@ -1,6 +1,6 @@ @ stdcall ODBCCPlApplet( long long ptr ptr) -@ stdcall SQLConfigDataSource(ptr long wstr wstr) -@ stdcall SQLConfigDataSourceW(ptr long str str) +@ stdcall SQLConfigDataSource(ptr long str str) +@ stdcall SQLConfigDataSourceW(ptr long wstr wstr) @ stdcall SQLConfigDriver(ptr long str str ptr long ptr) @ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) @ stdcall SQLCreateDataSource(ptr str) diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index 6aacbbf..08c750e 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -21,7 +21,7 @@ @ stdcall RasEnumDevicesA(ptr ptr ptr) @ stdcall RasEnumDevicesW(ptr ptr ptr) @ stdcall RasEnumEntriesA(str str ptr ptr ptr) -@ stdcall RasEnumEntriesW(str str ptr ptr ptr) +@ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) @ stub RasEnumEntriesWow @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9db4b6e..f91d0d8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -290,7 +290,7 @@ @ stdcall SetupDiCreateDeviceInfoA(long str ptr str long long ptr) @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) -@ stdcall SetupDiCreateDeviceInfoListExW(ptr long str ptr) +@ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr) @ stdcall SetupDiCreateDeviceInfoW(long wstr ptr wstr long long ptr) @ stdcall SetupDiCreateDeviceInterfaceA(ptr ptr ptr str long ptr) @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 719fc9a..961e1af 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -443,7 +443,7 @@ @ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW @ stdcall StrRChrA(str str long) shlwapi.StrRChrA @ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA -@ stdcall StrRChrIW(str str long) shlwapi.StrRChrIW +@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW @ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW @ stub StrRStrA @ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index ce29a72..9151b11 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -143,7 +143,7 @@ @ stdcall GetPrinterDriverA(long str long ptr long ptr) @ stdcall GetPrinterDriverDirectoryA(str str long ptr long ptr) @ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) -@ stdcall GetPrinterDriverW(long str long ptr long ptr) +@ stdcall GetPrinterDriverW(long wstr long ptr long ptr) @ stdcall GetPrinterW(long long ptr long ptr) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 048defe..8a8e29f 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -52,7 +52,7 @@ 62 cdecl ldap_add_extW(ptr wstr ptr ptr ptr ptr) 63 cdecl ldap_add_ext_s(ptr str ptr ptr ptr) ldap_add_ext_sA 64 cdecl ldap_add_ext_sA(ptr str ptr ptr ptr) - 65 cdecl ldap_add_ext_sW(ptr str ptr ptr ptr) + 65 cdecl ldap_add_ext_sW(ptr wstr ptr ptr ptr) 66 cdecl ldap_add_sA(ptr str ptr) 67 cdecl ldap_modrdn2(ptr str ptr long) ldap_modrdn2A 68 cdecl ldap_modrdn2_s(ptr str ptr long) ldap_modrdn2_sA @@ -206,7 +206,7 @@ 216 cdecl ldap_simple_bind_sW(ptr wstr wstr) 217 cdecl ldap_sslinit(str long long) ldap_sslinitA 218 cdecl ldap_sslinitA(str long long) -219 cdecl ldap_sslinitW(str long long) +219 cdecl ldap_sslinitW(wstr long long) 220 cdecl ldap_ufn2dn(str ptr) ldap_ufn2dnA 221 cdecl ldap_ufn2dnA(str ptr) 222 cdecl ldap_ufn2dnW(wstr ptr)

1 0

Mariusz Pluciński : gameux: Add storing Title registry value.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

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

Alistair Leslie-Hughes : msxml6: Register interfaces.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: ed7f017d71068c02b68058d6021393a8f9571a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7f017d71068c02b68058d60… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 9 19:56:48 2010 +1000 msxml6: Register interfaces. --- dlls/msxml6/regsvr.c | 39 +++++++++++++++++++++++++++++++++++++++ include/msxml6.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c index 04f07c9..872015d 100644 --- a/dlls/msxml6/regsvr.c +++ b/dlls/msxml6/regsvr.c @@ -346,6 +346,30 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.DOMDocument", "6.0" }, + { &CLSID_XMLSchemaCache60, + "XML Schema Cache 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.XMLSchemaCache", + "6.0" + }, + { &CLSID_MXXMLWriter60, + "IMXWriter interface 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.MXXMLWriter", + "6.0" + }, + { &CLSID_SAXAttributes60, + "SAX Attribute 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.SAXAttributes", + "6.0" + }, { &CLSID_FreeThreadedDOMDocument60, "Free Threaded XML DOM Document 6.0", NULL, @@ -366,6 +390,21 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument60, NULL }, + { "Msxml2.XMLSchemaCache.6.0", + "XML Schema Cache 6.0", + &CLSID_XMLSchemaCache60, + NULL + }, + { "Msxml2.MXXMLWriter.6.0", + "MXXMLWriter 6.0", + &CLSID_MXXMLWriter60, + NULL + }, + { "Msxml2.SAXAttributes.6.0", + "SAX Attribute 6.0", + &CLSID_SAXAttributes60, + NULL + }, { "MSXML.FreeThreadedDOMDocument60", "Free threaded XML DOM Document 6.0", &CLSID_FreeThreadedDOMDocument60, diff --git a/include/msxml6.idl b/include/msxml6.idl index 59c9d6d..5b14e47 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -58,3 +58,50 @@ interface IXMLDOMDocument3 : IXMLDOMDocument2 [in] VARIANT_BOOL deep, [out, retval] IXMLDOMNode **clone); } + +[ + uuid(88d96a07-f192-11d4-a65f-0040963251e5) +] +coclass XMLSchemaCache60 +{ + [default] interface IXMLDOMSchemaCollection2; +} + +[ + uuid(88d96a0f-f192-11d4-a65f-0040963251e5) +] +coclass MXXMLWriter60 +{ + [default] interface IMXWriter; + + interface ISAXContentHandler; + interface ISAXDeclHandler; + interface ISAXDTDHandler; + interface ISAXErrorHandler; + interface ISAXLexicalHandler; + + interface IVBSAXContentHandler; + interface IVBSAXDeclHandler; + interface IVBSAXDTDHandler; + interface IVBSAXErrorHandler; + interface IVBSAXLexicalHandler; +} + +[ + uuid(88d96a0c-f192-11d4-a65f-0040963251e5) +] +coclass SAXXMLReader60 +{ + [default] interface IVBSAXXMLReader; + interface ISAXXMLReader; +} + +[ + uuid(88d96a0e-f192-11d4-a65f-0040963251e5) +] +coclass SAXAttributes60 +{ + [default] interface IMXAttributes; + interface IVBSAXAttributes; + interface ISAXAttributes; +}

1 0

Mariusz Pluciński : gameux: Add support of loading Application Id into registry.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

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

Roderick Colenbrander : wined3d: Add AMD NT6x drivers.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: d79bbdca514f335eae7a1533deb60f4466a812ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79bbdca514f335eae7a1533d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 9 04:26:21 2010 +0200 wined3d: Add AMD NT6x drivers. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0b83ff6..c127571 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -996,6 +996,8 @@ static const struct driver_version_information driver_version_table[] = * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) */ {DRIVER_ATI_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_ATI_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 8681}, + {DRIVER_ATI_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, + {DRIVER_ATI_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, /* Nvidia * - Geforce6 and newer cards are supported by the current driver (197.x) on XP-Win7

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}IUri.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: d95d6b5d1bf3aad9c5c725e284a13dcd2327098c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95d6b5d1bf3aad9c5c725e28… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 19:29:56 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}IUri. --- dlls/urlmon/tests/uri.c | 156 ++++++++++++++++++++++++++++++----------------- dlls/urlmon/uri.c | 77 ++++++++++++++++++++++- 2 files changed, 173 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d95d6b5d1bf3aad9c5c72…

1 0

Thomas Mullaly : urlmon/tests: Restructured IUriBuilder tests so they can accept IUriBuilders which don' t have a base IUri.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

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

Thomas Mullaly : urlmon/tests: Removed no longer needed todo_wine's.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

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

Austin English : mmdevapi: Remove an unused variable.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

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