December 2009 - Wine-Commits

Michael Stefaniuc : riched20: Remove some explicit LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 3b45ababfb785027ffc9c1cfd61bab43ed484566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b45ababfb785027ffc9c1cfd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 14:39:17 2009 +0100 riched20: Remove some explicit LPARAM/WPARAM casts. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 112 +++++++++++++++++------------------------ 2 files changed, 48 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b45ababfb785027ffc9c…

1 0

Jacek Caban : mshtml: Correctly parse color strings.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 0f0cb60592ecdff99faf5ad021b10cd5737b8dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0cb60592ecdff99faf5ad02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 27 00:49:46 2009 +0100 mshtml: Correctly parse color strings. --- dlls/mshtml/htmlbody.c | 56 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index f0d4cbe..8daace1 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -83,15 +83,58 @@ static const struct { {yellowW, 0xffff00} }; +static int comp_value(const WCHAR *ptr, int dpc) +{ + int ret = 0; + WCHAR ch; + + if(dpc > 2) + dpc = 2; + + while(dpc--) { + if(!*ptr) + ret *= 16; + else if(isdigitW(ch = *ptr++)) + ret = ret*16 + (ch-'0'); + else if('a' <= ch && ch <= 'f') + ret = ret*16 + (ch-'a') + 10; + else if('A' <= ch && ch <= 'F') + ret = ret*16 + (ch-'A') + 10; + else + ret *= 16; + } + + return ret; +} + +/* Based on Gecko NS_LooseHexToRGB */ +static int loose_hex_to_rgb(const WCHAR *hex) +{ + int len, dpc; + + len = strlenW(hex); + if(*hex == '#') { + hex++; + len--; + } + if(len <= 3) + return 0; + + dpc = min(len/3 + (len%3 ? 1 : 0), 4); + return (comp_value(hex, dpc) << 16) + | (comp_value(hex+dpc, dpc) << 8) + | comp_value(hex+2*dpc, dpc); +} + static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) { int i, rgb = -1; static const WCHAR formatW[] = {'#','%','0','2','x','%','0','2','x','%','0','2','x',0}; - if(!color || *color == '#') { - *ret = SysAllocString(color); - return *ret ? S_OK : E_OUTOFMEMORY; + if(!color || !*color) { + *ret = NULL; + return S_OK; } if(*color != '#') { @@ -100,11 +143,8 @@ static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) rgb = keyword_table[i].rgb; } } - if(rgb == -1) { - WARN("unknown color %s\n", debugstr_w(color)); - *ret = SysAllocString(color); - return *ret ? S_OK : E_OUTOFMEMORY; - } + if(rgb == -1) + rgb = loose_hex_to_rgb(color); *ret = SysAllocStringLen(NULL, 7); if(!*ret)

1 0

Jacek Caban : wininet: Test also InternetCrackUrlW in test_crack_url.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 672f021e2bdc3b288794a86f8232980225f0be76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672f021e2bdc3b288794a86f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 27 01:27:38 2009 +0100 wininet: Test also InternetCrackUrlW in test_crack_url. --- dlls/wininet/tests/url.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 7439cd3..f811882 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -23,9 +23,11 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wininet.h" #include "wine/test.h" @@ -123,6 +125,8 @@ static const crack_url_test_t crack_url_tests[] = { static void test_crack_url(const crack_url_test_t *test) { + WCHAR buf[INTERNET_MAX_URL_LENGTH]; + URL_COMPONENTSW urlw; URL_COMPONENTSA url; BOOL b; @@ -186,6 +190,79 @@ static void test_crack_url(const crack_url_test_t *test) test->url, url.lpszExtraInfo, test->url+test->extra_off); ok(url.dwExtraInfoLength == test->extra_len, "[%s] url.lpszExtraInfoLength = %d, expected %d\n", test->url, url.dwExtraInfoLength, test->extra_len); + + memset(&urlw, 0, sizeof(URL_COMPONENTSW)); + urlw.dwStructSize = sizeof(URL_COMPONENTSW); + urlw.dwSchemeLength = 1; + urlw.dwHostNameLength = 1; + urlw.dwUserNameLength = 1; + urlw.dwPasswordLength = 1; + urlw.dwUrlPathLength = 1; + urlw.dwExtraInfoLength = 1; + + MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)); + b = InternetCrackUrlW(buf, lstrlenW(buf), 0, &urlw); + if(!b && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + win_skip("InternetCrackUrlW is not implemented\n"); + return; + } + ok(b, "InternetCrackUrl failed with error %d\n", GetLastError()); + + if(test->scheme_off == -1) + ok(!urlw.lpszScheme, "[%s] urlw.lpszScheme = %p, expected NULL\n", test->url, urlw.lpszScheme); + else + ok(urlw.lpszScheme == buf+test->scheme_off, "[%s] urlw.lpszScheme = %p, expected %p\n", + test->url, urlw.lpszScheme, buf+test->scheme_off); + ok(urlw.dwSchemeLength == test->scheme_len, "[%s] urlw.lpszSchemeLength = %d, expected %d\n", + test->url, urlw.dwSchemeLength, test->scheme_len); + + ok(urlw.nScheme == test->scheme, "[%s] urlw.nScheme = %d, expected %d\n", test->url, urlw.nScheme, test->scheme); + + if(test->host_off == -1) + ok(!urlw.lpszHostName, "[%s] urlw.lpszHostName = %p, expected NULL\n", test->url, urlw.lpszHostName); + else + ok(urlw.lpszHostName == buf+test->host_off, "[%s] urlw.lpszHostName = %p, expected %p\n", + test->url, urlw.lpszHostName, test->url+test->host_off); + if(test->host_skip_broken != -1 && urlw.dwHostNameLength == test->host_skip_broken) { + win_skip("skipping broken dwHostNameLength result\n"); + return; + } + ok(urlw.dwHostNameLength == test->host_len, "[%s] urlw.lpszHostNameLength = %d, expected %d\n", + test->url, urlw.dwHostNameLength, test->host_len); + + ok(urlw.nPort == test->port, "[%s] nPort = %d, expected %d\n", test->url, urlw.nPort, test->port); + + if(test->user_off == -1) + ok(!urlw.lpszUserName, "[%s] urlw.lpszUserName = %p\n", test->url, urlw.lpszUserName); + else + ok(urlw.lpszUserName == buf+test->user_off, "[%s] urlw.lpszUserName = %p, expected %p\n", + test->url, urlw.lpszUserName, buf+test->user_off); + ok(urlw.dwUserNameLength == test->user_len, "[%s] urlw.lpszUserNameLength = %d, expected %d\n", + test->url, urlw.dwUserNameLength, test->user_len); + + if(test->pass_off == -1) + ok(!urlw.lpszPassword, "[%s] urlw.lpszPassword = %p\n", test->url, urlw.lpszPassword); + else + ok(urlw.lpszPassword == buf+test->pass_off, "[%s] urlw.lpszPassword = %p, expected %p\n", + test->url, urlw.lpszPassword, buf+test->pass_off); + ok(urlw.dwPasswordLength == test->pass_len, "[%s] urlw.lpszPasswordLength = %d, expected %d\n", + test->url, urlw.dwPasswordLength, test->pass_len); + + if(test->path_off == -1) + ok(!urlw.lpszUrlPath, "[%s] urlw.lpszPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath); + else + ok(urlw.lpszUrlPath == buf+test->path_off, "[%s] urlw.lpszPath = %p, expected %p\n", + test->url, urlw.lpszUrlPath, buf+test->path_off); + ok(urlw.dwUrlPathLength == test->path_len, "[%s] urlw.lpszUrlPathLength = %d, expected %d\n", + test->url, urlw.dwUrlPathLength, test->path_len); + + if(test->extra_off == -1) + ok(!urlw.lpszExtraInfo, "[%s] url.lpszExtraInfo = %p, expected NULL\n", test->url, urlw.lpszExtraInfo); + else + ok(urlw.lpszExtraInfo == buf+test->extra_off, "[%s] urlw.lpszExtraInfo = %p, expected %p\n", + test->url, urlw.lpszExtraInfo, buf+test->extra_off); + ok(urlw.dwExtraInfoLength == test->extra_len, "[%s] urlw.lpszExtraInfoLength = %d, expected %d\n", + test->url, urlw.dwExtraInfoLength, test->extra_len); } static void InternetCrackUrl_test(void)

1 0

Jacek Caban : mshtml: Use nscolor_to_str in IHTMLBodyElement:: get_text implementation.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 90a4eb7d185e3e234b399d13e21222cf1ba822cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a4eb7d185e3e234b399d13e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 27 00:50:04 2009 +0100 mshtml: Use nscolor_to_str in IHTMLBodyElement::get_text implementation. --- dlls/mshtml/htmlbody.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 8daace1..1aa7313 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -448,22 +448,21 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT HTMLBodyElement *This = HTMLBODY_THIS(iface); nsAString text; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&text, NULL); - - V_VT(p) = VT_BSTR; - V_BSTR(p) = NULL; - nsres = nsIDOMHTMLBodyElement_GetText(This->nsbody, &text); - if(NS_SUCCEEDED(nsres)) - { - const PRUnichar *sText; - nsAString_GetData(&text, &sText); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *color; + nsAString_GetData(&text, &color); V_VT(p) = VT_BSTR; - V_BSTR(p) = SysAllocString(sText); + hres = nscolor_to_str(color, &V_BSTR(p)); + }else { + ERR("GetText failed: %08x\n", nsres); + hres = E_FAIL; } nsAString_Finish(&text);

1 0

Jacek Caban : mshtml: Fixed nsIDOMNSHTMLElement declaration.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 221b0979b7fc399dab22f9193d054b08873253dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=221b0979b7fc399dab22f9193… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 27 02:16:23 2009 +0100 mshtml: Fixed nsIDOMNSHTMLElement declaration. --- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlelem2.c | 2 +- dlls/mshtml/nsiface.idl | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index b930d88..de32302 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -670,7 +670,7 @@ static HRESULT WINAPI HTMLDocument4_focus(IHTMLDocument4 *iface) return E_FAIL; } - nsres = nsIDOMNSHTMLElement_focus(nselem); + nsres = nsIDOMNSHTMLElement_Focus(nselem); nsIDOMNSHTMLElement_Release(nselem); if(NS_FAILED(nsres)) { ERR("Focus failed: %08x\n", nsres); diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 254ebf8..cd9b676 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -451,7 +451,7 @@ static HRESULT WINAPI HTMLElement2_focus(IHTMLElement2 *iface) nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { - nsIDOMNSHTMLElement_focus(nselem); + nsIDOMNSHTMLElement_Focus(nselem); nsIDOMNSHTMLElement_Release(nselem); }else { ERR("Could not get nsIDOMHTMLNSElement: %08x\n", nsres); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 68d37fe..4111e12 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -803,8 +803,10 @@ interface nsIDOMNSHTMLElement : nsISupports nsresult SetTabIndex(PRInt32 aTabIndex); nsresult GetContentEditable(nsAString *aContentEditable); nsresult SetContentEditable(const nsAString *aContentEditable); - nsresult blur(); - nsresult focus(); + nsresult GetDraggable(PRBool *aDraggable); + nsresult SetDraggable(PRBool aDraggable); + nsresult Blur(); + nsresult Focus(); nsresult ScrollIntoView(PRBool top); nsresult GetSpellcheck(PRBool *aSpellcheck); nsresult SetSpellcheck(PRBool aSpellcheck); @@ -2222,7 +2224,7 @@ interface nsIDOMMouseEvent : nsIDOMUIEvent nsresult GetAltKey(PRBool *aAltKey); nsresult GetMetaKey(PRBool *aMetaKey); nsresult GetButton(PRUint16 *aButton); - nsresult GetRelatedTarget(nsIDOMEventTarget * *aRelatedTarget); + nsresult GetRelatedTarget(nsIDOMEventTarget **aRelatedTarget); nsresult InitMouseEvent(const nsAString *typeArg, PRBool canBubbleArg, PRBool cancelableArg, nsIDOMAbstractView *viewArg, PRInt32 detailArg, PRInt32 screenXArg, PRInt32 screenYArg, PRInt32 clientXArg, PRInt32 clientYArg, PRBool ctrlKeyArg, PRBool altKeyArg, @@ -2350,7 +2352,7 @@ interface nsIProfile : nsISupports nsresult GetProfileCount(PRInt32 *aProfileCount); nsresult GetProfileList(PRUint32 *length, PRUnichar ***profileNames); nsresult ProfileExists(const PRUnichar *profileName, PRBool *_retval); - nsresult GetCurrentProfile(PRUnichar * *aCurrentProfile); + nsresult GetCurrentProfile(PRUnichar **aCurrentProfile); nsresult SetCurrentProfile(const PRUnichar * aCurrentProfile); nsresult ShutDownCurrentProfile(PRUint32 shutDownType); nsresult CreateNewProfile(const PRUnichar *profileName, @@ -2756,7 +2758,7 @@ interface nsIDocShell : nsISupports nsresult GetSessionStorageForURI(nsIURI *uri, nsIDOMStorage **_retval); nsresult GetSessionStorageForPrincipal(nsIPrincipal *principal, PRBool create, nsIDOMStorage **_retval); nsresult AddSessionStorage(nsIPrincipal *principal, nsIDOMStorage *storage); - nsresult GetCurrentDocumentChannel(nsIChannel * *aCurrentDocumentChannel); + nsresult GetCurrentDocumentChannel(nsIChannel **aCurrentDocumentChannel); nsresult SetChildOffset(PRUint32 offset); nsresult GetIsInUnload(PRBool *aIsInUnload); nsresult GetChannelIsUnsafe(PRBool *aChannelIsUnsafe);

1 0

Jacek Caban : mshtml: Added better default bgColor test and code clean up.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 170b2da260126bbe108cc9a92d63dbc11b987f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170b2da260126bbe108cc9a92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 27 00:50:22 2009 +0100 mshtml: Added better default bgColor test and code clean up. --- dlls/mshtml/tests/dom.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cf140e5..8744129 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4792,8 +4792,6 @@ static void test_default_body(IHTMLBodyElement *body) BSTR bstr; HRESULT hres; VARIANT v; - WCHAR sBodyText[] = {'#','F','F','0','0','0','0',0}; - WCHAR sTextInvalid[] = {'I','n','v','a','l','i','d',0}; bstr = (void*)0xdeadbeef; hres = IHTMLBodyElement_get_background(body, &bstr); @@ -4814,10 +4812,9 @@ static void test_default_body(IHTMLBodyElement *body) ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); ok(bstr == NULL, "bstr != NULL\n"); - /* get_text - Invalid Text */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(sTextInvalid); + V_BSTR(&v) = a2bstr("Invalid"); hres = IHTMLBodyElement_put_text(body, v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); VariantClear(&v); @@ -4826,12 +4823,12 @@ static void test_default_body(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_text(body, &v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "#00a0d0"), "v != '#00a0d0'\n"); + ok(!strcmp_wa(V_BSTR(&v), "#00a0d0"), "v = %s, expected '#00a0d0'\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); /* get_text - Valid Text */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(sBodyText); + V_BSTR(&v) = a2bstr("#FF0000"); hres = IHTMLBodyElement_put_text(body, v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); VariantClear(&v); @@ -4840,23 +4837,22 @@ static void test_default_body(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_text(body, &v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "#ff0000"), "v != '#ff0000'\n"); + ok(!strcmp_wa(V_BSTR(&v), "#ff0000"), "v = %s, expected '#ff0000'\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); } static void test_body_funs(IHTMLBodyElement *body) { - static WCHAR sRed[] = {'r','e','d',0}; - VARIANT vbg; - VARIANT vDefaultbg; + VARIANT vbg, vDefaultbg; HRESULT hres; hres = IHTMLBodyElement_get_bgColor(body, &vDefaultbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); + ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; - V_BSTR(&vbg) = SysAllocString(sRed); + V_BSTR(&vbg) = a2bstr("red"); hres = IHTMLBodyElement_put_bgColor(body, vbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vbg);

1 0

Jacek Caban : mshtml: Store known colors as RGB.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 9a264e546cc2cb548e8eb24fa3d2abcd6d96ea04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a264e546cc2cb548e8eb24fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 27 00:49:31 2009 +0100 mshtml: Store known colors as RGB. --- dlls/mshtml/htmlbody.c | 62 ++++++++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index cf62cb9..f0d4cbe 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -63,45 +63,57 @@ static const WCHAR yellowW[] = {'y','e','l','l','o','w',0}; static const struct { LPCWSTR keyword; - const WCHAR hexstr[8]; + DWORD rgb; } keyword_table[] = { - {aquaW, {'#','0','0','f','f','f','f',0}}, - {blackW, {'#','0','0','0','0','0','0',0}}, - {blueW, {'#','0','0','0','0','f','f',0}}, - {fuchsiaW, {'#','f','f','0','0','f','f',0}}, - {grayW, {'#','8','0','8','0','8','0',0}}, - {greenW, {'#','0','0','8','0','0','0',0}}, - {limeW, {'#','0','0','f','f','0','0',0}}, - {maroonW, {'#','8','0','0','0','0','0',0}}, - {navyW, {'#','0','0','0','0','8','0',0}}, - {oliveW, {'#','8','0','8','0','0','0',0}}, - {purpleW, {'#','8','0','0','0','8','0',0}}, - {redW, {'#','f','f','0','0','0','0',0}}, - {silverW, {'#','c','0','c','0','c','0',0}}, - {tealW, {'#','0','0','8','0','8','0',0}}, - {whiteW, {'#','f','f','f','f','f','f',0}}, - {yellowW, {'#','f','f','f','f','0','0',0}} + {aquaW, 0x00ffff}, + {blackW, 0x000000}, + {blueW, 0x0000ff}, + {fuchsiaW, 0xff00ff}, + {grayW, 0x808080}, + {greenW, 0x008000}, + {limeW, 0x00ff00}, + {maroonW, 0x800000}, + {navyW, 0x000080}, + {oliveW, 0x808000}, + {purpleW, 0x800080}, + {redW, 0xff0000}, + {silverW, 0xc0c0c0}, + {tealW, 0x008080}, + {whiteW, 0xffffff}, + {yellowW, 0xffff00} }; static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) { - int i; + int i, rgb = -1; + + static const WCHAR formatW[] = {'#','%','0','2','x','%','0','2','x','%','0','2','x',0}; if(!color || *color == '#') { *ret = SysAllocString(color); return *ret ? S_OK : E_OUTOFMEMORY; } - for(i=0; i < sizeof(keyword_table)/sizeof(keyword_table[0]); i++) { - if(!strcmpiW(color, keyword_table[i].keyword)) { - *ret = SysAllocString(keyword_table[i].hexstr); - return *ret ? S_OK : E_OUTOFMEMORY; + if(*color != '#') { + for(i=0; i < sizeof(keyword_table)/sizeof(keyword_table[0]); i++) { + if(!strcmpiW(color, keyword_table[i].keyword)) + rgb = keyword_table[i].rgb; } } + if(rgb == -1) { + WARN("unknown color %s\n", debugstr_w(color)); + *ret = SysAllocString(color); + return *ret ? S_OK : E_OUTOFMEMORY; + } - WARN("unknown color %s\n", debugstr_w(color)); - *ret = SysAllocString(color); - return *ret ? S_OK : E_OUTOFMEMORY; + *ret = SysAllocStringLen(NULL, 7); + if(!*ret) + return E_OUTOFMEMORY; + + sprintfW(*ret, formatW, rgb>>16, (rgb>>8)&0xff, rgb&0xff); + + TRACE("%s -> %s\n", debugstr_w(color), debugstr_w(*ret)); + return S_OK; } static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr)

1 0

Jacek Caban : mshtml: Added better error handling to nscolor_to_str.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: bbd925ddfee95795d43bd906d535e567ab939eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd925ddfee95795d43bd906d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 27 00:49:10 2009 +0100 mshtml: Added better error handling to nscolor_to_str. --- dlls/mshtml/htmlbody.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 427444e..cf62cb9 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -83,20 +83,25 @@ static const struct { {yellowW, {'#','f','f','f','f','0','0',0}} }; -static BSTR nscolor_to_str(LPCWSTR color) +static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) { int i; - if(!color || *color == '#') - return SysAllocString(color); + if(!color || *color == '#') { + *ret = SysAllocString(color); + return *ret ? S_OK : E_OUTOFMEMORY; + } for(i=0; i < sizeof(keyword_table)/sizeof(keyword_table[0]); i++) { - if(!strcmpiW(color, keyword_table[i].keyword)) - return SysAllocString(keyword_table[i].hexstr); + if(!strcmpiW(color, keyword_table[i].keyword)) { + *ret = SysAllocString(keyword_table[i].hexstr); + return *ret ? S_OK : E_OUTOFMEMORY; + } } WARN("unknown color %s\n", debugstr_w(color)); - return SysAllocString(color); + *ret = SysAllocString(color); + return *ret ? S_OK : E_OUTOFMEMORY; } static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) @@ -348,23 +353,25 @@ static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIA HTMLBodyElement *This = HTMLBODY_THIS(iface); nsAString strColor; nsresult nsres; - const PRUnichar *color; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&strColor, NULL); nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &strColor); - if(NS_FAILED(nsres)) - ERR("SetBgColor failed: %08x\n", nsres); - - nsAString_GetData(&strColor, &color); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *color; - V_VT(p) = VT_BSTR; - V_BSTR(p) = nscolor_to_str(color); + nsAString_GetData(&strColor, &color); + V_VT(p) = VT_BSTR; + hres = nscolor_to_str(color, &V_BSTR(p)); + }else { + ERR("SetBgColor failed: %08x\n", nsres); + hres = E_FAIL; + } nsAString_Finish(&strColor); - - return S_OK; + return hres; } static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT v)

1 0

Nikolay Sivov : comctl32/tests: Skip test on <5.8x systems.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 2e1aa43ab18c51b5bde8294c10ba443051b9ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1aa43ab18c51b5bde8294c1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 25 15:03:32 2009 +0300 comctl32/tests: Skip test on <5.8x systems. --- dlls/comctl32/tests/updown.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index fef53bf..859b3a0 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -375,12 +375,18 @@ static void test_updown_pos(void) SetWindowTextA(g_edit, "50"); updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* test sequence only on 5.8x versions */ + r = SendMessage(updown, UDM_GETPOS32, 0, 0); + if (r) + { + flush_sequences(sequences, NUM_MSG_SEQUENCES); - r = SendMessage(updown, UDM_SETPOS, 0, 50); - expect(50,r); - ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, - "test updown pos, no change", FALSE); + r = SendMessage(updown, UDM_SETPOS, 0, 50); + expect(50,r); + + ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, + "test updown pos, no change", FALSE); + } DestroyWindow(updown); }

1 0

Vincent Povirk : gdiplus: Implement GdipImageGetFrameDimensionsList.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: d87b1d4980f0016093f6d0bd2212aae66ed56cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87b1d4980f0016093f6d0bd2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 24 16:04:32 2009 -0500 gdiplus: Implement GdipImageGetFrameDimensionsList. --- dlls/gdiplus/image.c | 35 +++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/image.c | 12 +++++++++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2716a34..e37d028 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1708,6 +1708,19 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num) return InvalidParameter; } +struct image_format_dimension +{ + const GUID *format; + const GUID *dimension; +}; + +struct image_format_dimension image_format_dimensions[] = +{ + {&ImageFormatGIF, &FrameDimensionTime}, + {&ImageFormatIcon, &FrameDimensionResolution}, + {NULL} +}; + GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, GDIPCONST GUID* dimensionID, UINT* count) { @@ -1738,13 +1751,27 @@ GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image, GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage* image, GUID* dimensionIDs, UINT count) { - static int calls; + int i; + const GUID *result=NULL; + + TRACE("(%p,%p,%u)\n", image, dimensionIDs, count); - if(!image || !dimensionIDs) + if(!image || !dimensionIDs || count != 1) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + for (i=0; image_format_dimensions[i].format; i++) + { + if (IsEqualGUID(&image->format, image_format_dimensions[i].format)) + { + result = image_format_dimensions[i].dimension; + break; + } + } + + if (!result) + result = &FrameDimensionPage; + + memcpy(dimensionIDs, result, sizeof(GUID)); return Ok; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 60d8027..9f70191 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -206,7 +206,13 @@ static void test_GdipImageGetFrameDimensionsCount(void) stat = GdipImageGetFrameDimensionsList((GpImage*)bm, &dimension, 1); expect(Ok, stat); - expect_guid(&FrameDimensionPage, &dimension, __LINE__, TRUE); + expect_guid(&FrameDimensionPage, &dimension, __LINE__, FALSE); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bm, &dimension, 2); + expect(InvalidParameter, stat); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bm, &dimension, 0); + expect(InvalidParameter, stat); count = 12345; stat = GdipImageGetFrameCount((GpImage*)bm, &dimension, &count); @@ -1246,7 +1252,7 @@ static void test_multiframegif(void) stat = GdipImageGetFrameDimensionsList((GpImage*)bmp, &dimension, 1); expect(Ok, stat); - expect_guid(&FrameDimensionTime, &dimension, __LINE__, TRUE); + expect_guid(&FrameDimensionTime, &dimension, __LINE__, FALSE); count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); @@ -1320,7 +1326,7 @@ static void test_multiframegif(void) stat = GdipImageGetFrameDimensionsList((GpImage*)bmp, &dimension, 1); expect(Ok, stat); - expect_guid(&FrameDimensionTime, &dimension, __LINE__, TRUE); + expect_guid(&FrameDimensionTime, &dimension, __LINE__, FALSE); count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count);

1 0