wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

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

27 May '10

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

Henri Verbeet : d3d9/tests: Fix a typo.
by Alexandre Julliard 27 May '10

27 May '10

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

Henri Verbeet : wined3d: Handle a zero source value for WINED3DSIH_POW.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 6f57aabc0a1223e27b52fc6c752e7605fd9a87e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f57aabc0a1223e27b52fc6c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 27 10:23:19 2010 +0200 wined3d: Handle a zero source value for WINED3DSIH_POW. --- dlls/wined3d/glsl_shader.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 056e9ad..ba16eae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2213,10 +2213,15 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &src1_param); - if (dst_size > 1) { - shader_addline(buffer, "vec%d(pow(abs(%s), %s)));\n", dst_size, src0_param.param_str, src1_param.param_str); - } else { - shader_addline(buffer, "pow(abs(%s), %s));\n", src0_param.param_str, src1_param.param_str); + if (dst_size > 1) + { + shader_addline(buffer, "vec%d(%s == 0.0 ? 0.0 : pow(abs(%s), %s)));\n", + dst_size, src0_param.param_str, src0_param.param_str, src1_param.param_str); + } + else + { + shader_addline(buffer, "%s == 0.0 ? 0.0 : pow(abs(%s), %s));\n", + src0_param.param_str, src0_param.param_str, src1_param.param_str); } }

1 0

Nikolay Sivov : comctl32: Export subclass calls by names too.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: d926939b12d3c260ad1e4bc3d0ba7341901dcd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d926939b12d3c260ad1e4bc3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 27 02:03:09 2010 +0400 comctl32: Export subclass calls by names too. --- dlls/comctl32/comctl32.spec | 8 +++--- dlls/comctl32/tests/subclass.c | 45 +++++++++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 4249d56..c2c76a3 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -101,10 +101,10 @@ 402 stdcall -noname FindMRUStringW(long wstr ptr) 403 stdcall -noname EnumMRUListW(long long ptr long) 404 stdcall -noname CreateMRUListLazyW(ptr long long long) -410 stdcall -noname SetWindowSubclass(long ptr long long) -411 stdcall -noname GetWindowSubclass(long ptr long ptr) -412 stdcall -noname RemoveWindowSubclass(long ptr long) -413 stdcall -noname DefSubclassProc(long long long long) +410 stdcall -ordinal SetWindowSubclass(long ptr long long) +411 stdcall -ordinal GetWindowSubclass(long ptr long ptr) +412 stdcall -ordinal RemoveWindowSubclass(long ptr long) +413 stdcall -ordinal DefSubclassProc(long long long long) 414 stdcall -noname MirrorIcon(ptr ptr) 415 stdcall -noname DrawTextWrap(long wstr long ptr long) user32.DrawTextW 416 stdcall -noname DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index f5a74ba..8511275 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -279,25 +279,50 @@ static BOOL RegisterWindowClasses(void) return TRUE; } -START_TEST(subclass) +static int init_function_pointers(void) { - HMODULE hdll; - - hdll = GetModuleHandleA("comctl32.dll"); - assert(hdll); + HMODULE hmod; + void *ptr; + + hmod = GetModuleHandleA("comctl32.dll"); + assert(hmod); + /* Functions have to be loaded by ordinal. Only XP and W2K3 export * them by name. */ - pSetWindowSubclass = (void*)GetProcAddress(hdll, (LPSTR)410); - pRemoveWindowSubclass = (void*)GetProcAddress(hdll, (LPSTR)412); - pDefSubclassProc = (void*)GetProcAddress(hdll, (LPSTR)413); - +#define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) + MAKEFUNC_ORD(SetWindowSubclass, 410); + MAKEFUNC_ORD(RemoveWindowSubclass, 412); + MAKEFUNC_ORD(DefSubclassProc, 413); +#undef MAKEFUNC_ORD + if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); - return; + return 0; + } + + /* test named exports */ + ptr = GetProcAddress(hmod, "SetWindowSubclass"); + ok(broken(ptr == 0) || ptr != 0, "expected named export for SetWindowSubclass\n"); + if(ptr) + { +#define TESTNAMED(f) \ + ptr = (void*)GetProcAddress(hmod, #f); \ + ok(ptr != 0, "expected named export for " #f "\n"); + TESTNAMED(RemoveWindowSubclass); + TESTNAMED(DefSubclassProc); + /* GetWindowSubclass exported for V6 only */ +#undef TESTNAMED } + return 1; +} + +START_TEST(subclass) +{ + if(!init_function_pointers()) return; + if(!RegisterWindowClasses()) assert(0); test_subclass();

1 0

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

27 May '10

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

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

27 May '10

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

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

27 May '10

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

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

27 May '10

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 27 May '10

27 May '10

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 27 May '10

27 May '10

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

← Newer
1
...
8
9
10
11
12
13
14
...
96
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 May 2010