May 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d9/tests: Fix a typo.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 2210b9a6ac0662dc434ad8fa0e88147d71071393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2210b9a6ac0662dc434ad8fa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 27 10:23:20 2010 +0200 d3d9/tests: Fix a typo. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cafdc2d..8e85d77 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1207,7 +1207,7 @@ static void test_cube_wrap(IDirect3DDevice9 *device) DWORD *ptr = (DWORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); for (x = 0; x < 64; ++x) { - *ptr++ = 0xff0000dd; + *ptr++ = 0xff0000ff; } for (x = 64; x < 128; ++x) { @@ -1289,7 +1289,7 @@ static void test_cube_wrap(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 11), + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 1), "Got color 0x%08x for addressing mode %s, expected 0x000000ff.\n", color, address_modes[x].name);

1 0

Andrew Nguyen : ws2_32: Update DLL version information to correspond to XP.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: f96d192947db518d2aee99e635248c265abc9b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96d192947db518d2aee99e63… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu May 27 04:14:08 2010 -0500 ws2_32: Update DLL version information to correspond to XP. The Star Trek: Armada II demo tries to install a Windows 95 winsock redist if the detected ws2_32.dll version is too old. --- dlls/ws2_32/version.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/version.rc b/dlls/ws2_32/version.rc index 1a2cb86..52dbb1b 100644 --- a/dlls/ws2_32/version.rc +++ b/dlls/ws2_32/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "ws2_32.dll" -#define WINE_FILEVERSION 4,0,0,0 -#define WINE_FILEVERSION_STR "4.0.0.0" -#define WINE_PRODUCTVERSION 4,0,0,0 -#define WINE_PRODUCTVERSION_STR "4.0" +#define WINE_FILEVERSION 5,1,2600,5512 +#define WINE_FILEVERSION_STR "5.1.2600.5512" +#define WINE_PRODUCTVERSION 5,1,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.1.2600.5512" #include "wine/wine_common_ver.rc"

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_GetPropertyBSTR.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: d68e88718ddf6a58abcc59f902383e5317084836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68e88718ddf6a58abcc59f90… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed May 26 16:30:32 2010 -0400 urlmon/tests: Added tests for IUri_GetPropertyBSTR. --- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/uri.c | 254 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d68e88718ddf6a58abcc5…

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_GetPropertyDWORD.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 7bc121c8802299d88ef01b0de8063247f936f4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc121c8802299d88ef01b0de… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed May 26 17:42:12 2010 -0400 urlmon/tests: Added tests for IUri_GetPropertyDWORD. --- dlls/urlmon/tests/uri.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 15 ++++++ include/urlmon.idl | 10 ++++ 3 files changed, 148 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 453fde7..cff1a08 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -37,8 +37,10 @@ #include "windef.h" #include "winbase.h" #include "urlmon.h" +#include "shlwapi.h" #define URI_STR_PROPERTY_COUNT Uri_PROPERTY_STRING_LAST+1 +#define URI_DWORD_PROPERTY_COUNT (Uri_PROPERTY_DWORD_LAST - Uri_PROPERTY_DWORD_START)+1 static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); @@ -65,6 +67,12 @@ typedef struct _uri_str_property { BOOL todo; } uri_str_property; +typedef struct _uri_dword_property { + DWORD value; + HRESULT expected; + BOOL todo; +} uri_dword_property; + typedef struct _uri_properties { const char* uri; DWORD create_flags; @@ -72,6 +80,7 @@ typedef struct _uri_properties { BOOL create_todo; uri_str_property str_props[URI_STR_PROPERTY_COUNT]; + uri_dword_property dword_props[URI_DWORD_PROPERTY_COUNT]; } uri_properties; static const uri_properties uri_tests[] = { @@ -92,6 +101,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, /* SCHEME_NAME */ {"",S_FALSE,TRUE}, /* USER_INFO */ {"",S_FALSE,TRUE} /* USER_NAME */ + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, /* HOST_TYPE */ + {80,S_OK,TRUE}, /* PORT */ + {URL_SCHEME_HTTP,S_OK,TRUE}, /* SCHEME */ + {URLZONE_INVALID,E_NOTIMPL,FALSE} /* ZONE */ } }, { "http://winehq.org/tests/.././tests", 0, S_OK, FALSE, @@ -111,6 +126,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "HtTp://www.winehq.org/tests/..?query=x&return=y", 0, S_OK, FALSE, @@ -130,6 +151,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, { "hTTp://us%45r%3Ainfo(a)examp%4CE.com:80/path/a/b/./c/../%2E%2E/Forbidden'<|> Characters", 0, S_OK, FALSE, @@ -149,6 +176,12 @@ static const uri_properties uri_tests[] = { {"http",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, { "ftp://winepass:wine(a)ftp.winehq.org:9999/dir/foo bar.txt", 0, S_OK, FALSE, @@ -168,6 +201,12 @@ static const uri_properties uri_tests[] = { {"ftp",S_OK,TRUE}, {"winepass:wine",S_OK,TRUE}, {"winepass",S_OK,TRUE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {9999,S_OK,TRUE}, + {URL_SCHEME_FTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "file://c:\\tests\\../tests/foo%20bar.mp3", 0, S_OK, FALSE, @@ -187,6 +226,12 @@ static const uri_properties uri_tests[] = { {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_FILE,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "FILE://localhost/test dir\\../tests/test%20file.README.txt", 0, S_OK, FALSE, @@ -206,6 +251,12 @@ static const uri_properties uri_tests[] = { {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_FILE,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, @@ -225,6 +276,12 @@ static const uri_properties uri_tests[] = { {"urn",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} } } }; @@ -340,6 +397,69 @@ static void test_IUri_GetPropertyBSTR(void) { } } +static void test_IUri_GetPropertyDWORD(void) { + IUri *uri = NULL; + HRESULT hr; + DWORD i; + + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + hr = IUri_GetPropertyDWORD(uri, Uri_PROPERTY_DWORD_START, NULL, 0); + ok(hr == E_INVALIDARG, "Error: GetPropertyDWORD returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + } + if(uri) IUri_Release(uri); + + for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + uri_properties test = uri_tests[i]; + LPWSTR uriW; + uri = NULL; + + uriW = a2w(test.uri); + hr = pCreateUri(uriW, test.create_flags, 0, &uri); + if(test.create_todo) { + todo_wine { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x. Failed on uri_tests[%d].\n", + hr, test.create_expected, i); + } + } else { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x. Failed on uri_tests[%d].\n", + hr, test.create_expected, i); + } + + if(SUCCEEDED(hr)) { + DWORD j; + + /* Checks all the DWORD properties of the uri. */ + for(j = 0; j < sizeof(test.dword_props)/sizeof(test.dword_props[0]); ++j) { + DWORD received; + uri_dword_property prop = test.dword_props[j]; + + hr = IUri_GetPropertyDWORD(uri, j+Uri_PROPERTY_DWORD_START, &received, 0); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "GetPropertyDWORD returned 0x%08x, expected 0x%08x. On uri_tests[%d].dword_props[%d].\n", + hr, prop.expected, i, j); + } + todo_wine { + ok(prop.value == received, "Expected %d but got %d on uri_tests[%d].dword_props[%d].\n", + prop.value, received, i, j); + } + } else { + ok(hr == prop.expected, "GetPropertyDWORD returned 0x%08x, expected 0x%08x. On uri_tests[%d].dword_props[%d].\n", + hr, prop.expected, i, j); + ok(prop.value == received, "Expected %d but got %d on uri_tests[%d].dword_props[%d].\n", + prop.value, received, i, j); + } + } + } + + if(uri) IUri_Release(uri); + + heap_free(uriW); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -359,4 +479,7 @@ START_TEST(uri) { trace("test IUri_GetPropertyBSTR...\n"); test_IUri_GetPropertyBSTR(); + + trace("test IUri_GetPropretyDWORD...\n"); + test_IUri_GetPropertyDWORD(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 5b72fa5..9018002 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Jacek Caban for CodeWeavers + * Copyright 2010 Thomas Mullaly * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -97,6 +98,20 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW { Uri *This = URI_THIS(iface); FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + + if(!pcchProperty) + return E_INVALIDARG; + + /* Microsoft's implementation for the ZONE property of a URI seems to be lacking... + * From what I can tell, instead of checking which URLZONE the URI belongs to it + * simply assigns URLZONE_INVALID and returns E_NOTIMPL. This also applies the GetZone + * function. + */ + if(uriProp == Uri_PROPERTY_ZONE) { + *pcchProperty = URLZONE_INVALID; + return E_NOTIMPL; + } + return E_NOTIMPL; } diff --git a/include/urlmon.idl b/include/urlmon.idl index 2ab3b2b..c1d3bec 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1231,6 +1231,7 @@ interface IInternetZoneManager : IUnknown typedef enum tagURLZONE { + URLZONE_INVALID = -1, URLZONE_PREDEFINED_MIN = 0, URLZONE_LOCAL_MACHINE = 0, URLZONE_INTRANET = 1, @@ -1563,6 +1564,15 @@ interface IUri : IUnknown Uri_PROPERTY_DWORD_LAST = Uri_PROPERTY_ZONE } Uri_PROPERTY; + typedef enum + { + Uri_HOST_UNKNOWN = 0, + Uri_HOST_DNS = 1, + Uri_HOST_IPV4 = 2, + Uri_HOST_IPV6 = 3, + Uri_HOST_IDN = 4 + } Uri_HOST_TYPE; + HRESULT GetPropertyBSTR( [in] Uri_PROPERTY uriProp, [out] BSTR *pbstrProperty,

1 0

Roderick Colenbrander : wined3d: Add support for mobile Geforce 3xx GPUs.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 39eaaeaa27db0c703913f2a49e9b053dc8c34f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39eaaeaa27db0c703913f2a49… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:36 2010 +0200 wined3d: Add support for mobile Geforce 3xx GPUs. --- dlls/wined3d/directx.c | 24 ++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02ebfa3..ba9e551 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1021,6 +1021,8 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", 15, 11, 9775 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", 15, 11, 9775 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ @@ -1275,6 +1277,22 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_GTX470; } + /* Geforce 300 highend mobile */ + if (strstr(gl_renderer, "GTS 350M") + || strstr(gl_renderer, "GTS 360M")) + { + *vidmem = 1024; + return CARD_NVIDIA_GEFORCE_GTS350M; + } + + /* Geforce 300 midend mobile (Geforce GT 325M/330M use the same core) */ + if (strstr(gl_renderer, "GT 325M") + || strstr(gl_renderer, "GT 330M")) + { + *vidmem = 1024; + return CARD_NVIDIA_GEFORCE_GT325M; + } + /* Geforce 200 - highend */ if (strstr(gl_renderer, "GTX 280") || strstr(gl_renderer, "GTX 285") @@ -1310,9 +1328,11 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl *vidmem = 512; /* The GT 220 has 512-1024MB */ return CARD_NVIDIA_GEFORCE_GT220; } - /* Geforce 200 lowend */ + /* Geforce 200 lowend (Geforce 305/310 use the same core) */ if (strstr(gl_renderer, "Geforce 210") - || strstr(gl_renderer, "G 210")) + || strstr(gl_renderer, "G 210") + || strstr(gl_renderer, "Geforce 305") + || strstr(gl_renderer, "Geforce 310")) { *vidmem = 512; return CARD_NVIDIA_GEFORCE_210; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7846ad..77bcf0e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1349,6 +1349,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, + CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0

Austin English : user32/tests: Check return value of GetUpdateRect in test_validatergn.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 6487f3397a1a82405224f23390c3e2f3b7562e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6487f3397a1a82405224f2339… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 26 15:19:46 2010 -0500 user32/tests: Check return value of GetUpdateRect in test_validatergn. --- dlls/user32/tests/win.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8f0f42d..eadad3a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3213,10 +3213,12 @@ static void test_validatergn(HWND hwnd) GetWindowRect( child, &rc); MapWindowPoints( NULL, hwnd, (POINT*) &rc, 2); ret = GetUpdateRect( child, &rc2, 0); + ok( ret == 1, "Expected GetUpdateRect to return non-zero, got %d\n", ret); ok( rc2.right > rc2.left && rc2.bottom > rc2.top, "Update rectangle is empty!\n"); ValidateRect( hwnd, &rc); ret = GetUpdateRect( child, &rc2, 0); + ok( !ret, "Expected GetUpdateRect to return zero, got %d\n", ret); ok( rc2.left == 0 && rc2.top == 0 && rc2.right == 0 && rc2.bottom == 0, "Update rectangle %d,%d-%d,%d is not empty!\n", rc2.left, rc2.top, rc2.right, rc2.bottom); @@ -3228,6 +3230,7 @@ static void test_validatergn(HWND hwnd) rgn = CreateRectRgnIndirect( &rc); ValidateRgn( hwnd, rgn); ret = GetUpdateRect( child, &rc2, 0); + ok( !ret, "Expected GetUpdateRect to return zero, got %d\n", ret); ok( rc2.left == 0 && rc2.top == 0 && rc2.right == 0 && rc2.bottom == 0, "Update rectangle %d,%d-%d,%d is not empty!\n", rc2.left, rc2.top, rc2.right, rc2.bottom);

1 0

Vincent Povirk : windowscodecs: Account for a NULL pceltFetched in ComponentEnum_Next.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 645f7c6208efe0db680d73979fbf73c4d3540a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=645f7c6208efe0db680d73979… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 26 15:28:46 2010 -0500 windowscodecs: Account for a NULL pceltFetched in ComponentEnum_Next. --- dlls/windowscodecs/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 2e558a8..f790dbc 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -817,7 +817,8 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, This->cursor = list_next(&This->objects, This->cursor); } LeaveCriticalSection(&This->lock); - *pceltFetched = num_fetched; + if (pceltFetched) + *pceltFetched = num_fetched; return hr; }

1 0

Roderick Colenbrander : wined3d: Mark Geforce GT 140 as a Geforce 9600GT.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: c44603a559c2ed37a8ac6d8bb71133994a61070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44603a559c2ed37a8ac6d8bb… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:35 2010 +0200 wined3d: Mark Geforce GT 140 as a Geforce 9600GT. --- dlls/wined3d/directx.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 023bd17..02ebfa3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1327,8 +1327,9 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_9800GT; } - /* Geforce9 - midend */ - if (strstr(gl_renderer, "9600")) + /* Geforce9 - midend (GT 140 uses the same core as the 9600GT) */ + if (strstr(gl_renderer, "9600") + || strstr(gl_renderer, "GT 140")) { *vidmem = 384; /* The 9600GSO has 384MB, the 9600GT has 512-1024MB */ return CARD_NVIDIA_GEFORCE_9600GT;

1 0

Roderick Colenbrander : wined3d: Add Geforce 2xx lowend models.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 036295c37a34057f380817cb03530ec4a042b716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=036295c37a34057f380817cb0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:34 2010 +0200 wined3d: Add Geforce 2xx lowend models. --- dlls/wined3d/directx.c | 18 +++++++++++++++++- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 11344bd..023bd17 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1015,10 +1015,12 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 9745 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", 15, 11, 9775 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", 15, 11, 9775 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ @@ -1302,6 +1304,20 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_GT240; } + /* Geforce 200 lowend */ + if (strstr(gl_renderer, "GT 220")) + { + *vidmem = 512; /* The GT 220 has 512-1024MB */ + return CARD_NVIDIA_GEFORCE_GT220; + } + /* Geforce 200 lowend */ + if (strstr(gl_renderer, "Geforce 210") + || strstr(gl_renderer, "G 210")) + { + *vidmem = 512; + return CARD_NVIDIA_GEFORCE_210; + } + /* Geforce9 - highend / Geforce 200 - midend (GTS 150/250 are based on the same core) */ if (strstr(gl_renderer, "9800") || strstr(gl_renderer, "GTS 150") diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ceea22b..e7846ad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1343,10 +1343,12 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, + CARD_NVIDIA_GEFORCE_210 = 0x0a23, + CARD_NVIDIA_GEFORCE_GT220 = 0x0a20, + CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, - CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0

Roderick Colenbrander : wined3d: Add Geforce 4x0 cards to GPU database.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: c471724a2abd2c7a74ac66368073383955eec3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c471724a2abd2c7a74ac66368… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:33 2010 +0200 wined3d: Add Geforce 4x0 cards to GPU database. --- dlls/wined3d/directx.c | 17 ++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 56b5565..11344bd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1019,7 +1019,8 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 9745 }, - + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", 15, 11, 9775 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", 15, 11, 9775 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {HW_VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 14, 10, 6764 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_X700, "ATI Radeon X700 SE", 14, 10, 6764 }, @@ -1258,6 +1259,20 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { if (WINE_D3D10_CAPABLE(gl_info)) { + /* Geforce 400 - highend */ + if (strstr(gl_renderer, "GTX 480")) + { + *vidmem = 1536; + return CARD_NVIDIA_GEFORCE_GTX480; + } + + /* Geforce 400 - midend high */ + if (strstr(gl_renderer, "GTX 470")) + { + *vidmem = 1280; + return CARD_NVIDIA_GEFORCE_GTX470; + } + /* Geforce 200 - highend */ if (strstr(gl_renderer, "GTX 280") || strstr(gl_renderer, "GTX 285") diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5c96d76..ceea22b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1347,6 +1347,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, + CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, + CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0