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

Vincent Povirk : gdiplus: Fix an overzealous optimization.
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: 9a5375989d43a08a6cf276e08b8deff9d2a9fffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5375989d43a08a6cf276e08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 13 16:18:50 2014 -0500 gdiplus: Fix an overzealous optimization. --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a570192..d16c6c1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2807,7 +2807,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image ptf[3].X = ptf[2].X + ptf[1].X - ptf[0].X; ptf[3].Y = ptf[2].Y + ptf[1].Y - ptf[0].Y; - if (!srcwidth || !srcheight || ptf[3].X == ptf[0].X || ptf[3].Y == ptf[0].Y) + if (!srcwidth || !srcheight || (ptf[3].X == ptf[0].X && ptf[3].Y == ptf[0].Y)) return Ok; transform_and_round_points(graphics, pti, ptf, 4);

1 0

Michael Stefaniuc : dswave: DirectSoundWave doesn' t support COM aggregation.
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: 2fe960537348416e57bad53a69863d5e20c812f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe960537348416e57bad53a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 13 23:45:16 2014 +0100 dswave: DirectSoundWave doesn't support COM aggregation. --- dlls/dswave/dswave.c | 3 ++- dlls/dswave/dswave_main.c | 13 +++++++++---- dlls/dswave/dswave_private.h | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index f6fbe07..d0850f7 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -723,7 +723,8 @@ static const IPersistStreamVtbl DirectMusicWave_PersistStream_Vtbl = { /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ppobj) +{ IDirectMusicWaveImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl)); diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 36eb266..a9be90c 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -71,12 +71,17 @@ static ULONG WINAPI WaveCF_Release(IClassFactory * iface) return 1; /* non-heap based object */ } -static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *pOuter, REFIID riid, - void **ppobj) +static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *outer_unk, REFIID riid, + void **ret_iface) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); + TRACE ("(%p, %s, %p)\n", outer_unk, debugstr_dmguid(riid), ret_iface); - return DMUSIC_CreateDirectMusicWaveImpl (riid, ppobj, pOuter); + if (outer_unk) { + *ret_iface = NULL; + return CLASS_E_NOAGGREGATION; + } + + return create_dswave(riid, ret_iface); } static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock) diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 6f402d7..ae9e346 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -48,7 +48,7 @@ typedef struct IDirectMusicWaveImpl IDirectMusicWaveImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ret_iface) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

Henri Verbeet : d3d9/tests: Use a separate device for multisample_get_rtdata_test().
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: 0ee5fae92944b17b1b6f9bd494a7d7b02bf6a84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee5fae92944b17b1b6f9bd49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 14 10:25:05 2014 +0100 d3d9/tests: Use a separate device for multisample_get_rtdata_test(). --- dlls/d3d9/tests/visual.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7f5f923..069642b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13496,21 +13496,29 @@ static void update_surface_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(src_tex); } -static void multisample_get_rtdata_test(IDirect3DDevice9 *device) +static void multisample_get_rtdata_test(void) { IDirect3DSurface9 *original_ds, *original_rt, *rt, *readback; - IDirect3D9 *d3d9; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; HRESULT hr; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - IDirect3D9_Release(d3d9); - if (FAILED(hr)) + 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 (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { - skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); - return; + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping tests.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; } hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, @@ -13544,6 +13552,11 @@ static void multisample_get_rtdata_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(original_rt); IDirect3DSurface9_Release(readback); IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void multisampled_depth_buffer_test(void) @@ -15562,11 +15575,11 @@ START_TEST(visual) depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); update_surface_test(device_ptr); - multisample_get_rtdata_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + multisample_get_rtdata_test(); zenable_test(); fog_special_test(); volume_srgb_test();

1 0

Akihiro Sagawa : version/tests: Add more VerQueryValueA tests.
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: 66933d71ee66bdb1502e35ba3a1a1d6310d9acb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66933d71ee66bdb1502e35ba3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 14 22:13:16 2014 +0900 version/tests: Add more VerQueryValueA tests. --- dlls/version/tests/info.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e66c9ee..b747547 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -574,10 +574,61 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); HeapFree(GetProcessHeap(), 0, ver); } +static void test_extra_block(void) +{ + WORD extra_block[] = { + 72, 0, 0, 'W', 'i', 'n', 'e', 'T', 'e', 's', 't', '\0', + 24, 4, 0, 'B', 'i', 'n', 'a', 'r', 'y', '\0', 0xbeef, 0xdead, + 24, 4, 1, 'T', 'e', 'x', 't', '\0', 'B', '-', ')', '\0', + }; + char buf[MAX_PATH]; + UINT len, ret; + ULONG w; + char *ver, *p; + WORD *length; + + ret = GetModuleFileNameA(NULL, buf, sizeof(buf)); + ok(ret, "GetModuleFileNameA failed\n"); + + len = GetFileVersionInfoSizeA(buf, NULL); + ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError()); + + ver = HeapAlloc(GetProcessHeap(), 0, len + sizeof(extra_block) * 2); + ok(ver != NULL, "Can't allocate memory\n"); + + ret = GetFileVersionInfoA(buf, 0, len, ver); + ok(ret, "GetFileVersionInfoA error %u\n", GetLastError()); + + /* forge the string table, as windres dislike an extra block */ + length = (WORD *)ver; /* see VS_VERSION_INFO_STRUCT32 for details */ + memcpy(ver + *length, extra_block, sizeof(extra_block)); + *length += sizeof(extra_block); + + p = (char *)0xdeadbeef; + len = 0xdeadbeef; + w = 0xdeadbeef; + ret = VerQueryValueA(ver, "WineTest\\Binary", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); +todo_wine ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); +todo_wine ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w); + + p = (char *)0xdeadbeef; + len = 0xdeadbeef; + ret = VerQueryValueA(ver, "WineTest\\Text", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); + ok(strcmp(p, "B-)") == 0, "got '%s', expected '%s'\n", p, "B-)"); + + HeapFree(GetProcessHeap(), 0, ver); +} + START_TEST(info) { test_info_size(); test_info(); test_32bit_win(); test_VerQueryValueA(); + test_extra_block(); }

1 0

Akihiro Sagawa : version: Don' t convert binary version resource to ANSI texts.
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: 05b3d7b69bf183ef879dc42bd11c65923025a910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b3d7b69bf183ef879dc42bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 14 22:13:18 2014 +0900 version: Don't convert binary version resource to ANSI texts. --- dlls/version/tests/info.c | 14 +++++++------- dlls/version/version.c | 15 ++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index b747547..107cfac 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -508,7 +508,7 @@ static void test_VerQueryValueA(void) SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; @@ -516,7 +516,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; @@ -524,7 +524,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; @@ -532,7 +532,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); sprintf(buf, "\\StringFileInfo\\%08x", translation); @@ -541,7 +541,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) @@ -609,9 +609,9 @@ static void test_extra_block(void) w = 0xdeadbeef; ret = VerQueryValueA(ver, "WineTest\\Binary", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); -todo_wine ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w); + ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w); p = (char *)0xdeadbeef; len = 0xdeadbeef; diff --git a/dlls/version/version.c b/dlls/version/version.c index d5d8452..9bc6ad1 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -567,7 +567,7 @@ typedef struct { WORD wLength; WORD wValueLength; - WORD wType; + WORD wType; /* 1:Text, 0:Binary */ WCHAR szKey[1]; #if 0 /* variable length structure */ /* DWORD aligned */ @@ -887,7 +887,7 @@ static BOOL VersionInfo16_QueryValue( const VS_VERSION_INFO_STRUCT16 *info, LPCS * Gets a value from a 32-bit PE resource */ static BOOL VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock, - LPVOID *lplpBuffer, UINT *puLen ) + LPVOID *lplpBuffer, UINT *puLen, BOOL *pbText ) { TRACE("lpSubBlock : (%s)\n", debugstr_w(lpSubBlock)); @@ -923,6 +923,8 @@ static BOOL VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCW *lplpBuffer = VersionInfo32_Value( info ); if (puLen) *puLen = info->wValueLength; + if (pbText) + *pbText = info->wType; return TRUE; } @@ -934,7 +936,6 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen ) { static const char rootA[] = "\\"; - static const char varfileinfoA[] = "\\VarFileInfo\\Translation"; const VS_VERSION_INFO_STRUCT16 *info = pBlock; TRACE("(%p,%s,%p,%p)\n", @@ -948,7 +949,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, if ( !VersionInfoIs16( info ) ) { - BOOL ret; + BOOL ret, isText; INT len; LPWSTR lpSubBlockW; @@ -960,11 +961,11 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, lpSubBlockW, len); - ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen); + ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen, &isText); HeapFree(GetProcessHeap(), 0, lpSubBlockW); - if (ret && strcasecmp( lpSubBlock, rootA ) && strcasecmp( lpSubBlock, varfileinfoA )) + if (ret && isText) { /* Set lpBuffer so it points to the 'empty' area where we store * the converted strings @@ -1040,7 +1041,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, return ret; } - return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen); + return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); }

1 0

Henri Verbeet : d3d9/tests: Use a separate device for zenable_test().
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: af63977750b224893ff210572cfa925cefc5f2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=af63977750b224893ff210572… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 14 10:25:04 2014 +0100 d3d9/tests: Use a separate device for zenable_test(). --- dlls/d3d9/tests/visual.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7771ea7..7f5f923 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14333,7 +14333,7 @@ static void resz_test(void) IDirect3D9_Release(d3d); } -static void zenable_test(IDirect3DDevice9 *device) +static void zenable_test(void) { static const struct { @@ -14347,12 +14347,26 @@ static void zenable_test(IDirect3DDevice9 *device) {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; UINT x, y; UINT i, j; + 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_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); @@ -14462,6 +14476,12 @@ static void zenable_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); IDirect3DVertexShader9_Release(vs); } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void fog_special_test(void) @@ -15543,11 +15563,11 @@ START_TEST(visual) srgbwrite_format_test(device_ptr); update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); - zenable_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + zenable_test(); fog_special_test(); volume_srgb_test(); volume_dxt5_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for fog_special_test().
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: 55e669265da956b4825dd1c335a0b0f0cde8dbb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e669265da956b4825dd1c33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 14 10:25:03 2014 +0100 d3d9/tests: Use a separate device for fog_special_test(). --- dlls/d3d9/tests/visual.c | 48 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7c8a99a..7771ea7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14464,7 +14464,7 @@ static void zenable_test(IDirect3DDevice9 *device) } } -static void fog_special_test(IDirect3DDevice9 *device) +static void fog_special_test(void) { static const struct { @@ -14474,8 +14474,8 @@ static void fog_special_test(IDirect3DDevice9 *device) quad[] = { {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} }; static const struct @@ -14511,6 +14511,13 @@ static void fog_special_test(IDirect3DDevice9 *device) 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff }; + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; union { float f; @@ -14521,7 +14528,21 @@ static void fog_special_test(IDirect3DDevice9 *device) unsigned int i; IDirect3DPixelShader9 *ps; IDirect3DVertexShader9 *vs; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + HWND window; + + 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); @@ -14546,8 +14567,16 @@ static void fog_special_test(IDirect3DDevice9 *device) ps = NULL; } + /* The table fog tests seem to depend on the projection matrix explicitly + * being set to an identity matrix, even though that's the default. + * (AMD Radeon HD 6310, Windows 7) */ + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); @@ -14561,7 +14590,7 @@ static void fog_special_test(IDirect3DDevice9 *device) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); if (!tests[i].vs) @@ -14617,16 +14646,15 @@ static void fog_special_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); } - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); if (vs) IDirect3DVertexShader9_Release(vs); if (ps) IDirect3DPixelShader9_Release(ps); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void volume_srgb_test(void) @@ -15516,11 +15544,11 @@ START_TEST(visual) update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); zenable_test(device_ptr); - fog_special_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + fog_special_test(); volume_srgb_test(); volume_dxt5_test(); add_dirty_rect_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for volume_srgb_test().
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: f9c46fb77a1fb5a0d04abd9262ce6f5517f85b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c46fb77a1fb5a0d04abd926… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 14 10:25:02 2014 +0100 d3d9/tests: Use a separate device for volume_srgb_test(). --- dlls/d3d9/tests/visual.c | 49 ++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c70b09c..7c8a99a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14629,15 +14629,19 @@ static void fog_special_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); } -static void volume_srgb_test(IDirect3DDevice9 *device) +static void volume_srgb_test(void) { HRESULT hr; - IDirect3D9 *d3d9; unsigned int i, j; IDirect3DVolumeTexture9 *tex1, *tex2; D3DPOOL pool; D3DLOCKED_BOX locked_box; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; + static const struct { BOOL srgb; @@ -14657,22 +14661,26 @@ static void volume_srgb_test(IDirect3DDevice9 *device) } quad[] = { - { {-1.0, -1.0, 0.0}, {0.0, 0.0, 0.0} }, - { { 1.0, -1.0, 0.0}, {0.0, 0.0, 0.0} }, - { {-1.0, 1.0, 0.0}, {0.0, 0.0, 0.0} }, - { { 1.0, 1.0, 0.0}, {0.0, 0.0, 0.0} }, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, }; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); - - hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_VOLUMETEXTURE, D3DFMT_A8R8G8B8); - if (hr != D3D_OK) + 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 (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_VOLUMETEXTURE, D3DFMT_A8R8G8B8) != D3D_OK) { skip("D3DFMT_A8R8G8B8 volume textures with SRGBREAD not supported.\n"); - IDirect3D9_Release(d3d9); - return; + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; } hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -14740,12 +14748,11 @@ static void volume_srgb_test(IDirect3DDevice9 *device) } } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op 0, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, FALSE); - ok(SUCCEEDED(hr), "Failed to set srgb state, hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void volume_dxt5_test(void) @@ -15510,11 +15517,11 @@ START_TEST(visual) multisample_get_rtdata_test(device_ptr); zenable_test(device_ptr); fog_special_test(device_ptr); - volume_srgb_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + volume_srgb_test(); volume_dxt5_test(); add_dirty_rect_test(); multisampled_depth_buffer_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for volume_dxt5_test().
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: c868f2d3a71037020f99b6823e88e4ea1dedace8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c868f2d3a71037020f99b6823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 14 10:25:01 2014 +0100 d3d9/tests: Use a separate device for volume_dxt5_test(). --- dlls/d3d9/tests/visual.c | 48 ++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7ee8be5..c70b09c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14748,14 +14748,18 @@ static void volume_srgb_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to set srgb state, hr %#x.\n", hr); } -static void volume_dxt5_test(IDirect3DDevice9 *device) +static void volume_dxt5_test(void) { - HRESULT hr; - IDirect3D9 *d3d9; IDirect3DVolumeTexture9 *texture; + IDirect3DDevice9 *device; D3DLOCKED_BOX box; + IDirect3D9 *d3d; unsigned int i; + ULONG refcount; DWORD color; + HWND window; + HRESULT hr; + static const char texture_data[] = { /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ @@ -14772,26 +14776,31 @@ static void volume_dxt5_test(IDirect3DDevice9 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); - IDirect3D9_Release(d3d9); - if (FAILED(hr)) + 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 (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) { - skip("Volume dxt5 textures are not supported, skipping test.\n"); - return; + skip("DXT5 volume textures are not supported, skipping test.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; } hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, @@ -14817,7 +14826,7 @@ static void volume_dxt5_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -14837,11 +14846,12 @@ static void volume_dxt5_test(IDirect3DDevice9 *device) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); IDirect3DVolumeTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void volume_v16u16_test(IDirect3DDevice9 *device) @@ -15501,11 +15511,11 @@ START_TEST(visual) zenable_test(device_ptr); fog_special_test(device_ptr); volume_srgb_test(device_ptr); - volume_dxt5_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + volume_dxt5_test(); add_dirty_rect_test(); multisampled_depth_buffer_test(); resz_test();

1 0

Michael Stefaniuc : dmloader/tests: Skip the tests if we don' t have IDirectMusicLoader8.
by Alexandre Julliard March 14, 2014

March 14, 2014

Module: wine Branch: master Commit: 79fe43752418e06edd4c47c3b6136ce978742a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79fe43752418e06edd4c47c3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 14 11:14:09 2014 +0100 dmloader/tests: Skip the tests if we don't have IDirectMusicLoader8. --- dlls/dmloader/tests/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 273149d..28adba1 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -29,13 +29,13 @@ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* he static BOOL missing_dmloader(void) { - IDirectMusicLoader *dml; + IDirectMusicLoader8 *dml; HRESULT hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicLoader, (void**)&dml); + &IID_IDirectMusicLoader8, (void**)&dml); if (hr == S_OK && dml) { - IDirectMusicLoader_Release(dml); + IDirectMusicLoader8_Release(dml); return FALSE; } return TRUE;

1 0