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

Akihiro Sagawa : gdi32/tests: GetGlyphOutlineA is broken for johab charset on windows.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: f548ce29ed55193d7589a4e1d6a0864e3320eb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f548ce29ed55193d7589a4e1d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 20 00:28:31 2014 +0900 gdi32/tests: GetGlyphOutlineA is broken for johab charset on windows. --- dlls/gdi32/tests/font.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 259f4a0..a205ac7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4129,7 +4129,6 @@ static void test_GetGlyphOutline(void) {ANSI_CHARSET, 0x30, 0x30}, {SHIFTJIS_CHARSET, 0x82a0, 0x3042}, {HANGEUL_CHARSET, 0x8141, 0xac02}, - {JOHAB_CHARSET, 0x8446, 0x3135}, {GB2312_CHARSET, 0x8141, 0x4e04}, {CHINESEBIG5_CHARSET, 0xa142, 0x3001} };

1 0

Jacek Caban : oleaut32: Fixed vartest.c tests on Windows 8.1.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: b6db22da3bfbe4ab93c953406e76c4674af7051c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6db22da3bfbe4ab93c953406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 20 12:28:12 2014 +0100 oleaut32: Fixed vartest.c tests on Windows 8.1. --- dlls/oleaut32/tests/vartest.c | 11 ++++------- dlls/oleaut32/variant.c | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2f82d9b..d28b5c1 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -542,14 +542,11 @@ static void _test_bstr_var(unsigned line, const VARIANT *v, const char *str) static void test_VariantInit(void) { - VARIANTARG v1, v2; + VARIANT v; - /* Test that VariantInit() only sets the type */ - memset(&v1, -1, sizeof(v1)); - v2 = v1; - V_VT(&v2) = VT_EMPTY; - VariantInit(&v1); - ok(!memcmp(&v1, &v2, sizeof(v1)), "VariantInit() set extra fields\n"); + memset(&v, -1, sizeof(v)); + VariantInit(&v); + ok(V_VT(&v) == VT_EMPTY, "VariantInit() returned vt %d\n", V_VT(&v)); } /* All possible combinations of extra V_VT() flags */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 92cf01b..053903e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -575,7 +575,8 @@ void WINAPI VariantInit(VARIANTARG* pVarg) { TRACE("(%p)\n", pVarg); - V_VT(pVarg) = VT_EMPTY; /* Native doesn't set any other fields */ + /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ + V_VT(pVarg) = VT_EMPTY; } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg)

1 0

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

March 20, 2014

Module: wine Branch: master Commit: cd93070bfd725cedf2dc0fc1182f3f8c6a0971b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd93070bfd725cedf2dc0fc11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:29 2014 +0100 d3d9/tests: Use a separate device for dp2add_ps_test(). --- dlls/d3d9/tests/visual.c | 134 +++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 68 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b142286..bee4b8e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5584,12 +5584,17 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_11); } -static void dp2add_ps_test(IDirect3DDevice9 *device) +static void dp2add_ps_test(void) { - IDirect3DPixelShader9 *shader_dp2add = NULL; - IDirect3DPixelShader9 *shader_dp2add_sat = NULL; - HRESULT hr; + IDirect3DPixelShader9 *shader_dp2add_sat; + IDirect3DPixelShader9 *shader_dp2add; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; /* DP2ADD is defined as: (src0.r * src1.r) + (src0.g * src1.g) + src2. * One D3D restriction of all shader instructions except SINCOS is that no more than 2 @@ -5626,16 +5631,34 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* end */ }; - - const 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, }; + 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(2, 0)) + { + skip("No ps_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_dp2add, &shader_dp2add); @@ -5647,64 +5670,43 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); - if (shader_dp2add) { - - hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } - - color = getPixelColor(device, 360, 240); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), - "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); - - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - - IDirect3DPixelShader9_Release(shader_dp2add); - } else { - skip("dp2add shader creation failed\n"); - } - - if (shader_dp2add_sat) { - - hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add_sat); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw primitive, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + color = getPixelColor(device, 360, 240); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present frame, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(shader_dp2add); - color = getPixelColor(device, 360, 240); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), - "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add_sat); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw primitive, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + color = getPixelColor(device, 360, 240); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), "Got unexpected color 0x%08x.\n", color); - IDirect3DPixelShader9_Release(shader_dp2add_sat); - } else { - skip("dp2add shader creation failed\n"); - } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present frame, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(shader_dp2add_sat); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void cnd_test(IDirect3DDevice9 *device) @@ -15914,11 +15916,6 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { constant_clamp_ps_test(device_ptr); cnd_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { - dp2add_ps_test(device_ptr); - } else { - skip("No ps_2_0 support\n"); - } } } else skip("No ps_1_1 support\n"); @@ -15926,6 +15923,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + dp2add_ps_test(); unbound_sampler_test(); nested_loop_test(); pretransformed_varying_test();

1 0

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

March 20, 2014

Module: wine Branch: master Commit: c0fdad52c2d75cee2f161282245542bd741891c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fdad52c2d75cee2f1612822… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:28 2014 +0100 d3d9/tests: Use a separate device for unbound_sampler_test(). --- dlls/d3d9/tests/visual.c | 48 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 98c6252..b142286 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13506,13 +13506,17 @@ static void ds_size_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(old_ds); } -static void unbound_sampler_test(IDirect3DDevice9 *device) +static void unbound_sampler_test(void) { - HRESULT hr; IDirect3DPixelShader9 *ps, *ps_cube, *ps_volume; IDirect3DSurface9 *rt, *old_rt; - DWORD color; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; static const DWORD ps_code[] = { @@ -13555,12 +13559,29 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f} }; + 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), "GetDeviceCaps failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) + { + skip("No ps_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) || !(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) { - skip("No cube / volume textures support, skipping the unbound sampler test.\n"); - return; + skip("No cube / volume texture support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetTexture(device, 0, NULL); @@ -13585,7 +13606,7 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 ); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetFVF failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x56ffffff, 0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x56ffffff, 1.0f, 0); ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); @@ -13641,17 +13662,16 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) color = getPixelColorFromSurface(rt, 32, 32); ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); - hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetPixelShader failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(rt); IDirect3DSurface9_Release(old_rt); IDirect3DPixelShader9_Release(ps); IDirect3DPixelShader9_Release(ps_cube); IDirect3DPixelShader9_Release(ps_volume); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void update_surface_test(void) @@ -15896,7 +15916,6 @@ START_TEST(visual) cnd_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { dp2add_ps_test(device_ptr); - unbound_sampler_test(device_ptr); } else { skip("No ps_2_0 support\n"); } @@ -15907,6 +15926,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + unbound_sampler_test(); nested_loop_test(); pretransformed_varying_test(); vface_register_test();

1 0

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

March 20, 2014

Module: wine Branch: master Commit: 07c42c9edaa5f52367aa88016c3650412cd53a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c42c9edaa5f52367aa88016… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:27 2014 +0100 d3d9/tests: Use a separate device for nested_loop_test(). --- dlls/d3d9/tests/visual.c | 63 +++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bd49c49..98c6252 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6225,8 +6225,18 @@ static void cnd_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_11); } -static void nested_loop_test(IDirect3DDevice9 *device) +static void nested_loop_test(void) { + IDirect3DVertexShader9 *vshader; + IDirect3DPixelShader9 *shader; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code[] = { 0xffff0300, /* ps_3_0 */ @@ -6250,17 +6260,33 @@ static void nested_loop_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - IDirect3DPixelShader9 *shader; - IDirect3DVertexShader9 *vshader; - HRESULT hr; - DWORD color; - const 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, }; + 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_CreatePixelShader(device, shader_code, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed with %08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, shader); @@ -6271,7 +6297,7 @@ static void nested_loop_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x0000ff00, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x0000ff00, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -6291,12 +6317,13 @@ static void nested_loop_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with %08x\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); IDirect3DPixelShader9_Release(shader); IDirect3DVertexShader9_Release(vshader); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void pretransformed_varying_test(void) @@ -15870,11 +15897,6 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { dp2add_ps_test(device_ptr); unbound_sampler_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { - nested_loop_test(device_ptr); - } else { - skip("No ps_3_0 or vs_3_0 support\n"); - } } else { skip("No ps_2_0 support\n"); } @@ -15885,6 +15907,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + nested_loop_test(); pretransformed_varying_test(); vface_register_test(); vpos_register_test();

1 0

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

March 20, 2014

Module: wine Branch: master Commit: f1d4d8c49dddc4d47e879eba71986b974f3ff86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d4d8c49dddc4d47e879eba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:26 2014 +0100 d3d9/tests: Use a separate device for pretransformed_varying_test(). --- dlls/d3d9/tests/visual.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b3abd87..bd49c49 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6299,7 +6299,7 @@ static void nested_loop_test(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(vshader); } -static void pretransformed_varying_test(IDirect3DDevice9 *device) +static void pretransformed_varying_test(void) { /* dcl_position: fails to compile */ static const DWORD blendweight_code[] = @@ -6483,9 +6483,33 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) }, }; IDirect3DVertexDeclaration9 *decl; - HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; unsigned int i; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT 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 (!(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_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); @@ -6498,7 +6522,7 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) { IDirect3DPixelShader9 *shader; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, tests[i].shader_code, &shader); @@ -6540,6 +6564,11 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) } IDirect3DVertexDeclaration9_Release(decl); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void test_compare_instructions(IDirect3DDevice9 *device) @@ -15843,7 +15872,6 @@ START_TEST(visual) unbound_sampler_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { nested_loop_test(device_ptr); - pretransformed_varying_test(device_ptr); } else { skip("No ps_3_0 or vs_3_0 support\n"); } @@ -15857,6 +15885,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + pretransformed_varying_test(); vface_register_test(); vpos_register_test(); multiple_rendertargets_test();

1 0

Alexandre Julliard : user32/tests: Make a few more messages optional.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: e445303ab45b218585357220c9c2d37d6418ba45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e445303ab45b218585357220c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 11:37:39 2014 +0100 user32/tests: Make a few more messages optional. --- dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e445303ab45b218585357…

1 0

Nikolay Sivov : scrrun/tests: Update idl file in tests.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 40e23cde9ec8a9c49e198301541abd6cfd8f510c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e23cde9ec8a9c49e1983015… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 09:44:51 2014 +0400 scrrun/tests: Update idl file in tests. --- dlls/scrrun/tests/scrrun.idl | 430 +++++++++++++++++++++--------------------- 1 file changed, 210 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40e23cde9ec8a9c49e198…

1 0

Nikolay Sivov : kernel32: Added WerUnregisterMemoryBlock() stub.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 975abdea7f8d9193c49a7c44f4dffeb62c2bc5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975abdea7f8d9193c49a7c44f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 01:07:49 2014 +0400 kernel32: Added WerUnregisterMemoryBlock() stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/wer.c | 12 ++++++++++++ include/werapi.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f8d3a80..3126628 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1275,6 +1275,7 @@ @ stdcall WerRegisterMemoryBlock(ptr long) @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) @ stdcall WerSetFlags(long) +@ stdcall WerUnregisterMemoryBlock(ptr) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) @ stdcall Wow64EnableWow64FsRedirection(long) diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index aa1d530..3c517c4 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -64,8 +64,20 @@ HRESULT WINAPI WerSetFlags(DWORD flags) return E_NOTIMPL; } +/*********************************************************************** + * WerRegisterMemoryBlock (KERNEL32.@) + */ HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size) { FIXME("(%p %d) stub\n", block, size); return E_NOTIMPL; } + +/*********************************************************************** + * WerUnregisterMemoryBlock (KERNEL32.@) + */ +HRESULT WINAPI WerUnregisterMemoryBlock(void *block) +{ + FIXME("(%p) stub\n", block); + return E_NOTIMPL; +} diff --git a/include/werapi.h b/include/werapi.h index 6c3bb24..c66195f 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -175,6 +175,8 @@ typedef struct _WER_EXCEPTION_INFORMATION HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); +HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size); +HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, void *context); HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerReportAddFile(HREPORT, PCWSTR, WER_FILE_TYPE, DWORD); HRESULT WINAPI WerReportCloseHandle(HREPORT); @@ -182,6 +184,8 @@ HRESULT WINAPI WerReportCreate(PCWSTR, WER_REPORT_TYPE, PWER_REPORT_INFORMATION, HRESULT WINAPI WerReportSetParameter(HREPORT, DWORD, PCWSTR, PCWSTR); HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); +HRESULT WINAPI WerSetFlags(DWORD flags); +HRESULT WINAPI WerUnregisterMemoryBlock(void *block); #ifdef __cplusplus }

1 0

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

March 20, 2014

Module: wine Branch: master Commit: c11904b86d0009c84f9bbaf0100608e53742cbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11904b86d0009c84f9bbaf01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:25 2014 +0100 d3d9/tests: Use a separate device for vface_register_test(). --- dlls/d3d9/tests/visual.c | 87 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 39b3449..b3abd87 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8337,10 +8337,20 @@ static void conditional_np2_repeat_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } -static void vFace_register_test(IDirect3DDevice9 *device) +static void vface_register_test(void) { - HRESULT hr; + IDirect3DSurface9 *surface, *backbuffer; + IDirect3DVertexShader9 *vshader; + IDirect3DPixelShader9 *shader; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code[] = { 0xffff0300, /* ps_3_0 */ @@ -8360,34 +8370,51 @@ static void vFace_register_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - IDirect3DPixelShader9 *shader; - IDirect3DVertexShader9 *vshader; - IDirect3DTexture9 *texture; - IDirect3DSurface9 *surface, *backbuffer; - const float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 0.0, 0.1, + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + -1.0f, 0.0f, 0.1f, - 1.0, -1.0, 0.1, - 1.0, 0.0, 0.1, - -1.0, 0.0, 0.1, + 1.0f, -1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, + -1.0f, 0.0f, 0.1f, - -1.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 0.0, 0.1, + -1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, - 1.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1, + 1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; - const float blit[] = { - 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, + static const float blit[] = + { + 0.0f, -1.0f, 0.1f, 0.0f, 0.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; + 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_CreateVertexShader(device, vshader_code, &vshader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); @@ -8396,6 +8423,8 @@ static void vFace_register_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed hr=%08x\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to set cull mode, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, vshader); @@ -8405,7 +8434,7 @@ static void vFace_register_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "IDirect3DDevice9_GetBackBuffer failed hr=%08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + 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_BeginScene(device); @@ -8455,12 +8484,16 @@ static void vFace_register_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); - IDirect3DDevice9_SetTexture(device, 0, NULL); IDirect3DPixelShader9_Release(shader); IDirect3DVertexShader9_Release(vshader); IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(backbuffer); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) @@ -15811,7 +15844,6 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { nested_loop_test(device_ptr); pretransformed_varying_test(device_ptr); - vFace_register_test(device_ptr); } else { skip("No ps_3_0 or vs_3_0 support\n"); } @@ -15825,6 +15857,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + vface_register_test(); vpos_register_test(); multiple_rendertargets_test(); texop_test();

1 0