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

Francois Gouget : testbot: Clarify the timeout error message in the email reports.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: tools Branch: master Commit: 872a26b5fe4e82b2e03541c4f1d6222012723dc4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=872a26b5fe4e82b2e03541c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 17 10:22:07 2014 +0100 testbot: Clarify the timeout error message in the email reports. --- testbot/bin/WineSendLog.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index aec2bee..b375447 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -116,7 +116,7 @@ sub ReadLog if ($Line =~ m/${BaseName}:${TestSet} done $(\d+)$/ && $1 eq "258") { - $Messages[@Messages] = "Timeout"; + $Messages[@Messages] = "The test timed out"; } $Found = 1; } @@ -256,7 +256,7 @@ EOF } if ($Line =~ m/^[^:]+:([^ ]+) done $258$/) { - print SENDMAIL "$1: Timeout\n"; + print SENDMAIL "$1: The test timed out\n"; } else {

1 0

Nikolay Sivov : stdole2: Fix usage of 'optional' with 'defaultvalue'.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 62ee13c59431551abc0186af4145f33f66d62517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ee13c59431551abc0186af4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 19 10:20:51 2014 +0400 stdole2: Fix usage of 'optional' with 'defaultvalue'. --- include/stdole2.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 432314f..81b5463 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -405,9 +405,9 @@ library stdole helpcontext(0x2775) ] HRESULT LoadPicture([in, optional] VARIANT filename, - [in, optional, defaultvalue(0)] int widthDesired, - [in, optional, defaultvalue(0)] int heightDesired, - [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, + [in, defaultvalue(0)] int widthDesired, + [in, defaultvalue(0)] int heightDesired, + [in, defaultvalue(Default)] enum LoadPictureConstants flags, [out, retval] IPictureDisp **retval); [ entry("OleSavePictureFile"),

1 0

Nikolay Sivov : idl: Remove 'optional' for 'defaultvalue' non-VARIANT arguments.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 18c350ae224af6fafe15b92036fca77fdb4371da URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c350ae224af6fafe15b9203… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 19 10:21:10 2014 +0400 idl: Remove 'optional' for 'defaultvalue' non-VARIANT arguments. --- dlls/scrrun/scrrun.idl | 38 ++++++++++++++++++------------------ dlls/wshom.ocx/wshom.idl | 20 +++++++++---------- include/msinkaut.idl | 48 +++++++++++++++++++++++----------------------- 3 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18c350ae224af6fafe15b…

1 0

Nikolay Sivov : scrrun: Implemented AtEndOfStream() property.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 038438ad696fc936a6bae5669bc0f35d7dbb7fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038438ad696fc936a6bae5669… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 19 10:21:27 2014 +0400 scrrun: Implemented AtEndOfStream() property. --- dlls/scrrun/filesystem.c | 26 ++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f1fea06..c6dbb76 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -111,6 +111,7 @@ struct textstream { IOMode mode; BOOL unicode; BOOL first_write; + LARGE_INTEGER size; HANDLE file; }; @@ -332,8 +333,24 @@ static HRESULT WINAPI textstream_get_Column(ITextStream *iface, LONG *column) static HRESULT WINAPI textstream_get_AtEndOfStream(ITextStream *iface, VARIANT_BOOL *eos) { struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p)->(%p): stub\n", This, eos); - return E_NOTIMPL; + LARGE_INTEGER pos, dist; + + TRACE("(%p)->(%p)\n", This, eos); + + if (!eos) + return E_POINTER; + + if (textstream_check_iomode(This, IORead)) { + *eos = VARIANT_TRUE; + return CTL_E_BADFILEMODE; + } + + dist.QuadPart = 0; + if (!SetFilePointerEx(This->file, dist, &pos, FILE_CURRENT)) + return E_FAIL; + + *eos = This->size.QuadPart == pos.QuadPart ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI textstream_get_AtEndOfLine(ITextStream *iface, VARIANT_BOOL *eol) @@ -548,6 +565,11 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod return hr; } + if (mode == ForReading) + GetFileSizeEx(stream->file, &stream->size); + else + stream->size.QuadPart = 0; + *ret = &stream->ITextStream_iface; return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 4897652..63b79fa 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -154,9 +154,11 @@ static void test_textstream(void) static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; ITextStream *stream; VARIANT_BOOL b; + DWORD written; HANDLE file; HRESULT hr; BSTR name, data; + BOOL ret; file = CreateFileW(testfileW, GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); CloseHandle(file); @@ -199,12 +201,14 @@ static void test_textstream(void) hr = ITextStream_Write(stream, name); ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + hr = ITextStream_get_AtEndOfStream(stream, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); -todo_wine { - ok(hr == S_FALSE || broken(hr == S_OK), "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "got 0x%x\n", b); -} + ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); @@ -212,10 +216,9 @@ todo_wine { b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); -todo_wine { ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); -} + b = 10; hr = ITextStream_get_AtEndOfLine(stream, &b); todo_wine { @@ -235,14 +238,12 @@ todo_wine { hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - SysFreeString(name); b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); -todo_wine { ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); -} + b = 10; hr = ITextStream_get_AtEndOfLine(stream, &b); todo_wine { @@ -260,6 +261,21 @@ todo_wine { ITextStream_Release(stream); + /* now with non-empty file */ + file = CreateFileW(testfileW, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ret = WriteFile(file, testfileW, sizeof(testfileW), &written, NULL); + ok(ret && written == sizeof(testfileW), "got %d\n", ret); + CloseHandle(file); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got 0x%x\n", b); + ITextStream_Release(stream); + + SysFreeString(name); DeleteFileW(testfileW); }

1 0

Nikolay Sivov : user32: Added AddClipboardFormatListener/ RemoveClipboardFormatListener stubs.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 961d26418a68bfc92e8c1f14afe9a319bf8a6ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961d26418a68bfc92e8c1f14a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 19 10:29:47 2014 +0400 user32: Added AddClipboardFormatListener/RemoveClipboardFormatListener stubs. --- dlls/user32/clipboard.c | 18 ++++++++++++++++++ dlls/user32/user32.spec | 2 ++ 2 files changed, 20 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index fd16384..eb9f559 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -580,3 +580,21 @@ DWORD WINAPI GetClipboardSequenceNumber(VOID) TRACE("returning %x\n", seqno); return seqno; } + +/************************************************************************** + * AddClipboardFormatListener (USER32.@) + */ +BOOL WINAPI AddClipboardFormatListener(HWND hwnd) +{ + FIXME("%p: stub\n", hwnd); + return TRUE; +} + +/************************************************************************** + * RemoveClipboardFormatListener (USER32.@) + */ +BOOL WINAPI RemoveClipboardFormatListener(HWND hwnd) +{ + FIXME("%p: stub\n", hwnd); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4b1f4b5..052f7ff 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -1,4 +1,5 @@ @ stdcall ActivateKeyboardLayout(long long) +@ stdcall AddClipboardFormatListener(long) @ stdcall AdjustWindowRect(ptr long long) @ stdcall AdjustWindowRectEx(ptr long long long) @ stdcall AlignRects(ptr long long long) @@ -575,6 +576,7 @@ @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @ stdcall ReleaseDC(long long) +@ stdcall RemoveClipboardFormatListener(long) @ stdcall RemoveMenu(long long long) @ stdcall RemovePropA(long str) @ stdcall RemovePropW(long wstr)

1 0

Henri Verbeet : d3d9/tests: Use a separate device for alphareplicate_test( ).
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 33b32c9dd5da2a16d7dcda3564440a33cfea256a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b32c9dd5da2a16d7dcda356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 19 08:57:04 2014 +0100 d3d9/tests: Use a separate device for alphareplicate_test(). --- dlls/d3d9/tests/visual.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 893d7b1..21c9d17 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10812,15 +10812,32 @@ static void texop_range_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } -static void alphareplicate_test(IDirect3DDevice9 *device) { - struct vertex quad[] = { - { -1.0, -1.0, 0.1, 0x80ff00ff }, - { 1.0, -1.0, 0.1, 0x80ff00ff }, - { -1.0, 1.0, 0.1, 0x80ff00ff }, - { 1.0, 1.0, 0.1, 0x80ff00ff }, - }; - HRESULT hr; +static void alphareplicate_test(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; DWORD color; + HWND window; + HRESULT hr; + + static const struct vertex quad[] = + { + {-1.0f, -1.0f, 0.1f, 0x80ff00ff}, + {-1.0f, 1.0f, 0.1f, 0x80ff00ff}, + { 1.0f, -1.0f, 0.1f, 0x80ff00ff}, + { 1.0f, 1.0f, 0.1f, 0x80ff00ff}, + }; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); @@ -10848,9 +10865,11 @@ static void alphareplicate_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); - + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void dp3_alpha_test(void) @@ -15706,11 +15725,11 @@ START_TEST(visual) texop_test(device_ptr); texop_range_test(device_ptr); - alphareplicate_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + alphareplicate_test(); dp3_alpha_test(); depth_buffer_test(); depth_buffer2_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for texop_range_test().
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 91d3dcffd75e8944b30c3401392aa175076248ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d3dcffd75e8944b30c34013… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 19 08:57:05 2014 +0100 d3d9/tests: Use a separate device for texop_range_test(). --- dlls/d3d9/tests/visual.c | 67 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 21c9d17..e8b0e79 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10700,37 +10700,61 @@ static void yuv_layout_test(IDirect3DDevice9 *device) IDirect3D9_Release(d3d); } -static void texop_range_test(IDirect3DDevice9 *device) +static void texop_range_test(void) { - static const struct { + IDirect3DTexture9 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; + + static const struct + { float x, y, z; D3DCOLOR diffuse; - } quad[] = { + } + quad[] = + { {-1.0f, -1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)}, {-1.0f, 1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)}, { 1.0f, -1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)}, { 1.0f, 1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)} }; - HRESULT hr; - IDirect3DTexture9 *texture; - D3DLOCKED_RECT locked_rect; - D3DCAPS9 caps; - DWORD color; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } /* We need ADD and SUBTRACT operations */ hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); - if (!(caps.TextureOpCaps & D3DTEXOPCAPS_ADD)) { - skip("D3DTOP_ADD is not supported, skipping value range test\n"); - return; + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_ADD)) + { + skip("D3DTOP_ADD is not supported, skipping value range test.\n"); + IDirect3DDevice9_Release(device); + goto done; } - if (!(caps.TextureOpCaps & D3DTEXOPCAPS_SUBTRACT)) { - skip("D3DTEXOPCAPS_SUBTRACT is not supported, skipping value range test\n"); - return; + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_SUBTRACT)) + { + skip("D3DTEXOPCAPS_SUBTRACT is not supported, skipping value range test.\n"); + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "SetFVF failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); /* Stage 1: result = diffuse(=1.0) + diffuse * stage 2: result = result - tfactor(= 0.5) */ @@ -10749,6 +10773,8 @@ static void texop_range_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_SUBTRACT); ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear device, hr %#x.\n\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "BeginScene failed with 0x%08x\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); @@ -10803,13 +10829,12 @@ static void texop_range_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void alphareplicate_test(void) @@ -15724,11 +15749,11 @@ START_TEST(visual) else skip("No ps_1_1 support\n"); texop_test(device_ptr); - texop_range_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + texop_range_test(); alphareplicate_test(); dp3_alpha_test(); depth_buffer_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for texop_test().
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: ad45d2c2339ca22777699d0b89468ffdceffee34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad45d2c2339ca22777699d0b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 19 08:57:06 2014 +0100 d3d9/tests: Use a separate device for texop_test(). --- dlls/d3d9/tests/visual.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e8b0e79..2cb6998 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10260,13 +10260,17 @@ cleanup: if(dsttex) IDirect3DTexture9_Release(dsttex); } -static void texop_test(IDirect3DDevice9 *device) +static void texop_test(void) { IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DTexture9 *texture = NULL; D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; unsigned i; @@ -10319,6 +10323,16 @@ static void texop_test(IDirect3DDevice9 *device) {D3DTOP_LERP, "LERP", D3DTEXOPCAPS_LERP, D3DCOLOR_ARGB(0x00, 0x00, 0x33, 0x33)}, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); @@ -10386,9 +10400,13 @@ static void texop_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed with 0x%08x\n", hr); } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); IDirect3DTexture9_Release(texture); IDirect3DVertexDeclaration9_Release(vertex_declaration); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void yuv_color_test(IDirect3DDevice9 *device) @@ -15748,11 +15766,10 @@ START_TEST(visual) } else skip("No ps_1_1 support\n"); - texop_test(device_ptr); - cleanup_device(device_ptr); device_ptr = NULL; + texop_test(); texop_range_test(); alphareplicate_test(); dp3_alpha_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for multiple_rendertargets_test().
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 7df9eb08fb73a8909701b5a86949b6e9d153e1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df9eb08fb73a8909701b5a86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 19 08:57:07 2014 +0100 d3d9/tests: Use a separate device for multiple_rendertargets_test(). --- dlls/d3d9/tests/visual.c | 95 +++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 34 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2cb6998..38bf62a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9410,8 +9410,21 @@ static void pointsize_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed, hr=%08x\n", hr); } -static void multiple_rendertargets_test(IDirect3DDevice9 *device) +static void multiple_rendertargets_test(void) { + IDirect3DSurface9 *surf1, *surf2, *backbuf, *readback; + IDirect3DPixelShader9 *ps1, *ps2; + IDirect3DTexture9 *tex1, *tex2; + IDirect3DVertexShader9 *vs; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; + UINT i, j; + static const DWORD vshader_code[] = { 0xfffe0300, /* vs_3_0 */ @@ -9436,42 +9449,52 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0801, 0xa0e40001, /* mov oC1, c1 */ 0x0000ffff /* end */ }; - - HRESULT hr; - IDirect3DVertexShader9 *vs; - IDirect3DPixelShader9 *ps1, *ps2; - IDirect3DTexture9 *tex1, *tex2; - IDirect3DSurface9 *surf1, *surf2, *backbuf, *readback; - D3DCAPS9 caps; - DWORD color; - UINT i, j; - float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1, + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; - float texquad[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - 0.0, -1.0, 0.1, 1.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 0.0, 1.0, 0.1, 1.0, 1.0, + static const float texquad[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 0.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, - 0.0, -1.0, 0.1, 0.0, 0.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - 0.0, 1.0, 0.1, 0.0, 1.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + 0.0f, -1.0f, 0.1f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; - memset(&caps, 0, sizeof(caps)); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(hr == D3D_OK, "IDirect3DDevice9_GetCaps failed, hr=%08x\n", hr); - if(caps.NumSimultaneousRTs < 2) { - skip("Only 1 simultaneous render target supported, skipping MRT test\n"); - return; + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs < 2) + { + skip("Only 1 simultaneous render target supported, skipping MRT test.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0) || caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + skip("No shader model 3 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 16, 16, @@ -9568,6 +9591,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, NULL); @@ -9589,9 +9614,6 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &texquad[20], 5 * sizeof(float)); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr=%08x\n", hr); } @@ -9611,6 +9633,11 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(surf2); IDirect3DSurface9_Release(backbuf); IDirect3DSurface9_Release(readback); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } struct formats { @@ -15755,7 +15782,6 @@ START_TEST(visual) pretransformed_varying_test(device_ptr); vFace_register_test(device_ptr); vpos_register_test(device_ptr); - multiple_rendertargets_test(device_ptr); } else { skip("No ps_3_0 or vs_3_0 support\n"); } @@ -15769,6 +15795,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + multiple_rendertargets_test(); texop_test(); texop_range_test(); alphareplicate_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for vpos_register_test() .
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 3ec514382fb6c96a19492da5483e0485d83c370c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec514382fb6c96a19492da54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 19 08:57:08 2014 +0100 d3d9/tests: Use a separate device for vpos_register_test(). --- dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 38bf62a..39b3449 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8943,10 +8943,21 @@ cleanup: DestroyWindow(window); } -static void vpos_register_test(IDirect3DDevice9 *device) +static void vpos_register_test(void) { - HRESULT hr; + IDirect3DSurface9 *surface = NULL, *backbuffer; + IDirect3DPixelShader9 *shader, *shader_frac; + IDirect3DVertexShader9 *vshader; + IDirect3DDevice9 *device; + D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; + DWORD *pos; + static const DWORD shader_code[] = { 0xffff0300, /* ps_3_0 */ @@ -8978,20 +8989,35 @@ static void vpos_register_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - IDirect3DVertexShader9 *vshader; - IDirect3DPixelShader9 *shader, *shader_frac; - IDirect3DSurface9 *surface = NULL, *backbuffer; - const float quad[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; - D3DLOCKED_RECT lr; float constant[4] = {1.0, 0.0, 320, 240}; - DWORD *pos; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0) || caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + skip("No shader model 3 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vshader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); @@ -9102,6 +9128,11 @@ static void vpos_register_test(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(vshader); if(surface) IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(backbuffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static BOOL point_match(IDirect3DDevice9 *device, UINT x, UINT y, UINT r) @@ -15781,7 +15812,6 @@ START_TEST(visual) nested_loop_test(device_ptr); pretransformed_varying_test(device_ptr); vFace_register_test(device_ptr); - vpos_register_test(device_ptr); } else { skip("No ps_3_0 or vs_3_0 support\n"); } @@ -15795,6 +15825,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + vpos_register_test(); multiple_rendertargets_test(); texop_test(); texop_range_test();

1 0