wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_ [Get|Set]Dither.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 2268f8c7f1e45f995466d682bc9073e6b3d3d21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2268f8c7f1e45f995466d682b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:34:40 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_[Get|Set]Dither. --- dlls/d3drm/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index e6d1036..9ad9367 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -39,6 +39,7 @@ typedef struct { IDirect3DRMDevice3 IDirect3DRMDevice3_iface; IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; LONG ref; + BOOL dither; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -281,9 +282,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetDither(IDirect3DRMDevice2* iface { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%d): stub\n", iface, This, enable); + TRACE("(%p/%p)->(%d)\n", iface, This, enable); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetDither(&This->IDirect3DRMDevice3_iface, enable); } static HRESULT WINAPI IDirect3DRMDevice2Impl_SetShades(IDirect3DRMDevice2* iface, DWORD count) @@ -329,9 +330,9 @@ static BOOL WINAPI IDirect3DRMDevice2Impl_GetDither(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetDither(&This->IDirect3DRMDevice3_iface); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetShades(IDirect3DRMDevice2* iface) @@ -701,9 +702,11 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetDither(IDirect3DRMDevice3* iface { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%d): stub\n", iface, This, enable); + TRACE("(%p/%p)->(%d)\n", iface, This, enable); - return E_NOTIMPL; + This->dither = enable; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_SetShades(IDirect3DRMDevice3* iface, DWORD count) @@ -749,9 +752,9 @@ static BOOL WINAPI IDirect3DRMDevice3Impl_GetDither(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->dither; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetShades(IDirect3DRMDevice3* iface)

1 0

Kimmo Myllyvirta : wined3d: Add NVIDIA GeForce GTX 680.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d738e6ffd2219b353d4f40a2c14447ef73d4bb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d738e6ffd2219b353d4f40a2c… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sun May 27 11:02:10 2012 +0300 wined3d: Add NVIDIA GeForce GTX 680. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7810d7b..f2542b9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1125,6 +1125,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1517,6 +1518,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 051b04e..096fe60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1406,6 +1406,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, + CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582,

1 0

André Hentschel : libwine: Add checks for DragonFly BSD.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: e369e79bd545e491b38c415bb85daeb27c906415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e369e79bd545e491b38c415bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:26:45 2012 +0200 libwine: Add checks for DragonFly BSD. --- libs/wine/ldt.c | 6 +++--- libs/wine/mmap.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 4e48b16..85a835b 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -87,7 +87,7 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #endif #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) #include <machine/segments.h> #include <machine/sysarch.h> #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ @@ -175,7 +175,7 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry ) if ((ret = modify_ldt(0x11, &ldt_info, sizeof(ldt_info))) < 0) perror( "modify_ldt" ); } -#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) { LDT_ENTRY entry_copy = *entry; /* The kernel will only let us set LDTs with user priority level */ @@ -412,7 +412,7 @@ void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ) ldt_info.entry_number = sel >> 3; fill_modify_ldt_struct( &ldt_info, entry ); if ((ret = set_thread_area( &ldt_info ) < 0)) perror( "set_thread_area" ); -#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) i386_set_fsbase( wine_ldt_get_base( entry )); #endif } diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 6ec814a..44fc53f 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -205,7 +205,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) if (!(flags & MAP_FIXED)) { -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) /* Even FreeBSD 5.3 does not properly support NULL here. */ if( start == NULL ) start = (void *)0x110000; #endif @@ -377,7 +377,7 @@ void mmap_init(void) char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); if (base > user_space_limit) reserve_area( user_space_limit, base ); base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1); -#if defined(linux) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__) +#if defined(linux) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) /* Heuristic: assume the stack is near the end of the address */ /* space, this avoids a lot of futile allocation attempts */ end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000);

1 0

André Hentschel : loader: Add check for DragonFly BSD.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 1491e7b99cd8f612e6da26e14f410a169c1e0d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1491e7b99cd8f612e6da26e14… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:22:13 2012 +0200 loader: Add check for DragonFly BSD. --- loader/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/main.c b/loader/main.c index 11f475b..edbf4f7 100644 --- a/loader/main.c +++ b/loader/main.c @@ -174,7 +174,7 @@ static int pre_exec(void) return 1; /* we have a preloader on x86-64 */ } -#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__)) && defined(__i386__) +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(__i386__) static int pre_exec(void) {

1 0

André Hentschel : kernel32: Add checks for DragonFly BSD.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 1f71006fe5ec644b4b43d767d9b3418ae95995a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f71006fe5ec644b4b43d767d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:21:08 2012 +0200 kernel32: Add checks for DragonFly BSD. --- dlls/kernel32/heap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 34fbb75..b74763f 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1147,7 +1147,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) SYSTEM_INFO si; #ifdef linux FILE *f; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) unsigned long val; int mib[2]; size_t size_sys; @@ -1219,7 +1219,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) } fclose( f ); } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) mib[0] = CTL_HW; mib[1] = HW_PHYSMEM; size_sys = sizeof(val);

1 0

André Hentschel : server: Add checks for DragonFly BSD .
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 89e462b1419ce2c6b30021eae20633bb912f3823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e462b1419ce2c6b30021eae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:21:04 2012 +0200 server: Add checks for DragonFly BSD. --- server/fd.c | 2 +- server/ptrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index a8b3a5f..f3e42bd 100644 --- a/server/fd.c +++ b/server/fd.c @@ -924,7 +924,7 @@ static int is_device_removable( dev_t dev, int unix_fd ) return (stfs.f_type == 0x9660 || /* iso9660 */ stfs.f_type == 0x9fa1 || /* supermount */ stfs.f_type == 0x15013346); /* udf */ -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__) struct statfs stfs; if (fstatfs( unix_fd, &stfs ) == -1) return 0; diff --git a/server/ptrace.c b/server/ptrace.c index 6c14481..912f90e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -656,7 +656,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign } #elif defined(__i386__) && defined(PTRACE_GETDBREGS) && defined(PTRACE_SETDBREGS) && \ - (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__)) + (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)) #include <machine/reg.h>

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVolume9Impl.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: a91ef5217dcc7442a08bf0183ef4137a44f120c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91ef5217dcc7442a08bf0183… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:29 2012 +0200 d3d9: Get rid of IDirect3DVolume9Impl. --- dlls/d3d9/d3d9_private.h | 12 +-- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 6 +- dlls/d3d9/volume.c | 189 +++++++++++++++++++++++----------------------- 4 files changed, 101 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a91ef5217dcc7442a08bf…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DDevice9Impl.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 2a63fe66240134b46bd0edf57af8f673eb9a3a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a63fe66240134b46bd0edf57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:28 2012 +0200 d3d9: Get rid of IDirect3DDevice9Impl. --- dlls/d3d9/buffer.c | 4 +- dlls/d3d9/d3d9_private.h | 45 +- dlls/d3d9/device.c | 1576 ++++++++++++++++++++--------------------- dlls/d3d9/directx.c | 4 +- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 4 +- dlls/d3d9/texture.c | 6 +- dlls/d3d9/vertexdeclaration.c | 4 +- dlls/d3d9/volume.c | 2 +- 12 files changed, 794 insertions(+), 861 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a63fe66240134b46bd0e…

1 0

Henri Verbeet : ddraw/tests: Add test_window_style() for older ddraw versions.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 7a52db09e3b61acbd185ee0d88af4257b04a7536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a52db09e3b61acbd185ee0d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:27 2012 +0200 ddraw/tests: Add test_window_style() for older ddraw versions. --- dlls/ddraw/tests/ddraw1.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cb681bf..e53a1cd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1834,6 +1834,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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 = IDirectDraw_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -1848,4 +1891,5 @@ START_TEST(ddraw1) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ca3536a..7f1ae88 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1971,6 +1971,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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 = IDirectDraw2_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -1987,4 +2030,5 @@ START_TEST(ddraw2) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c19cd4b..6f00b41 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2095,6 +2095,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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 = IDirectDraw4_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2112,4 +2155,5 @@ START_TEST(ddraw4) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); }

1 0

Henri Verbeet : ddraw/tests: Move test_window_style() to ddraw7.c.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: ec8a9df007f3c98a9f0e45b936ef69ab65622eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8a9df007f3c98a9f0e45b93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:26 2012 +0200 ddraw/tests: Move test_window_style() to ddraw7.c. --- dlls/ddraw/tests/d3d.c | 51 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 44 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 51 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 86e93b2..0daad33 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3527,56 +3527,6 @@ 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); -} - static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; @@ -4740,7 +4690,6 @@ START_TEST(d3d) D3D1_releaseObjects(); } - test_window_style(); test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ad3e46a..3d151e1 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1904,6 +1904,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -1928,4 +1971,5 @@ START_TEST(ddraw7) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
74
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 2012