February 2011 - Wine-Commits

André Hentschel : Don' t mention Usenet in Forums overview
by Jeremy Newman Feb. 28, 2011

Feb. 28, 2011

Module: website Branch: master Commit: b2817161e9fe1eeb7938b104efa8932e4eb8a81c URL: http://source.winehq.org/git/website.git/?a=commit;h=b2817161e9fe1eeb7938b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 28 16:48:18 2011 +0100 Don't mention Usenet in Forums overview offical abandond now --- templates/en/forums.template | 13 ------------- templates/he/forums.template | 13 ------------- 2 files changed, 0 insertions(+), 26 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index e427d50..f2bd64e 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -115,17 +115,4 @@ mailing list software.</p> A medium traffic (10/day) open list for submitting test results. </ul> - - -<a name="ng"></a> -<h2>Usenet Newsgroup</h2> - -<p>WineHQ has a newsgroup hosted by Usenet. This newsgroup is connected to the Wine-Users mailing -list and is used primarily by users of Wine and people that volunteer to help them. You can read and post using a -newsgroup reader such as <a href="http://www.mozilla.org/">Mozilla</a> -or <a href="http://pan.rebelbase.com/">Pan</a>.</p> - -<p><a href="news:comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</a> or via the web at -<a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">Google</a></p> - <p> </p> diff --git a/templates/he/forums.template b/templates/he/forums.template index 0ea858f..5953810 100644 --- a/templates/he/forums.template +++ b/templates/he/forums.template @@ -116,17 +116,4 @@ רשימה פתוחה בעלת תעבורה בינונית (10 ליום) לשליחת תוצאות של בדיקות. </ul> - - -<a name="ng"></a> -<h2>קבוצת החדשות ב־Usenet</h2> - -<p>ל־WineHQ יש קבוצת חדשות המתארחת ב־Usenet. קבוצת חדשות זו מקושרת לרשימת הדיוור Wine-Users -והיא משמשת בעיקר את המשתמשים ב־Wine ואת האנשים המתנדבים לעזור להם. ניתן לקרוא ולפרסם באמצעות -קורא קבוצות חדשות כגון <a href="http://www.mozilla.org/">מוזילה</a> -או <a href="http://pan.rebelbase.com/">Pan</a>.</p> - -<p><a href="news:comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</a> או באינטרנט דרך -<a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">Google</a></p> - <p> </p>

1 0

André Hentschel : Remove unused resources entry
by Jeremy Newman Feb. 28, 2011

Feb. 28, 2011

Module: website Branch: master Commit: c06e73cb18aee1fc63c1258d7dc65ee0afbfd31e URL: http://source.winehq.org/git/website.git/?a=commit;h=c06e73cb18aee1fc63c125… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 28 16:48:43 2011 +0100 Remove unused resources entry (dead links) --- templates/de/devel.template | 9 --------- templates/pl/devel.template | 9 --------- 2 files changed, 0 insertions(+), 18 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template index d6e9f21..88601b4 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -145,15 +145,6 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/resources">Hilfsmittel</a> - </td> - <td valign="top"> - Weitere Entwicklerhilfsmittel. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="http://wiki.winehq.org/WineConf">WineConf</a> </td> <td valign="top"> diff --git a/templates/pl/devel.template b/templates/pl/devel.template index bd5fad3..fb64058 100644 --- a/templates/pl/devel.template +++ b/templates/pl/devel.template @@ -144,15 +144,6 @@ rozmaitych materiałów dostępnych dla programistów Wine.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/resources">Zasoby</a> - </td> - <td valign="top"> - Więcej zasobów dla programistów. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="http://wiki.winehq.org/WineConf">WineConf</a> </td> <td valign="top">

1 0

André Hentschel : Remove Help Link to Googlegroups
by Jeremy Newman Feb. 28, 2011

Feb. 28, 2011

Module: website Branch: master Commit: f357bc7227e56b74b60aec0e2dbb4a3af5acf3b5 URL: http://source.winehq.org/git/website.git/?a=commit;h=f357bc7227e56b74b60aec… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 26 16:02:03 2011 +0100 Remove Help Link to Googlegroups see http://bugs.winehq.org/show_bug.cgi?id=26144 --- templates/de/help.template | 6 ++---- templates/en/help.template | 3 +-- templates/he/help.template | 4 +--- templates/pl/help.template | 3 ++- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/templates/de/help.template b/templates/de/help.template index 3b2aa24..e21dca1 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -61,10 +61,8 @@ </td> <td valign="top"> Wir haben eine <a href="http://forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email-basierte (en)</a> - Gemeinschaft von Wine-Anwendern, in der Anwender Fragen stellen und miteinander netzwerken können. Es gibt - mehrere Möglichkeiten, dieser Gemeinschaft beizutreten. Eine Alternative, auf unsere Foren zuzugreifen, ist - die Google Groups Website unter <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine"> - comp.emulators.ms-windows.wine</a>. Des weiteren gibt es die <a href="{$root}/site/forums">Mailing Lists</a>, die + Gemeinschaft von Wine-Anwendern, in der Anwender Fragen stellen und miteinander netzwerken können. + Des weiteren gibt es die <a href="{$root}/site/forums">Mailing Lists</a>, die Teil der gleichen Gemeinschaft sind. </td> </tr> diff --git a/templates/en/help.template b/templates/en/help.template index 62004bb..1f9222c 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -61,8 +61,7 @@ <td valign="top"> We have a <a href="http://forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email</a> based community for Wine users, which is a place that Wine users can visit to ask questions and connect - with each other. You can join this community in a variety of ways. An alternate way to access our forums is via the - Google Groups page at <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</a>. + with each other. You may also wish to explore the <a href="{$root}/site/forums">mailing lists</a> that make up that community as well. </td> diff --git a/templates/he/help.template b/templates/he/help.template index 2aefe0d..0bc8608 100644 --- a/templates/he/help.template +++ b/templates/he/help.template @@ -59,9 +59,7 @@ </td> <td valign="top"> יש לנו קהילה מבוססת <a href="http://forums.winehq.org/">פורומים</a>/<a href="{$root}/site/forums">דוא״ל</a> - למשתמשי Wine, המהווים מקום שבו יכולים לבקר משתמשים, לשאול שאלות וליצור קשר זה עם זה. ניתן להצטרף לקהילה - זו במגוון דרכים. הדרך החלופית לגשת לפורומים שלך היא דרך העמוד בקבוצות של - Google <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</a>. + למשתמשי Wine, המהווים מקום שבו יכולים לבקר משתמשים, לשאול שאלות וליצור קשר זה עם זה. יתכן שיהיה ברצונך לעיין ב<a href="{$root}/site/forums">רשימות התפוצה</a> המהוות קהילות בפני עצמן. </td> diff --git a/templates/pl/help.template b/templates/pl/help.template index 5284d33..8cef3f1 100644 --- a/templates/pl/help.template +++ b/templates/pl/help.template @@ -59,7 +59,8 @@ <a href="http://forums.winehq.org/"><img src="{$root}/images/forum.png"><br>Forum</a> </td> <td valign="top"> - Mamy <a href="http://forums.winehq.org/">webowo</a>/<a href="{$root}/site/forums">emailową</a> społeczność dla użytkowników Wine, która jest miejscem gdzie użytkownicy Wine mogą pytać i łączyć się z innymi. Możesz dołączyć do tej społeczności na kilka różnych sposobów. Alternatywnym sposobem na dostęp do forum istnieje przez strony grupy Google na stronie <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</a>. + Mamy <a href="http://forums.winehq.org/">webowo</a>/<a href="{$root}/site/forums">emailową</a> społeczność dla + użytkowników Wine, która jest miejscem gdzie użytkownicy Wine mogą pytać i łączyć się z innymi. Masz również możliwość przeglądania <a href="{$root}/site/forums">listy mailingowej</a> , która także tworzy społeczność. </td>

1 0

Peter Urbanec : gdi32: Fix 64-bit pointer issues when copying upside-down bitmaps.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: de7d1ad77a78156bbd00ad460a21e9ea08b13b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7d1ad77a78156bbd00ad460… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri Feb 25 23:41:31 2011 +1100 gdi32: Fix 64-bit pointer issues when copying upside-down bitmaps. --- dlls/gdi32/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0619304..eae7f35 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -885,7 +885,7 @@ INT WINAPI GetDIBits( */ if (bmp->dib->dsBmih.biHeight < 0) { - sbits += (srcwidthb * (abs(bmp->dib->dsBmih.biHeight) - 2 * startscan - 1)); + sbits += (srcwidthb * (int)(abs(bmp->dib->dsBmih.biHeight) - 2 * startscan - 1)); srcwidthb = -srcwidthb; } switch( bpp ) {

1 0

Jacek Caban : mshtml: Reimplement IHTMLStyle:: get_backgroundPositionY using background-position property.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: c7da163bf33bb441c545d9bf796705e82f7989a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7da163bf33bb441c545d9bf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 14:12:26 2011 +0100 mshtml: Reimplement IHTMLStyle::get_backgroundPositionY using background-position property. --- dlls/mshtml/htmlstyle.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f21ff87..dffc39e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1136,8 +1136,35 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA static HRESULT WINAPI HTMLStyle_get_backgroundPositionY(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); + nsAString pos_str; + BSTR ret; + HRESULT hres; + TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_POSITION_Y, p, 0); + + nsAString_Init(&pos_str, NULL); + hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + if(SUCCEEDED(hres)) { + const PRUnichar *pos, *posy; + + nsAString_GetData(&pos_str, &pos); + posy = strchrW(pos, ' '); + if(posy) { + ret = SysAllocString(posy+1); + if(!ret) + hres = E_OUTOFMEMORY; + }else { + ret = NULL; + } + } + nsAString_Finish(&pos_str); + if(FAILED(hres)) + return hres; + + TRACE("returning %s\n", debugstr_w(ret)); + V_VT(p) = VT_BSTR; + V_BSTR(p) = ret; + return S_OK; } static HRESULT WINAPI HTMLStyle_put_wordSpacing(IHTMLStyle *iface, VARIANT v)

1 0

Damjan Jovanovic : winemenubuilder: FriendlyDocName isn' t part of the association.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 7c8f5feba0769573d92a08ad2a406819a8a52fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8f5feba0769573d92a08ad2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Feb 25 17:20:09 2011 +0200 winemenubuilder: FriendlyDocName isn't part of the association. --- programs/winemenubuilder/winemenubuilder.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e0c8e8f..9aae73f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1971,10 +1971,9 @@ static HKEY open_associations_reg_key(void) } static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, - LPCSTR appName, LPCWSTR docName, LPCSTR openWithIcon) + LPCSTR appName, LPCSTR openWithIcon) { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; - static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; static const WCHAR OpenWithIconW[] = {'O','p','e','n','W','i','t','h','I','c','o','n',0}; @@ -2003,11 +2002,6 @@ static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR ret = TRUE; HeapFree(GetProcessHeap(), 0, valueA); - value = reg_get_valW(assocKey, extensionW, DocNameW); - if (docName && (!value || strcmpW(value, docName))) - ret = TRUE; - HeapFree(GetProcessHeap(), 0, value); - valueA = reg_get_val_utf8(assocKey, extensionW, OpenWithIconW); if ((openWithIcon && !valueA) || (!openWithIcon && valueA) || @@ -2026,10 +2020,9 @@ static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR } static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progId, - LPCSTR appName, LPCWSTR docName, LPCSTR desktopFile, LPCSTR openWithIcon) + LPCSTR appName, LPCSTR desktopFile, LPCSTR openWithIcon) { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; - static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; static const WCHAR DesktopFileW[] = {'D','e','s','k','t','o','p','F','i','l','e',0}; @@ -2088,8 +2081,6 @@ static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progI RegSetValueExW(subkey, MimeTypeW, 0, REG_SZ, (const BYTE*) mimeTypeW, (lstrlenW(mimeTypeW) + 1) * sizeof(WCHAR)); RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (const BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); RegSetValueExW(subkey, AppNameW, 0, REG_SZ, (const BYTE*) appNameW, (lstrlenW(appNameW) + 1) * sizeof(WCHAR)); - if (docName) - RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); RegSetValueExW(subkey, DesktopFileW, 0, REG_SZ, (const BYTE*) desktopFileW, (lstrlenW(desktopFileW) + 1) * sizeof(WCHAR)); if (openWithIcon) RegSetValueExW(subkey, OpenWithIconW, 0, REG_SZ, (const BYTE*) openWithIconW, (lstrlenW(openWithIconW) + 1) * sizeof(WCHAR)); @@ -2455,7 +2446,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } - if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, openWithIconA)) + if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, openWithIconA)) { char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); if (desktopPath) @@ -2463,7 +2454,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (write_freedesktop_association_entry(desktopPath, extensionA, friendlyAppNameA, mimeTypeA, progIdA, openWithIconA)) { hasChanged = TRUE; - update_association(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, desktopPath, openWithIconA); + update_association(extensionW, mimeTypeA, progIdW, friendlyAppNameA, desktopPath, openWithIconA); } HeapFree(GetProcessHeap(), 0, desktopPath); }

1 0

Jacek Caban : mshtml: Reimplement IHTMLStyle:: put_backgroundPositionY using background-position property.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 4cc3517107dbcf272db786f9c5243d45cedc2326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc3517107dbcf272db786f9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 14:12:13 2011 +0100 mshtml: Reimplement IHTMLStyle::put_backgroundPositionY using background-position property. --- dlls/mshtml/htmlstyle.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 914c1ce..f21ff87 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1079,8 +1079,58 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionX(IHTMLStyle *iface, VARIA static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); + WCHAR buf[14], *pos_val; + nsAString pos_str; + const WCHAR *val; + DWORD val_len; + HRESULT hres; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return set_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_POSITION_Y, &v, 0); + + hres = var_to_styleval(&v, buf, ATTR_FIX_PX, &val); + if(FAILED(hres)) + return hres; + + val_len = val ? strlenW(val) : 0; + + nsAString_Init(&pos_str, NULL); + hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + if(SUCCEEDED(hres)) { + const PRUnichar *pos, *space; + DWORD posx_len; + + nsAString_GetData(&pos_str, &pos); + space = strchrW(pos, ' '); + if(space) { + space++; + }else { + static const WCHAR zero_pxW[] = {'0','p','x',' ',0}; + + TRACE("no space in %s\n", debugstr_w(pos)); + pos = zero_pxW; + space = pos + sizeof(zero_pxW)/sizeof(WCHAR)-1; + } + + posx_len = space-pos; + + pos_val = heap_alloc((posx_len+val_len+1)*sizeof(WCHAR)); + if(pos_val) { + memcpy(pos_val, pos, posx_len*sizeof(WCHAR)); + if(val_len) + memcpy(pos_val+posx_len, val, val_len*sizeof(WCHAR)); + pos_val[posx_len+val_len] = 0; + }else { + hres = E_OUTOFMEMORY; + } + } + nsAString_Finish(&pos_str); + if(FAILED(hres)) + return hres; + + TRACE("setting position to %s\n", debugstr_w(pos_val)); + hres = set_nsstyle_attr(This->nsstyle, STYLEID_BACKGROUND_POSITION, pos_val, ATTR_FIX_PX); + heap_free(pos_val); + return hres; } static HRESULT WINAPI HTMLStyle_get_backgroundPositionY(IHTMLStyle *iface, VARIANT *p)

1 0

Jacek Caban : mshtml: Added more backgroundPosition* tests.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 0e5aa05e71887c7b4976a25bfe774d9db1c09121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5aa05e71887c7b4976a25bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 14:12:37 2011 +0100 mshtml: Added more backgroundPosition* tests. --- dlls/mshtml/tests/dom.c | 49 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b4e1619..7d6a476 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5287,8 +5287,11 @@ static void test_default_style(IHTMLStyle *style) SysFreeString(sDefault); /* backgroundPositionX */ - hres = IHTMLStyle_get_backgroundPositionX(style, &vDefault); + 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)); + ok(!V_BSTR(&v), "backgroundPositionX = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("10px"); @@ -5299,18 +5302,17 @@ static void test_default_style(IHTMLStyle *style) 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)); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "backgroundPositionX = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); - hres = IHTMLStyle_put_backgroundPositionX(style, vDefault); - ok(hres == S_OK, "put_backgroundPositionX failed: %08x\n", hres); - VariantClear(&vDefault); - /* backgroundPositionY */ - hres = IHTMLStyle_get_backgroundPositionY(style, &vDefault); + 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); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("10px"); + V_BSTR(&v) = a2bstr("15px"); hres = IHTMLStyle_put_backgroundPositionY(style, v); ok(hres == S_OK, "put_backgroundPositionY failed: %08x\n", hres); VariantClear(&v); @@ -5318,11 +5320,38 @@ static void test_default_style(IHTMLStyle *style) 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)); + ok(!strcmp_wa(V_BSTR(&v), "15px"), "backgroundPositionY = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); - hres = IHTMLStyle_put_backgroundPositionY(style, vDefault); - ok(hres == S_OK, "put_backgroundPositionY failed: %08x\n", hres); - VariantClear(&vDefault); + /* backgroundPosition */ + str = NULL; + hres = IHTMLStyle_get_backgroundPosition(style, &str); + ok(hres == S_OK, "get_backgroundPosition failed: %08x\n", hres); + ok(!strcmp_wa(str, "10px 15px"), "backgroundPosition = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("center 20%"); + hres = IHTMLStyle_put_backgroundPosition(style, str); + ok(hres == S_OK, "put_backgroundPosition failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle_get_backgroundPosition(style, &str); + ok(hres == S_OK, "get_backgroundPosition failed: %08x\n", hres); + ok(!strcmp_wa(str, "center 20%"), "backgroundPosition = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + 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)); + ok(!strcmp_wa(V_BSTR(&v), "center"), "backgroundPositionX = %s\n", wine_dbgstr_w(V_BSTR(&v))); + 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)); + ok(!strcmp_wa(V_BSTR(&v), "20%"), "backgroundPositionY = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); /* borderTopWidth */ hres = IHTMLStyle_get_borderTopWidth(style, &vDefault);

1 0

Jacek Caban : mshtml: Reimplement IHTMLStyle:: get_backgroundPositionX using background-position property.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 2d333216ad906c331738afb63ec3ba606a9dd461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d333216ad906c331738afb63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 14:12:02 2011 +0100 mshtml: Reimplement IHTMLStyle::get_backgroundPositionX using background-position property. --- dlls/mshtml/htmlstyle.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 23dc394..914c1ce 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1040,8 +1040,40 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA static HRESULT WINAPI HTMLStyle_get_backgroundPositionX(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); + nsAString pos_str; + BSTR ret; + HRESULT hres; + TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_POSITION_X, p, 0); + + nsAString_Init(&pos_str, NULL); + hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + if(SUCCEEDED(hres)) { + const PRUnichar *pos, *space; + + nsAString_GetData(&pos_str, &pos); + space = strchrW(pos, ' '); + if(!space) { + WARN("no space in %s\n", debugstr_w(pos)); + space = pos + strlenW(pos); + } + + if(space != pos) { + ret = SysAllocStringLen(pos, space-pos); + if(!ret) + hres = E_OUTOFMEMORY; + }else { + ret = NULL; + } + } + nsAString_Finish(&pos_str); + if(FAILED(hres)) + return hres; + + TRACE("returning %s\n", debugstr_w(ret)); + V_VT(p) = VT_BSTR; + V_BSTR(p) = ret; + return S_OK; } static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLStyle::[get|put] _backgroundPosition implementation.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: b5d68c70d3027efda996d5717ee831ae0c872e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d68c70d3027efda996d5717… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 14:11:16 2011 +0100 mshtml: Added IHTMLStyle::[get|put]_backgroundPosition implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 51e3fd3..7f1308c 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 attrBackgroundPosition[] = + {'b','a','c','k','g','r','o','u','n','d','-','p','o','s','i','t','i','o','n',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[] = @@ -171,6 +173,7 @@ static const struct{ {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, + {attrBackgroundPosition, DISPID_IHTMLSTYLE_BACKGROUNDPOSITION}, {attrBackgroundPositionX, DISPID_IHTMLSTYLE_BACKGROUNDPOSITIONX}, {attrBackgroundPositionY, DISPID_IHTMLSTYLE_BACKGROUNDPOSITIONY}, {attrBackgroundRepeat, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT}, @@ -952,15 +955,19 @@ static HRESULT WINAPI HTMLStyle_get_backgroundAttachment(IHTMLStyle *iface, BSTR static HRESULT WINAPI HTMLStyle_put_backgroundPosition(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_BACKGROUND_POSITION, v, 0); } static HRESULT WINAPI HTMLStyle_get_backgroundPosition(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_BACKGROUND_POSITION, p); } static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ea4ece3..6731584 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -33,6 +33,7 @@ typedef enum { STYLEID_BACKGROUND, STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, + STYLEID_BACKGROUND_POSITION, STYLEID_BACKGROUND_POSITION_X, STYLEID_BACKGROUND_POSITION_Y, STYLEID_BACKGROUND_REPEAT,

1 0