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

Jacek Caban : mshtml: Added IHTMLStyle:: listStyleType property implementation.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 20108162408c7cf571e6424b35b573bb1a098dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=20108162408c7cf571e6424b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 13:47:56 2014 +0100 mshtml: Added IHTMLStyle::listStyleType property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c85e4db..d2d2fc8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -126,6 +126,8 @@ static const WCHAR attrLetterSpacing[] = {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR attrLineHeight[] = {'l','i','n','e','-','h','e','i','g','h','t',0}; +static const WCHAR attrListStyleType[] = + {'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0}; static const WCHAR attrMargin[] = {'m','a','r','g','i','n',0}; static const WCHAR attrMarginBottom[] = @@ -241,6 +243,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT}, + {attrListStyleType, DISPID_IHTMLSTYLE_LISTSTYLETYPE}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, @@ -2168,15 +2171,19 @@ static HRESULT WINAPI HTMLStyle_get_visibility(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_listStyleType(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_LISTSTYLETYPE, v, 0); } static HRESULT WINAPI HTMLStyle_get_listStyleType(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_LISTSTYLETYPE, p); } static HRESULT WINAPI HTMLStyle_put_listStylePosition(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9294015..030d8a1 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -78,6 +78,7 @@ typedef enum { STYLEID_LEFT, STYLEID_LETTER_SPACING, STYLEID_LINE_HEIGHT, + STYLEID_LISTSTYLETYPE, STYLEID_MARGIN, STYLEID_MARGIN_BOTTOM, STYLEID_MARGIN_LEFT, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 2df585a..3c68f61 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2092,6 +2092,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "nowrap"), "whiteSpace = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + /* listStyleType */ + hres = IHTMLStyle_get_listStyleType(style, &str); + ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); + ok(!str, "listStyleType = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("square"); + hres = IHTMLStyle_put_listStyleType(style, str); + ok(hres == S_OK, "put_listStyleType failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle_get_listStyleType(style, &str); + ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); + ok(!strcmp_wa(str, "square"), "listStyleType = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : vbscript: Fixed a leak.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 7aaf597db12477a1d9d05737742dbed882f49694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aaf597db12477a1d9d057377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 13:49:33 2014 +0100 vbscript: Fixed a leak. --- dlls/vbscript/compile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 609bb66..e1245d6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -873,8 +873,10 @@ static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t * if(FAILED(hres)) break; - if(!emit_catch_jmp(ctx, 0, case_labels[i])) - return E_OUTOFMEMORY; + if(!emit_catch_jmp(ctx, 0, case_labels[i])) { + hres = E_OUTOFMEMORY; + break; + } } }

1 0

Dmitry Timoshkov : schedsvc: Skip the UTF-8 byte order mark when returing XML to the client.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 285922ca7115424bb4bf3ce5b5bda7ffba8eba96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=285922ca7115424bb4bf3ce5b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 24 16:08:34 2014 +0900 schedsvc: Skip the UTF-8 byte order mark when returing XML to the client. --- dlls/schedsvc/schedsvc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 988430d..5c7d359 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); +static const char bom_utf8[] = { 0xef,0xbb,0xbf }; + HRESULT __cdecl SchRpcHighestVersion(DWORD *version) { TRACE("%p\n", version); @@ -105,7 +107,6 @@ static HRESULT create_directory(const WCHAR *path) static HRESULT write_xml_utf8(const WCHAR *name, DWORD disposition, const WCHAR *xmlW) { - static const char bom_utf8[] = { 0xef,0xbb,0xbf }; static const char comment[] = "\n"; HANDLE hfile; DWORD size; @@ -220,8 +221,6 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl static int detect_encoding(const void *buffer, DWORD size) { - static const char bom_utf8[] = { 0xef,0xbb,0xbf }; - if (size >= sizeof(bom_utf8) && !memcmp(buffer, bom_utf8, sizeof(bom_utf8))) return CP_UTF8; else @@ -270,6 +269,9 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) return S_OK; } + if (cp == CP_UTF8 && size >= sizeof(bom_utf8) && !memcmp(src, bom_utf8, sizeof(bom_utf8))) + src += sizeof(bom_utf8); + size = MultiByteToWideChar(cp, 0, src, -1, NULL, 0); *xml = heap_alloc(size * sizeof(WCHAR)); if (!*xml) return E_OUTOFMEMORY;

1 0

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

March 24, 2014

Module: wine Branch: master Commit: 65c9b48de6f6b1c47089413bea8edcf0846169d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c9b48de6f6b1c47089413be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 24 11:31:33 2014 +0100 d3d9/tests: Use a separate device for texdepth_test(). --- dlls/d3d9/tests/visual.c | 71 +++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9d3d201..1d27326 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4679,17 +4679,24 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9_Release(decl4); } -static void texdepth_test(IDirect3DDevice9 *device) +static void texdepth_test(void) { IDirect3DPixelShader9 *shader; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; HRESULT hr; - const float texdepth_test_data1[] = { 0.25, 2.0, 0.0, 0.0}; - const float texdepth_test_data2[] = { 0.25, 0.5, 0.0, 0.0}; - const float texdepth_test_data3[] = {-1.00, 0.1, 0.0, 0.0}; - const float texdepth_test_data4[] = {-0.25, -0.5, 0.0, 0.0}; - const float texdepth_test_data5[] = { 1.00, -0.1, 0.0, 0.0}; - const float texdepth_test_data6[] = { 1.00, 0.5, 0.0, 0.0}; - const float texdepth_test_data7[] = { 0.50, 0.0, 0.0, 0.0}; + + static const float texdepth_test_data1[] = { 0.25f, 2.0f, 0.0f, 0.0f}; + static const float texdepth_test_data2[] = { 0.25f, 0.5f, 0.0f, 0.0f}; + static const float texdepth_test_data3[] = {-1.00f, 0.1f, 0.0f, 0.0f}; + static const float texdepth_test_data4[] = {-0.25f, -0.5f, 0.0f, 0.0f}; + static const float texdepth_test_data5[] = { 1.00f, -0.1f, 0.0f, 0.0f}; + static const float texdepth_test_data6[] = { 1.00f, 0.5f, 0.0f, 0.0f}; + static const float texdepth_test_data7[] = { 0.50f, 0.0f, 0.0f, 0.0f}; static const DWORD shader_code[] = { 0xffff0104, /* ps_1_4 */ @@ -4700,19 +4707,40 @@ static void texdepth_test(IDirect3DDevice9 *device) 0x00000001, 0x800f0000, 0xa0e40001, /* mov r0, c1 */ 0x0000ffff /* end */ }; - DWORD color; - float vertex[] = { - -1.0, -1.0, 0.0, - 1.0, -1.0, 1.0, - -1.0, 1.0, 0.0, - 1.0, 1.0, 1.0 + static const float vertex[] = + { + -1.0f, -1.0f, 0.0f, + -1.0f, 1.0f, 0.0f, + 1.0f, -1.0f, 1.0f, + 1.0f, 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(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffff00, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\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_ZENABLE, D3DZB_TRUE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); @@ -4897,15 +4925,12 @@ static void texdepth_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - /* Cleanup */ - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed (%08x)\n", hr); IDirect3DPixelShader9_Release(shader); - - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState 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 texkill_test(void) @@ -16043,13 +16068,13 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) { texbem_test(device_ptr); - texdepth_test(device_ptr); } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + texdepth_test(); texkill_test(); x8l8v8u8_test(); volume_v16u16_test();

1 0

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

March 24, 2014

Module: wine Branch: master Commit: aded2bb23ca1d745a32771d91f74ebe442c16ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aded2bb23ca1d745a32771d91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 24 11:31:34 2014 +0100 d3d9/tests: Use a separate device for texbem_test(). --- dlls/d3d9/tests/visual.c | 136 +++++++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 61 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1d27326..c736bfb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2179,23 +2179,36 @@ static void generate_bumpmap_textures(IDirect3DDevice9 *device) { } } -/* test the behavior of the texbem instruction - * with normal 2D and projective 2D textures - */ -static void texbem_test(IDirect3DDevice9 *device) +/* Test the behavior of the texbem instruction with normal 2D and projective + * 2D textures. */ +static void texbem_test(void) { - HRESULT hr; + IDirect3DVertexDeclaration9 *vertex_declaration = NULL; + /* Use asymmetric matrix to test loading. */ + float bumpenvmat[4] = {0.0f, 0.5f, -0.5f, 0.0f}; + IDirect3DPixelShader9 *pixel_shader = NULL; + IDirect3DTexture9 *texture1, *texture2; + IDirect3DTexture9 *texture = NULL; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; int i; - static const DWORD pixel_shader_code[] = { + static const DWORD pixel_shader_code[] = + { 0xffff0101, /* ps_1_1*/ 0x00000042, 0xb00f0000, /* tex t0*/ 0x00000043, 0xb00f0001, 0xb0e40000, /* texbem t1, t0*/ 0x00000001, 0x800f0000, 0xb0e40001, /* mov r0, t1*/ 0x0000ffff }; - static const DWORD double_texbem_code[] = { + static const DWORD double_texbem_code[] = + { 0xffff0103, /* ps_1_3 */ 0x00000042, 0xb00f0000, /* tex t0 */ 0x00000043, 0xb00f0001, 0xb0e40000, /* texbem t1, t0 */ @@ -2204,40 +2217,61 @@ static void texbem_test(IDirect3DDevice9 *device) 0x00000002, 0x800f0000, 0xb0e40001, 0xb0e40003, /* add r0, t1, t3 */ 0x0000ffff /* end */ }; - - - static const float quad[][7] = { + static const float quad[][7] = + { {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f}, {-128.0f/640.0f, 128.0f/480.0f, 0.1f, 0.0f, 1.0f, 0.0f, 1.0f}, { 128.0f/640.0f, -128.0f/480.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f}, { 128.0f/640.0f, 128.0f/480.0f, 0.1f, 1.0f, 1.0f, 1.0f, 1.0f}, }; - static const float quad_proj[][9] = { + static const float quad_proj[][9] = + { {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 128.0f}, {-128.0f/640.0f, 128.0f/480.0f, 0.1f, 0.0f, 1.0f, 0.0f, 128.0f, 0.0f, 128.0f}, { 128.0f/640.0f, -128.0f/480.0f, 0.1f, 1.0f, 0.0f, 128.0f, 0.0f, 0.0f, 128.0f}, { 128.0f/640.0f, 128.0f/480.0f, 0.1f, 1.0f, 1.0f, 128.0f, 128.0f, 0.0f, 128.0f}, }; + static const float double_quad[] = + { + -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.5f, 0.0f, 0.0f, 0.5f, 0.5f, + -1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.5f, 0.0f, 0.0f, 0.5f, 0.5f, + 1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.5f, 0.0f, 0.0f, 0.5f, 0.5f, + 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.5f, 0.0f, 0.0f, 0.5f, 0.5f, + }; + static const D3DVERTEXELEMENT9 decl_elements[][4] = + { + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + {0, 20, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, + D3DDECL_END() + }, + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + {0, 20, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, + D3DDECL_END() + }, + }; - static const D3DVERTEXELEMENT9 decl_elements[][4] = { { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - {0, 20, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, - D3DDECL_END() - },{ - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - {0, 20, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, - D3DDECL_END() - } }; - - /* use asymmetric matrix to test loading */ - float bumpenvmat[4] = {0.0,0.5,-0.5,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; + } - IDirect3DVertexDeclaration9 *vertex_declaration = NULL; - IDirect3DPixelShader9 *pixel_shader = NULL; - IDirect3DTexture9 *texture = NULL, *texture1, *texture2; - D3DLOCKED_RECT locked_rect; + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } generate_bumpmap_textures(device); @@ -2250,7 +2284,7 @@ static void texbem_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff00ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); for(i=0; i<2; i++) @@ -2427,34 +2461,14 @@ static void texbem_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_SetSamplerState returned %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "BeginScene failed (0x%08x)\n", hr); - if(SUCCEEDED(hr)) { - static const float double_quad[] = { - -1.0, -1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, - 1.0, -1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, - -1.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, - 1.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, - }; - - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, double_quad, sizeof(float) * 11); - ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); - } + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, double_quad, sizeof(float) * 11); + 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); color = getPixelColor(device, 320, 240); ok(color == 0x00ffff00, "double texbem failed: Got color 0x%08x, expected 0x00ffff00.\n", color); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 1, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 2, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 3, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "Direct3DDevice9_SetPixelShader failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); @@ -2462,6 +2476,11 @@ static void texbem_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); IDirect3DTexture9_Release(texture1); IDirect3DTexture9_Release(texture2); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void z_range_test(IDirect3DDevice9 *device) @@ -16065,15 +16084,10 @@ START_TEST(visual) } else skip("No vs_2_0 and ps_2_0 support\n"); - if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) - { - texbem_test(device_ptr); - } - else skip("No ps_1_1 support\n"); - cleanup_device(device_ptr); device_ptr = NULL; + texbem_test(); texdepth_test(); texkill_test(); x8l8v8u8_test();

1 0

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

March 24, 2014

Module: wine Branch: master Commit: 0be10d60503549a2ae25d7efa4a63e946782226b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be10d60503549a2ae25d7efa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 24 11:31:35 2014 +0100 d3d9/tests: Use a separate device for fog_with_shader_test(). --- dlls/d3d9/tests/visual.c | 106 +++++++++++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 38 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c736bfb..29649d8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1746,17 +1746,25 @@ out: * linear table fog with non foggy vertex shader * vertex fog with foggy vertex shader, non-linear * fog with shader, non-linear fog with foggy shader, - * linear table fog with foggy shader - */ -static void fog_with_shader_test(IDirect3DDevice9 *device) + * linear table fog with foggy shader */ +static void fog_with_shader_test(void) { - HRESULT hr; + IDirect3DVertexShader9 *vertex_shader[4] = {NULL, NULL, NULL, NULL}; + IDirect3DPixelShader9 *pixel_shader[3] = {NULL, NULL, NULL}; + IDirect3DVertexDeclaration9 *vertex_declaration = NULL; + IDirect3DDevice9 *device; + unsigned int i, j; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; - union { + HWND window; + HRESULT hr; + union + { float f; DWORD i; } start, end; - unsigned int i, j; /* basic vertex shader without fog computation ("non foggy") */ static const DWORD vertex_shader_code1[] = @@ -1808,32 +1816,31 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ 0x0000ffff }; - - static struct vertex quad[] = { + static struct vertex quad[] = + { {-1.0f, -1.0f, 0.0f, 0xffff0000 }, {-1.0f, 1.0f, 0.0f, 0xffff0000 }, { 1.0f, -1.0f, 0.0f, 0xffff0000 }, { 1.0f, 1.0f, 0.0f, 0xffff0000 }, }; - - static const D3DVERTEXELEMENT9 decl_elements[] = { + static const D3DVERTEXELEMENT9 decl_elements[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, D3DDECL_END() }; - - IDirect3DVertexDeclaration9 *vertex_declaration = NULL; - IDirect3DVertexShader9 *vertex_shader[4] = {NULL, NULL, NULL, NULL}; - IDirect3DPixelShader9 *pixel_shader[3] = {NULL, NULL, NULL}; - - /* This reference data was collected on a nVidia GeForce 7600GS driver version 84.19 DirectX version 9.0c on Windows XP */ - static const struct test_data_t { + /* This reference data was collected on a nVidia GeForce 7600GS driver + * version 84.19 DirectX version 9.0c on Windows XP. */ + static const struct test_data_t + { int vshader; int pshader; D3DFOGMODE vfog; D3DFOGMODE tfog; unsigned int color[11]; - } test_data[] = { + } + test_data[] = + { /* only pixel shader: */ {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, @@ -2010,10 +2017,43 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, }; + 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, + }}}; - /* NOTE: changing these values will not affect the tests with foggy vertex shader, as the values are hardcoded in the shader*/ - start.f=0.1f; - end.f=0.9f; + 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.VertexShaderVersion < D3DVS_VERSION(2, 0) || caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) + { + skip("No shader model 2 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + /* NOTE: Changing these values will not affect the tests with foggy vertex + * shader, as the values are hardcoded in the shader. */ + start.f = 0.1f; + end.f = 0.9f; + + /* Some of the 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_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); @@ -2068,7 +2108,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) quad[2].z = 0.001f + (float)j / 10.02f; quad[3].z = 0.001f + (float)j / 10.02f; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff00ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -2090,22 +2130,17 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) } } - /* reset states */ - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(hr == D3D_OK, "Turning off fog calculations failed (%08x)\n", hr); - IDirect3DVertexShader9_Release(vertex_shader[1]); IDirect3DVertexShader9_Release(vertex_shader[2]); IDirect3DVertexShader9_Release(vertex_shader[3]); IDirect3DPixelShader9_Release(pixel_shader[1]); IDirect3DPixelShader9_Release(pixel_shader[2]); 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 generate_bumpmap_textures(IDirect3DDevice9 *device) { @@ -16078,15 +16113,10 @@ START_TEST(visual) } else skip("No vs_2_0 support\n"); - if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0) && caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) - { - fog_with_shader_test(device_ptr); - } - else skip("No vs_2_0 and ps_2_0 support\n"); - cleanup_device(device_ptr); device_ptr = NULL; + fog_with_shader_test(); texbem_test(); texdepth_test(); texkill_test();

1 0

Nikolay Sivov : oleaut32/tests: Remove early returns on test failure that never happen.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 02228ff5854083a688f85b0f623c7cc8e1421026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02228ff5854083a688f85b0f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 24 20:00:57 2014 +0400 oleaut32/tests: Remove early returns on test failure that never happen. --- dlls/oleaut32/tests/safearray.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index cc6a62c..2be8b06 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1080,8 +1080,6 @@ static void test_SafeArrayGetPutElement(void) return; /* Some early versions can't handle > 3 dims */ ok(sa->cbElements == sizeof(value), "int size mismatch\n"); - if (sa->cbElements != sizeof(value)) - return; /* Failure cases */ for (x = 0; x < NUM_DIMENSIONS; x++) @@ -1233,8 +1231,6 @@ static void test_SafeArrayGetPutElement_BSTR(void) return; ok(sa->cbElements == sizeof(BSTR), "BSTR size mismatch\n"); - if (sa->cbElements != sizeof(BSTR)) - return; indices[0] = sab.lLbound; value = SysAllocString(szTest); @@ -1297,8 +1293,6 @@ static void test_SafeArrayGetPutElement_IUnknown(void) return; ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - if (sa->cbElements != sizeof(LPUNKNOWN)) - return; indices[0] = sab.lLbound; xtunk.ref = 1; @@ -1331,8 +1325,6 @@ static void test_SafeArrayRedim_IUnknown(void) return; ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - if (sa->cbElements != sizeof(LPUNKNOWN)) - return; indices[0] = 2; xtunk.ref = 1; @@ -1363,8 +1355,6 @@ static void test_SafeArrayGetPutElement_VARIANT(void) return; ok(sa->cbElements == sizeof(VARIANT), "VARIANT size mismatch\n"); - if (sa->cbElements != sizeof(VARIANT)) - return; indices[0] = sab.lLbound; V_VT(&value) = VT_I4; @@ -1418,8 +1408,6 @@ static void test_SafeArrayCopyData(void) return; ok(sa->cbElements == sizeof(int), "int size mismatch\n"); - if (sa->cbElements != sizeof(int)) - return; /* Fill the source array with some data; it doesn't matter what */ for (dimension = 0; dimension < size; dimension++)

1 0

Ken Thomases : winemac: Improve handling of swap interval with respect to pbuffers, clamping to 0.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: fc37ed94d85fb951aad9c94fa3b3ac946f4670ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc37ed94d85fb951aad9c94fa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:44:25 2014 -0500 winemac: Improve handling of swap interval with respect to pbuffers, clamping to 0. --- dlls/winemac.drv/opengl.c | 66 ++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 4265797..0187822 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1504,13 +1504,25 @@ static BOOL set_swap_interval(struct wgl_context *context, long interval) */ static void sync_swap_interval(struct wgl_context *context) { - struct macdrv_win_data *data; - - if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) && - (data = get_win_data(context->draw_hwnd))) + if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE)) { - set_swap_interval(context, data->swap_interval); - release_win_data(data); + int interval; + + if (context->draw_hwnd) + { + struct macdrv_win_data *data = get_win_data(context->draw_hwnd); + if (data) + { + interval = data->swap_interval; + release_win_data(data); + } + else /* window was destroyed? */ + interval = 1; + } + else /* pbuffer */ + interval = 0; + + set_swap_interval(context, interval); } } @@ -2718,6 +2730,10 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w SetLastError(ERROR_INVALID_PIXEL_FORMAT); return FALSE; } + + if (allow_vsync && + (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || pbuffer != context->draw_pbuffer)) + set_swap_interval(context, 0); } else { @@ -3019,7 +3035,7 @@ static BOOL macdrv_wglSetPixelFormatWINE(HDC hdc, int fmt) static BOOL macdrv_wglSwapIntervalEXT(int interval) { struct wgl_context *context = NtCurrentTeb()->glContext; - struct macdrv_win_data *data; + BOOL changed = FALSE; TRACE("interval %d\n", interval); @@ -3031,6 +3047,20 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) if (interval > 1) interval = 1; + if (context->draw_hwnd) + { + struct macdrv_win_data *data = get_win_data(context->draw_hwnd); + if (data) + { + changed = data->swap_interval != interval; + if (changed) + data->swap_interval = interval; + release_win_data(data); + } + } + else /* pbuffer */ + interval = 0; + InterlockedExchange(&context->update_swap_interval, FALSE); if (!set_swap_interval(context, interval)) { @@ -3038,25 +3068,17 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) return FALSE; } - if ((data = get_win_data(context->draw_hwnd))) + if (changed) { - BOOL changed = data->swap_interval != interval; - if (changed) - data->swap_interval = interval; - release_win_data(data); + struct wgl_context *ctx; - if (changed) + EnterCriticalSection(&context_section); + LIST_FOR_EACH_ENTRY(ctx, &context_list, struct wgl_context, entry) { - struct wgl_context *ctx; - - EnterCriticalSection(&context_section); - LIST_FOR_EACH_ENTRY(ctx, &context_list, struct wgl_context, entry) - { - if (ctx != context && ctx->draw_hwnd == context->draw_hwnd) - InterlockedExchange(&context->update_swap_interval, TRUE); - } - LeaveCriticalSection(&context_section); + if (ctx != context && ctx->draw_hwnd == context->draw_hwnd) + InterlockedExchange(&context->update_swap_interval, TRUE); } + LeaveCriticalSection(&context_section); } return TRUE;

1 0

Nikolay Sivov : scrrun: Implement OpenAsTextStream().
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: f674ddee2896b9ea0d433aac86cd5cecb7b43c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f674ddee2896b9ea0d433aac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 23 22:25:36 2014 +0400 scrrun: Implement OpenAsTextStream(). --- dlls/scrrun/filesystem.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c6dbb76..ec4890a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2456,11 +2456,18 @@ static HRESULT WINAPI file_Move(IFile *iface, BSTR Destination) return E_NOTIMPL; } -static HRESULT WINAPI file_OpenAsTextStream(IFile *iface, IOMode IOMode, Tristate Format, ITextStream **ppts) +static HRESULT WINAPI file_OpenAsTextStream(IFile *iface, IOMode mode, Tristate format, ITextStream **stream) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%x %x %p)\n", This, IOMode, Format, ppts); - return E_NOTIMPL; + + TRACE("(%p)->(%d %d %p)\n", This, mode, format, stream); + + if (format == TristateUseDefault) { + FIXME("default format not handled, defaulting to unicode\n"); + format = TristateTrue; + } + + return create_textstream(This->path, OPEN_EXISTING, mode, format == TristateTrue, stream); } static const IFileVtbl file_vtbl = {

1 0

Austin English : winhttp: Skip tests on broken ISPs.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 9665d5a409d96cfc5d893ad990a86bf9c6b8b67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9665d5a409d96cfc5d893ad99… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Mar 22 14:34:26 2014 -0700 winhttp: Skip tests on broken ISPs. --- dlls/winhttp/tests/winhttp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e14f366..354f46f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1721,6 +1721,11 @@ static void test_resolve_timeout(void) SetLastError(0xdeadbeef); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if(ret == 1) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } ok(!ret, "sent request\n"); ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError());

1 0