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

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderTopWidth.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 931bf681ab09f100185ae6bc84c750376be32782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=931bf681ab09f100185ae6bc8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:32:41 2009 +1100 mshtml: Implement IHTMLStyle get/put borderTopWidth. --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a199a3c..7c08a5e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -63,6 +63,8 @@ static const WCHAR attrBorderStyle[] = {'b','o','r','d','e','r','-','s','t','y','l','e',0}; static const WCHAR attrBorderTopStyle[] = {'b','o','r','d','e','r','-','t','o','p','-','s','t','y','l','e',0}; +static const WCHAR attrBorderTopWidth[] = + {'b','o','r','d','e','r','-','t','o','p','-','w','i','d','t','h',0}; static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrColor[] = @@ -134,6 +136,7 @@ static const struct{ {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, {attrBorderStyle, DISPID_IHTMLSTYLE_BORDERSTYLE}, {attrBorderTopStyle, DISPID_IHTMLSTYLE_BORDERTOPSTYLE}, + {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, @@ -1517,15 +1520,17 @@ static HRESULT WINAPI HTMLStyle_get_borderWidth(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderTopWidth(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_TOP_WIDTH, &v, 0); } static HRESULT WINAPI HTMLStyle_get_borderTopWidth(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_TOP_WIDTH, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderRightWidth(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index b5fa230..92cfcbb 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -49,6 +49,7 @@ typedef enum { STYLEID_BORDER_RIGHT_STYLE, STYLEID_BORDER_STYLE, STYLEID_BORDER_TOP_STYLE, + STYLEID_BORDER_TOP_WIDTH, STYLEID_BORDER_WIDTH, STYLEID_COLOR, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 50f55b1..5aaec99 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3467,6 +3467,25 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_backgroundPositionY failed: %08x\n", hres); VariantClear(&vDefault); + /* borderTopWidth */ + hres = IHTMLStyle_get_borderTopWidth(style, &vDefault); + ok(hres == S_OK, "get_borderTopWidth: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10px"); + hres = IHTMLStyle_put_borderTopWidth(style, v); + ok(hres == S_OK, "put_borderTopWidth: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderTopWidth(style, &v); + ok(hres == S_OK, "get_borderTopWidth: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expected 10px = %s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderTopWidth(style, vDefault); + ok(hres == S_OK, "put_borderTopWidth: %08x\n", hres); + VariantClear(&vDefault); + 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

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put backgroundPositionY.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: e44608c896c7731a4e65fe8839c516648db29c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44608c896c7731a4e65fe883… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:26:36 2009 +1100 mshtml: Implement IHTMLStyle get/put backgroundPositionY. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 82d4869..a199a3c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -43,6 +43,8 @@ static const WCHAR attrBackgroundImage[] = {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0}; static const WCHAR attrBackgroundPositionX[] = {'b','a','c','k','g','r','o','u','n','d','-','p','o','s','i','t','i','o','n','-','x',0}; +static const WCHAR attrBackgroundPositionY[] = + {'b','a','c','k','g','r','o','u','n','d','-','p','o','s','i','t','i','o','n','-','y',0}; static const WCHAR attrBackgroundRepeat[] = {'b','a','c','k','g','r','o','u','n','d','-','r','e','p','e','a','t',0}; static const WCHAR attrBorder[] = @@ -122,6 +124,7 @@ static const struct{ {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBackgroundPositionX, DISPID_IHTMLSTYLE_BACKGROUNDPOSITIONX}, + {attrBackgroundPositionY, DISPID_IHTMLSTYLE_BACKGROUNDPOSITIONY}, {attrBackgroundRepeat, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, @@ -891,15 +894,15 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionX(IHTMLStyle *iface, VARIA static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_POSITION_Y, &v, 0); } static HRESULT WINAPI HTMLStyle_get_backgroundPositionY(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_POSITION_Y, p, 0); } static HRESULT WINAPI HTMLStyle_put_wordSpacing(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 407a4ab..b5fa230 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -39,6 +39,7 @@ typedef enum { STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, STYLEID_BACKGROUND_POSITION_X, + STYLEID_BACKGROUND_POSITION_Y, STYLEID_BACKGROUND_REPEAT, STYLEID_BORDER, STYLEID_BORDER_BOTTOM_STYLE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2a67585..50f55b1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3448,6 +3448,25 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_backgroundPositionX failed: %08x\n", hres); VariantClear(&vDefault); + /* backgroundPositionY */ + hres = IHTMLStyle_get_backgroundPositionY(style, &vDefault); + ok(hres == S_OK, "get_backgroundPositionY failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10px"); + hres = IHTMLStyle_put_backgroundPositionY(style, v); + ok(hres == S_OK, "put_backgroundPositionY failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_backgroundPositionY(style, &v); + ok(hres == S_OK, "get_backgroundPositionY failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + VariantClear(&v); + + hres = IHTMLStyle_put_backgroundPositionY(style, vDefault); + ok(hres == S_OK, "put_backgroundPositionY failed: %08x\n", hres); + VariantClear(&vDefault); + 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

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put backgroundPositionX.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 6937ddca8e3e0c2135632dd0117c51f80e780a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6937ddca8e3e0c2135632dd01… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:24:24 2009 +1100 mshtml: Implement IHTMLStyle get/put backgroundPositionX. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 96ab9a4..82d4869 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -41,6 +41,8 @@ static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrBackgroundImage[] = {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0}; +static const WCHAR attrBackgroundPositionX[] = + {'b','a','c','k','g','r','o','u','n','d','-','p','o','s','i','t','i','o','n','-','x',0}; static const WCHAR attrBackgroundRepeat[] = {'b','a','c','k','g','r','o','u','n','d','-','r','e','p','e','a','t',0}; static const WCHAR attrBorder[] = @@ -119,6 +121,7 @@ static const struct{ {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, + {attrBackgroundPositionX, DISPID_IHTMLSTYLE_BACKGROUNDPOSITIONX}, {attrBackgroundRepeat, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, @@ -874,15 +877,15 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPosition(IHTMLStyle *iface, BSTR * static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_POSITION_X, &v, 0); } static HRESULT WINAPI HTMLStyle_get_backgroundPositionX(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_POSITION_X, p, 0); } static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a275c3a..407a4ab 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -38,6 +38,7 @@ typedef enum { STYLEID_BACKGROUND, STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, + STYLEID_BACKGROUND_POSITION_X, STYLEID_BACKGROUND_REPEAT, STYLEID_BORDER, STYLEID_BORDER_BOTTOM_STYLE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f09a78b..2a67585 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3429,6 +3429,25 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_borderLeft failed: %08x\n", hres); SysFreeString(sDefault); + /* backgroundPositionX */ + hres = IHTMLStyle_get_backgroundPositionX(style, &vDefault); + ok(hres == S_OK, "get_backgroundPositionX failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10px"); + hres = IHTMLStyle_put_backgroundPositionX(style, v); + ok(hres == S_OK, "put_backgroundPositionX failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_backgroundPositionX(style, &v); + ok(hres == S_OK, "get_backgroundPositionX failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + VariantClear(&v); + + hres = IHTMLStyle_put_backgroundPositionX(style, vDefault); + ok(hres == S_OK, "put_backgroundPositionX failed: %08x\n", hres); + VariantClear(&vDefault); + 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

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_get_borderLeft.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 48cbc036a3f630f14241057411d70f88d72ce462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48cbc036a3f630f1424105741… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 22:01:16 2009 +1100 mshtml: Implement IHTMLStyle_get_borderLeft. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d7d4f50..96ab9a4 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1414,8 +1414,10 @@ static HRESULT WINAPI HTMLStyle_put_borderLeft(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_borderLeft(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_BORDER_LEFT, p); } static HRESULT WINAPI HTMLStyle_put_borderColor(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4b13ed5..f09a78b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3395,6 +3395,40 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_borderColor failed: %08x\n", hres); SysFreeString(sDefault); + /* BorderLeft */ + hres = IHTMLStyle_get_borderLeft(style, &sDefault); + ok(hres == S_OK, "get_borderLeft failed: %08x\n", hres); + + str = a2bstr("thick dotted red"); + hres = IHTMLStyle_put_borderLeft(style, str); + ok(hres == S_OK, "put_borderLeft failed: %08x\n", hres); + SysFreeString(str); + + /* IHTMLStyle_get_borderLeft appears to have a bug where + it returns the first letter of the color. So we check + each style individually. + */ + V_BSTR(&v) = NULL; + hres = IHTMLStyle_get_borderLeftColor(style, &v); + todo_wine ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres); + todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_BSTR(&v) = NULL; + hres = IHTMLStyle_get_borderLeftWidth(style, &v); + todo_wine ok(hres == S_OK, "get_borderLeftWidth failed: %08x\n", hres); + todo_wine ok(!strcmp_wa(V_BSTR(&v), "thick"), "str=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_get_borderLeftStyle(style, &str); + ok(hres == S_OK, "get_borderLeftStyle failed: %08x\n", hres); + ok(!strcmp_wa(str, "dotted"), "str=%s\n", dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLStyle_put_borderLeft(style, sDefault); + ok(hres == S_OK, "put_borderLeft failed: %08x\n", hres); + SysFreeString(sDefault); + 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

Paul Vriens : mshtml/tests: Fix some typos.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 53a4e174f9e1049d0ffe33c8ee26d06ee50f9f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a4e174f9e1049d0ffe33c8e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 6 13:23:41 2009 +0100 mshtml/tests: Fix some typos. --- dlls/mshtml/tests/dom.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8bc393a..4b13ed5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -486,7 +486,7 @@ static IHTMLElement *_get_elem_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement: %08x\n", hres); return elem; } @@ -497,7 +497,7 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement2, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement2: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); return elem; } @@ -508,7 +508,7 @@ static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement3, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement3: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement3: %08x\n", hres); return elem; } @@ -519,7 +519,7 @@ static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); - ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLDOMNode: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); return node; }

1 0

Paul Vriens : gdiplus/tests: Fix two test failures on Win98.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: b7219295ccfa2dec30a12e0f52aa2c8513a98f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7219295ccfa2dec30a12e0f5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 6 13:06:39 2009 +0100 gdiplus/tests: Fix two test failures on Win98. --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 12fab7c..5d46c8b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -229,6 +229,7 @@ static void test_SavingImages(void) const REAL WIDTH = 10.0, HEIGHT = 20.0; REAL w, h; ImageCodecInfo *codecs; + static const CHAR filenameA[] = "a.bmp"; static const WCHAR filename[] = { 'a','.','b','m','p',0 }; codecs = NULL; @@ -280,7 +281,7 @@ static void test_SavingImages(void) GdipFree(codecs); if (bm) GdipDisposeImage((GpImage*)bm); - ok(DeleteFileW(filename), "Delete failed.\n"); + ok(DeleteFileA(filenameA), "Delete failed.\n"); } static void test_encoders(void) @@ -292,7 +293,7 @@ static void test_encoders(void) int i; int bmp_found; - static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; + static const CHAR bmp_format[] = "BMP"; stat = GdipGetImageEncodersSize(&n, &s); expect(stat, Ok); @@ -319,8 +320,13 @@ static void test_encoders(void) bmp_found = FALSE; for (i = 0; i < n; i++) { - if (CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, - codecs[i].FormatDescription, -1, + CHAR desc[32]; + + WideCharToMultiByte(CP_ACP, 0, codecs[i].FormatDescription, -1, + desc, 32, 0, 0); + + if (CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, + desc, -1, bmp_format, -1) == CSTR_EQUAL) { bmp_found = TRUE; break;

1 0

Paul Vriens : shdocvw/tests: Add a missing FreeLibrary().
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 4f65338a05c2cb23c79d5ccc4984cb4553246476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f65338a05c2cb23c79d5ccc4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 6 12:19:43 2009 +0100 shdocvw/tests: Add a missing FreeLibrary(). --- dlls/shdocvw/tests/shdocvw.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index 8e7b1f3..17ea8d0 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -357,4 +357,5 @@ START_TEST(shdocvw) test_URLSubRegQueryA(); test_ParseURLFromOutsideSourceA(); test_ParseURLFromOutsideSourceW(); + FreeLibrary(hshdocvw); }

1 0

Paul Vriens : ole32/tests: Remove an unused function declaration.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: e31df3616afeb58bced858c9ca8be3bd501d8301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31df3616afeb58bced858c9c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 6 12:15:28 2009 +0100 ole32/tests: Remove an unused function declaration. --- dlls/ole32/tests/dragdrop.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index b759981..b28a831 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -31,9 +31,6 @@ #include "wine/test.h" -/* functions that are not present on all versions of Windows */ -HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); - static int droptarget_addref_called; static int droptarget_release_called;

1 0

Michael Stefaniuc : twain_32/tests: Remove superfluous pointer casts.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 77f0a71d251d4677a7c8625270b666ecfb3685a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f0a71d251d4677a7c862527… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 14:10:51 2009 +0100 twain_32/tests: Remove superfluous pointer casts. --- dlls/twain_32/tests/dsm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 17c106b..c1f92f5 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -106,7 +106,7 @@ static void check_get(TW_CAPABILITY *pCapability, TW_INT32 actual_support, { if (pCapability->ConType == TWON_ONEVALUE) { - TW_ONEVALUE *onev = (TW_ONEVALUE *) p; + TW_ONEVALUE *onev = p; ok(onev->Item == orig_value || !(actual_support & TWQC_GETCURRENT), "MSG_GET of 0x%x returned 0x%x, expecting 0x%x\n", pCapability->Cap, onev->Item, orig_value); trace("MSG_GET of 0x%x returned val 0x%x, type %d\n", pCapability->Cap, onev->Item, onev->ItemType); @@ -119,7 +119,7 @@ static void check_get(TW_CAPABILITY *pCapability, TW_INT32 actual_support, TW_UINT8 *p8; TW_UINT16 *p16; TW_UINT32 *p32; - TW_ENUMERATION *enumv = (TW_ENUMERATION *) p; + TW_ENUMERATION *enumv = p; p8 = enumv->ItemList; p16 = (TW_UINT16 *) p8; p32 = (TW_UINT32 *) p8;

1 0

Paul Vriens : qmgr/tests: Fix some tests on systems with BITS 1.5 and lower .
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 936b10b473a29bc4fb53e5aede70ceee644be044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936b10b473a29bc4fb53e5aed… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 6 11:47:32 2009 +0100 qmgr/tests: Fix some tests on systems with BITS 1.5 and lower. --- dlls/qmgr/tests/job.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 36201f8..d0e2306 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include "bits.h" +#include "initguid.h" /* Globals used by many tests */ static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; @@ -123,6 +124,49 @@ static void teardown(void) IBackgroundCopyManager_Release(test_manager); } +/* FIXME: Remove when Wine has implemented this */ +DEFINE_GUID(CLSID_BackgroundCopyManager2_0, 0x6d18ad12, 0xbde3, 0x4393, 0xb3,0x11, 0x09,0x9c,0x34,0x6e,0x6d,0xf9); + +static BOOL check_bits20(void) +{ + HRESULT hres; + IBackgroundCopyManager *manager; + BOOL ret = TRUE; + + hres = CoCreateInstance(&CLSID_BackgroundCopyManager2_0, NULL, + CLSCTX_LOCAL_SERVER, + &IID_IBackgroundCopyManager, + (void **) &manager); + + if (hres == REGDB_E_CLASSNOTREG) + { + ret = FALSE; + + /* FIXME: Wine implements 2.0 functionality but doesn't advertise 2.0 + * + * Remove when Wine is fixed + */ + if (setup()) + { + HRESULT hres2; + + hres2 = IBackgroundCopyJob_AddFile(test_job, test_remotePathA, + test_localPathA); + if (hres2 == S_OK) + { + trace("Running on Wine, claim 2.0 is present\n"); + ret = TRUE; + } + teardown(); + } + } + + if (manager) + IBackgroundCopyManager_Release(manager); + + return ret; +} + /* Test that the jobId is properly set */ static void test_GetId(void) { @@ -486,12 +530,15 @@ START_TEST(job) test_GetId, test_GetType, test_GetName, - test_AddFile, - test_AddFileSet, - test_EnumFiles, test_GetProgress_preTransfer, test_GetState, test_ResumeEmpty, + 0 + }; + static const test_t tests_bits20[] = { + test_AddFile, + test_AddFileSet, + test_EnumFiles, test_CompleteLocal, test_CompleteLocalURL, 0 @@ -502,6 +549,7 @@ START_TEST(job) return; CoInitialize(NULL); + for (test = tests; *test; ++test) { /* Keep state separate between tests. */ @@ -513,5 +561,25 @@ START_TEST(job) (*test)(); teardown(); } + + if (check_bits20()) + { + for (test = tests_bits20; *test; ++test) + { + /* Keep state separate between tests. */ + if (!setup()) + { + skip("Unable to setup test\n"); + break; + } + (*test)(); + teardown(); + } + } + else + { + win_skip("Tests need BITS 2.0 or higher\n"); + } + CoUninitialize(); }

1 0