December 2009 - Wine-Commits

Nikolay Sivov : comctl32/updown: Don't change control z-order, this breaks auto buddy binding.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 9ef90f480aac68e296c9d42be3ca03a2bd684af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef90f480aac68e296c9d42be… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 22:01:31 2009 +0300 comctl32/updown: Don't change control z-order, this breaks auto buddy binding. --- dlls/comctl32/updown.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 776d72e..e87df87 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -868,13 +868,13 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L SetWindowLongW (hwnd, GWL_STYLE, infoPtr->dwStyle & ~WS_BORDER); if (!(infoPtr->dwStyle & UDS_HORZ)) SetWindowPos (hwnd, NULL, 0, 0, DEFAULT_WIDTH, pcs->cy, - SWP_NOOWNERZORDER | SWP_NOMOVE); + SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE); /* Do we pick the buddy win ourselves? */ if (infoPtr->dwStyle & UDS_AUTOBUDDY) UPDOWN_SetBuddy (infoPtr, GetWindow (hwnd, GW_HWNDPREV)); - OpenThemeData (hwnd, themeClass); + OpenThemeData (hwnd, themeClass); TRACE("UpDown Ctrl creation, hwnd=%p\n", hwnd); }

1 0

Nikolay Sivov : comctl32/tests: Explicitly create rebar for each test, cleanup main function a bit.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 80ed866ff43249fd5728309327c418a640b77c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ed866ff43249fd572830932… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 01:41:07 2009 +0300 comctl32/tests: Explicitly create rebar for each test, cleanup main function a bit. --- dlls/comctl32/tests/rebar.c | 163 +++++++++++++++++++++++++++++------------- 1 files changed, 112 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80ed866ff43249fd57283…

1 0

Henri Verbeet : wined3d: Use proper enum elements for FOURCC formats.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 3288911ae3e3cbd7124ed60d805ff3310f6a21c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3288911ae3e3cbd7124ed60d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 22 18:32:17 2009 +0100 wined3d: Use proper enum elements for FOURCC formats. --- dlls/wined3d/wined3d_private.h | 4 ++++ include/wine/wined3d.idl | 33 +++++++++++++++------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f1fc13..489137c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2894,4 +2894,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" +#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) + #endif diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 27267c2..7196a98 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -253,27 +253,24 @@ typedef enum _WINED3DFORMAT WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, + /* FOURCC formats. */ + WINED3DFMT_UYVY = 0x59565955, /* UYVY */ + WINED3DFMT_YUY2 = 0x32595559, /* YUY2 */ + WINED3DFMT_YV12 = 0x32315659, /* YV12 */ + WINED3DFMT_DXT1 = 0x31545844, /* DXT1 */ + WINED3DFMT_DXT2 = 0x32545844, /* DXT2 */ + WINED3DFMT_DXT3 = 0x33545844, /* DXT3 */ + WINED3DFMT_DXT4 = 0x34545844, /* DXT4 */ + WINED3DFMT_DXT5 = 0x35545844, /* DXT5 */ + WINED3DFMT_MULTI2_ARGB8 = 0x3154454d, /* MET1 */ + WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */ + WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */ + WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */ + WINED3DFMT_NVHU = 0x5548564e, /* NVHU */ + WINED3DFMT_NVHS = 0x5348564e, /* NVHS */ WINED3DFMT_FORCE_DWORD = 0xffffffff } WINED3DFORMAT; -cpp_quote("#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \\") -cpp_quote(" ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \\") -cpp_quote(" ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))") -cpp_quote("#define WINED3DFMT_UYVY WINEMAKEFOURCC('U', 'Y', 'V', 'Y')") -cpp_quote("#define WINED3DFMT_YUY2 WINEMAKEFOURCC('Y', 'U', 'Y', '2')") -cpp_quote("#define WINED3DFMT_YV12 WINEMAKEFOURCC('Y', 'V', '1', '2')") -cpp_quote("#define WINED3DFMT_DXT1 WINEMAKEFOURCC('D', 'X', 'T', '1')") -cpp_quote("#define WINED3DFMT_DXT2 WINEMAKEFOURCC('D', 'X', 'T', '2')") -cpp_quote("#define WINED3DFMT_DXT3 WINEMAKEFOURCC('D', 'X', 'T', '3')") -cpp_quote("#define WINED3DFMT_DXT4 WINEMAKEFOURCC('D', 'X', 'T', '4')") -cpp_quote("#define WINED3DFMT_DXT5 WINEMAKEFOURCC('D', 'X', 'T', '5')") -cpp_quote("#define WINED3DFMT_MULTI2_ARGB8 WINEMAKEFOURCC('M', 'E', 'T', '1')") -cpp_quote("#define WINED3DFMT_G8R8_G8B8 WINEMAKEFOURCC('G', 'R', 'G', 'B')") -cpp_quote("#define WINED3DFMT_R8G8_B8G8 WINEMAKEFOURCC('R', 'G', 'B', 'G')") -/* Vendor specific formats */ -cpp_quote("#define WINED3DFMT_ATI2N WINEMAKEFOURCC('A', 'T', 'I', '2')") -cpp_quote("#define WINED3DFMT_NVHU WINEMAKEFOURCC('N', 'V', 'H', 'U')") -cpp_quote("#define WINED3DFMT_NVHS WINEMAKEFOURCC('N', 'V', 'H', 'S')") typedef enum _WINED3DRENDERSTATETYPE {

1 0

Nikolay Sivov : comctl32/updown: Don't update buddy text if it's the same.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 750ce6be35c44052f453d26aac44b4fe636472f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750ce6be35c44052f453d26aa… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 21:58:27 2009 +0300 comctl32/updown: Don't update buddy text if it's the same. --- dlls/comctl32/tests/updown.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/comctl32/updown.c | 6 +++++- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index dacc460..fef53bf 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -59,6 +59,9 @@ #define EDIT_SEQ_INDEX 1 #define UPDOWN_SEQ_INDEX 2 +#define UPDOWN_ID 0 +#define BUDDY_ID 1 + static HWND parent_wnd, g_edit; static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -156,6 +159,11 @@ static const struct message test_updown_unicode_seq[] = { { 0 } }; +static const struct message test_updown_pos_nochange_seq[] = { + { WM_GETTEXT, sent|id, 0, 0, BUDDY_ID }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -233,6 +241,7 @@ static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = BUDDY_ID; add_message(sequences, EDIT_SEQ_INDEX, &msg); defwndproc_counter++; @@ -274,6 +283,7 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = UPDOWN_ID; add_message(sequences, UPDOWN_SEQ_INDEX, &msg); defwndproc_counter++; @@ -360,6 +370,19 @@ static void test_updown_pos(void) ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos_seq , "test updown pos", FALSE); DestroyWindow(updown); + + /* there's no attempt to update buddy Edit if text didn't change */ + SetWindowTextA(g_edit, "50"); + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + r = SendMessage(updown, UDM_SETPOS, 0, 50); + expect(50,r); + ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, + "test updown pos, no change", FALSE); + + DestroyWindow(updown); } static void test_updown_pos32(void) @@ -434,6 +457,19 @@ static void test_updown_pos32(void) ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos32_seq, "test updown pos32", FALSE); DestroyWindow(updown); + + /* there's no attempt to update buddy Edit if text didn't change */ + SetWindowTextA(g_edit, "50"); + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + r = SendMessage(updown, UDM_SETPOS32, 0, 50); + expect(50,r); + ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, + "test updown pos, no change", FALSE); + + DestroyWindow(updown); } static void test_updown_buddy(void) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 127bb40..776d72e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -310,7 +310,7 @@ static BOOL UPDOWN_GetBuddyInt (UPDOWN_INFO *infoPtr) static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) { WCHAR fmt[3] = { '%', 'd', '\0' }; - WCHAR txt[20]; + WCHAR txt[20], txt_old[20] = { 0 }; int len; if (!((infoPtr->Flags & FLAG_BUDDYINT) && IsWindow(infoPtr->Buddy))) @@ -345,6 +345,10 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) *dst = 0; } + /* if nothing changed exit earlier */ + GetWindowTextW(infoPtr->Buddy, txt_old, sizeof(txt_old)/sizeof(WCHAR)); + if (lstrcmpiW(txt_old, txt) == 0) return 0; + return SetWindowTextW(infoPtr->Buddy, txt); }

1 0

Henri Verbeet : d3d8/tests: Add some tests for focus behaviour.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 5d2a46d92e53039c2bb5ecaf52d2f13e3bbfe4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d2a46d92e53039c2bb5ecaf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 22 18:32:16 2009 +0100 d3d8/tests: Add some tests for focus behaviour. --- dlls/d3d8/tests/device.c | 84 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 64 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f3e7f5f..ebfc030 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -46,13 +46,13 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } -static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND window) +static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND device_window, HWND focus_window) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice8 *device; present_parameters.Windowed = FALSE; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -60,14 +60,14 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND window) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; return NULL; @@ -1487,25 +1487,32 @@ cleanup: if (d3d8) IDirect3D8_Release(d3d8); } -static BOOL filter_messages; +static HWND filter_messages; +struct +{ + HWND window; + UINT message; +} expect_message; static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { - if (filter_messages) + if (filter_messages && filter_messages == hwnd) { - ok(message == WM_DISPLAYCHANGE, "Received unexpected message %#x.\n", message); + ok(message == WM_DISPLAYCHANGE, "Received unexpected message %#x for window %p.\n", message, hwnd); } + if (expect_message.window == hwnd && expect_message.message == message) expect_message.message = 0; + return DefWindowProcA(hwnd, message, wparam, lparam); } static void test_wndproc(void) { + HWND device_window, focus_window, dummy_window, tmp; IDirect3DDevice8 *device; WNDCLASSA wc = {0}; IDirect3D8 *d3d8; LONG_PTR proc; - HWND window; ULONG ref; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) @@ -1518,54 +1525,91 @@ static void test_wndproc(void) wc.lpszClassName = "d3d8_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); - window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", + focus_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + dummy_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); - filter_messages = TRUE; - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + trace("device_window %p, focus_window %p, dummy_window %p.\n", device_window, focus_window, dummy_window); + + tmp = GetFocus(); + ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); - device = create_device(d3d8, window); + expect_message.window = focus_window; + expect_message.message = WM_SETFOCUS; + + device = create_device(d3d8, device_window, focus_window); if (!device) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", + expect_message.message, expect_message.window); + tmp = GetFocus(); + ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + + filter_messages = focus_window; + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); - device = create_device(d3d8, window); + device = create_device(d3d8, focus_window, focus_window); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + device = create_device(d3d8, device_window, focus_window); if (!device) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)DefWindowProcA, proc); done: - filter_messages = FALSE; + filter_messages = NULL; IDirect3D8_Release(d3d8); - DestroyWindow(window); + DestroyWindow(dummy_window); + DestroyWindow(device_window); + DestroyWindow(focus_window); UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); }

1 0

Alexandre Julliard : user32: Avoid accessing the window structure directly in Get/SetWindowLong16.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 388814dfa975f8c57b199ed6870f58489be58acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=388814dfa975f8c57b199ed68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 15:25:15 2009 +0100 user32: Avoid accessing the window structure directly in Get/SetWindowLong16. --- dlls/user32/wnd16.c | 69 +++++++++++++++++--------------------------------- 1 files changed, 24 insertions(+), 45 deletions(-) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index dfcd71f..b4741ff 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -821,44 +821,36 @@ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval ) /********************************************************************** * GetWindowLong (USER.135) */ -LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) +LONG WINAPI GetWindowLong16( HWND16 hwnd16, INT16 offset ) { - WND *wndPtr; + HWND hwnd = WIN_Handle32( hwnd16 ); LONG_PTR retvalue; BOOL is_winproc = (offset == GWLP_WNDPROC); if (offset >= 0) { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + int cbWndExtra = GetClassLongA( hwnd, GCL_CBWNDEXTRA ); + + if (offset > (int)(cbWndExtra - sizeof(LONG))) { - if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) + /* + * Some programs try to access last element from 16 bit + * code using illegal offset value. Hopefully this is + * what those programs really expect. + */ + if (cbWndExtra >= 4 && offset == cbWndExtra - sizeof(WORD)) { - /* - * Some programs try to access last element from 16 bit - * code using illegal offset value. Hopefully this is - * what those programs really expect. - */ - if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) - { - offset = wndPtr->cbWndExtra - sizeof(LONG); - } - else - { - WIN_ReleasePtr( wndPtr ); - SetLastError( ERROR_INVALID_INDEX ); - return 0; - } + offset = cbWndExtra - sizeof(LONG); + } + else + { + SetLastError( ERROR_INVALID_INDEX ); + return 0; } - is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); } + else if (offset == DWLP_DLGPROC) is_winproc = (DIALOG_get_info( hwnd, FALSE ) != NULL); } - retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); + retvalue = GetWindowLongA( hwnd, offset ); if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue, FALSE ); return retvalue; } @@ -867,33 +859,20 @@ LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) /********************************************************************** * SetWindowLong (USER.136) */ -LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) +LONG WINAPI SetWindowLong16( HWND16 hwnd16, INT16 offset, LONG newval ) { - WND *wndPtr; + HWND hwnd = WIN_Handle32( hwnd16 ); BOOL is_winproc = (offset == GWLP_WNDPROC); - if (offset == DWLP_DLGPROC) - { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); - } - } + if (offset == DWLP_DLGPROC) is_winproc = (DIALOG_get_info( hwnd, FALSE ) != NULL); if (is_winproc) { WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); - WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); + WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( hwnd, offset, (LONG_PTR)new_proc ); return (LONG)WINPROC_GetProc16( old_proc, FALSE ); } - else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); + else return SetWindowLongA( hwnd, offset, newval ); }

1 0

Henri Verbeet : wined3d: Filter messages for the device' s focus window instead of the swapchain's device window.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: a0aa10eb5c7cc8ce3fd01776c3caff36e57876f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0aa10eb5c7cc8ce3fd01776c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 22 18:32:13 2009 +0100 wined3d: Filter messages for the device's focus window instead of the swapchain's device window. Usually these will be the same window, but they don't have to be. --- dlls/wined3d/device.c | 31 +++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 41 +++++---------------------------------- dlls/wined3d/swapchain_gdi.c | 2 - dlls/wined3d/wined3d_main.c | 12 +++++----- dlls/wined3d/wined3d_private.h | 11 +++++---- 5 files changed, 48 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0aa10eb5c7cc8ce3fd01…

1 0

Henri Verbeet : d3d9/tests: Add some tests for focus behaviour.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: a96aa28d98e230c0d0c2cf08d11701e711acd028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96aa28d98e230c0d0c2cf08d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 22 18:32:15 2009 +0100 d3d9/tests: Add some tests for focus behaviour. --- dlls/d3d9/tests/device.c | 87 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 66 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 32f40aa..9429e7a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -32,13 +32,13 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } -static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND window) +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND device_window, HWND focus_window) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; present_parameters.Windowed = FALSE; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -46,14 +46,14 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND window) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; return NULL; @@ -2406,25 +2406,33 @@ fail: if (hwnd2) DestroyWindow(hwnd2); } -static BOOL filter_messages; +static HWND filter_messages; +struct +{ + HWND window; + UINT message; +} expect_message; static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { - if (filter_messages) + if (filter_messages && filter_messages == hwnd) { - ok(message == WM_DISPLAYCHANGE, "Received unexpected message %#x.\n", message); + ok(message == WM_DISPLAYCHANGE || message == WM_IME_NOTIFY, + "Received unexpected message %#x for window %p.\n", message, hwnd); } + if (expect_message.window == hwnd && expect_message.message == message) expect_message.message = 0; + return DefWindowProcA(hwnd, message, wparam, lparam); } static void test_wndproc(void) { + HWND device_window, focus_window, dummy_window, tmp; IDirect3DDevice9 *device; WNDCLASSA wc = {0}; IDirect3D9 *d3d9; LONG_PTR proc; - HWND window; ULONG ref; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) @@ -2437,54 +2445,91 @@ static void test_wndproc(void) wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); - window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); - filter_messages = TRUE; + focus_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + dummy_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", + WS_MAXIMIZE | WS_CAPTION | WS_VISIBLE, 0, 0, 640, 480, 0, 0, 0, 0); - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); - device = create_device(d3d9, window); + trace("device_window %p, focus_window %p, dummy_window %p.\n", device_window, focus_window, dummy_window); + + tmp = GetFocus(); + ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); + + expect_message.window = focus_window; + expect_message.message = WM_SETFOCUS; + + device = create_device(d3d9, device_window, focus_window); if (!device) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", + expect_message.message, expect_message.window); + tmp = GetFocus(); + ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + + filter_messages = focus_window; + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); - device = create_device(d3d9, window); + device = create_device(d3d9, focus_window, focus_window); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + device = create_device(d3d9, device_window, focus_window); if (!device) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)DefWindowProcA, proc); done: - filter_messages = FALSE; + filter_messages = NULL; IDirect3D9_Release(d3d9); - DestroyWindow(window); + DestroyWindow(dummy_window); + DestroyWindow(device_window); + DestroyWindow(focus_window); UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : wined3d: Focus the focus window.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: b49e684f5d2447171589acccb37ffee81ffffbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49e684f5d2447171589acccb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 22 18:32:14 2009 +0100 wined3d: Focus the focus window. --- dlls/wined3d/device.c | 2 ++ dlls/wined3d/swapchain.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dac4ef6..31b3187 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1456,6 +1456,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, } } + SetFocus(This->focus_window); + /* Setup the implicit swapchain. This also initializes a context. */ TRACE("Creating implicit swapchain\n"); hr = IWineD3DDeviceParent_CreateSwapChain(This->device_parent, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6970ee0..ad257f5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -603,7 +603,7 @@ void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW); + SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); device->filter_messages = filter_messages; }

1 0

Eric Pouech : dbghelp: Create a cpu backend to store CPU dependent code, and use it for the i386 stack implementation.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 7230659ce924327be9caae74df01d0a084095235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7230659ce924327be9caae74d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:21:07 2009 +0100 dbghelp: Create a cpu backend to store CPU dependent code, and use it for the i386 stack implementation. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_i386.c | 348 ++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 22 ++ dlls/dbghelp/dbghelp_private.h | 39 ++++ dlls/dbghelp/stack.c | 456 +++++----------------------------------- 5 files changed, 467 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7230659ce924327be9caa…

1 0