wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Henri Verbeet : d3d8/tests: Add a test for window styles on device creation .
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 7b44caa7520d18a226cbd36d3bd63bdfeb09e246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b44caa7520d18a226cbd36d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:39 2011 +0200 d3d8/tests: Add a test for window styles on device creation. --- dlls/d3d8/tests/device.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 557eec1..16fc22b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2182,6 +2182,80 @@ cleanup: DestroyWindow(hwnd); } +static void test_window_style(void) +{ + RECT focus_rect, fullscreen_rect, r; + LONG device_style, device_exstyle; + LONG focus_style, focus_exstyle; + LONG style, expected_style; + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + ULONG ref; + + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + SetRect(&fullscreen_rect, 0, 0, screen_width, screen_height); + GetWindowRect(focus_window, &focus_rect); + + device = create_device(d3d8, device_window, focus_window, FALSE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(device_window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, + r.left, r.top, r.right, r.bottom); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D8_Release(d3d8); + + DestroyWindow(device_window); + DestroyWindow(focus_window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -2230,6 +2304,7 @@ START_TEST(device) test_wndproc(); test_wndproc_windowed(); test_depth_stencil_size(); + test_window_style(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : ddraw/tests: Add a test for SetCooperativeLevel() window styles.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 65272a4f8124a74ed120b9efb3fd130843092fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=65272a4f8124a74ed120b9efb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:38 2011 +0200 ddraw/tests: Add a test for SetCooperativeLevel() window styles. --- dlls/ddraw/tests/d3d.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 8bb517c..9c01ef0 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3874,6 +3874,56 @@ static void BackBuffer3DAttachmentTest(void) DestroyWindow(window); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw7 *ddraw7; + HWND window; + HRESULT hr; + ULONG ref; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + DestroyWindow(window); + return; + } + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(d3d) { init_function_pointers(); @@ -3915,4 +3965,5 @@ START_TEST(d3d) } test_wndproc(); + test_window_style(); }

1 0

Henri Verbeet : ddraw/tests: Make sure the window is properly released by ddraw in test_wndproc().
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 0293e19928f9ec66697cbd6e421c64bb43380aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0293e19928f9ec66697cbd6e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:37 2011 +0200 ddraw/tests: Make sure the window is properly released by ddraw in test_wndproc(). --- dlls/ddraw/tests/d3d.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 8d43cca..8bb517c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3251,6 +3251,27 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM return DefWindowProcA(hwnd, message, wparam, lparam); } +/* Set the wndproc back to what ddraw expects it to be, and release the ddraw + * interface. This prevents subsequent SetCooperativeLevel() calls on a + * different window from failing with DDERR_HWNDALREADYSET. */ +static void fix_wndproc(HWND window, LONG_PTR proc) +{ + IDirectDraw7 *ddraw7; + HRESULT hr; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw7 object, hr %#x.", hr); + if (FAILED(hr)) return; + + SetWindowLongPtrA(window, GWLP_WNDPROC, proc); + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + IDirectDraw7_Release(ddraw7); +} + static void test_wndproc(void) { LONG_PTR proc, ddraw_proc; @@ -3458,6 +3479,7 @@ static void test_wndproc(void) (LONG_PTR)DefWindowProcA, proc); done: + fix_wndproc(window, (LONG_PTR)test_proc); expect_messages = NULL; DestroyWindow(window); UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL));

1 0

Henri Verbeet : d3d9/tests: Destroy the window after we' re done with it in test_reset().
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 02f0d82d24646c209a74befc5f3a7c92276d9fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f0d82d24646c209a74befc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:36 2011 +0200 d3d9/tests: Destroy the window after we're done with it in test_reset(). --- dlls/d3d9/tests/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b377bee..55b6982 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1229,6 +1229,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D9_Release(pD3d); + if (hwnd) DestroyWindow(hwnd); } /* Test adapter display modes */

1 0

Henri Verbeet : wined3d: Cleanup surfaces only once.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 0116af370330941a5cb9b6da92cedcb2f64a9f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0116af370330941a5cb9b6da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:35 2011 +0200 wined3d: Cleanup surfaces only once. --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 67d3f16..f5245cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2667,7 +2667,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) if (!refcount) { - surface_cleanup(surface); surface->surface_ops->surface_cleanup(surface); surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent);

1 0

André Hentschel : winedbg: Implement printing the Program Status Register.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: a2d10bc2e5a9fc9ba4f3f86140a0ed15f82467a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d10bc2e5a9fc9ba4f3f8614… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 2 22:40:00 2011 +0200 winedbg: Implement printing the Program Status Register. --- programs/winedbg/be_arm.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index f34ecc7..f71514c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -57,9 +57,35 @@ static void be_arm_single_step(CONTEXT* ctx, unsigned enable) static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { + static const char condflags[] = "NZCV"; + int i; + char buf[8]; + + switch (ctx->Cpsr & 0x1F) + { + case 0: strcpy(buf, "User26"); break; + case 1: strcpy(buf, "FIQ26"); break; + case 2: strcpy(buf, "IRQ26"); break; + case 3: strcpy(buf, "SVC26"); break; + case 16: strcpy(buf, "User"); break; + case 17: strcpy(buf, "FIQ"); break; + case 18: strcpy(buf, "IRQ"); break; + case 19: strcpy(buf, "SVC"); break; + case 23: strcpy(buf, "ABT"); break; + case 27: strcpy(buf, "UND"); break; + default: strcpy(buf, "UNKNWN"); break; + } + dbg_printf("Register dump:\n"); - dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x\n", - ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr); + dbg_printf("%s %s Mode\n", (ctx->Cpsr & 0x20) ? "Thumb" : "ARM", buf); + + strcpy(buf, condflags); + for (i = 0; buf[i]; i++) + if (!((ctx->Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) + buf[i] = '-'; + + dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x(%s)\n", + ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); dbg_printf(" r0:%04x r1:%04x r2:%04x r3:%04x\n", ctx->R0, ctx->R1, ctx->R2, ctx->R3); dbg_printf(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x\n",

1 0

André Hentschel : winedbg: Fix a typo.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 423a447fbe0df4b238a5d0ec9a07af8017673135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423a447fbe0df4b238a5d0ec9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 2 19:56:37 2011 +0200 winedbg: Fix a typo. --- programs/winedbg/be_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index a602c7e..904581d 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -145,7 +145,7 @@ static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) (ctx->FloatSave.StatusWord & 0x00000200) >> 9, (ctx->FloatSave.StatusWord & 0x00000100) >> 8); - /* Now pull out hte 3 bit of the TOP stack pointer */ + /* Now pull out the 3 bit of the TOP stack pointer */ dbg_printf(" TOP:%01x", (unsigned int) (ctx->FloatSave.StatusWord & 0x00003800) >> 11); /* Lets analyse the error bits and indicate the status

1 0

Alexandre Julliard : msvcrt: Allow forwarding to stub functions when the arguments are known.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 6c88228078ab925d6a7d76ed2fc16ff4d9c10b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c88228078ab925d6a7d76ed2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 13:13:15 2011 +0200 msvcrt: Allow forwarding to stub functions when the arguments are known. --- dlls/crtdll/crtdll.spec | 16 ++++---- dlls/msvcr100/msvcr100.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr70/msvcr70.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr71/msvcr71.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr80/msvcr80.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr90/msvcr90.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcrt20/msvcrt20.spec | 78 ++++++++++++++++++------------------ dlls/msvcrt40/msvcrt40.spec | 90 ++++++++++++++++++++-------------------- dlls/msvcrtd/msvcrtd.spec | 94 +++++++++++++++++++++--------------------- tools/make_specfiles | 2 +- 10 files changed, 375 insertions(+), 375 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c88228078ab925d6a7d7…

1 0

Alexandre Julliard : msvcrt: Specify arguments for the stub functions.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: e51132b2389894346e13b5dd44c086876dde9610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51132b2389894346e13b5dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 13:09:55 2011 +0200 msvcrt: Specify arguments for the stub functions. --- dlls/msvcrt/msvcrt.spec | 756 +++++++++++++++++++++++----------------------- 1 files changed, 378 insertions(+), 378 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e51132b2389894346e13b…

1 0

Alexandre Julliard : winebuild: Output relay thunks for stub functions when the arguments are known.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 631fb9b652dbb3fad5705d7ec08b123e8361db02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=631fb9b652dbb3fad5705d7ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 13:09:09 2011 +0200 winebuild: Output relay thunks for stub functions when the arguments are known. --- tools/winebuild/spec32.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 8999b88..a5b4118 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -53,7 +53,18 @@ static inline int needs_relay( const ORDDEF *odp ) /* skip nonexistent entry points */ if (!odp) return 0; /* skip non-functions */ - if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL && odp->type != TYPE_THISCALL) return 0; + switch (odp->type) + { + case TYPE_STDCALL: + case TYPE_CDECL: + case TYPE_THISCALL: + break; + case TYPE_STUB: + if (odp->u.func.nb_args != -1) break; + /* fall through */ + default: + return 0; + } /* skip norelay and forward entry points */ if (odp->flags & (FLAG_NORELAY|FLAG_FORWARD)) return 0; /* skip register entry points on x86_64 */

1 0

← Newer
1
...
85
86
87
88
89
90
91
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011