December 2009 - Wine-commits

Eric Pouech : dbghelp: Add a couple of helpers to struct cpu to help adding the stack to minidump .
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: ed96e740e9f3d378c0694d93dfd3b6cba3e087e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed96e740e9f3d378c0694d93d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:21:37 2009 +0100 dbghelp: Add a couple of helpers to struct cpu to help adding the stack to minidump. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_i386.c | 60 ++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/cpu_ppc.c | 63 ++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/cpu_x86_64.c | 18 +++++++++++ dlls/dbghelp/dbghelp_private.h | 7 ++++ dlls/dbghelp/minidump.c | 53 ++++++--------------------------- 6 files changed, 159 insertions(+), 43 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index d3a72a2..a3b1553 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -11,6 +11,7 @@ DELAYIMPORTS = version C_SRCS = \ coff.c \ cpu_i386.c \ + cpu_ppc.c \ cpu_x86_64.c \ crc32.c \ dbghelp.c \ diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index a3649ba..a83f0fa 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -29,6 +29,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +#define STEP_FLAG 0x00000100 /* single step flag */ +#define V86_FLAG 0x00020000 + +#define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) + +#ifdef __i386__ +static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD sel) +{ + LDT_ENTRY le; + + if (IS_VM86_MODE(ctx)) return AddrModeReal; + /* null or system selector */ + if (!(sel & 4) || ((sel >> 3) < 17)) return AddrModeFlat; + if (hThread && GetThreadSelectorEntry(hThread, sel, &le)) + return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; + /* selector doesn't exist */ + return -1; +} + +static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr, + unsigned seg, unsigned long offset) +{ + addr->Mode = AddrModeFlat; + addr->Segment = seg; + addr->Offset = offset; + if (seg) + { + switch (addr->Mode = get_selector_type(hThread, ctx, seg)) + { + case AddrModeReal: + case AddrMode1616: + addr->Offset &= 0xffff; + break; + case AddrModeFlat: + case AddrMode1632: + break; + default: + return FALSE; + } + } + return TRUE; +} +#endif + +static unsigned i386_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ +#ifdef __i386__ + switch (ca) + { + case cpu_addr_pc: return i386_build_addr(hThread, ctx, addr, ctx->SegCs, ctx->Eip); + case cpu_addr_stack: return i386_build_addr(hThread, ctx, addr, ctx->SegSs, ctx->Esp); + case cpu_addr_frame: return i386_build_addr(hThread, ctx, addr, ctx->SegSs, ctx->Ebp); + } +#endif + return FALSE; +} + enum st_mode {stm_start, stm_32bit, stm_16bit, stm_done}; /* indexes in Reserved array */ @@ -344,5 +402,7 @@ done_err: struct cpu cpu_i386 = { IMAGE_FILE_MACHINE_I386, + 4, + i386_get_addr, i386_stack_walk, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c new file mode 100644 index 0000000..da440f8 --- /dev/null +++ b/dlls/dbghelp/cpu_ppc.c @@ -0,0 +1,63 @@ +/* + * File cpu_ppc.c + * + * Copyright (C) 2009-2009, Eric Pouech. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "wine/winbase16.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +static unsigned ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + switch (ca) + { +#if defined(__powerpc__) + case cpu_addr_pc: + addr->Mode = AddrModeFlat; + addr->Segment = 0; /* don't need segment */ + addr->Offset = ctx->Iar; + return TRUE; +#endif + default: + case cpu_addr_stack: + case cpu_addr_frame: + FIXME("not done\n"); + } + return FALSE; +} + +static BOOL ppc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame) +{ + FIXME("not done\n"); + return FALSE; +} + +struct cpu cpu_ppc = { + IMAGE_FILE_MACHINE_POWERPC, + 4, + ppc_get_addr, + ppc_stack_walk, +}; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 5678678..d7fb138 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -29,6 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +static unsigned x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + addr->Mode = AddrModeFlat; + switch (ca) + { +#ifdef __x86_64__ + case cpu_addr_pc: addr->Segment = ctx->SegCs; addr->Offset = ctx->Rip; return TRUE; + case cpu_addr_stack: addr->Segment = ctx->SegSs; addr->Offset = ctx->Rsp; return TRUE; + case cpu_addr_frame: addr->Segment = ctx->SegSs; addr->Offset = ctx->Rbp; return TRUE; +#endif + default: addr->Mode = -1; + return FALSE; + } +} + enum st_mode {stm_start, stm_64bit, stm_done}; /* indexes in Reserved array */ @@ -111,5 +127,7 @@ done_err: struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, + 8, + x86_64_get_addr, x86_64_stack_walk, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 69150e1..d2e2f1b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -443,9 +443,16 @@ struct cpu_stack_walk } u; }; +enum cpu_addr {cpu_addr_pc, cpu_addr_stack, cpu_addr_frame}; struct cpu { DWORD machine; + DWORD word_size; + /* address manipulation */ + unsigned (*get_addr)(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr, ADDRESS64* addr); + + /* stack manipulation */ BOOL (*stack_walk)(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame); }; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 1dc7dc3..3cddb72 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -115,58 +115,25 @@ static void fetch_thread_stack(struct dump_context* dc, const void* teb_addr, const CONTEXT* ctx, MINIDUMP_MEMORY_DESCRIPTOR* mmd) { NT_TIB tib; + ADDRESS64 addr; - if (ReadProcessMemory(dc->hProcess, teb_addr, &tib, sizeof(tib), NULL)) + if (ReadProcessMemory(dc->hProcess, teb_addr, &tib, sizeof(tib), NULL) && + dbghelp_current_cpu && + dbghelp_current_cpu->get_addr(NULL /* FIXME */, ctx, cpu_addr_stack, &addr) && addr.Mode == AddrModeFlat) { -#ifdef __i386__ - /* limiting the stack dumping to the size actually used */ - if (ctx->Esp){ - - /* make sure ESP is within the established range of the stack. It could have - been clobbered by whatever caused the original exception. */ - if (ctx->Esp - 4 < (ULONG_PTR)tib.StackLimit || ctx->Esp - 4 > (ULONG_PTR)tib.StackBase) - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - - else - mmd->StartOfMemoryRange = (ctx->Esp - 4); - } - - else - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - -#elif defined(__powerpc__) - if (ctx->Iar){ - - /* make sure IAR is within the established range of the stack. It could have - been clobbered by whatever caused the original exception. */ - if (ctx->Iar - 4 < (ULONG_PTR)tib.StackLimit || ctx->Iar - 4 > (ULONG_PTR)tib.StackBase) - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - - else - mmd->StartOfMemoryRange = (ctx->Iar - 4); - } - - else - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - -#elif defined(__x86_64__) - if (ctx->Rsp){ - - /* make sure RSP is within the established range of the stack. It could have + if (addr.Offset) + { + addr.Offset -= dbghelp_current_cpu->word_size; + /* make sure stack pointer is within the established range of the stack. It could have been clobbered by whatever caused the original exception. */ - if (ctx->Rsp - 8 < (ULONG_PTR)tib.StackLimit || ctx->Rsp - 8 > (ULONG_PTR)tib.StackBase) + if (addr.Offset < (ULONG_PTR)tib.StackLimit || addr.Offset > (ULONG_PTR)tib.StackBase) mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; else - mmd->StartOfMemoryRange = (ctx->Rsp - 8); + mmd->StartOfMemoryRange = addr.Offset; } - else mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - -#else -#error unsupported CPU -#endif mmd->Memory.DataSize = (ULONG_PTR)tib.StackBase - mmd->StartOfMemoryRange; } }

1 0

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

23 Dec '09

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 : wined3d: Focus the focus window.
by Alexandre Julliard 23 Dec '09

23 Dec '09

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

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

23 Dec '09

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 : d3d8/tests: Add some tests for focus behaviour.
by Alexandre Julliard 23 Dec '09

23 Dec '09

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: Reimplement MENU_FindSubMenu on the 16-bit side using only exported functions .
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 00e75f2b9eb117b95e9024c16fa916c3b3f7460d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e75f2b9eb117b95e9024c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:00:12 2009 +0100 user32: Reimplement MENU_FindSubMenu on the 16-bit side using only exported functions. --- dlls/user32/controls.h | 1 - dlls/user32/menu.c | 2 +- dlls/user32/msg16.c | 22 ++++++++++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index f9752ee..9392cbe 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -158,7 +158,6 @@ extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDE extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, BOOL suppress_draw ) DECLSPEC_HIDDEN; -extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 9205146..0f083ff 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -656,7 +656,7 @@ static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) * *hmenu in case it is found in another sub-menu. * If the submenu cannot be found, NO_SELECTED_ITEM is returned. */ -UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) +static UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) { POPUPMENU *menu; UINT i; diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 0866875..672e4a2 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -587,6 +587,24 @@ static HANDLE16 convert_handle_32_to_16(UINT_PTR src, unsigned int flags) return dst; } +static int find_sub_menu( HMENU *hmenu, HMENU16 target ) +{ + int i, pos, count = GetMenuItemCount( *hmenu ); + + for (i = 0; i < count; i++) + { + HMENU sub = GetSubMenu( *hmenu, i ); + if (!sub) continue; + if (HMENU_16(sub) == target) return i; + if ((pos = find_sub_menu( &sub, target )) != -1) + { + *hmenu = sub; + return pos; + } + } + return -1; +} + /********************************************************************** * WINPROC_CallProc16To32A */ @@ -825,8 +843,8 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 if((LOWORD(lParam) & MF_POPUP) && (LOWORD(lParam) != 0xFFFF)) { HMENU hmenu = HMENU_32(HIWORD(lParam)); - UINT pos = MENU_FindSubMenu( &hmenu, HMENU_32(wParam) ); - if (pos == 0xffff) pos = 0; /* NO_SELECTED_ITEM */ + int pos = find_sub_menu( &hmenu, wParam ); + if (pos == -1) pos = 0; wParam = pos; } ret = callback( hwnd32, msg, MAKEWPARAM( wParam, LOWORD(lParam) ),

1 0

Alexandre Julliard : user32: Add wrapper functions for manipulation of cursor/icon handles.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 0280f058f9b2f9ec761e46efd10bcac950dd178e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0280f058f9b2f9ec761e46efd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:04:33 2009 +0100 user32: Add wrapper functions for manipulation of cursor/icon handles. --- dlls/user32/cursoricon.c | 110 ++++++++++++++++++++++++++++----------------- dlls/user32/user16.c | 53 +++++++++++++++------- 2 files changed, 105 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0280f058f9b2f9ec761e4…

1 0

Alexandre Julliard : user32: Call the cursor/ icon handle allocation functions through the WoW handlers table.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: b36ca4860803aa076e138537347edaa872da9c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36ca4860803aa076e1385373… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:06:50 2009 +0100 user32: Call the cursor/icon handle allocation functions through the WoW handlers table. --- dlls/user32/controls.h | 4 ++ dlls/user32/cursoricon.c | 75 ++++++++++++++++----------------------------- dlls/user32/msg16.c | 33 +++++++++++++++++++- dlls/user32/winproc.c | 28 ++++++++++++++++- 4 files changed, 90 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b36ca4860803aa076e138…

1 0

Alexandre Julliard : user32: Don't assume global handles in CopyIcon.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 0f511f3c8e3105b00953648a8a072bfaada94ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f511f3c8e3105b00953648a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:13:49 2009 +0100 user32: Don't assume global handles in CopyIcon. --- dlls/user32/cursoricon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 90f8356..2b2151a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1451,11 +1451,12 @@ HICON WINAPI CopyIcon( HICON hIcon ) { CURSORICONINFO *ptrOld, *ptrNew; int size; - HICON16 hOld = HICON_16(hIcon); HICON hNew; if (!(ptrOld = wow_handlers.get_icon_ptr( hIcon ))) return 0; - size = GlobalSize16( hOld ); + size = sizeof(CURSORICONINFO); + size += ptrOld->nHeight * get_bitmap_width_bytes( ptrOld->nWidth, 1 ); /* and bitmap */ + size += ptrOld->nHeight * ptrOld->nWidthBytes; /* xor bitmap */ hNew = wow_handlers.alloc_icon_handle( size ); ptrNew = wow_handlers.get_icon_ptr( hNew ); memcpy( ptrNew, ptrOld, size );

1 0

Alexandre Julliard : user32: Allocate user handles for cursors/ icons when we don't have 16-bit support.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: cecb3a993c156b7aef91f719beec4901597095cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecb3a993c156b7aef91f719b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:16:50 2009 +0100 user32: Allocate user handles for cursors/icons when we don't have 16-bit support. --- dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 41379f0..c383b48 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -129,6 +129,7 @@ enum user_obj_type USER_WINDOW = 1, /* window */ USER_MENU, /* menu */ USER_ACCEL, /* accelerator */ + USER_ICON, /* icon or cursor */ USER_DWP /* DeferWindowPos structure */ }; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index bcb6853..354efe0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1123,24 +1123,32 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static HICON alloc_icon_handle( unsigned int size ) { - HGLOBAL16 handle = GlobalAlloc16( GMEM_MOVEABLE, size ); - FarSetOwner16( handle, 0 ); - return HICON_32( handle ); + struct user_object *obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) + size ); + if (!obj) return 0; + return alloc_user_handle( obj, USER_ICON ); } static struct tagCURSORICONINFO *get_icon_ptr( HICON handle ) { - return GlobalLock16( HICON_16(handle) ); + struct user_object *obj = get_user_handle_ptr( handle, USER_ICON ); + if (obj == OBJ_OTHER_PROCESS) + { + WARN( "cursor handle %p from other process\n", handle ); + obj = NULL; + } + return obj ? (struct tagCURSORICONINFO *)(obj + 1) : NULL; } static void release_icon_ptr( HICON handle, struct tagCURSORICONINFO *ptr ) { - GlobalUnlock16( HICON_16(handle) ); + release_user_handle_ptr( (struct user_object *)ptr - 1 ); } static int free_icon_handle( HICON handle ) { - return GlobalFree16( HICON_16(handle) ); + struct user_object *obj = free_user_handle( handle, USER_ICON ); + HeapFree( GetProcessHeap(), 0, obj ); + return !obj; }

1 0