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

Andrew Eikum : mciqtz: Actually assign result to the output structure.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: ad175df21a26cb9c76537a1198c98534f1a1913e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad175df21a26cb9c76537a119… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Mar 8 15:08:41 2012 -0600 mciqtz: Actually assign result to the output structure. --- dlls/mciqtz32/mciqtz.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 03f6f9d..3e16235 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -653,11 +653,11 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS LONG state = State_Stopped; IMediaControl_GetState(wma->pmctrl, -1, &state); if (state == State_Stopped) - state = MCI_MODE_STOP; + lpParms->dwReturn = MCI_MODE_STOP; else if (state == State_Running) - state = MCI_MODE_PLAY; + lpParms->dwReturn = MCI_MODE_PLAY; else if (state == State_Paused) - state = MCI_MODE_PAUSE; + lpParms->dwReturn = MCI_MODE_PAUSE; break; } case MCI_STATUS_MEDIA_PRESENT:

1 0

André Hentschel : dbghelp: Add arm_fetch_minidump_thread implementation.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 138cb84be0f693d52dd6cb6ef638c0a81747682a URL: http://source.winehq.org/git/wine.git/?a=commit;h=138cb84be0f693d52dd6cb6ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:27:07 2012 +0100 dbghelp: Add arm_fetch_minidump_thread implementation. --- dlls/dbghelp/cpu_arm.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 2712db4..eeb8984 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -224,8 +224,16 @@ static const char* arm_fetch_regname(unsigned regno) static BOOL arm_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) { - FIXME("NIY\n"); - return FALSE; + if (ctx->ContextFlags && (flags & ThreadWriteInstructionWindow)) + { + /* FIXME: crop values across module boundaries, */ +#ifdef __arm__ + ULONG base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80; + minidump_add_memory_block(dc, base, ctx->Pc + 0x80 - base, 0); +#endif + } + + return TRUE; } static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags)

1 0

André Hentschel : dbghelp: Silence arm_fetch_minidump_module.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 84a036a435c86e3a75d185fa0cbd3ffed38fec9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a036a435c86e3a75d185fa0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:27:54 2012 +0100 dbghelp: Silence arm_fetch_minidump_module. --- dlls/dbghelp/cpu_arm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index eeb8984..a38afe8 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -238,7 +238,9 @@ static BOOL arm_fetch_minidump_thread(struct dump_context* dc, unsigned index, u static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) { - FIXME("NIY\n"); + /* FIXME: actually, we should probably take care of FPO data, unless it's stored in + * function table minidump stream + */ return FALSE; }

1 0

André Hentschel : winedbg: Use copy of be_i386_fetch_float for be_arm_fetch_float ( except of long double).
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: a948c20151197996b3668c49df123b40d743b3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a948c20151197996b3668c49d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:28:26 2012 +0100 winedbg: Use copy of be_i386_fetch_float for be_arm_fetch_float (except of long double). --- programs/winedbg/be_arm.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 0bd5601..c39043c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -237,8 +237,20 @@ static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - dbg_printf("be_arm_fetch_float: not done\n"); - return FALSE; + char tmp[sizeof(long double)]; + + /* FIXME: this assumes that debuggee and debugger use the same + * representation for reals + */ + if (!memory_read_value(lvalue, size, tmp)) return FALSE; + + switch (size) + { + case sizeof(float): *ret = *(float*)tmp; break; + case sizeof(double): *ret = *(double*)tmp; break; + default: return FALSE; + } + return TRUE; } struct backend_cpu be_arm =

1 0

Christian Costa : configure: Check if version of msgfmt (from gettext) is recent enough.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 949693011dfc91c38a79c779b96df0ac4d8f54e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949693011dfc91c38a79c779b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 5 20:00:20 2012 +0100 configure: Check if version of msgfmt (from gettext) is recent enough. --- configure | 24 ++++++++++++++++++++++-- configure.ac | 19 ++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6e81f94..55464c7 100755 --- a/configure +++ b/configure @@ -5150,11 +5150,31 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether msgfmt supports contexts" >&5 +$as_echo_n "checking whether msgfmt supports contexts... " >&6; } + cat >conftest.po <<EOF +# comment +msgctxt "ctxt" +msgid "id" +msgstr "str" +EOF + if $MSGFMT -o /dev/null conftest.po 2>&5 + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + MSGFMT=false + fi +fi if test "$MSGFMT" = false; then : case "x$with_gettext" in - x) as_fn_append wine_warnings "|gettext tools not found, translations won't be built." ;; + x) as_fn_append wine_warnings "|gettext tools not found (or too old), translations won't be built." ;; xno) ;; - *) as_fn_error $? "gettext tools not found, translations won't be built. + *) as_fn_error $? "gettext tools not found (or too old), translations won't be built. This is an error since --with-gettext was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 0b68774..357c829 100644 --- a/configure.ac +++ b/configure.ac @@ -349,8 +349,25 @@ else fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + AC_MSG_CHECKING([whether msgfmt supports contexts]) + cat >conftest.po <<EOF +# comment +msgctxt "ctxt" +msgid "id" +msgstr "str" +EOF + if $MSGFMT -o /dev/null conftest.po 2>&AS_MESSAGE_LOG_FD + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + MSGFMT=false + fi +fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], - [gettext tools not found, translations won't be built.]) + [gettext tools not found (or too old), translations won't be built.]) dnl **** Check for some libraries ****

1 0

Thomas Faber : msvcp60: Fix build with MSVC.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 44feaf9bd8dd6402d3f5aabd12a0c0634e3714a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44feaf9bd8dd6402d3f5aabd1… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 7 09:23:50 2012 +0100 msvcp60: Fix build with MSVC. --- dlls/msvcp60/memory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp60/memory.c b/dlls/msvcp60/memory.c index 6f6a77a..4407cfe 100644 --- a/dlls/msvcp60/memory.c +++ b/dlls/msvcp60/memory.c @@ -80,7 +80,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { - return MSVCRT_operator_new(sizeof(char[count])); + return MSVCRT_operator_new(count); } /* ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z */ @@ -177,7 +177,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun return NULL; } - return MSVCRT_operator_new(sizeof(wchar_t[count])); + return MSVCRT_operator_new(count * sizeof(wchar_t)); } /* ?allocate@?$allocator(a)_W@std@@QAEPA_WIPBX(a)Z */ @@ -276,7 +276,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate( return NULL; } - return MSVCRT_operator_new(sizeof(unsigned short[count])); + return MSVCRT_operator_new(count * sizeof(unsigned short)); } /* ?allocate@?$allocator(a)G@std@@QAEPAGIPBX(a)Z */

1 0

Thomas Faber : msvcp90: Fix build with MSVC.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 62901e6ea07df194ab7f1407783a17d639a58ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62901e6ea07df194ab7f14077… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 7 10:10:18 2012 +0100 msvcp90: Fix build with MSVC. --- dlls/msvcp90/memory.c | 6 +++--- dlls/msvcp90/string.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 4ecc379..c5cae50 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -80,7 +80,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { - return MSVCRT_operator_new(sizeof(char[count])); + return MSVCRT_operator_new(count); } /* ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z */ @@ -177,7 +177,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun return NULL; } - return MSVCRT_operator_new(sizeof(wchar_t[count])); + return MSVCRT_operator_new(count * sizeof(wchar_t)); } /* ?allocate@?$allocator(a)_W@std@@QAEPA_WIPBX(a)Z */ @@ -276,7 +276,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate( return NULL; } - return MSVCRT_operator_new(sizeof(unsigned short[count])); + return MSVCRT_operator_new(count * sizeof(unsigned short)); } /* ?allocate@?$allocator(a)G@std@@QAEPAGIPBX(a)Z */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 8a6bf64..e404699 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -215,7 +215,7 @@ MSVCP_bool CDECL MSVCP_char_traits_wchar_lt(const wchar_t *ch1, int CDECL MSVCP_char_traits_wchar_compare(const wchar_t *s1, const wchar_t *s2, MSVCP_size_t count) { - int ret = memcmp(s1, s2, sizeof(wchar_t[count])); + int ret = memcmp(s1, s2, count * sizeof(wchar_t)); return (ret>0 ? 1 : (ret<0 ? -1 : 0)); } @@ -238,7 +238,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest, return dest; } - return memcpy(dest, src, sizeof(wchar_t[count])); + return memcpy(dest, src, count * sizeof(wchar_t)); } /* ?copy@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -275,7 +275,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest, return dest; } - return memmove(dest, src, sizeof(WCHAR[count])); + return memmove(dest, src, count * sizeof(WCHAR)); } /* ?move@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -395,7 +395,7 @@ unsigned short * CDECL MSVCP_char_traits_short__Copy_s(unsigned short *dest, return dest; } - return memcpy(dest, src, sizeof(unsigned short[count])); + return memcpy(dest, src, count * sizeof(unsigned short)); } /* ?copy@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */ @@ -430,7 +430,7 @@ unsigned short* CDECL MSVCP_char_traits_short__Move_s(unsigned short *dest, return dest; } - return memmove(dest, src, sizeof(unsigned short[count])); + return memmove(dest, src, count * sizeof(unsigned short)); } /* ?move@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */

1 0

Akihiro Sagawa : kernel32/tests: Add more tests for WriteConsole.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: e4692b3f6681799fb41749cd36151734cea81c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4692b3f6681799fb41749cd3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Mar 6 22:51:57 2012 +0900 kernel32/tests: Add more tests for WriteConsole. --- dlls/kernel32/tests/console.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 7eea5d9..d0c58f8 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -780,6 +780,28 @@ static void testScreenBuffer(HANDLE hConOut) "GetLastError: expecting %u got %u\n", ERROR_INVALID_HANDLE, GetLastError()); + /* trying to write non-console handle */ + SetLastError(0xdeadbeef); + ok(!WriteConsoleA(hFileOutRW, test_str1, lstrlenA(test_str1), &len, NULL), + "Shouldn't succeed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + SetLastError(0xdeadbeef); + ok(!WriteConsoleA(hFileOutRO, test_str1, lstrlenA(test_str1), &len, NULL), + "Shouldn't succeed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + SetLastError(0xdeadbeef); + ok(!WriteConsoleA(hFileOutWT, test_str1, lstrlenA(test_str1), &len, NULL), + "Shouldn't succeed\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + CloseHandle(hFileOutRW); CloseHandle(hFileOutRO); CloseHandle(hFileOutWT);

1 0

Stefan Dösinger : d3d8/tests: Port the depth blit test to d3d8.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 3c1d5f6c5d950debb7626bbcaa560cbc8a10e2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1d5f6c5d950debb7626bbca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 7 21:26:07 2012 +0100 d3d8/tests: Port the depth blit test to d3d8. --- dlls/d3d8/device.c | 14 +++++++++ dlls/d3d8/tests/device.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 2 +- 3 files changed, 88 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5777fd5..b528e2c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -944,12 +944,26 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_resource = wined3d_surface_get_resource(Source->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", + pSourceSurface); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } srcFormat = wined3d_desc.format; src_w = wined3d_desc.width; src_h = wined3d_desc.height; wined3d_resource = wined3d_surface_get_resource(Dest->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + WARN("Dest %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", + pDestinationSurface); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } destFormat = wined3d_desc.format; /* Check that the source and destination formats match */ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index cfac2cd..2e1bc98 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3091,6 +3091,78 @@ done: UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void depth_blit_test(void) +{ + HWND hwnd = NULL; + IDirect3D8 *d3d8 = NULL; + IDirect3DDevice8 *device = NULL; + IDirect3DSurface8 *backbuffer, *ds1, *ds2, *ds3; + RECT src_rect; + const POINT dst_point = {0, 0}; + HRESULT hr; + + d3d8 = pDirect3DCreate8(D3D_SDK_VERSION); + ok(d3d8 != NULL, "Direct3DCreate8 failed.\n"); + hwnd = CreateWindow("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed.\n"); + if (!d3d8 || !hwnd) + goto done; + + device = create_device(d3d8, hwnd, hwnd, TRUE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetRenderTarget(device, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &ds1); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &ds2); + ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &ds3); + ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, ds2, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Flipped. */ + SetRect(&src_rect, 0, 480, 640, 0); + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, ds2, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, ds2, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Depth -> color blit.*/ + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, backbuffer, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, NULL rects, current depth stencil -> unbound depth stencil */ + hr = IDirect3DDevice8_CopyRects(device, ds1, NULL, 0, ds2, NULL); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, NULL rects, unbound depth stencil -> current depth stencil */ + hr = IDirect3DDevice8_CopyRects(device, ds2, NULL, 0, ds1, NULL); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, NULL rects, unbound depth stencil -> unbound depth stencil */ + hr = IDirect3DDevice8_CopyRects(device, ds2, NULL, 0, ds3, NULL); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(ds3); + IDirect3DSurface8_Release(ds2); + IDirect3DSurface8_Release(ds1); + +done: + if (device) IDirect3DDevice8_Release(device); + if (d3d8) IDirect3D8_Release(d3d8); + if (hwnd) DestroyWindow(hwnd); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3145,6 +3217,7 @@ START_TEST(device) test_wrong_shader(); test_mode_change(); test_device_window_reset(); + depth_blit_test(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d8e1ed2..aab8101 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2429,7 +2429,7 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to read render target back, hr %#x.\n", hr); hr = IDirect3DDevice8_CopyRects(device, ds, NULL, 0, ds_plain, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Depth buffer copy, hr %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Depth buffer copy, hr %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr);

1 0

Jozef Kucia : d3dx9/tests: Don't leak D3DXBuffer.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: fde2abbabf6210f17b7f5311646006191b05b56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde2abbabf6210f17b7f53116… Author: Jozef Kucia <joseph.kucia(a)gmail.com> Date: Wed Mar 7 21:33:37 2012 +0100 d3dx9/tests: Don't leak D3DXBuffer. --- dlls/d3dx9_36/tests/mesh.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 390197d..d24326f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2471,10 +2471,6 @@ static void D3DXCreateBoxTest(void) return; } - hr = D3DXCreateBuffer(36 * sizeof(DWORD), &ppBuffer); - ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); - if (FAILED(hr)) goto end; - hr = D3DXCreateBox(device,2.0f,20.0f,4.9f,NULL, &ppBuffer); todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); @@ -2490,6 +2486,7 @@ static void D3DXCreateBoxTest(void) hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ppBuffer = NULL; hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); todo_wine ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); @@ -2508,7 +2505,7 @@ static void D3DXCreateBoxTest(void) end: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); - ID3DXBuffer_Release(ppBuffer); + if (ppBuffer) ID3DXBuffer_Release(ppBuffer); DestroyWindow(wnd); }

1 0