January 2013 - Wine-commits

Henri Verbeet : ddraw: Avoid LPD3DSTATE.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 61e8f02ce253d656fdab41cc54689aa4f3906e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e8f02ce253d656fdab41cc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 08:46:51 2013 +0100 ddraw: Avoid LPD3DSTATE. --- dlls/ddraw/executebuffer.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 5e8e475..80e44ef 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -205,8 +205,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, DWORD i; TRACE("STATELIGHT (%d)\n", count); - for (i = 0; i < count; i++) { - LPD3DSTATE ci = (LPD3DSTATE) instr; + for (i = 0; i < count; ++i) + { + D3DSTATE *ci = (D3DSTATE *)instr; TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); @@ -272,8 +273,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface; TRACE("STATERENDER (%d)\n", count); - for (i = 0; i < count; i++) { - LPD3DSTATE ci = (LPD3DSTATE) instr; + for (i = 0; i < count; ++i) + { + D3DSTATE *ci = (D3DSTATE *)instr; IDirect3DDevice2_SetRenderState(d3d_device2, ci->u1.drstRenderStateType, ci->u2.dwArg[0]);

1 0

Henri Verbeet : ddraw: Avoid LPD3DPROCESSVERTICES.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: b43f897675f3c6c6f8c4bc92db0e87bfef97da2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43f897675f3c6c6f8c4bc92d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 08:46:52 2013 +0100 ddraw: Avoid LPD3DPROCESSVERTICES. --- dlls/ddraw/executebuffer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 80e44ef..1673cac 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -301,8 +301,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, wined3d_device_get_transform(device->wined3d_device, WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)&world_mat); - for (i = 0; i < count; i++) { - LPD3DPROCESSVERTICES ci = (LPD3DPROCESSVERTICES) instr; + for (i = 0; i < count; ++i) + { + D3DPROCESSVERTICES *ci = (D3DPROCESSVERTICES *)instr; TRACE(" Start : %d Dest : %d Count : %d\n", ci->wStart, ci->wDest, ci->dwCount);

1 0

Henri Verbeet : ddraw: Add a small tests for SetCooperativeLevel() calls with different windows.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: ae725df54a4ea8c414043b252929bd85f7ce33f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae725df54a4ea8c414043b252… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 08:46:53 2013 +0100 ddraw: Add a small tests for SetCooperativeLevel() calls with different windows. In particular, test that the windows aren't destroyed by accident. --- dlls/ddraw/tests/ddraw1.c | 31 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 31 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 31 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cf83b98..a37e0b7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2629,6 +2629,36 @@ static void test_coop_level_surf_create(void) IDirectDraw_Release(ddraw); } +static void test_coop_level_multi_window(void) +{ + HWND window1, window2; + IDirectDraw *ddraw; + HRESULT hr; + + window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window2); + DestroyWindow(window1); + return; + } + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window2), "Window 2 was destroyed.\n"); + + IDirectDraw_Release(ddraw); + DestroyWindow(window2); + DestroyWindow(window1); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -2649,4 +2679,5 @@ START_TEST(ddraw1) test_coop_level_mode_set_multi(); test_initialize(); test_coop_level_surf_create(); + test_coop_level_multi_window(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 303c634..e475f5b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2748,6 +2748,36 @@ static void test_coop_level_surf_create(void) IDirectDraw2_Release(ddraw); } +static void test_coop_level_multi_window(void) +{ + HWND window1, window2; + IDirectDraw2 *ddraw; + HRESULT hr; + + window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window2); + DestroyWindow(window1); + return; + } + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window2), "Window 2 was destroyed.\n"); + + IDirectDraw2_Release(ddraw); + DestroyWindow(window2); + DestroyWindow(window1); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -2770,4 +2800,5 @@ START_TEST(ddraw2) test_coop_level_mode_set_multi(); test_initialize(); test_coop_level_surf_create(); + test_coop_level_multi_window(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 2e9c845..82cd5d5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2935,6 +2935,36 @@ static void test_vb_discard(void) DestroyWindow(window); } +static void test_coop_level_multi_window(void) +{ + HWND window1, window2; + IDirectDraw4 *ddraw; + HRESULT hr; + + window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window2); + DestroyWindow(window1); + return; + } + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window2), "Window 2 was destroyed.\n"); + + IDirectDraw4_Release(ddraw); + DestroyWindow(window2); + DestroyWindow(window1); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2959,4 +2989,5 @@ START_TEST(ddraw4) test_initialize(); test_coop_level_surf_create(); test_vb_discard(); + test_coop_level_multi_window(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2b7e075..cd22e0c 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2744,6 +2744,36 @@ static void test_vb_discard(void) DestroyWindow(window); } +static void test_coop_level_multi_window(void) +{ + HWND window1, window2; + IDirectDraw7 *ddraw; + HRESULT hr; + + window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window2); + DestroyWindow(window1); + return; + } + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window2), "Window 2 was destroyed.\n"); + + IDirectDraw7_Release(ddraw); + DestroyWindow(window2); + DestroyWindow(window1); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -2775,4 +2805,5 @@ START_TEST(ddraw7) test_initialize(); test_coop_level_surf_create(); test_vb_discard(); + test_coop_level_multi_window(); }

1 0

Henri Verbeet : ddraw: Only modify the ddraw destination window at the end of ddraw7_SetCooperativeLevel ().
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 292522c4ad121375bd284eaeae54a0c5d0fe23f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292522c4ad121375bd284eaea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 08:46:54 2013 +0100 ddraw: Only modify the ddraw destination window at the end of ddraw7_SetCooperativeLevel(). We want this to happen after ddraw_destroy_swapchain() in particular, because dest_window being different from d3d_window will cause it to destroy d3d_window, but this seems like a good idea in general. --- dlls/ddraw/ddraw.c | 10 ++-------- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ca6f8d5..21acc28 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -551,9 +551,6 @@ static HRESULT ddraw_set_focus_window(struct ddraw *ddraw, HWND window) ddraw->focuswindow = window; - /* Use the focus window for drawing too. */ - ddraw->dest_window = ddraw->focuswindow; - return DD_OK; } @@ -852,10 +849,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } } - /* Don't override focus windows or private device windows */ - if (hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) - This->dest_window = hwnd; - if (cooplevel & DDSCL_MULTITHREADED && !(This->cooperative_level & DDSCL_MULTITHREADED)) wined3d_device_set_multithreaded(This->wined3d_device); @@ -886,7 +879,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, ddraw_destroy_swapchain(This); } - if (FAILED(hr = ddraw_create_swapchain(This, This->dest_window, !(cooplevel & DDSCL_FULLSCREEN)))) + if (FAILED(hr = ddraw_create_swapchain(This, hwnd, !(cooplevel & DDSCL_FULLSCREEN)))) ERR("Failed to create swapchain, hr %#x.\n", hr); if (restore_state) @@ -922,6 +915,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, /* Store the cooperative_level */ This->cooperative_level = cooplevel; + This->dest_window = hwnd; TRACE("SetCooperativeLevel retuning DD_OK\n"); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a37e0b7..2cbcf44 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2651,7 +2651,7 @@ static void test_coop_level_multi_window(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window1), "Window 1 was destroyed.\n"); ok(IsWindow(window2), "Window 2 was destroyed.\n"); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e475f5b..79b0e9b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2770,7 +2770,7 @@ static void test_coop_level_multi_window(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window1), "Window 1 was destroyed.\n"); ok(IsWindow(window2), "Window 2 was destroyed.\n"); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 82cd5d5..3d81d1d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2957,7 +2957,7 @@ static void test_coop_level_multi_window(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window1), "Window 1 was destroyed.\n"); ok(IsWindow(window2), "Window 2 was destroyed.\n"); IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index cd22e0c..5668dc7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2766,7 +2766,7 @@ static void test_coop_level_multi_window(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - todo_wine ok(IsWindow(window1), "Window 1 was destroyed.\n"); + ok(IsWindow(window1), "Window 1 was destroyed.\n"); ok(IsWindow(window2), "Window 2 was destroyed.\n"); IDirectDraw7_Release(ddraw);

1 0

Henri Verbeet : ddraw: Get rid of the local "window" variable in ddraw7_SetCooperativeLevel().
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: a7f4ac283b40d15fa023b5b28e3140069288cf3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f4ac283b40d15fa023b5b28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 08:46:55 2013 +0100 ddraw: Get rid of the local "window" variable in ddraw7_SetCooperativeLevel(). Having both a "hwnd" and a "window" here doesn't exactly make things much easier to follow. --- dlls/ddraw/ddraw.c | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 21acc28..a04de34 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -696,23 +696,19 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win * (Probably others too, have to investigate) * *****************************************************************************/ -static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, DWORD cooplevel) +static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND window, DWORD cooplevel) { struct ddraw *This = impl_from_IDirectDraw7(iface); struct wined3d_surface *rt = NULL, *ds = NULL; struct wined3d_stateblock *stateblock; BOOL restore_state = FALSE; - HWND window; HRESULT hr; - TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, cooplevel); + TRACE("iface %p, window %p, flags %#x.\n", iface, window, cooplevel); DDRAW_dump_cooperativelevel(cooplevel); wined3d_mutex_lock(); - /* Get the old window */ - window = This->dest_window; - /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | DDSCL_NORMAL | @@ -749,14 +745,14 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } - hr = ddraw_set_focus_window(This, hwnd); + hr = ddraw_set_focus_window(This, window); wined3d_mutex_unlock(); return hr; } if (cooplevel & DDSCL_EXCLUSIVE) { - if (!(cooplevel & DDSCL_FULLSCREEN) || !(hwnd || (cooplevel & DDSCL_CREATEDEVICEWINDOW))) + if (!(cooplevel & DDSCL_FULLSCREEN) || !(window || (cooplevel & DDSCL_CREATEDEVICEWINDOW))) { WARN("DDSCL_EXCLUSIVE requires DDSCL_FULLSCREEN and a window.\n"); wined3d_mutex_unlock(); @@ -794,20 +790,20 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if (cooplevel & DDSCL_SETFOCUSWINDOW) { - if (!hwnd) + if (!window) { wined3d_mutex_unlock(); return DDERR_NOHWND; } - if (FAILED(hr = ddraw_set_focus_window(This, hwnd))) + if (FAILED(hr = ddraw_set_focus_window(This, window))) { wined3d_mutex_unlock(); return hr; } } - hwnd = device_window; + window = device_window; } } else @@ -819,28 +815,28 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } if ((This->cooperative_level & DDSCL_EXCLUSIVE) - && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) + && (window != This->dest_window || !(cooplevel & DDSCL_EXCLUSIVE))) wined3d_device_release_focus_window(This->wined3d_device); - if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || hwnd != window) + if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || window != This->dest_window) { if (This->cooperative_level & DDSCL_FULLSCREEN) - wined3d_device_restore_fullscreen_window(This->wined3d_device, window); + wined3d_device_restore_fullscreen_window(This->wined3d_device, This->dest_window); if (cooplevel & DDSCL_FULLSCREEN) { struct wined3d_display_mode display_mode; wined3d_get_adapter_display_mode(This->wined3d, WINED3DADAPTER_DEFAULT, &display_mode, NULL); - wined3d_device_setup_fullscreen_window(This->wined3d_device, hwnd, + wined3d_device_setup_fullscreen_window(This->wined3d_device, window, display_mode.width, display_mode.height); } } if ((cooplevel & DDSCL_EXCLUSIVE) - && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) + && (window != This->dest_window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) { - hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd); + hr = wined3d_device_acquire_focus_window(This->wined3d_device, window); if (FAILED(hr)) { ERR("Failed to acquire focus window, hr %#x.\n", hr); @@ -879,7 +875,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, ddraw_destroy_swapchain(This); } - if (FAILED(hr = ddraw_create_swapchain(This, hwnd, !(cooplevel & DDSCL_FULLSCREEN)))) + if (FAILED(hr = ddraw_create_swapchain(This, window, !(cooplevel & DDSCL_FULLSCREEN)))) ERR("Failed to create swapchain, hr %#x.\n", hr); if (restore_state) @@ -915,7 +911,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, /* Store the cooperative_level */ This->cooperative_level = cooplevel; - This->dest_window = hwnd; + This->dest_window = window; TRACE("SetCooperativeLevel retuning DD_OK\n"); wined3d_mutex_unlock();

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetInfo.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 47e9ffa773a0c96e2ac64005f9d9b50f152442e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e9ffa773a0c96e2ac64005f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 15 11:26:48 2013 +0100 wmiutils: Implement IWbemPath::GetInfo. --- dlls/wmiutils/path.c | 56 ++++++++++++++++++++++++++++--------- dlls/wmiutils/tests/path.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ include/wmiutils.idl | 22 +++++++++++++++ 3 files changed, 128 insertions(+), 14 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index abdf0a5..f02c9c6 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -35,16 +35,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); struct path { IWbemPath IWbemPath_iface; - LONG refs; - WCHAR *text; - int len_text; - WCHAR *server; - int len_server; - WCHAR **namespaces; - int *len_namespaces; - int num_namespaces; - WCHAR *class; - int len_class; + LONG refs; + WCHAR *text; + int len_text; + WCHAR *server; + int len_server; + WCHAR **namespaces; + int *len_namespaces; + int num_namespaces; + WCHAR *class; + int len_class; + ULONGLONG flags; }; static void init_path( struct path *path ) @@ -58,6 +59,7 @@ static void init_path( struct path *path ) path->num_namespaces = 0; path->class = NULL; path->len_class = 0; + path->flags = 0; } static void clear_path( struct path *path ) @@ -136,6 +138,7 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) memcpy( path->server, p, len * sizeof(WCHAR) ); path->server[len] = 0; path->len_server = len; + path->flags |= WBEMPATH_INFO_PATH_HAD_SERVER; } p = q; while (*q && *q != ':') @@ -180,6 +183,7 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) done: if (hr != S_OK) clear_path( path ); + else path->flags |= WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT; return hr; } @@ -197,6 +201,7 @@ static HRESULT WINAPI path_SetText( if (!uMode || !pszPath) return WBEM_E_INVALID_PARAMETER; clear_path( path ); + if (!pszPath[0]) return S_OK; if ((hr = parse_text( path, uMode, pszPath )) != S_OK) return hr; len = strlenW( pszPath ); @@ -404,11 +409,34 @@ static HRESULT WINAPI path_GetText( static HRESULT WINAPI path_GetInfo( IWbemPath *iface, - ULONG uRequestedInfo, - ULONGLONG *puResponse) + ULONG info, + ULONGLONG *response) { - FIXME("%p, %d, %p\n", iface, uRequestedInfo, puResponse); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %u, %p\n", iface, info, response); + + if (info || !response) return WBEM_E_INVALID_PARAMETER; + + FIXME("some flags are not implemented\n"); + + *response = path->flags; + if (!path->server || (path->len_server == 1 && path->server[0] == '.')) + *response |= WBEMPATH_INFO_ANON_LOCAL_MACHINE; + else + *response |= WBEMPATH_INFO_HAS_MACHINE_NAME; + + if (!path->class) + *response |= WBEMPATH_INFO_SERVER_NAMESPACE_ONLY; + else + { + *response |= WBEMPATH_INFO_HAS_SUBSCOPES; + if (path->text && strchrW( path->text, '=' )) /* FIXME */ + *response |= WBEMPATH_INFO_IS_INST_REF; + else + *response |= WBEMPATH_INFO_IS_CLASS_REF; + } + return S_OK; } static HRESULT WINAPI path_SetServer( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 2d435f0..3367690 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -370,6 +370,69 @@ static void test_IWbemPath_GetServer(void) IWbemPath_Release( path ); } +static void test_IWbemPath_GetInfo(void) +{ + IWbemPath *path; + HRESULT hr; + ULONGLONG resp; + + if (!(path = create_path())) return; + + hr = IWbemPath_GetInfo( path, 0, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemPath_GetInfo( path, 1, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + resp = 0xdeadbeef; + hr = IWbemPath_GetInfo( path, 0, &resp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), + "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemPath_GetInfo( path, 0, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemPath_GetInfo( path, 1, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + resp = 0xdeadbeef; + hr = IWbemPath_GetInfo( path, 0, &resp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), + "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + + IWbemPath_Release( path ); + if (!(path = create_path())) return; + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path12 ); + ok( hr == S_OK, "got %08x\n", hr ); + + resp = 0xdeadbeef; + hr = IWbemPath_GetInfo( path, 0, &resp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT), + "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + resp = 0xdeadbeef; + hr = IWbemPath_GetInfo( path, 0, &resp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), + "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -378,6 +441,7 @@ START_TEST (path) test_IWbemPath_GetText(); test_IWbemPath_GetClassName(); test_IWbemPath_GetServer(); + test_IWbemPath_GetInfo(); CoUninitialize(); } diff --git a/include/wmiutils.idl b/include/wmiutils.idl index 82f64d1..fa790c8 100644 --- a/include/wmiutils.idl +++ b/include/wmiutils.idl @@ -21,6 +21,28 @@ import "oaidl.idl"; interface IWbemPath; interface IWbemPathKeyList; +typedef [v1_enum] enum tag_WBEM_PATH_STATUS_FLAG +{ + WBEMPATH_INFO_ANON_LOCAL_MACHINE = 0x1, + WBEMPATH_INFO_HAS_MACHINE_NAME = 0x2, + WBEMPATH_INFO_IS_CLASS_REF = 0x4, + WBEMPATH_INFO_IS_INST_REF = 0x8, + WBEMPATH_INFO_HAS_SUBSCOPES = 0x10, + WBEMPATH_INFO_IS_COMPOUND = 0x20, + WBEMPATH_INFO_HAS_V2_REF_PATHS = 0x40, + WBEMPATH_INFO_HAS_IMPLIED_KEY = 0x80, + WBEMPATH_INFO_CONTAINS_SINGLETON = 0x100, + WBEMPATH_INFO_V1_COMPLIANT = 0x200, + WBEMPATH_INFO_V2_COMPLIANT = 0x400, + WBEMPATH_INFO_CIM_COMPLIANT = 0x800, + WBEMPATH_INFO_IS_SINGLETON = 0x1000, + WBEMPATH_INFO_IS_PARENT = 0x2000, + WBEMPATH_INFO_SERVER_NAMESPACE_ONLY = 0x4000, + WBEMPATH_INFO_NATIVE_PATH = 0x8000, + WBEMPATH_INFO_WMI_PATH = 0x10000, + WBEMPATH_INFO_PATH_HAD_SERVER = 0x20000 +} tag_WBEM_PATH_STATUS_FLAG; + typedef [v1_enum] enum tag_WBEM_PATH_CREATE_FLAG { WBEMPATH_CREATE_ACCEPT_RELATIVE = 0x1,

1 0

Andrew Talbot : dinput: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 6eecf4886f57c33aee8e7878bc38578d567cec2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eecf4886f57c33aee8e7878b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 14 21:44:49 2013 +0000 dinput: Avoid signed-unsigned integer comparisons. --- dlls/dinput/config.c | 2 +- dlls/dinput/joystick.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index abf3fd5..708f406 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -331,7 +331,7 @@ static void assign_action(HWND dialog) static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from) { - int i; + DWORD i; for (i=0; i < from->dwNumActions; i++) { to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index d32acec..73ded55 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -482,7 +482,8 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); - int i, j, has_actions = 0; + unsigned int i, j; + int has_actions = 0; DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON };

1 0

Andrew Talbot : dbghelp: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: ddf922d7a180066f8c4b65656055a1c5fac5d12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf922d7a180066f8c4b65656… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 14 21:44:19 2013 +0000 dbghelp: Avoid signed-unsigned integer comparisons. --- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/msc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 874835d..f8015c1 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -273,7 +273,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* { static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; - int i; + unsigned int i; Elf_Phdr phdr; size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 7a68e1d..ddabd07 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1370,7 +1370,8 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B { const BYTE* ptr = linetab; int nfile, nseg; - int i, j, k; + int i, j; + unsigned int k; const unsigned int* filetab; const unsigned int* lt_ptr; const unsigned short* linenos;

1 0

Ken Thomases : winemac: Implement window surface rendering.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 7d6ebfa742eac87c9f5ac5e228c0c5f68e785f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6ebfa742eac87c9f5ac5e22… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 14 20:23:55 2013 -0600 winemac: Implement window surface rendering. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 82 ++++++++++ dlls/winemac.drv/macdrv.h | 4 + dlls/winemac.drv/macdrv_cocoa.h | 6 + dlls/winemac.drv/surface.c | 340 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/window.c | 107 ++++++++++++- 7 files changed, 542 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d6ebfa742eac87c9f5ac…

1 0

Ken Thomases : winemac: Implement SetWindowRgn.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 2d4bcc47be73ae8ca78a21d7c36b04685fa78238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4bcc47be73ae8ca78a21d7c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 14 20:23:58 2013 -0600 winemac: Implement SetWindowRgn. --- dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 81 +++++++++++++++++ dlls/winemac.drv/macdrv.h | 7 ++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 172 +++++++++++++++++++++++++++++++++---- dlls/winemac.drv/winemac.drv.spec | 2 + 6 files changed, 250 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d4bcc47be73ae8ca78a2…

1 0