November 2010 - Wine-Commits

Austin Lund : comctl32/tests: Change expect_band_content test to ensure line numbers are reported correctly on test failure .
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 1f97cb22874d470fcfb59a84569dad54f6c695cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f97cb22874d470fcfb59a845… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Nov 9 11:42:56 2010 +1000 comctl32/tests: Change expect_band_content test to ensure line numbers are reported correctly on test failure. --- dlls/comctl32/tests/rebar.c | 54 +++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index c62844b..0672720 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -47,7 +47,8 @@ static int system_font_height; #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp)); -#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } +#define expect_eq(line, expr, value, type, format) { type ret = expr;\ + ok((value) == ret, #expr " expected " format " got " format " from line %d\n", (value), (ret), line); } static INT CALLBACK is_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) { @@ -685,6 +686,7 @@ static int resize_numtests = 0; #define comment(fmt, arg1) #define check_client() { \ RECT r; \ + int value; \ const rbresize_test_result_t *res = &resize_results[resize_numtests++]; \ assert(resize_numtests <= sizeof(resize_results)/sizeof(resize_results[0])); \ GetWindowRect(hRebar, &r); \ @@ -694,7 +696,8 @@ static int resize_numtests = 0; } else { \ check_rect("client", r, res->rc); \ } \ - expect_eq((int)SendMessage(hRebar, RB_GETROWCOUNT, 0, 0), res->iNumRows, int, "%d"); \ + value = (int)SendMessage(hRebar, RB_GETROWCOUNT, 0, 0); \ + ok(res->iNumRows == value, "RB_GETROWCOUNT expected %d got %d", res->iNumRows, value); \ if (res->heightNotify) { \ RECT rcClient; \ GetClientRect(hRebar, &rcClient); \ @@ -758,7 +761,7 @@ static void test_resize(void) } } -static void expect_band_content(HWND hRebar, UINT uBand, INT fStyle, COLORREF clrFore, +static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle, COLORREF clrFore, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID, INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam, @@ -774,28 +777,35 @@ static void expect_band_content(HWND hRebar, UINT uBand, INT fStyle, COLORREF cl | RBBIM_SIZE | RBBIM_STYLE | RBBIM_TEXT; rb.lpText = buf; rb.cch = MAX_PATH; - ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n"); - expect_eq(rb.fStyle, fStyle, int, "%x"); - expect_eq(rb.clrFore, clrFore, COLORREF, "%x"); - expect_eq(rb.clrBack, clrBack, COLORREF, "%x"); - expect_eq(strcmp(rb.lpText, lpText), 0, int, "%d"); - expect_eq(rb.iImage, iImage, int, "%x"); - expect_eq(rb.hwndChild, hwndChild, HWND, "%p"); - expect_eq(rb.cxMinChild, cxMinChild, int, "%d"); - expect_eq(rb.cyMinChild, cyMinChild, int, "%d"); - expect_eq(rb.cx, cx, int, "%d"); - expect_eq(rb.hbmBack, hbmBack, HBITMAP, "%p"); - expect_eq(rb.wID, wID, int, "%d"); + ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed from line %d\n", line); + expect_eq(line, rb.fStyle, fStyle, int, "%x"); + expect_eq(line, rb.clrFore, clrFore, COLORREF, "%x"); + expect_eq(line, rb.clrBack, clrBack, COLORREF, "%x"); + expect_eq(line, strcmp(rb.lpText, lpText), 0, int, "%d"); + expect_eq(line, rb.iImage, iImage, int, "%x"); + expect_eq(line, rb.hwndChild, hwndChild, HWND, "%p"); + expect_eq(line, rb.cxMinChild, cxMinChild, int, "%d"); + expect_eq(line, rb.cyMinChild, cyMinChild, int, "%d"); + expect_eq(line, rb.cx, cx, int, "%d"); + expect_eq(line, rb.hbmBack, hbmBack, HBITMAP, "%p"); + expect_eq(line, rb.wID, wID, int, "%d"); /* the values of cyChild, cyMaxChild and cyIntegral can't be read unless the band is RBBS_VARIABLEHEIGHT */ - expect_eq(rb.cyChild, cyChild, int, "%x"); - expect_eq(rb.cyMaxChild, cyMaxChild, int, "%x"); - expect_eq(rb.cyIntegral, cyIntegral, int, "%x"); - expect_eq(rb.cxIdeal, cxIdeal, int, "%d"); - expect_eq(rb.lParam, lParam, LPARAM, "%ld"); - ok( rb.cxHeader == cxHeader || broken(rb.cxHeader == cxHeader_broken), - "expected %d for %d\n", cxHeader, rb.cxHeader ); + expect_eq(line, rb.cyChild, cyChild, int, "%x"); + expect_eq(line, rb.cyMaxChild, cyMaxChild, int, "%x"); + expect_eq(line, rb.cyIntegral, cyIntegral, int, "%x"); + expect_eq(line, rb.cxIdeal, cxIdeal, int, "%d"); + expect_eq(line, rb.lParam, lParam, LPARAM, "%ld"); + ok(rb.cxHeader == cxHeader || broken(rb.cxHeader == cxHeader_broken), + "expected %d for %d from line %d\n", cxHeader, rb.cxHeader, line); } +#define expect_band_content(hRebar, uBand, fStyle, clrFore, clrBack,\ + lpText, iImage, hwndChild, cxMinChild, cyMinChild, cx, hbmBack, wID,\ + cyChild, cyMaxChild, cyIntegral, cxIdeal, lParam, cxHeader, cxHeader_broken) \ + expect_band_content_(__LINE__, hRebar, uBand, fStyle, clrFore, clrBack,\ + lpText, iImage, hwndChild, cxMinChild, cyMinChild, cx, hbmBack, wID,\ + cyChild, cyMaxChild, cyIntegral, cxIdeal, lParam, cxHeader, cxHeader_broken) + static void test_bandinfo(void) { REBARBANDINFOA rb;

1 0

Henri Verbeet : wined3d: Don' t unregister a window unless the window proc is what we expect it to be.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 7a354177b38c9451c938389576890a14d5c543fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a354177b38c9451c93838957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:04 2010 +0100 wined3d: Don't unregister a window unless the window proc is what we expect it to be. In particular, if we'd unregister a window when the application replaced our window proc, but still forwards to us, we'd create a loop when we register the same window again later. --- dlls/ddraw/tests/d3d.c | 84 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_main.c | 52 +++++++++++++++++---------- 2 files changed, 115 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 82fdedf..a8535a3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3263,9 +3263,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM static void test_wndproc(void) { + LONG_PTR proc, ddraw_proc; IDirectDraw7 *ddraw7; WNDCLASSA wc = {0}; - LONG_PTR proc; HWND window; HRESULT hr; ULONG ref; @@ -3356,7 +3356,87 @@ static void test_wndproc(void) (LONG_PTR)test_proc, proc); /* The original window proc is only restored by ddraw if the current - * window proc matches the one ddraw set. */ + * window proc matches the one ddraw set. This also affects switching + * from DDSCL_NORMAL to DDSCL_EXCLUSIVE. */ + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + ddraw_proc = proc; + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)ddraw_proc); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0e44702..8cc2828 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -467,35 +467,49 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) void wined3d_unregister_window(HWND window) { - unsigned int i; + struct wined3d_wndproc *entry, *last; + LONG_PTR proc; wined3d_mutex_lock(); - for (i = 0; i < wndproc_table.count; ++i) + + if (!(entry = wined3d_find_wndproc(window))) { - if (wndproc_table.entries[i].window == window) - { - struct wined3d_wndproc *entry = &wndproc_table.entries[i]; - struct wined3d_wndproc *last = &wndproc_table.entries[--wndproc_table.count]; + wined3d_mutex_unlock(); + ERR("Window %p is not registered with wined3d.\n", window); + return; + } - if (entry->unicode) - { - if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); - } - else - { - if (GetWindowLongPtrA(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); - } - if (entry != last) *entry = *last; + if (entry->unicode) + { + proc = GetWindowLongPtrW(window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + { wined3d_mutex_unlock(); + WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", + window, proc, wined3d_wndproc); + return; + } + SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + else + { + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + { + wined3d_mutex_unlock(); + WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", + window, proc, wined3d_wndproc); return; } + + SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); } - wined3d_mutex_unlock(); - ERR("Window %p is not registered with wined3d.\n", window); + last = &wndproc_table.entries[--wndproc_table.count]; + if (entry != last) *entry = *last; + + wined3d_mutex_unlock(); } /* At process attach */

1 0

Dmitry Timoshkov : gdi32: Remove broken check for WinXP.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: d419f2437251ad4fa08badcb34d6343493e5597a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d419f2437251ad4fa08badcb3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 10 20:38:55 2010 +0800 gdi32: Remove broken check for WinXP. --- dlls/gdi32/tests/font.c | 99 ++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cede3aa..b200ca1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3185,8 +3185,6 @@ static void test_AddFontMemResource(void) void *font; DWORD font_size, num_fonts; HANDLE ret; - DEVMODEA dmA; - BOOL is_winxp; if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) { @@ -3201,62 +3199,59 @@ static void test_AddFontMemResource(void) return; } - is_winxp = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA) && - (dmA.dmFields & DM_DISPLAYORIENTATION); - - if (is_winxp) - { - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 10, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - num_fonts = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); - ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + if (0) /* hangs under windows 2000 */ + { num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, 10, NULL, &num_fonts); @@ -3266,8 +3261,6 @@ static void test_AddFontMemResource(void) GetLastError()); ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); } - else - win_skip("AddFontMemResourceEx invalid parameter tests are problematic on Win2k\n"); num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef);

1 0

Henri Verbeet : ddraw: Make switching to/ from fullscreen work more than once.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 2b0684c56db343112d845e0b277bf831f6b578df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0684c56db343112d845e0b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:02 2010 +0100 ddraw: Make switching to/from fullscreen work more than once. --- dlls/ddraw/ddraw.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e155482..b9ff201 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -647,15 +647,12 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); - /* Do we switch from fullscreen to non-fullscreen ? */ - if (!(cooplevel & DDSCL_FULLSCREEN) && (This->cooperative_level & DDSCL_FULLSCREEN)) - { - IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, This->dest_window); - } - - /* Don't override focus windows or private device windows */ - if (hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) + if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || hwnd != window) { + if (This->cooperative_level & DDSCL_FULLSCREEN) + { + IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, window); + } if (cooplevel & DDSCL_FULLSCREEN) { WINED3DDISPLAYMODE display_mode; @@ -663,7 +660,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, hwnd, display_mode.Width, display_mode.Height); } - This->dest_window = hwnd; } if ((cooplevel & DDSCL_EXCLUSIVE) @@ -678,6 +674,10 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } } + /* Don't override focus windows or private device windows */ + if (hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) + This->dest_window = hwnd; + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) { /* Don't create a device window if a focus window is set */

1 0

Henri Verbeet : wined3d: Register a window only once.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 9a1fddb0fd8f0d5c2c8601a9eadfe7737598c007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1fddb0fd8f0d5c2c8601a9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:03 2010 +0100 wined3d: Register a window only once. --- dlls/wined3d/wined3d_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0932351..0e44702 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -422,6 +422,13 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) wined3d_mutex_lock(); + if (wined3d_find_wndproc(window)) + { + wined3d_mutex_unlock(); + WARN("Window %p is already registered with wined3d.\n", window); + return TRUE; + } + if (wndproc_table.size == wndproc_table.count) { unsigned int new_size = max(1, wndproc_table.size * 2);

1 0

Henri Verbeet : ddraw: Window proc replacement depends on DDSCL_EXCLUSIVE, not DDSCL_FULLSCREEN.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 6fcb33f59f8449d836bf7eb58acd48172bf9ad4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fcb33f59f8449d836bf7eb58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:01 2010 +0100 ddraw: Window proc replacement depends on DDSCL_EXCLUSIVE, not DDSCL_FULLSCREEN. --- dlls/ddraw/ddraw.c | 27 +++++++++++++++++---------- dlls/ddraw/tests/d3d.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 512fd8e..e155482 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -641,12 +641,15 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, TRACE("(%p) SetCooperativeLevel needs at least SetFocusWindow or Exclusive or Normal mode\n", This); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; - } + } + + if ((This->cooperative_level & DDSCL_EXCLUSIVE) + && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) + IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); /* Do we switch from fullscreen to non-fullscreen ? */ if (!(cooplevel & DDSCL_FULLSCREEN) && (This->cooperative_level & DDSCL_FULLSCREEN)) { - IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, This->dest_window); } @@ -656,21 +659,25 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if (cooplevel & DDSCL_FULLSCREEN) { WINED3DDISPLAYMODE display_mode; - HRESULT hr; IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, hwnd, display_mode.Width, display_mode.Height); - hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); - if (FAILED(hr)) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } } This->dest_window = hwnd; } + if ((cooplevel & DDSCL_EXCLUSIVE) + && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) + { + HRESULT hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); + if (FAILED(hr)) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + LeaveCriticalSection(&ddraw_cs); + return hr; + } + } + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) { /* Don't create a device window if a focus window is set */ diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9066e4e..82fdedf 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3281,6 +3281,7 @@ static void test_wndproc(void) 0, }; + /* DDSCL_EXCLUSIVE replaces the window's window proc. */ hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { @@ -3323,6 +3324,39 @@ static void test_wndproc(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); + /* DDSCL_NORMAL doesn't. */ + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + /* The original window proc is only restored by ddraw if the current + * window proc matches the one ddraw set. */ hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) {

1 0

Thomas Mullaly : urlmon: Simplified path canonicalization functions.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 1d11185d443a08ddf50f834b8e30cefc8f295d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d11185d443a08ddf50f834b8… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Nov 8 21:23:01 2010 -0500 urlmon: Simplified path canonicalization functions. --- dlls/urlmon/uri.c | 65 ++++++++++++++++++---------------------------------- 1 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 6e4ed06..6ed71e1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2973,6 +2973,8 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, } for(; ptr < data->path+data->path_len; ++ptr) { + BOOL do_default_action = TRUE; + if(*ptr == '%' && !is_res) { const WCHAR *tmp = ptr; WCHAR val; @@ -2986,6 +2988,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); uri->canon_len += 3; + do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || (is_file && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { @@ -2995,41 +2998,33 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, ptr += 2; continue; - } else { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; } } else if(*ptr == '/' && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert the '/' back to a '\\'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '\\'; ++uri->canon_len; + do_default_action = FALSE; } else if(*ptr == '\\' && known_scheme) { - if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - /* Don't convert the '\\' to a '/'. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else { + if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { + /* Convert '\\' into a '/'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; + do_default_action = FALSE; } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { - if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - /* Don't escape the character. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else { + if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { /* Escape the forbidden character. */ if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); uri->canon_len += 3; + do_default_action = FALSE; } - } else { + } + + if(do_default_action) { if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len; @@ -3107,6 +3102,8 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla } for(ptr = data->path; ptr < data->path+data->path_len; ++ptr) { + BOOL do_default_action = TRUE; + if(*ptr == '%' && known_scheme) { WCHAR val = decode_pct_val(ptr); @@ -3117,47 +3114,31 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla ptr += 2; continue; - } else { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; } } else if(*ptr == '/' && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { if(!computeOnly) uri->canon_uri[uri->canon_len] = '\\'; ++uri->canon_len; - } else if(*ptr == '\\' && is_file) { - if(!(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + do_default_action = FALSE; + } else if(*ptr == '\\') { + if(is_file && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert to a '/'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; - } else { - /* Just copy it over. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; + do_default_action = FALSE; } } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && !(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS)) { - if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - /* Forbidden characters aren't percent encoded for file schemes - * with USE_DOS_PATH set. - */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else if(data->scheme_type == URL_SCHEME_MK && *ptr == '\\') { - /* MK URIs don't get '\\' percent encoded. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else { + if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); uri->canon_len += 3; + do_default_action = FALSE; } - } else { + } + + if(do_default_action) { if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len;

1 0

André Hentschel : mmdevapi/tests: Fix test on some 2k8 and mark those errors broken.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: fe75e958059bb301d140356a35faaab37a7a5669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe75e958059bb301d140356a3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 10 00:07:08 2010 +0100 mmdevapi/tests: Fix test on some 2k8 and mark those errors broken. --- dlls/mmdevapi/tests/render.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 254c94d..70d6b39 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -208,8 +208,9 @@ static void test_audioclient(IAudioClient *ac) hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED || - hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || - hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME) /* Some Vista */ + broken(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME)) || + broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) /* Some 2k8 */ || + broken(hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME)) /* Some Vista */ , "SetEventHandle returns %08x\n", hr); hr = IAudioClient_Reset(ac);

1 0

Michael Stefaniuc : urlmon/tests: Escape '\' in C strings (sparse).
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 0f21814bbe293bd9efc84e9722b8161a582eab63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f21814bbe293bd9efc84e972… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:20:38 2010 +0100 urlmon/tests: Escape '\' in C strings (sparse). --- dlls/urlmon/tests/uri.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b11a3a0..8c4fd38 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3307,20 +3307,20 @@ static const uri_properties uri_tests[] = { } }, /* Allow more characters when Uri_CREATE_FILE_USE_DOS_PATH is specified */ - { "file:///c:/dir\%%61%20%5Fname/file%2A.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, + { "file:///c:/dir\\%%61%20%5Fname/file%2A.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, { - {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"file://c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, - {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"file://c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, {".html",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, - {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, - {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, + {"c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, - {"file:///c:/dir\%%61%20%5Fname/file%2A.html",S_OK,FALSE}, + {"file:///c:/dir\\%%61%20%5Fname/file%2A.html",S_OK,FALSE}, {"file",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}

1 0

Henri Verbeet : wined3d: Use a lookup table in select_card_ati_binary().
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 4503d0cb4b4fa5ab5857980ab232bf7bedfd6cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503d0cb4b4fa5ab5857980ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:00 2010 +0100 wined3d: Use a lookup table in select_card_ati_binary(). --- dlls/wined3d/directx.c | 124 ++++++++++++++++++------------------------------ 1 files changed, 47 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ceb742..4485491 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1578,89 +1578,59 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ if (WINE_D3D10_CAPABLE(gl_info)) { - /* Radeon EG CYPRESS XT / PRO HD5800 - highend */ - if (strstr(gl_renderer, "HD 5800") /* Radeon EG CYPRESS HD58xx generic renderer string */ - || strstr(gl_renderer, "HD 5850") /* Radeon EG CYPRESS XT */ - || strstr(gl_renderer, "HD 5870")) /* Radeon EG CYPRESS PRO */ - { - return CARD_ATI_RADEON_HD5800; - } - - /* Radeon EG JUNIPER XT / LE HD5700 - midend */ - if (strstr(gl_renderer, "HD 5700") /* Radeon EG JUNIPER HD57xx generic renderer string */ - || strstr(gl_renderer, "HD 5750") /* Radeon EG JUNIPER LE */ - || strstr(gl_renderer, "HD 5770")) /* Radeon EG JUNIPER XT */ - { - return CARD_ATI_RADEON_HD5700; - } - - /* Radeon R7xx HD4800 - highend */ - if (strstr(gl_renderer, "HD 4800") /* Radeon RV7xx HD48xx generic renderer string */ - || strstr(gl_renderer, "HD 4830") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4850") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4870") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4890")) /* Radeon RV790 */ - { - return CARD_ATI_RADEON_HD4800; - } - - /* Radeon R740 HD4700 - midend */ - if (strstr(gl_renderer, "HD 4700") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4770")) /* Radeon RV740 */ - { - return CARD_ATI_RADEON_HD4700; - } - - /* Radeon R730 HD4600 - midend */ - if (strstr(gl_renderer, "HD 4600") /* Radeon RV730 */ - || strstr(gl_renderer, "HD 4650") /* Radeon RV730 */ - || strstr(gl_renderer, "HD 4670")) /* Radeon RV730 */ - { - return CARD_ATI_RADEON_HD4600; - } - - /* Radeon R710 HD4500/HD4350 - lowend */ - if (strstr(gl_renderer, "HD 4350") /* Radeon RV710 */ - || strstr(gl_renderer, "HD 4550")) /* Radeon RV710 */ - { - return CARD_ATI_RADEON_HD4350; - } - - /* Radeon R6xx HD2900/HD3800 - highend */ - if (strstr(gl_renderer, "HD 2900") - || strstr(gl_renderer, "HD 3870") - || strstr(gl_renderer, "HD 3850")) - { - return CARD_ATI_RADEON_HD2900; - } + unsigned int i; - /* Radeon R6xx HD2600/HD3600 - midend; HD3830 is China-only midend */ - if (strstr(gl_renderer, "HD 2600") - || strstr(gl_renderer, "HD 3830") - || strstr(gl_renderer, "HD 3690") - || strstr(gl_renderer, "HD 3650")) + static const struct { - return CARD_ATI_RADEON_HD2600; + const char *renderer; + enum wined3d_pci_device id; } - - /* Radeon R6xx HD2350/HD2400/HD3400 - lowend - * Note HD2300=DX9, HD2350=DX10 */ - if (strstr(gl_renderer, "HD 2350") - || strstr(gl_renderer, "HD 2400") - || strstr(gl_renderer, "HD 3470") - || strstr(gl_renderer, "HD 3450") - || strstr(gl_renderer, "HD 3430") - || strstr(gl_renderer, "HD 3400")) + cards[] = { - return CARD_ATI_RADEON_HD2350; - } + /* Evergreen */ + {"HD 5870", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS PRO */ + {"HD 5850", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS XT */ + {"HD 5800", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS HD58xx generic renderer string */ + {"HD 5770", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER XT */ + {"HD 5750", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER LE */ + {"HD 5700", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER HD57xx generic renderer string */ + /* R700 */ + {"HD 4890", CARD_ATI_RADEON_HD4800}, /* Radeon RV790 */ + {"HD 4870", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4850", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4830", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4800", CARD_ATI_RADEON_HD4800}, /* Radeon RV7xx HD48xx generic renderer string */ + {"HD 4770", CARD_ATI_RADEON_HD4700}, /* Radeon RV740 */ + {"HD 4700", CARD_ATI_RADEON_HD4700}, /* Radeon RV7xx HD47xx generic renderer string */ + {"HD 4670", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4650", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4600", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4550", CARD_ATI_RADEON_HD4350}, /* Radeon RV710 */ + {"HD 4350", CARD_ATI_RADEON_HD4350}, /* Radeon RV710 */ + /* R600/R700 integrated */ + {"HD 3300", CARD_ATI_RADEON_HD3200}, + {"HD 3200", CARD_ATI_RADEON_HD3200}, + {"HD 3100", CARD_ATI_RADEON_HD3200}, + /* R600 */ + {"HD 3870", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 3850", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 2900", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 3830", CARD_ATI_RADEON_HD2600}, /* China-only midend */ + {"HD 3690", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 3650", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 2600", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 3470", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3450", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3430", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3400", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 2400", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 2350", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + }; - /* Radeon R6xx/R7xx integrated */ - if (strstr(gl_renderer, "HD 3100") - || strstr(gl_renderer, "HD 3200") - || strstr(gl_renderer, "HD 3300")) + for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) { - return CARD_ATI_RADEON_HD3200; + if (strstr(gl_renderer, cards[i].renderer)) + return cards[i].id; } /* Default for when no GPU has been found */

1 0