March 2011 - Wine-commits - list.winehq.org

Francois Gouget : winecfg: Add a full stop to an error message.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 11bbb80dc94e52d91b9e85f501978946713129b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bbb80dc94e52d91b9e85f50… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:25:21 2011 +0100 winecfg: Add a full stop to an error message. --- programs/winecfg/winecfg.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index f98a14d..652fc47 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -83,7 +83,7 @@ BEGIN IDS_DRIVE_REMOTE "Network share" IDS_DRIVE_REMOVABLE "Floppy disk" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" + IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26." IDS_SYSTEM_DRIVE_LABEL "System drive" IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" IDS_COL_DRIVELETTER "Letter"

1 0

Francois Gouget : advapi32: Make trustee_name_A_to_W() and free_trustee_name() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 5b4f0dfc4c030014d32c1cf19a5ba42210dac429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4f0dfc4c030014d32c1cf19… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:25:36 2011 +0100 advapi32: Make trustee_name_A_to_W() and free_trustee_name() static. --- dlls/advapi32/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 1aa7990..cd76fb5 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3471,7 +3471,7 @@ BOOL WINAPI SetAclInformation( PACL pAcl, LPVOID pAclInformation, return TRUE; } -DWORD trustee_name_A_to_W(TRUSTEE_FORM form, char *trustee_nameA, WCHAR **ptrustee_nameW) +static DWORD trustee_name_A_to_W(TRUSTEE_FORM form, char *trustee_nameA, WCHAR **ptrustee_nameW) { DWORD len; @@ -3552,7 +3552,7 @@ error: } } -void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW) +static void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW) { switch (form) {

1 0

Eric Pouech : winedbg: Also get rid of trailing \r in input_read_line.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 77eefaed583ad3f6c53378c63b364d0dcc6912c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77eefaed583ad3f6c53378c63… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 22:26:49 2011 +0100 winedbg: Also get rid of trailing \r in input_read_line. --- programs/winedbg/dbg.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index c7e2c3b..4f2da25 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -507,8 +507,8 @@ int input_read_line(const char* pfx, char* buf, int size) int len = input_fetch_entire_line(pfx, &line); if (len < 0) return 0; - /* remove trailing \n */ - if (len > 0 && line[len - 1] == '\n') len--; + /* remove trailing \n and \r */ + while (len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r')) len--; len = min(size - 1, len); memcpy(buf, line, len); buf[len] = '\0';

1 0

Eric Pouech : winedbg: Display a valid source file when reporting an error about a missing source file .
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 1adbe826012f13cf0208a384adecb9afd41ed22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adbe826012f13cf0208a384a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 22:26:55 2011 +0100 winedbg: Display a valid source file when reporting an error about a missing source file. --- programs/winedbg/source.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index e341d48..e564815 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -199,31 +199,39 @@ static int source_display(const char* sourcefile, int start, int end) if (dbg_interactiveP) { char zbuf[256]; - /* - * Still couldn't find it. Ask user for path to add. - */ - snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s': ", sourcefile); - input_read_line(zbuf, tmppath, sizeof(tmppath)); - if (tmppath[strlen(tmppath) - 1] != '/') + for (;;) { - strcat(tmppath, "/"); + size_t len; + /* + * Still couldn't find it. Ask user for path to add. + */ + snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s' (<cr> to end search): ", sourcefile); + input_read_line(zbuf, tmppath, sizeof(tmppath)); + if (!(len = strlen(tmppath))) break; + + /* append '/' if missing at the end */ + if (tmppath[len - 1] != '/' && tmppath[len - 1] != '\\') + tmppath[len++] = '/'; + strcpy(&tmppath[len], basename); + if (GetFileAttributesA(tmppath) != INVALID_FILE_ATTRIBUTES) + break; + dbg_printf("Unable to access file '%s'\n", tmppath); } - /* - * Now append the base file name. - */ - strcat(tmppath, basename); } - else tmppath[0] = '\0'; + else + { + dbg_printf("Unable to access file '%s'\n", sourcefile); + tmppath[0] = '\0'; + } - if (GetFileAttributesA(tmppath) == INVALID_FILE_ATTRIBUTES) + if (!tmppath[0]) { /* * OK, I guess the user doesn't really want to see it * after all. */ ol = source_add_file(sourcefile, NULL); - dbg_printf("Unable to open file '%s'\n", tmppath); return FALSE; } }

1 0

Nikolay Sivov : msxml3: Merge save() tests to a single function.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 59f64b2896cfed6a0d00553cb1c4db6cf5b1be8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f64b2896cfed6a0d00553cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 23:26:55 2011 +0300 msxml3: Merge save() tests to a single function. --- dlls/msxml3/tests/domdoc.c | 103 ++++++++++++++++---------------------------- 1 files changed, 37 insertions(+), 66 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 108d610..6948201 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5629,10 +5629,15 @@ static void test_nodeTypeTests( void ) free_bstrs(); } -static void test_DocumentSaveToDocument(void) +static void test_save(void) { IXMLDOMDocument *doc, *doc2; - IXMLDOMElement *pRoot; + IXMLDOMElement *root; + VARIANT file, vDoc; + BSTR sOrig, sNew; + char buffer[100]; + DWORD read = 0; + HANDLE hfile; HRESULT hr; doc = create_document(&IID_IXMLDOMDocument); @@ -5645,86 +5650,53 @@ static void test_DocumentSaveToDocument(void) return; } - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vDoc; - BSTR sOrig; - BSTR sNew; - - V_VT(&vDoc) = VT_UNKNOWN; - V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - - hr = IXMLDOMDocument_save(doc, vDoc); - ok(hr == S_OK, "ret %08x\n", hr ); + /* save to IXMLDOMDocument */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc, &sOrig); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc2, &sNew); - ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&vDoc) = VT_UNKNOWN; + V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); + hr = IXMLDOMDocument_save(doc, vDoc); + EXPECT_HR(hr, S_OK); - SysFreeString(sOrig); - SysFreeString(sNew); - } - IXMLDOMElement_Release(pRoot); - } + hr = IXMLDOMDocument_get_xml(doc, &sOrig); + EXPECT_HR(hr, S_OK); - IXMLDOMDocument_Release(doc2); - IXMLDOMDocument_Release(doc); -} + hr = IXMLDOMDocument_get_xml(doc2, &sNew); + EXPECT_HR(hr, S_OK); -static void test_DocumentSaveToFile(void) -{ - IXMLDOMDocument *doc; - IXMLDOMElement *pRoot; - HANDLE file; - char buffer[100]; - DWORD read = 0; - HRESULT hr; + ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; + SysFreeString(sOrig); + SysFreeString(sNew); - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vFile; + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc2); - V_VT(&vFile) = VT_BSTR; - V_BSTR(&vFile) = _bstr_("test.xml"); + /* save to path */ + V_VT(&file) = VT_BSTR; + V_BSTR(&file) = _bstr_("test.xml"); - hr = IXMLDOMDocument_save(doc, vFile); - ok(hr == S_OK, "ret %08x\n", hr ); - } - } + hr = IXMLDOMDocument_save(doc, file); + EXPECT_HR(hr, S_OK); - IXMLDOMElement_Release(pRoot); IXMLDOMDocument_Release(doc); - file = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - ok(file != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); - if(file == INVALID_HANDLE_VALUE) - return; + hfile = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); + if(hfile == INVALID_HANDLE_VALUE) return; - ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); ok(read != 0, "could not read file\n"); ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); - CloseHandle(file); + CloseHandle(hfile); DeleteFile("test.xml"); + free_bstrs(); } static void test_testTransforms(void) @@ -8678,8 +8650,7 @@ START_TEST(domdoc) test_cloneNode(); test_xmlTypes(); test_nodeTypeTests(); - test_DocumentSaveToDocument(); - test_DocumentSaveToFile(); + test_save(); test_testTransforms(); test_Namespaces(); test_FormattingXML();

1 0

Nikolay Sivov : msxml3: Support VT_BSTR|VT_BYREF as source in load().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: cde8e6c8cc69ca0b3542779a5cdf5e88475c7465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde8e6c8cc69ca0b3542779a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 16 00:35:55 2011 +0300 msxml3: Support VT_BSTR|VT_BYREF as source in load(). --- dlls/msxml3/domdoc.c | 24 ++++++++++-------- dlls/msxml3/main.c | 3 ++ dlls/msxml3/tests/domdoc.c | 57 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7d1b352..43bcb77 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2104,7 +2104,7 @@ static HRESULT doread( domdoc *This, LPWSTR filename ) static HRESULT WINAPI domdoc_load( IXMLDOMDocument3 *iface, - VARIANT xmlSource, + VARIANT source, VARIANT_BOOL* isSuccessful ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); @@ -2114,19 +2114,23 @@ static HRESULT WINAPI domdoc_load( IStream *pStream = NULL; xmlDocPtr xmldoc; - TRACE("(%p)->type %d\n", This, V_VT(&xmlSource) ); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&source)); *isSuccessful = VARIANT_FALSE; assert( &This->node ); - switch( V_VT(&xmlSource) ) + switch( V_VT(&source) ) { case VT_BSTR: - filename = V_BSTR(&xmlSource); + filename = V_BSTR(&source); + break; + case VT_BSTR|VT_BYREF: + if (!V_BSTRREF(&source)) return E_INVALIDARG; + filename = *V_BSTRREF(&source); break; case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IXMLDOMDocument3, (void**)&pNewDoc); + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc); if(hr == S_OK) { if(pNewDoc) @@ -2141,7 +2145,7 @@ static HRESULT WINAPI domdoc_load( return hr; } } - hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IStream, (void**)&pStream); + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IStream, (void**)&pStream); if(hr == S_OK) { IPersistStream *pDocStream; @@ -2170,14 +2174,12 @@ static HRESULT WINAPI domdoc_load( else { /* ISequentialStream */ - FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&xmlSource)->lpVtbl); + FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); } break; default: - FIXME("VT type not supported (%d)\n", V_VT(&xmlSource)); - } - - TRACE("filename (%s)\n", debugstr_w(filename)); + FIXME("VT type not supported (%d)\n", V_VT(&source)); + } if ( filename ) { diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 6cbdd99..01eabab 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -286,6 +286,9 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_UNKNOWN: %p}", V_UNKNOWN(v)); case VT_UINT: return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); + case VT_BSTR|VT_BYREF: + return wine_dbg_sprintf("{VT_BSTR|VT_BYREF: ptr %p, data %s}", + V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w(*V_BSTRREF(v)) : NULL); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6948201..3e60e24 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5686,7 +5686,7 @@ static void test_save(void) IXMLDOMDocument_Release(doc); - hfile = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); if(hfile == INVALID_HANDLE_VALUE) return; @@ -6097,7 +6097,7 @@ static void test_TransformWithLoadingLocalFile(void) GetTempPathA(MAX_PATH, lpPathBuffer); strcat(lpPathBuffer, "customers.xml" ); - file = CreateFile(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + file = CreateFileA(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return; @@ -8609,6 +8609,58 @@ static void test_selection(void) free_bstrs(); } +static void test_load(void) +{ + IXMLDOMDocument *doc; + VARIANT_BOOL b; + HANDLE hfile; + VARIANT src; + HRESULT hr; + BOOL ret; + BSTR path; + DWORD written; + + /* prepare a file */ + hfile = CreateFileA("test.xml", GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file\n"); + if(hfile == INVALID_HANDLE_VALUE) return; + + ret = WriteFile(hfile, szNonUnicodeXML, sizeof(szNonUnicodeXML)-1, &written, NULL); + ok(ret, "WriteFile failed\n"); + + CloseHandle(hfile); + + doc = create_document(&IID_IXMLDOMDocument); + + path = _bstr_("test.xml"); + + /* load from path: VT_BSTR */ + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = path; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + /* load from a path: VT_BSTR|VT_BYREF */ + V_VT(&src) = VT_BSTR | VT_BYREF; + V_BSTRREF(&src) = &path; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + /* load from a path: VT_BSTR|VT_BYREF, null ptr */ + V_VT(&src) = VT_BSTR | VT_BYREF; + V_BSTRREF(&src) = NULL; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, E_INVALIDARG); + ok(b == VARIANT_FALSE, "got %d\n", b); + + IXMLDOMDocument_Release(doc); + + DeleteFileA("test.xml"); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -8680,6 +8732,7 @@ START_TEST(domdoc) test_get_nodeTypeString(); test_get_attributes(); test_selection(); + test_load(); test_xsltemplate();

1 0

Roderick Colenbrander : wined3d: Update Nvidia Geforce6+ driver version.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: b1a97099e7983e77479a450a573c268542924a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a97099e7983e77479a450a5… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 15 22:07:39 2011 -0700 wined3d: Update Nvidia Geforce6+ driver version. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c607d99..c5a9ef3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1009,8 +1009,8 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_TNT, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 7186}, {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}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 12, 6658}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 12, 6658}, }; struct gpu_description

1 0

Roderick Colenbrander : wined3d: Add latest Nvidia GPUs.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: d003215ab4e54537440d77297588b4dd9f3ea9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d003215ab4e54537440d77297… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 15 22:07:40 2011 -0700 wined3d: Add latest Nvidia GPUs. --- dlls/wined3d/directx.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c5a9ef3..43f445e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1066,10 +1066,18 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560 TI", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_7200, "ATI RADEON 7200 SERIES", DRIVER_AMD_R100, 32 }, @@ -1405,10 +1413,17 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ + {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ + {"GTX 560 TI", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ {"GTX 460", CARD_NVIDIA_GEFORCE_GTX460}, /* Geforce 400 - midend */ + {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ + {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ + {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ + {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ @@ -1864,7 +1879,9 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } cards[] = { + {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, + {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, {"NVAC", CARD_NVIDIA_GEFORCE_8200}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8726e2d..ec5c203 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1405,10 +1405,17 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, + CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, + CARD_NVIDIA_GEFORCE_GT440 = 0x0de0, + CARD_NVIDIA_GEFORCE_GTS450 = 0x0dc4, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, + CARD_NVIDIA_GEFORCE_GTX560 = 0x1200, + CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, + CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Huw Davies : include: Uncomment EMRGRADIENTFILL.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 58442c1b50e11644924779f5cf2ac149e4fdd851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58442c1b50e11644924779f5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 16 10:07:40 2011 +0000 include: Uncomment EMRGRADIENTFILL. --- include/wingdi.h | 86 +++++++++++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 29fb351..ca6df30 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1966,6 +1966,49 @@ typedef struct #define STOCK_LAST 19 #define CLR_INVALID 0xffffffff + +typedef USHORT COLOR16; + +typedef struct _TRIVERTEX +{ + LONG x; + LONG y; + COLOR16 Red; + COLOR16 Green; + COLOR16 Blue; + COLOR16 Alpha; +} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; + +typedef struct _GRADIENT_TRIANGLE +{ + ULONG Vertex1; + ULONG Vertex2; + ULONG Vertex3; +} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE; + +typedef struct _GRADIENT_RECT +{ + ULONG UpperLeft; + ULONG LowerRight; +} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT; + +#define AC_SRC_OVER 0x00 +#define AC_SRC_ALPHA 0x01 + +typedef struct _BLENDFUNCTION +{ + BYTE BlendOp; + BYTE BlendFlags; + BYTE SourceConstantAlpha; + BYTE AlphaFormat; +} BLENDFUNCTION, *PBLENDFUNCTION; + +#define GRADIENT_FILL_RECT_H 0x00000000 +#define GRADIENT_FILL_RECT_V 0x00000001 +#define GRADIENT_FILL_TRIANGLE 0x00000002 +#define GRADIENT_FILL_OP_FLAG 0x000000ff + + /* Metafile header structure */ #include <pshpack2.h> typedef struct @@ -2347,7 +2390,6 @@ typedef struct { BYTE Data[1]; } EMRGDICOMMENT, *PEMRGDICOMMENT; -#if 0 typedef struct { EMR emr; RECTL rclBounds; @@ -2356,7 +2398,6 @@ typedef struct { ULONG ulMode; TRIVERTEX Ver[1]; } EMRGRADIENTFILL, *PEMRGRADIENTFILL; -#endif typedef struct { EMR emr; @@ -3255,47 +3296,6 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 -typedef USHORT COLOR16; - -typedef struct _TRIVERTEX -{ - LONG x; - LONG y; - COLOR16 Red; - COLOR16 Green; - COLOR16 Blue; - COLOR16 Alpha; -} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; - -typedef struct _GRADIENT_TRIANGLE -{ - ULONG Vertex1; - ULONG Vertex2; - ULONG Vertex3; -} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE; - -typedef struct _GRADIENT_RECT -{ - ULONG UpperLeft; - ULONG LowerRight; -} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT; - -#define AC_SRC_OVER 0x00 -#define AC_SRC_ALPHA 0x01 - -typedef struct _BLENDFUNCTION -{ - BYTE BlendOp; - BYTE BlendFlags; - BYTE SourceConstantAlpha; - BYTE AlphaFormat; -} BLENDFUNCTION, *PBLENDFUNCTION; - -#define GRADIENT_FILL_RECT_H 0x00000000 -#define GRADIENT_FILL_RECT_V 0x00000001 -#define GRADIENT_FILL_TRIANGLE 0x00000002 -#define GRADIENT_FILL_OP_FLAG 0x000000ff - #define GDI_ERROR (~0u) #define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0)

1 0

Hans Leidekker : msi: Skip reference counting for assembly components.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 12135acb70bb7a05b4421db89e31e95044452f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12135acb70bb7a05b4421db89… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 16 09:22:48 2011 +0100 msi: Skip reference counting for assembly components. --- dlls/msi/action.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7567f5d..f806f18 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3151,9 +3151,6 @@ static UINT ACTION_WriteSharedDLLsCount(LPCWSTR path, UINT count) return count; } -/* - * Return TRUE if the count should be written out and FALSE if not - */ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) { MSIFEATURE *feature; @@ -3162,6 +3159,7 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) /* only refcount DLLs */ if (comp->KeyPath == NULL || + comp->assembly || comp->Attributes & msidbComponentAttributesRegistryKeyPath || comp->Attributes & msidbComponentAttributesODBCDataSource) write = FALSE;

1 0