August 2009 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLStyle3::wordWrap property implementation.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 77ff2df83a387eebb95f1322a4487735221cc46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ff2df83a387eebb95f1322a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 2 00:09:49 2009 +0200 mshtml: Added IHTMLStyle3::wordWrap property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/dom.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6a225a6..f036077 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -119,6 +119,8 @@ static const WCHAR attrVisibility[] = {'v','i','s','i','b','i','l','i','t','y',0}; static const WCHAR attrWidth[] = {'w','i','d','t','h',0}; +static const WCHAR attrWordWrap[] = + {'w','o','r','d','-','w','r','a','p',0}; static const WCHAR attrZIndex[] = {'z','-','i','n','d','e','x',0}; @@ -168,6 +170,7 @@ static const struct{ {attrVerticalAlign, DISPID_IHTMLSTYLE_VERTICALALIGN}, {attrVisibility, DISPID_IHTMLSTYLE_VISIBILITY}, {attrWidth, DISPID_IHTMLSTYLE_WIDTH}, + {attrWordWrap, DISPID_IHTMLSTYLE3_WORDWRAP}, {attrZIndex, DISPID_IHTMLSTYLE_ZINDEX} }; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 596f579..307824e 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -77,6 +77,7 @@ typedef enum { STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, STYLEID_WIDTH, + STYLEID_WORD_WRAP, STYLEID_Z_INDEX } styleid_t; diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index ce1d56e..505e91e 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -117,15 +117,19 @@ static HRESULT WINAPI HTMLStyle3_get_zoom(IHTMLStyle3 *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle3_put_wordWrap(IHTMLStyle3 *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE3_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_WORD_WRAP, v, 0); } static HRESULT WINAPI HTMLStyle3_get_wordWrap(IHTMLStyle3 *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE3_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_WORD_WRAP, p); } static HRESULT WINAPI HTMLStyle3_put_textUnderlinePosition(IHTMLStyle3 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a153a14..97102db 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2627,6 +2627,28 @@ static void test_style2(IHTMLStyle2 *style2) SysFreeString(str); } +static void test_style3(IHTMLStyle3 *style3) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLStyle3_get_wordWrap(style3, &str); + ok(hres == S_OK, "get_wordWrap failed: %08x\n", hres); + ok(!str, "str != NULL\n"); + + str = a2bstr("break-word"); + hres = IHTMLStyle3_put_wordWrap(style3, str); + ok(hres == S_OK, "put_wordWrap failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle3_get_wordWrap(style3, &str); + ok(hres == S_OK, "get_wordWrap failed: %08x\n", hres); + ok(!strcmp_wa(str, "break-word"), "get_wordWrap returned %s\n", dbgstr_w(str)); + SysFreeString(str); +} + static void test_style4(IHTMLStyle4 *style4) { HRESULT hres; @@ -2655,6 +2677,7 @@ static void test_style4(IHTMLStyle4 *style4) static void test_default_style(IHTMLStyle *style) { IHTMLStyle2 *style2; + IHTMLStyle3 *style3; IHTMLStyle4 *style4; VARIANT_BOOL b; VARIANT v; @@ -3637,6 +3660,13 @@ static void test_default_style(IHTMLStyle *style) IHTMLStyle2_Release(style2); } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle3, (void**)&style3); + ok(hres == S_OK, "Could not get IHTMLStyle3 iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + test_style3(style3); + IHTMLStyle3_Release(style3); + } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle4, (void**)&style4); ok(hres == S_OK, "Could not get IHTMLStyle4 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Always return hex string in IHTMLBodyElement:: get_bgColor.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 2d5a8763fce634c7a16ae51a50a7c7b9d22a9620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5a8763fce634c7a16ae51a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 2 00:09:09 2009 +0200 mshtml: Always return hex string in IHTMLBodyElement::get_bgColor. --- dlls/mshtml/htmlbody.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 0cbfc06..b8e0f95 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -44,6 +44,61 @@ typedef struct { #define HTMLBODY(x) (&(x)->lpHTMLBodyElementVtbl) +static const WCHAR aquaW[] = {'a','q','u','a',0}; +static const WCHAR blackW[] = {'b','l','a','c','k',0}; +static const WCHAR blueW[] = {'b','l','u','e',0}; +static const WCHAR fuchsiaW[] = {'f','u','s','h','s','i','a',0}; +static const WCHAR grayW[] = {'g','r','a','y',0}; +static const WCHAR greenW[] = {'g','r','e','e','n',0}; +static const WCHAR limeW[] = {'l','i','m','e',0}; +static const WCHAR maroonW[] = {'m','a','r','o','o','n',0}; +static const WCHAR navyW[] = {'n','a','v','y',0}; +static const WCHAR oliveW[] = {'o','l','i','v','e',0}; +static const WCHAR purpleW[] = {'p','u','r','p','l','e',0}; +static const WCHAR redW[] = {'r','e','d',0}; +static const WCHAR silverW[] = {'s','i','l','v','e','r',0}; +static const WCHAR tealW[] = {'t','e','a','l',0}; +static const WCHAR whiteW[] = {'w','h','i','t','e',0}; +static const WCHAR yellowW[] = {'y','e','l','l','o','w',0}; + +static const struct { + LPCWSTR keyword; + const WCHAR hexstr[8]; +} 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}} +}; + +static BSTR nscolor_to_str(LPCWSTR color) +{ + int i; + + if(!color || *color == '#') + return SysAllocString(color); + + 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); + } + + WARN("unknown color %s\n", debugstr_w(color)); + return SysAllocString(color); +} + static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) { switch(V_VT(v)) { @@ -305,7 +360,7 @@ static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIA nsAString_GetData(&strColor, &color); V_VT(p) = VT_BSTR; - V_BSTR(p) = SysAllocString(color); + V_BSTR(p) = nscolor_to_str(color); nsAString_Finish(&strColor);

1 0

Jacek Caban : wininet: Explicity delete Content-Length header for gzip encoded connection.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 3858e35432cfba97797c955a5967e62bbb9d9b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3858e35432cfba97797c955a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 21:07:42 2009 +0200 wininet: Explicity delete Content-Length header for gzip encoded connection. --- dlls/wininet/http.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 693a44f..117d302 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -218,7 +218,7 @@ static void wininet_zfree(voidpf opaque, voidpf address) static void init_gzip_stream(http_request_t *req) { gzip_stream_t *gzip_stream; - int zres; + int index, zres; gzip_stream = HeapAlloc(GetProcessHeap(), 0, sizeof(gzip_stream_t)); gzip_stream->zstream.zalloc = wininet_zalloc; @@ -240,6 +240,10 @@ static void init_gzip_stream(http_request_t *req) } req->gzip_stream = gzip_stream; + + index = HTTP_GetCustomHeaderIndex(req, szContent_Length, 0, FALSE); + if(index != -1) + HTTP_DeleteCustomHeader(req, index); } #else @@ -2635,17 +2639,6 @@ static BOOL HTTP_HttpQueryInfoW(http_request_t *lpwhr, DWORD dwInfoLevel, if (!lpBuffer) return FALSE; index = HTTP_GetCustomHeaderIndex(lpwhr, lpBuffer, requested_index, request_only); break; - - case HTTP_QUERY_CONTENT_LENGTH: - if(lpwhr->gzip_stream) { - INTERNET_SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return FALSE; - } - - index = HTTP_GetCustomHeaderIndex(lpwhr, header_lookup[level], - requested_index,request_only); - break; - case HTTP_QUERY_RAW_HEADERS_CRLF: { LPWSTR headers;

1 0

Dmitry Timoshkov : gdi32: Use a better heuristics for tmWeight.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 69b29fa07e42fc281b62ed3e3bb1ec6bec9e2379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b29fa07e42fc281b62ed3e3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 31 22:21:51 2009 +0900 gdi32: Use a better heuristics for tmWeight. Marlett uses FW_MEDIUM (500) and current code allows only FW_REGULAR and FW_BOLD. New heuristics detects if flags and usWeightClass in the font match. --- dlls/gdi32/freetype.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 96b197a..b5ab51a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5585,7 +5585,19 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, TM.tmAveCharWidth = 1; } TM.tmMaxCharWidth = (pFT_MulFix(ft_face->bbox.xMax - ft_face->bbox.xMin, x_scale) + 32) >> 6; - TM.tmWeight = (font->fake_bold || (ft_face->style_flags & FT_STYLE_FLAG_BOLD)) ? FW_BOLD : FW_REGULAR; + TM.tmWeight = FW_REGULAR; + if (font->fake_bold) + TM.tmWeight = FW_BOLD; + else + { + if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) + { + if (pOS2->usWeightClass > FW_MEDIUM) + TM.tmWeight = pOS2->usWeightClass; + } + else if (pOS2->usWeightClass <= FW_MEDIUM) + TM.tmWeight = pOS2->usWeightClass; + } TM.tmOverhang = 0; TM.tmDigitizedAspectX = 300; TM.tmDigitizedAspectY = 300;

1 0

Dmitry Timoshkov : gdi32: Some fonts have a broken last segment of cmap4 table, avoid a crash in that case.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 16aa1369f8fcfc07e81953aa6142423216579bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16aa1369f8fcfc07e81953aa6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 31 22:21:23 2009 +0900 gdi32: Some fonts have a broken last segment of cmap4 table, avoid a crash in that case. Freetype has a similar consistency check. --- dlls/gdi32/tests/font.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6950503..3d0e81d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2172,7 +2172,7 @@ static void get_seg4(cmap_format_4 *cmap, USHORT seg_num, cmap_format_4_seg *seg seg->id_range_offset = GET_BE_WORD(cmap->end_count[3 * segs + 1 + seg_num]); } -static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last) +static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last, DWORD limit) { int i; cmap_format_4 *cmap = (cmap_format_4*)ptr; @@ -2197,7 +2197,15 @@ static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last) + code - seg.start_count + i - seg_count; - index = GET_BE_WORD(glyph_ids[index]); + /* some fonts have broken last segment */ + if ((char *)(glyph_ids + index + sizeof(*glyph_ids)) < (char *)ptr + limit) + index = GET_BE_WORD(glyph_ids[index]); + else + { + trace("segment %04x/%04x index %04x points to nowhere\n", + seg.start_count, seg.end_count, index); + index = 0; + } if(index) index += seg.id_delta; } if(*first == 0x10000) @@ -2270,7 +2278,7 @@ static BOOL get_first_last_from_cmap(HDC hdc, DWORD *first, DWORD *last, cmap_ty r = get_first_last_from_cmap0(cmap, first, last); break; case 4: - r = get_first_last_from_cmap4(cmap, first, last); + r = get_first_last_from_cmap4(cmap, first, last, size); break; default: trace("unhandled cmap format %d\n", format);

1 0

Aric Stewart : imm32: Stub implementation of ImmDisableTextFrameService.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: d882edea88097f6eccfe1f5bab30b775db372e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d882edea88097f6eccfe1f5ba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 30 12:52:09 2009 -0500 imm32: Stub implementation of ImmDisableTextFrameService. --- dlls/imm32/imm.c | 9 +++++++++ dlls/imm32/imm32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index cb97ecd..f085080 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2792,3 +2792,12 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD data->lastVK = VK_PROCESSKEY; return FALSE; } + +/*********************************************************************** +* ImmDisableTextFrameService(IMM32.@) +*/ +BOOL WINAPI ImmDisableTextFrameService(DWORD idThread) +{ + FIXME("Stub\n"); + return FALSE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index e0c9385..0d05362 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -11,6 +11,7 @@ @ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME +@ stdcall ImmDisableTextFrameService(long) @ stub ImmEnumInputContext @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr)

1 0

Paul Vriens : winhlp32: Add the UTF-8 pragma for the Italian resources.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: d5eeba3609ee240f5310e7385162b707efe56bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5eeba3609ee240f5310e7385… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 20:01:25 2009 +0200 winhlp32: Add the UTF-8 pragma for the Italian resources. --- programs/winhlp32/It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/It.rc b/programs/winhlp32/It.rc index 5d1abb8..3f0ffd2 100644 --- a/programs/winhlp32/It.rc +++ b/programs/winhlp32/It.rc @@ -21,6 +21,8 @@ #include "winhelp_res.h" +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

1 0

Paul Vriens : cmdlgtst: Add the UTF-8 pragma for the Italian resources.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 6f8026821b7b1276b6901daed14ed0e470dd15a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8026821b7b1276b6901daed… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 20:07:49 2009 +0200 cmdlgtst: Add the UTF-8 pragma for the Italian resources. --- programs/cmdlgtst/It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index 1bc2e46..c77acbe 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -22,6 +22,8 @@ #include "cmdlgtst.h" +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /*

1 0

Paul Vriens : winhlp32: Add the UTF-8 pragma for the Romansh resources.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: fb8ead919bc15b7b363035afae22572c6cc69513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8ead919bc15b7b363035afa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 20:04:50 2009 +0200 winhlp32: Add the UTF-8 pragma for the Romansh resources. --- programs/winhlp32/Rm.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Rm.rc b/programs/winhlp32/Rm.rc index ece7bb1..3b2a1fa 100644 --- a/programs/winhlp32/Rm.rc +++ b/programs/winhlp32/Rm.rc @@ -22,6 +22,8 @@ #include "winhelp_res.h" +#pragma code_page(65001) + /* FIXME: This file is in the Vallader Romansh dialect and not in the official Rumantsch Grischun. */

1 0

Paul Vriens : wineboot: Add the UTF-8 pragma for the Dutch resources.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: afcdf6d266201366757fc70c4f144ce674dadb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcdf6d266201366757fc70c4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 19:59:36 2009 +0200 wineboot: Add the UTF-8 pragma for the Dutch resources. --- programs/wineboot/wineboot_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Nl.rc b/programs/wineboot/wineboot_Nl.rc index c22a5c5..14a44c1 100644 --- a/programs/wineboot/wineboot_Nl.rc +++ b/programs/wineboot/wineboot_Nl.rc @@ -21,6 +21,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71

1 0