wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

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

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

Alistair Leslie-Hughes : msxml6: Register interfaces.
by Alexandre Julliard 09 Sep '10

09 Sep '10

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

Paul Vriens : dlls: Fix some specfiles with respect to 'str' and 'wstr' usage.
by Alexandre Julliard 09 Sep '10

09 Sep '10

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

Roderick Colenbrander : wined3d: Add Intel gpu and driver information.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: a352ad209719f947bffa2989503a2e08cc3c7016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a352ad209719f947bffa29895… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 9 04:26:22 2010 +0200 wined3d: Add Intel gpu and driver information. --- dlls/wined3d/directx.c | 25 ++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c127571..2f4fd55 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -999,6 +999,17 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_ATI_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, {DRIVER_ATI_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, + /* Intel + * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp + * drivers used ialmrnt5.dll for GMA800/GMA900 but at some point the file was renamed to + * igxprd32.dll but the GMA800 driver was never updated. */ + {DRIVER_INTEL_GMA800, DRIVER_MODEL_NT5X, "ialmrnt5.dll", 14, 10, 3889}, + {DRIVER_INTEL_GMA900, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 4764}, + {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 4926}, + {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 5218}, + {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 14, 10, 1504}, + {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 15, 10, 1666}, + /* Nvidia * - Geforce6 and newer cards are supported by the current driver (197.x) on XP-Win7 * - GeforceFX support is up to 173.x on <= XP @@ -1074,9 +1085,17 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_ATI_R600, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4800, "ATI Radeon HD 4800 Series", DRIVER_ATI_R600, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, }, - {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, } - - /* TODO: Add information about legacy ATI hardware, Intel and other cards. */ + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, }, + /* Intel cards */ + {HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800 }, + {HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800 }, + {HW_VENDOR_INTEL, CARD_INTEL_I865G, "Intel(R) 82865G Graphics Controller", DRIVER_INTEL_GMA800 }, + {HW_VENDOR_INTEL, CARD_INTEL_I915G, "Intel(R) 82915G/GV/910GL Express Chipset Family", DRIVER_INTEL_GMA900 }, + {HW_VENDOR_INTEL, CARD_INTEL_I915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900 }, + {HW_VENDOR_INTEL, CARD_INTEL_I945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950 }, + {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000 } + + /* TODO: Add information about legacy ATI hardware and other cards. */ }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9e6e83..9edc83a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1241,6 +1241,10 @@ enum wined3d_display_driver { DRIVER_ATI_R300, DRIVER_ATI_R600, + DRIVER_INTEL_GMA800, + DRIVER_INTEL_GMA900, + DRIVER_INTEL_GMA950, + DRIVER_INTEL_GMA3000, DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX,

1 0

Roderick Colenbrander : wined3d: Add AMD NT6x drivers.
by Alexandre Julliard 09 Sep '10

09 Sep '10

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

Roderick Colenbrander : wined3d: Add Nvidia NT6x driver information.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: ae5d8698f92cba37c903776cdb5d2f09116e5466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5d8698f92cba37c903776cd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 9 04:26:20 2010 +0200 wined3d: Add Nvidia NT6x driver information. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f51f968..0b83ff6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1007,6 +1007,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCE2MX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 9371}, {DRIVER_NVIDIA_GEFORCEFX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 11, 7516}, {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 11, 9745}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 11, 9745}, }; struct gpu_description

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_RemoveProperties.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: bef85fbc980e44ae77a7d458995f870e97ed2843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef85fbc980e44ae77a7d4589… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 20:12:37 2010 -0400 urlmon: Implemented IUriBuilder_RemoveProperties. --- dlls/urlmon/tests/uri.c | 51 +++++++++++++++++++++++++++++++++++------------ dlls/urlmon/uri.c | 36 +++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 37b6cfd..3045b3d 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4943,16 +4943,38 @@ typedef struct _uri_builder_remove_test { static const uri_builder_remove_test uri_builder_remove_tests[] = { { "http://google.com/test?test=y#Frag",0,S_OK,FALSE, - Uri_HAS_FRAGMENT|Uri_HAS_PATH|Uri_HAS_QUERY,S_OK,TRUE, + Uri_HAS_FRAGMENT|Uri_HAS_PATH|Uri_HAS_QUERY,S_OK,FALSE, "http://google.com/",0,S_OK,TRUE }, { "http://user:pass@winehq.org/",0,S_OK,FALSE, - Uri_HAS_USER_NAME|Uri_HAS_PASSWORD,S_OK,TRUE, + Uri_HAS_USER_NAME|Uri_HAS_PASSWORD,S_OK,FALSE, "http://winehq.org/",0,S_OK,TRUE }, { "zip://google.com?Test=x",0,S_OK,FALSE, - Uri_HAS_HOST,S_OK,TRUE, + Uri_HAS_HOST,S_OK,FALSE, "zip:/?Test=x",0,S_OK,TRUE + }, + /* Doesn't remove the whole userinfo component. */ + { "http://username:pass@google.com/",0,S_OK,FALSE, + Uri_HAS_USER_INFO,S_OK,FALSE, + "http://username:pass@google.com/",0,S_OK,TRUE + }, + /* Doesn't remove the domain. */ + { "http://google.com/",0,S_OK,FALSE, + Uri_HAS_DOMAIN,S_OK,FALSE, + "http://google.com/",0,S_OK,TRUE + }, + { "http://google.com:120/",0,S_OK,FALSE, + Uri_HAS_AUTHORITY,S_OK,FALSE, + "http://google.com:120/",0,S_OK,TRUE + }, + { "http://google.com/test.com/",0,S_OK,FALSE, + Uri_HAS_EXTENSION,S_OK,FALSE, + "http://google.com/test.com/",0,S_OK,TRUE + }, + { "http://google.com/?test=x",0,S_OK,FALSE, + Uri_HAS_PATH_AND_QUERY,S_OK,FALSE, + "http://google.com/?test=x",0,S_OK,TRUE } }; @@ -7837,19 +7859,22 @@ static void test_IUriBuilder_RemoveProperties(void) { for(i = Uri_PROPERTY_STRING_START; i <= Uri_PROPERTY_DWORD_LAST; ++i) { hr = IUriBuilder_RemoveProperties(builder, i << 1); if((i << 1) & invalid) { - todo_wine { - ok(hr == E_INVALIDARG, - "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", - hr, E_INVALIDARG, i); - } + ok(hr == E_INVALIDARG, + "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", + hr, E_INVALIDARG, i); } else { - todo_wine { - ok(hr == S_OK, - "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", - hr, S_OK, i); - } + ok(hr == S_OK, + "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", + hr, S_OK, i); } } + + /* Also doesn't accept anything that's outside the range of the + * Uri_HAS flags. + */ + hr = IUriBuilder_RemoveProperties(builder, (Uri_PROPERTY_DWORD_LAST+1) << 1); + ok(hr == E_INVALIDARG, "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x.\n", + hr, E_INVALIDARG); } if(builder) IUriBuilder_Release(builder); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 45acde9..e69f090 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4743,9 +4743,41 @@ static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewV static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPropertyMask) { + const DWORD accepted_flags = Uri_HAS_AUTHORITY|Uri_HAS_DOMAIN|Uri_HAS_EXTENSION|Uri_HAS_FRAGMENT|Uri_HAS_HOST| + Uri_HAS_PASSWORD|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_QUERY| + Uri_HAS_SCHEME_NAME|Uri_HAS_USER_INFO|Uri_HAS_USER_NAME; + UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(0x%08x)\n", This, dwPropertyMask); - return E_NOTIMPL; + TRACE("(%p)->(0x%08x)\n", This, dwPropertyMask); + + if(dwPropertyMask & ~accepted_flags) + return E_INVALIDARG; + + if(dwPropertyMask & Uri_HAS_FRAGMENT) + UriBuilder_SetFragment(iface, NULL); + + if(dwPropertyMask & Uri_HAS_HOST) + UriBuilder_SetHost(iface, NULL); + + if(dwPropertyMask & Uri_HAS_PASSWORD) + UriBuilder_SetPassword(iface, NULL); + + if(dwPropertyMask & Uri_HAS_PATH) + UriBuilder_SetPath(iface, NULL); + + if(dwPropertyMask & Uri_HAS_PORT) + UriBuilder_SetPort(iface, FALSE, 0); + + if(dwPropertyMask & Uri_HAS_QUERY) + UriBuilder_SetQuery(iface, NULL); + + if(dwPropertyMask & Uri_HAS_SCHEME_NAME) + UriBuilder_SetSchemeName(iface, NULL); + + if(dwPropertyMask & Uri_HAS_USER_NAME) + UriBuilder_SetUserName(iface, NULL); + + return S_OK; } static HRESULT WINAPI UriBuilder_HasBeenModified(IUriBuilder *iface, BOOL *pfModified)

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_HasBeenModified.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 9d41c3d51ab8dd562541eb3be9dde05b298b7ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d41c3d51ab8dd562541eb3be… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 19:34:44 2010 -0400 urlmon: Implemented IUriBuilder_HasBeenModified. --- dlls/urlmon/tests/uri.c | 67 ++++++++++++++++++---------------------------- dlls/urlmon/uri.c | 4 +- 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fb89e13..37b6cfd 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7652,18 +7652,13 @@ static void test_IUriBuilder(void) { } hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, - "Error IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", - hr, S_OK, i); - } - if(SUCCEEDED(hr)) { - todo_wine { - ok(received == modified, - "Error: Expected received to be %d but was %d instead on uri_builder_tests[%d].\n", - modified, received, i); - } - } + ok(hr == S_OK, + "Error IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, i); + if(SUCCEEDED(hr)) + ok(received == modified, + "Error: Expected received to be %d but was %d instead on uri_builder_tests[%d].\n", + modified, received, i); /* Test the "Get*" functions. */ test_IUriBuilder_GetFragment(builder, &test, i); @@ -7705,12 +7700,10 @@ static void test_IUriBuilder_HasBeenModified(void) { hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); hr = pCreateUri(http_urlW, 0, 0, &uri); ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); @@ -7723,24 +7716,20 @@ static void test_IUriBuilder_HasBeenModified(void) { hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == FALSE, "Error: Expected received to be FALSE.\n"); } + ok(received == FALSE, "Error: Expected received to be FALSE.\n"); /* Test what happens with you call SetIUri with the same IUri again. */ hr = IUriBuilder_SetHost(builder, hostW); ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); hr = IUriBuilder_SetIUri(builder, uri); ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); @@ -7749,11 +7738,10 @@ static void test_IUriBuilder_HasBeenModified(void) { * reset any of the changes that were made to the IUriBuilder. */ hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); + hr = IUriBuilder_GetHost(builder, &len, &prop); ok(hr == S_OK, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { @@ -7769,23 +7757,20 @@ static void test_IUriBuilder_HasBeenModified(void) { hr = IUriBuilder_SetHost(builder, hostW); ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); hr = IUriBuilder_SetIUri(builder, NULL); ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%09x.\n", hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); + hr = IUriBuilder_GetHost(builder, &len, &prop); ok(hr == S_OK, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f6616be..45acde9 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4756,8 +4756,8 @@ static HRESULT WINAPI UriBuilder_HasBeenModified(IUriBuilder *iface, BOOL *pfMod if(!pfModified) return E_POINTER; - FIXME("(%p)->(%p)\n", This, pfModified); - return E_NOTIMPL; + *pfModified = This->modified_props > 0; + return S_OK; } #undef URIBUILDER_THIS

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}IUri.
by Alexandre Julliard 09 Sep '10

09 Sep '10

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

← Newer
1
...
59
60
61
62
63
64
65
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010