December 2013 - Wine-Commits

Dmitry Timoshkov : secur32/tests: Make sure that QueryContextAttributes( SECPKG_ATTR_STREAM_SIZES) succeeds.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 476f57fd632110d53c501c15375120fdaf627733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=476f57fd632110d53c501c153… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:12:13 2013 +0900 secur32/tests: Make sure that QueryContextAttributes(SECPKG_ATTR_STREAM_SIZES) succeeds. --- dlls/secur32/tests/schannel.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index a00c276..daac39f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -804,7 +804,8 @@ todo_wine ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); } - pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); + status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status); reset_buffers(&buffers[0]);

1 0

Ken Thomases : user32: Respect monitor work area when sizing or moving a top-level window.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 03f8f85ddae0cb7d7ff85d0478f1d9a77c88b26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f8f85ddae0cb7d7ff85d047… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 12 16:49:48 2013 -0600 user32: Respect monitor work area when sizing or moving a top-level window. This prevents dragging a window's title bar behind a menu bar across the top of a screen, for example. --- dlls/user32/winpos.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 22ee290..7cae0ad 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2625,6 +2625,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) BOOL moved = FALSE; DWORD dwPoint = GetMessagePos (); BOOL DragFullWindows = TRUE; + HMONITOR mon = 0; if (IsZoomed(hwnd) || !IsWindowVisible(hwnd)) return; @@ -2673,6 +2674,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) { parent = 0; mouseRect = get_virtual_screen_rect(); + mon = MonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST ); } if (ON_LEFT_BORDER(hittest)) @@ -2749,6 +2751,24 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) pt.y = max( pt.y, mouseRect.top ); pt.y = min( pt.y, mouseRect.bottom ); + if (!parent) + { + HMONITOR newmon; + MONITORINFO info; + + if ((newmon = MonitorFromPoint( pt, MONITOR_DEFAULTTONULL ))) + mon = newmon; + + info.cbSize = sizeof(info); + if (mon && GetMonitorInfoW( mon, &info )) + { + pt.x = max( pt.x, info.rcWork.left ); + pt.x = min( pt.x, info.rcWork.right ); + pt.y = max( pt.y, info.rcWork.top ); + pt.y = min( pt.y, info.rcWork.bottom ); + } + } + dx = pt.x - capturePoint.x; dy = pt.y - capturePoint.y;

1 0

Henri Verbeet : ddraw: Just set the palette caps in ddraw7_GetCaps().
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 89dedf64082c23c70f320e517c5f4bea4b353fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dedf64082c23c70f320e517… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:47 2013 +0100 ddraw: Just set the palette caps in ddraw7_GetCaps(). --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 5 +---- include/wine/wined3d.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ea24eee..7aea03e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1493,7 +1493,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps2 = winecaps.ddraw_caps.caps2; caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps; caps.dwFXCaps = winecaps.ddraw_caps.fx_caps; - caps.dwPalCaps = winecaps.ddraw_caps.pal_caps; + caps.dwPalCaps = DDPCAPS_8BIT | DDPCAPS_PRIMARYSURFACE; caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps; caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps; caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce08a61..29ff883 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4105,7 +4105,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte struct shader_caps shader_caps; struct fragment_caps fragment_caps; struct wined3d_vertex_caps vertex_caps; - DWORD ckey_caps, blit_caps, fx_caps, pal_caps; + DWORD ckey_caps, blit_caps, fx_caps; TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); @@ -4629,8 +4629,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDCAPS_COLORKEY | WINEDDCAPS_COLORKEYHWASSIST | WINEDDCAPS_ALIGNBOUNDARYSRC; - pal_caps = WINEDDPCAPS_8BIT | - WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ caps->ddraw_caps.caps = WINEDDCAPS_GDI | @@ -4643,7 +4641,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDCAPS2_CANRENDERWINDOWED; caps->ddraw_caps.color_key_caps = ckey_caps; caps->ddraw_caps.fx_caps = fx_caps; - caps->ddraw_caps.pal_caps = pal_caps; caps->ddraw_caps.svb_caps = blit_caps; caps->ddraw_caps.svb_color_key_caps = ckey_caps; caps->ddraw_caps.svb_fx_caps = fx_caps; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1c85396..4599678 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1737,7 +1737,6 @@ struct wined3d_ddraw_caps DWORD color_key_caps; DWORD fx_caps; DWORD fx_alpha_caps; - DWORD pal_caps; DWORD sv_caps; DWORD svb_caps; DWORD svb_color_key_caps;

1 0

Dmitry Timoshkov : secur32/tests: Use LoadLibrary instead of GetModuleHandle to load advapi32.dll APIs.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 79511d98b740c662f46ab33df2e79e401acbd942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79511d98b740c662f46ab33df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:11:30 2013 +0900 secur32/tests: Use LoadLibrary instead of GetModuleHandle to load advapi32.dll APIs. --- dlls/secur32/tests/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 81539c7..a00c276 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -123,7 +123,7 @@ static void InitFunctionPtrs(void) secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); - advapi32dll = GetModuleHandleA("advapi32.dll"); + advapi32dll = LoadLibraryA("advapi32.dll"); #define GET_PROC(h, func) p ## func = (void*)GetProcAddress(h, #func)

1 0

Jactry Zeng : Add wine-zh mailing list to forums page in Simplified Chinese .
by Jeremy Newman Dec. 13, 2013

Dec. 13, 2013

Module: website Branch: master Commit: 074d1b83263cbed3c7c71966da0e0609a9668408 URL: http://source.winehq.org/git/website.git/?a=commit;h=074d1b83263cbed3c7c719… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Dec 14 01:05:36 2013 +0800 Add wine-zh mailing list to forums page in Simplified Chinese. --- templates/zh-cn/forums.template | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index ea15c02..6da126d 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -50,6 +50,13 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 <i>指定列表 </li> <li> + [<a href="http://www.freelists.org/list/wine-zh">（取消）订阅</a>] + [<a href="http://www.freelists.org/archive/wine-zh/">存档</a>] + <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a><br> + 一个低流量（10封/天）的开放性列表，用于中文终端用户讨论。 + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>]

1 0

Dan Kegel : Add wine-zh mailing list to forums page
by Jeremy Newman Dec. 13, 2013

Dec. 13, 2013

Module: website Branch: master Commit: 9a27a39d94a4b08b6ad4c505db9c9f2e2f379c1a URL: http://source.winehq.org/git/website.git/?a=commit;h=9a27a39d94a4b08b6ad4c5… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Dec 13 07:49:08 2013 -0800 Add wine-zh mailing list to forums page Zhenbo Li suggested this change. The wine-zh mailing list's been going for a year now, let's add it to the list. --- templates/en/forums.template | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 60090d3..c2106e4 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -60,6 +60,13 @@ mailing list software.</p> </li> <li> + [<a href="http://www.freelists.org/list/wine-zh">(Un-)Subscribe</a>] + [<a href="http://www.freelists.org/archive/wine-zh/">Archive</a>] + <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a><br> + A low traffic (10/day) open list for end-user discussions in Chinese. + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>]

1 0

Alexandre Julliard : format_comment.txt.tmpl: Don' t point to the edit page for attachments.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: bugzilla Branch: master Commit: e1dfeca781942ca9b6c1952d9eb03b354767152d URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=e1dfeca781942ca9b6c19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 20:32:35 2013 +0100 format_comment.txt.tmpl: Don't point to the edit page for attachments. This reverts the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=658547. Viewing the attachment directly is more useful. --- template/en/default/bug/format_comment.txt.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 1567980..ed89188 100644 --- a/template/en/default/bug/format_comment.txt.tmpl +++ b/template/en/default/bug/format_comment.txt.tmpl @@ -42,7 +42,7 @@ X[% comment_body %] [% ELSIF comment.type == constants.CMT_ATTACHMENT_CREATED %] Created attachment [% comment.extra_data %] [% IF is_bugmail %] - --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data _ "&action=edit" %] + --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data %] [% END %] [%+ comment.attachment.description %]

1 0

Stefan Dösinger : ddraw/tests: Use correct ddraw COM macros.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: cc978c90d425950efd2f7c6c948c490a5c0537f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc978c90d425950efd2f7c6c9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 22:30:46 2013 +0100 ddraw/tests: Use correct ddraw COM macros. --- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 528bada..d6d38c8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4607,7 +4607,7 @@ static void test_set_surface_desc(void) U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; - hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **)&surface3); @@ -4826,7 +4826,7 @@ static void test_set_surface_desc(void) U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; } - hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr); if (FAILED(hr)) { diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a4981c9..6f9160c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5197,7 +5197,7 @@ static void test_set_surface_desc(void) window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); reset_ddsd(&ddsd); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d253ebf..819f4d0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5084,7 +5084,7 @@ static void test_set_surface_desc(void) window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); reset_ddsd(&ddsd);

1 0

Frédéric Delanoy : wined3d: Use BOOL type where appropriate.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: cc6f9c36cd58cf28b56db7726052ebd382027f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6f9c36cd58cf28b56db7726… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 20:05:34 2013 +0100 wined3d: Use BOOL type where appropriate. --- dlls/wined3d/arb_program_shader.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0821fc2..23ca809 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1506,17 +1506,16 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr) { /* Generate a line that does the input modifier computation and return the input register to use */ - BOOL is_color = FALSE; + BOOL is_color = FALSE, insert_line; char regstr[256]; char swzstr[20]; - int insert_line; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; const char *one = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ONE); const char *two = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_TWO); /* Assume a new line will be added */ - insert_line = 1; + insert_line = TRUE; /* Get register name */ shader_arb_get_register_name(ins, &src->reg, regstr, &is_color); @@ -1526,11 +1525,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in { case WINED3DSPSM_NONE: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_NEG: sprintf(outregstr, "-%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_BIAS: shader_addline(buffer, "ADD T%c, %s, -coefdiv.x;\n", 'A' + tmpreg, regstr); @@ -1564,7 +1563,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in case WINED3DSPSM_ABS: if(ctx->target_version >= NV2) { sprintf(outregstr, "|%s%s|", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } else { shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); } @@ -1576,11 +1575,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); sprintf(outregstr, "-T%c%s", 'A' + tmpreg, swzstr); } - insert_line = 0; + insert_line = FALSE; break; default: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } /* Return modified or original register, with swizzle */

1 0

Stefan Dösinger : d3d9/tests: Test user memory and getdc interaction.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: 03fe6f3e0781b09073541ca65b9ffcc0bb2f5cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fe6f3e0781b09073541ca65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 22:30:43 2013 +0100 d3d9/tests: Test user memory and getdc interaction. --- dlls/d3d9/tests/Makefile.in | 2 +- dlls/d3d9/tests/d3d9ex.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index 380d105..7b205be 100644 --- a/dlls/d3d9/tests/Makefile.in +++ b/dlls/d3d9/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d9.dll -IMPORTS = user32 +IMPORTS = user32 gdi32 C_SRCS = \ d3d9ex.c \ diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7f39d70..7ac8bb3 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1151,6 +1151,50 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirect3DDevice9Ex *device; + HWND window; + HRESULT hr; + ULONG ref; + IDirect3DSurface9 *surface; + DWORD *data; + HDC dc; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * 16 * 16); + memset(data, 0xaa, sizeof(*data) * 16 * 16); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 16, 16, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, (HANDLE *)&data); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DSurface9_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get dc, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirect3DSurface9_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release dc, hr %#x.\n", hr); + + ok(data[0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0]); + ok(data[8 * 16] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[8 * 16]); + + IDirect3DSurface9_Release(surface); + HeapFree(GetProcessHeap(), 0, data); + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + DestroyWindow(window); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -1180,4 +1224,5 @@ START_TEST(d3d9ex) test_reset(); test_reset_resources(); test_vidmem_accounting(); + test_user_memory_getdc(); }

1 0