March 2010 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8/tests: Extend the window proc / focus window tests.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 7aa5e90914506449086ebabedc1e8d63e3787e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa5e90914506449086ebabed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 17 21:59:46 2010 +0100 d3d8/tests: Extend the window proc / focus window tests. --- dlls/d3d8/tests/device.c | 103 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 404c564..c6613ca 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1494,6 +1494,13 @@ struct UINT message; } expect_message; +struct wndproc_thread_param +{ + HWND dummy_window; + HANDLE window_created; + HANDLE test_finished; +}; + static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { if (filter_messages && filter_messages == hwnd) @@ -1506,14 +1513,37 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM return DefWindowProcA(hwnd, message, wparam, lparam); } +static DWORD WINAPI wndproc_thread(void *param) +{ + struct wndproc_thread_param *p = param; + DWORD res; + BOOL ret; + + p->dummy_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + + ret = SetEvent(p->window_created); + ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(p->test_finished, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + + DestroyWindow(p->dummy_window); + + return 0; +} + static void test_wndproc(void) { - HWND device_window, focus_window, dummy_window, tmp; + struct wndproc_thread_param thread_params; + HWND device_window, focus_window, tmp; IDirect3DDevice8 *device; WNDCLASSA wc = {0}; IDirect3D8 *d3d8; + HANDLE thread; LONG_PTR proc; ULONG ref; + DWORD res; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1525,12 +1555,20 @@ static void test_wndproc(void) wc.lpszClassName = "d3d8_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); + thread_params.window_created = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError()); + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + 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); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(thread_params.window_created, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", @@ -1539,10 +1577,14 @@ static void test_wndproc(void) 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); + trace("device_window %p, focus_window %p, dummy_window %p.\n", + device_window, focus_window, thread_params.dummy_window); tmp = GetFocus(); - ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); + ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; @@ -1557,7 +1599,10 @@ static void test_wndproc(void) 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); + todo_wine ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + tmp = GetForegroundWindow(); + todo_wine ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + SetForegroundWindow(focus_window); filter_messages = focus_window; @@ -1607,7 +1652,13 @@ static void test_wndproc(void) done: filter_messages = NULL; IDirect3D8_Release(d3d8); - DestroyWindow(dummy_window); + + SetEvent(thread_params.test_finished); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread_params.test_finished); + CloseHandle(thread_params.window_created); + CloseHandle(thread); + DestroyWindow(device_window); DestroyWindow(focus_window); UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); @@ -1615,12 +1666,15 @@ done: static void test_wndproc_windowed(void) { - HWND device_window, focus_window, dummy_window, tmp; + struct wndproc_thread_param thread_params; + HWND device_window, focus_window, tmp; IDirect3DDevice8 *device; WNDCLASSA wc = {0}; IDirect3D8 *d3d8; + HANDLE thread; LONG_PTR proc; ULONG ref; + DWORD res; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1632,12 +1686,20 @@ static void test_wndproc_windowed(void) wc.lpszClassName = "d3d8_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); + thread_params.window_created = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError()); + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + 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); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(thread_params.window_created, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", @@ -1646,10 +1708,14 @@ static void test_wndproc_windowed(void) 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); + trace("device_window %p, focus_window %p, dummy_window %p.\n", + device_window, focus_window, thread_params.dummy_window); tmp = GetFocus(); - ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); + ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); filter_messages = focus_window; @@ -1661,7 +1727,10 @@ static void test_wndproc_windowed(void) } tmp = GetFocus(); - ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); + ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", @@ -1699,7 +1768,13 @@ static void test_wndproc_windowed(void) done: filter_messages = NULL; IDirect3D8_Release(d3d8); - DestroyWindow(dummy_window); + + SetEvent(thread_params.test_finished); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread_params.test_finished); + CloseHandle(thread_params.window_created); + CloseHandle(thread); + DestroyWindow(device_window); DestroyWindow(focus_window); UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL));

1 0

Henri Verbeet : d3d9/tests: Extend the window proc / focus window tests.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: a62e5a46786f7f56deacec9c7c76279e9fb41d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62e5a46786f7f56deacec9c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 17 21:59:47 2010 +0100 d3d9/tests: Extend the window proc / focus window tests. --- dlls/d3d9/tests/device.c | 103 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index de46082..5ef2910 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2338,6 +2338,13 @@ struct UINT message; } expect_message; +struct wndproc_thread_param +{ + HWND dummy_window; + HANDLE window_created; + HANDLE test_finished; +}; + static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { if (filter_messages && filter_messages == hwnd) @@ -2351,14 +2358,37 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM return DefWindowProcA(hwnd, message, wparam, lparam); } +static DWORD WINAPI wndproc_thread(void *param) +{ + struct wndproc_thread_param *p = param; + DWORD res; + BOOL ret; + + p->dummy_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + + ret = SetEvent(p->window_created); + ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(p->test_finished, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + + DestroyWindow(p->dummy_window); + + return 0; +} + static void test_wndproc(void) { - HWND device_window, focus_window, dummy_window, tmp; + struct wndproc_thread_param thread_params; + HWND device_window, focus_window, tmp; IDirect3DDevice9 *device; WNDCLASSA wc = {0}; IDirect3D9 *d3d9; + HANDLE thread; LONG_PTR proc; ULONG ref; + DWORD res; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2370,12 +2400,20 @@ static void test_wndproc(void) wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); + thread_params.window_created = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError()); + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + 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); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(thread_params.window_created, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", @@ -2384,10 +2422,14 @@ static void test_wndproc(void) 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); + trace("device_window %p, focus_window %p, dummy_window %p.\n", + device_window, focus_window, thread_params.dummy_window); tmp = GetFocus(); - ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); + ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; @@ -2402,7 +2444,10 @@ static void test_wndproc(void) 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); + todo_wine ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + tmp = GetForegroundWindow(); + todo_wine ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + SetForegroundWindow(focus_window); filter_messages = focus_window; @@ -2452,7 +2497,13 @@ static void test_wndproc(void) done: filter_messages = NULL; IDirect3D9_Release(d3d9); - DestroyWindow(dummy_window); + + SetEvent(thread_params.test_finished); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread_params.test_finished); + CloseHandle(thread_params.window_created); + CloseHandle(thread); + DestroyWindow(device_window); DestroyWindow(focus_window); UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); @@ -2460,12 +2511,15 @@ done: static void test_wndproc_windowed(void) { - HWND device_window, focus_window, dummy_window, tmp; + struct wndproc_thread_param thread_params; + HWND device_window, focus_window, tmp; IDirect3DDevice9 *device; WNDCLASSA wc = {0}; IDirect3D9 *d3d9; + HANDLE thread; LONG_PTR proc; ULONG ref; + DWORD res; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2477,12 +2531,20 @@ static void test_wndproc_windowed(void) wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); + thread_params.window_created = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError()); + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + 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_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(thread_params.window_created, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", @@ -2491,10 +2553,14 @@ static void test_wndproc_windowed(void) 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); + trace("device_window %p, focus_window %p, dummy_window %p.\n", + device_window, focus_window, thread_params.dummy_window); tmp = GetFocus(); - ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); + ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); filter_messages = focus_window; @@ -2506,7 +2572,10 @@ static void test_wndproc_windowed(void) } tmp = GetFocus(); - ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp); + ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", @@ -2544,7 +2613,13 @@ static void test_wndproc_windowed(void) done: filter_messages = NULL; IDirect3D9_Release(d3d9); - DestroyWindow(dummy_window); + + SetEvent(thread_params.test_finished); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread_params.test_finished); + CloseHandle(thread_params.window_created); + CloseHandle(thread); + DestroyWindow(device_window); DestroyWindow(focus_window); UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL));

1 0

Henri Verbeet : wined3d: Make the focus window also the foreground window.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 0838d0ab6491bdc0fb32d0b8715fbb57088b926a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0838d0ab6491bdc0fb32d0b87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 17 21:59:48 2010 +0100 wined3d: Make the focus window also the foreground window. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0968bfc..ed6c031 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1571,7 +1571,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, } } - if (This->focus_window) SetFocus(This->focus_window); + if (This->focus_window) SetForegroundWindow(This->focus_window); /* Setup the implicit swapchain. This also initializes a context. */ TRACE("Creating implicit swapchain\n");

1 0

Vincent Povirk : winex11.drv: ReadSelectionData should fail if the import function fails.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 1eff311e8da7d2ca202427933b1e31302dddaef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eff311e8da7d2ca202427933… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 17 11:39:35 2010 -0500 winex11.drv: ReadSelectionData should fail if the import function fails. --- dlls/winex11.drv/clipboard.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f4e49e2..4d4306e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2199,7 +2199,10 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA HANDLE hData = lpData->lpFormat->lpDrvImportFunc(display, xe.xselection.requestor, xe.xselection.property); - bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, 0, lpData->lpFormat, TRUE); + if (hData) + bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, 0, lpData->lpFormat, TRUE); + else + TRACE("Import function failed\n"); } else {

1 0

Stefan Dösinger : d3d9: Remove the double unlock test.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 25c6dbfc2a62e43672d3fc7b75ea80c565d50ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c6dbfc2a62e43672d3fc7b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 15 13:42:57 2010 +0100 d3d9: Remove the double unlock test. --- dlls/d3d9/tests/surface.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 4427cc0..967c608 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -169,8 +169,9 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr) ok(SUCCEEDED(hr), "IDirect3DTexture9_LockRect: %08x\n", hr); hr = IDirect3DTexture9_UnlockRect(pTexture, j); ok(SUCCEEDED(hr), "IDirect3DTexture9_UnLockRect: %08x\n", hr); - hr = IDirect3DTexture9_UnlockRect(pTexture, j); -todo_wine ok(SUCCEEDED(hr), "Double IDirect3DTexture9_UnLockRect failed with %08x\n", hr); + /* Windows XP returns D3D_OK when calling UnlockRect on an unlocked surface, + * windows 7 returns an error. + */ pitch = ((descr.Width + 3) >> 2) << 3; if (i > 0) pitch <<= 1;

1 0

Stefan Dösinger : d3d9: Windows 7 rejects invalid rectangles.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: f5b5f7176a656ba0a61a082d51419732362a1346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b5f7176a656ba0a61a082d5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 15 14:08:23 2010 +0100 d3d9: Windows 7 rejects invalid rectangles. --- dlls/d3d9/tests/surface.c | 54 ++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 967c608..c1246fc 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -255,6 +255,12 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) IDirect3D9_Release(d3d); } +struct rect_test +{ + RECT rect; + HRESULT win7_result; +}; + static void test_lockrect_invalid(IDirect3DDevice9 *device) { IDirect3DSurface9 *surface = 0; @@ -264,20 +270,20 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) HRESULT hr; const RECT test_rect_2 = { 0, 0, 8, 8 }; - const RECT test_data[] = { - {60, 60, 68, 68}, /* Valid */ - {60, 60, 60, 68}, /* 0 height */ - {60, 60, 68, 60}, /* 0 width */ - {68, 60, 60, 68}, /* left > right */ - {60, 68, 68, 60}, /* top > bottom */ - {-8, 60, 0, 68}, /* left < surface */ - {60, -8, 68, 0}, /* top < surface */ - {-16, 60, -8, 68}, /* right < surface */ - {60, -16, 68, -8}, /* bottom < surface */ - {60, 60, 136, 68}, /* right > surface */ - {60, 60, 68, 136}, /* bottom > surface */ - {136, 60, 144, 68}, /* left > surface */ - {60, 136, 68, 144}, /* top > surface */ + const struct rect_test test_data[] = { + {{60, 60, 68, 68}, D3D_OK}, /* Valid */ + {{60, 60, 60, 68}, D3DERR_INVALIDCALL}, /* 0 height */ + {{60, 60, 68, 60}, D3DERR_INVALIDCALL}, /* 0 width */ + {{68, 60, 60, 68}, D3DERR_INVALIDCALL}, /* left > right */ + {{60, 68, 68, 60}, D3DERR_INVALIDCALL}, /* top > bottom */ + {{-8, 60, 0, 68}, D3DERR_INVALIDCALL}, /* left < surface */ + {{60, -8, 68, 0}, D3DERR_INVALIDCALL}, /* top < surface */ + {{-16, 60, -8, 68}, D3DERR_INVALIDCALL}, /* right < surface */ + {{60, -16, 68, -8}, D3DERR_INVALIDCALL}, /* bottom < surface */ + {{60, 60, 136, 68}, D3DERR_INVALIDCALL}, /* right > surface */ + {{60, 60, 68, 136}, D3DERR_INVALIDCALL}, /* bottom > surface */ + {{136, 60, 144, 68}, D3DERR_INVALIDCALL}, /* left > surface */ + {{60, 136, 68, 144}, D3DERR_INVALIDCALL}, /* top > surface */ }; hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, 0); @@ -294,14 +300,18 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) { unsigned int offset, expected_offset; - const RECT *rect = &test_data[i]; + const RECT *rect = &test_data[i].rect; locked_rect.pBits = (BYTE *)0xdeadbeef; locked_rect.Pitch = 0xdeadbeef; hr = IDirect3DSurface9_LockRect(surface, &locked_rect, rect, 0); - ok(SUCCEEDED(hr), "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]\n", + /* Windows XP accepts invalid locking rectangles, windows 7 rejects them. + * Some games(C&C3) depend on the XP behavior, mark the Win7 one broken */ + ok(SUCCEEDED(hr) || broken(hr == test_data[i].win7_result), + "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]\n", hr, rect->left, rect->top, rect->right, rect->bottom); + if(FAILED(hr)) continue; offset = (BYTE *)locked_rect.pBits - base; expected_offset = rect->top * locked_rect.Pitch + rect->left * 4; @@ -319,14 +329,14 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); - hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0], 0); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0); ok(hr == D3D_OK, "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" - ", expected D3D_OK (0x%08x)\n", hr, test_data[0].left, test_data[0].top, - test_data[0].right, test_data[0].bottom, D3D_OK); - hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0], 0); + ", expected D3D_OK (0x%08x)\n", hr, test_data[0].rect.left, test_data[0].rect.top, + test_data[0].rect.right, test_data[0].rect.bottom, D3D_OK); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0); ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" - ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_data[0].left, test_data[0].top, - test_data[0].right, test_data[0].bottom, D3DERR_INVALIDCALL); + ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_data[0].rect.left, test_data[0].rect.top, + test_data[0].rect.right, test_data[0].rect.bottom, D3DERR_INVALIDCALL); hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_rect_2, 0); ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_rect_2.left, test_rect_2.top,

1 0

Stefan Dösinger : d3d9: Remove old debug messages from the tests.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 48d6167c29b06edfe4be0c29430adb1fe82b285e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d6167c29b06edfe4be0c294… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 14 07:54:58 2010 -0800 d3d9: Remove old debug messages from the tests. --- dlls/d3d9/tests/visual.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 875d2be..1fa7f47 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -495,9 +495,6 @@ static void clear_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetViewport(device, &old_vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); - trace("viewport: X %u, Y %u, W %u, H %u, MinZ %.8e, MaxZ %.8e.\n", - old_vp.X, old_vp.Y, old_vp.Width, old_vp.Height, old_vp.MinZ, old_vp.MaxZ); - vp.X = 160; vp.Y = 120; vp.Width = 160; @@ -10433,7 +10430,6 @@ static void loop_index_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); if(SUCCEEDED(hr)) { - trace("going to draw index\n"); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); hr = IDirect3DDevice9_EndScene(device);

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCreateTextureFromFileInMemoryEx.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: c090624fbc86009c13860603947306406a8ce789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c090624fbc86009c138606039… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 17 12:21:22 2010 +0100 d3dx9_36: Add stub for D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 7924081..2034a04 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -97,7 +97,7 @@ @ stub D3DXCreateTextureFromFileExA @ stub D3DXCreateTextureFromFileExW @ stub D3DXCreateTextureFromFileInMemory -@ stub D3DXCreateTextureFromFileInMemoryEx +@ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileW @ stub D3DXCreateTextureFromResourceA @ stub D3DXCreateTextureFromResourceExA diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f47853a..f0773b9 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -35,3 +35,25 @@ HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); } + +HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatasize, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO* srcinfo, + PALETTEENTRY* palette, + LPDIRECT3DTEXTURE9* texture) +{ + FIXME("(%p, %p, %d, %d, %d, %d, %x, %x, %x, %d, %d, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, + height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + + return E_NOTIMPL; +}

1 0

Nikolay Sivov : ole32: Remove useless parameter check.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 0498534b6b1193f60ba63af00a14e665e3b37178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0498534b6b1193f60ba63af00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 17 18:21:52 2010 +0300 ole32: Remove useless parameter check. --- dlls/ole32/stg_prop.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 52153a2..b3362bc 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -181,7 +181,9 @@ static HRESULT WINAPI IPropertyStorage_fnQueryInterface( { PropertyStorage_impl *This = (PropertyStorage_impl *)iface; - if ( (This==0) || (ppvObject==0) ) + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + + if (!ppvObject) return E_INVALIDARG; *ppvObject = 0;

1 0

Andrew Eikum : hlink: Split target at hash in HlinkCreateFromString.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 3e041586a65db0b7bf6dfc0ab2338864cf99c1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e041586a65db0b7bf6dfc0ab… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 16 14:52:04 2010 -0500 hlink: Split target at hash in HlinkCreateFromString. --- dlls/hlink/hlink_main.c | 42 +++++++++++++++++++++++- dlls/hlink/tests/hlink.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index d07901a..e96f206 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -99,6 +99,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, { IHlink *hl = NULL; HRESULT r = S_OK; + WCHAR *hash, *tgt; + const WCHAR *loc; TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, @@ -108,8 +110,44 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (FAILED(r)) return r; - IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, - pwzTarget, pwzLocation); + if (pwzTarget) + { + hash = strchrW(pwzTarget, '#'); + if (hash) + { + if (hash == pwzTarget) + tgt = NULL; + else + { + int tgt_len = hash - pwzTarget; + tgt = heap_alloc((tgt_len + 1) * sizeof(WCHAR)); + if (!tgt) + return E_OUTOFMEMORY; + memcpy(tgt, pwzTarget, tgt_len * sizeof(WCHAR)); + tgt[tgt_len] = 0; + } + if (!pwzLocation) + loc = hash + 1; + else + loc = pwzLocation; + } + else + { + tgt = hlink_strdupW(pwzTarget); + if (!tgt) + return E_OUTOFMEMORY; + loc = pwzLocation; + } + } + else + { + tgt = NULL; + loc = pwzLocation; + } + + IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, tgt, loc); + + heap_free(tgt); if (pwzFriendlyName) IHlink_SetFriendlyName(hl, pwzFriendlyName); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 28c0c9a..d454819 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1363,6 +1363,83 @@ static void test_HlinkMoniker(void) IHlink_Release(hlink); } +static void test_HashLink(void) +{ + IHlink *hlink; + IMoniker *pmk; + const WCHAR hash_targetW[] = {'a','f','i','l','e','#','a','n','a','n','c','h','o','r',0}; + const WCHAR two_hash_targetW[] = {'a','f','i','l','e','#','a','n','a','n','c','h','o','r','#','a','n','o','t','h','e','r',0}; + const WCHAR hash_no_tgtW[] = {'#','a','n','a','n','c','h','o','r',0}; + const WCHAR tgt_partW[] = {'a','f','i','l','e',0}; + const WCHAR loc_partW[] = {'a','n','a','n','c','h','o','r',0}; + const WCHAR two_hash_loc_partW[] = {'a','n','a','n','c','h','o','r','#','a','n','o','t','h','e','r',0}; + const WCHAR test_locW[] = {'t','e','s','t','l','o','c',0}; + HRESULT hres; + + /* simple single hash test */ + hres = HlinkCreateFromString(hash_targetW, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, tgt_partW, loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW); + ok(pmk != NULL, "Found moniker should not be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + setStringRef(hlink, HLINKSETF_TARGET, hash_targetW, NULL); + getStringRef(hlink, hash_targetW, loc_partW); + + IHlink_Release(hlink); + } + + /* two hashes in the target */ + hres = HlinkCreateFromString(two_hash_targetW, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, tgt_partW, two_hash_loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, two_hash_loc_partW); + ok(pmk != NULL, "Found moniker should not be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + IHlink_Release(hlink); + } + + /* target with hash plus a location string */ + hres = HlinkCreateFromString(hash_targetW, test_locW, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, tgt_partW, test_locW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, test_locW); + ok(pmk != NULL, "Found moniker should not be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + IHlink_Release(hlink); + } + + /* target with hash containing no "target part" */ + hres = HlinkCreateFromString(hash_no_tgtW, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, NULL, loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW); + ok(pmk == NULL, "Found moniker should be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + IHlink_Release(hlink); + } +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1377,6 +1454,7 @@ START_TEST(hlink) test_HlinkGetSetMonikerReference(); test_HlinkGetSetStringReference(); test_HlinkMoniker(); + test_HashLink(); CoUninitialize(); }

1 0