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

Jacek Caban : winedump: Improved TLB custom data handling.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 30def32b6f0e0e703aed768fd2c6eac5fdd18cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30def32b6f0e0e703aed768fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:06:53 2013 +0200 winedump: Improved TLB custom data handling. --- tools/winedump/tlb.c | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 4ed3162..d12831e 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -390,6 +390,15 @@ static int dump_msft_namehashtab(seg_t *seg) return -1; } +static void dump_string(int len, int align_off) +{ + printf("\""); + fwrite(tlb_read(len), len, 1, stdout); + printf("\" "); + while((len++ + align_off) & 3) + printf("\\%2.2x", tlb_read_byte()); +} + static void dump_msft_name(int base, int n) { int len; @@ -401,11 +410,8 @@ static void dump_msft_name(int base, int n) len = print_hex("namelen")&0xff; print_offset(); - printf("name = \""); - fwrite(tlb_read(len), len, 1, stdout); - printf("\" "); - while(len++ & 3) - printf("\\%2.2x", tlb_read_byte()); + printf("name = "); + dump_string(len, 0); printf("\n"); print_end_block(); @@ -470,9 +476,29 @@ static int dump_msft_arraydescs(seg_t *seg) static int dump_msft_custdata(seg_t *seg) { + unsigned short vt; + unsigned i, n; + print_begin_block("CustData"); - dump_binary(seg->length); /* FIXME */ + for(i=0; offset < seg->offset+seg->length; i++) { + print_offset(); + + vt = tlb_read_short(); + printf("vt %d", vt); + n = tlb_read_int(); + + switch(vt) { + case 8 /* VT_BSTR */: + printf(" len %d: ", n); + dump_string(n, 2); + printf("\n"); + break; + default: + printf(": %x ", n); + printf("\\%2.2x \\%2.2x\n", tlb_read_byte(), tlb_read_byte()); + } + } print_end_block(); return -1;

1 0

Frédéric Delanoy : wineusr: Assorted formatting & tagging fixes.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: docs Branch: master Commit: b0abf8911871f073e3c7989dd0dc1b76e5dcd4be URL: http://source.winehq.org/git/docs.git/?a=commit;h=b0abf8911871f073e3c7989dd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 29 15:02:34 2013 +0200 wineusr: Assorted formatting & tagging fixes. A couple typos as well. --- en/wineusr-bugs.sgml | 36 ++++++++++++++++++++++--------- en/wineusr-configuring.sgml | 47 +++++++++++++++++++++-------------------- en/wineusr-getting.sgml | 6 ++-- en/wineusr-glossary.sgml | 26 ++++++++--------------- en/wineusr-introduction.sgml | 16 +++++++------- en/wineusr-running.sgml | 41 ++++++++++++++++++----------------- 6 files changed, 90 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=b0abf8911871f073e3c79…

1 0

Huw Davies : gdi32: Skip vdmx records with charset == 0.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 2f20032dd3a74fe690fc72ea617ec52c4065f711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f20032dd3a74fe690fc72ea6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 28 14:21:13 2013 +0100 gdi32: Skip vdmx records with charset == 0. --- dlls/gdi32/freetype.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3d61ad1..d9f111a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4512,6 +4512,8 @@ static LONG load_VDMX(GdiFont *font, LONG height) TRACE("Ratios[%d] %d %d : %d -> %d\n", i, ratio.bCharSet, ratio.xRatio, ratio.yStartRatio, ratio.yEndRatio); + if (!ratio.bCharSet) continue; + if((ratio.xRatio == 0 && ratio.yStartRatio == 0 && ratio.yEndRatio == 0) || @@ -4526,10 +4528,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) } } - if(offset == -1) { - FIXME("No suitable ratio found\n"); - return ppem; - } + if(offset == -1) return 0; if(get_font_data(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { USHORT recs;

1 0

Huw Davies : gdi32/tests: Mark some tests as exact.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 7310bdb4983e88af67a28504c1a4b08617867363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7310bdb4983e88af67a28504c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 28 14:21:14 2013 +0100 gdi32/tests: Mark some tests as exact. --- dlls/gdi32/tests/font.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 513d33e..32a2540 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1704,9 +1704,7 @@ static void test_height( HDC hdc, const struct font_data *fd ) ok(match_off_by_1(tm.tmHeight, fd[i].height, fd[i].exact), "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmHeight, fd[i].height); ok(match_off_by_1(tm.tmAscent, fd[i].ascent, fd[i].exact), "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmAscent, fd[i].ascent); ok(match_off_by_1(tm.tmDescent, fd[i].descent, fd[i].exact), "%s(%d): tm.tmDescent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmDescent, fd[i].descent); -#if 0 /* FIXME: calculation of tmInternalLeading in Wine doesn't match what Windows does */ - ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmInternalLeading, fd[i].int_leading); -#endif + ok(match_off_by_1(tm.tmInternalLeading, fd[i].int_leading, fd[i].exact), "%s(%d): tm.tmInternalLeading %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmInternalLeading, fd[i].int_leading); ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmExternalLeading, fd[i].ext_leading); } @@ -1725,10 +1723,10 @@ static void test_height_selection(void) {"Tahoma", -96, FW_NORMAL, 116, 96, 20, 20, 0, 96, TRUE }, {"Tahoma", -192, FW_NORMAL, 232, 192, 40, 40, 0, 96, TRUE }, {"Tahoma", 12, FW_NORMAL, 12, 10, 2, 2, 0, 96, TRUE }, - {"Tahoma", 24, FW_NORMAL, 24, 20, 4, 4, 0, 96, FALSE }, + {"Tahoma", 24, FW_NORMAL, 24, 20, 4, 4, 0, 96, TRUE }, {"Tahoma", 48, FW_NORMAL, 48, 40, 8, 8, 0, 96, TRUE }, {"Tahoma", 96, FW_NORMAL, 96, 80, 16, 17, 0, 96, FALSE }, - {"Tahoma", 192, FW_NORMAL, 192, 159, 33, 33, 0, 96, FALSE }, + {"Tahoma", 192, FW_NORMAL, 192, 159, 33, 33, 0, 96, TRUE }, {"", 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; HDC hdc = CreateCompatibleDC(0);

1 0

Huw Davies : gdi32/tests: Add vdmx tests.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 774f57ca242684d05e1ed9fcf81f5ddd68979cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=774f57ca242684d05e1ed9fcf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 28 14:21:15 2013 +0100 gdi32/tests: Add vdmx tests. --- dlls/gdi32/tests/font.c | 215 +++++++++++++++++++++++++++++--- dlls/gdi32/tests/resource.rc | 2 + dlls/gdi32/tests/wine_vdmx.sfd | 271 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_vdmx.ttf | Bin 0 -> 3280 bytes 4 files changed, 473 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=774f57ca242684d05e1ed…

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_hash implementation.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 366929f16b37c9936ba880a367fab3785bd8caa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366929f16b37c9936ba880a36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 28 16:02:00 2013 +0200 mshtml: Added IHTMLAnchorElement::get_hash implementation. --- dlls/mshtml/htmlanchor.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 8471b71..32b39cb 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -466,8 +466,14 @@ static HRESULT WINAPI HTMLAnchorElement_put_hash(IHTMLAnchorElement *iface, BSTR static HRESULT WINAPI HTMLAnchorElement_get_hash(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString hash_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&hash_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHash(This->nsanchor, &hash_str); + return return_nsstr(nsres, &hash_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_onblur(IHTMLAnchorElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 749d3c0..3141643 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1468,6 +1468,22 @@ static void _test_anchor_hostname(unsigned line, IUnknown *unk, const char *host SysFreeString(str); } +#define test_anchor_hash(a,h) _test_anchor_hash(__LINE__,a,h) +static void _test_anchor_hash(unsigned line, IHTMLElement *elem, const char *exhash) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_hash(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_hash failed: %08x\n", hres); + if(exhash) + ok_(__FILE__,line)(!strcmp_wa(str, exhash), "hash = %s, expected %s\n", wine_dbgstr_w(str), exhash); + else + ok_(__FILE__,line)(!str, "hash = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + #define test_option_text(o,t) _test_option_text(__LINE__,o,t) static void _test_option_text(unsigned line, IHTMLOptionElement *option, const char *text) { @@ -6380,6 +6396,7 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_put_href((IUnknown*)elem, "http://test/"); test_anchor_href((IUnknown*)elem, "http://test/"); test_anchor_hostname((IUnknown*)elem, "test"); + test_anchor_hash(elem, NULL); /* target */ test_anchor_get_target((IUnknown*)elem, NULL); @@ -6401,6 +6418,9 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_put_name((IUnknown*)elem, NULL); test_anchor_put_name((IUnknown*)elem, "x"); + test_anchor_put_href((IUnknown*)elem, "http://test/#hash"); + test_anchor_hash(elem, "#hash"); + IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLStyle::whiteSpace property implementation.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 7db2691e6fdc4be05ff8d4f1d1785d437dee0a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db2691e6fdc4be05ff8d4f1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 28 17:51:08 2013 +0200 mshtml: Added IHTMLStyle::whiteSpace property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 8d3148c..053c326 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -171,6 +171,8 @@ static const WCHAR attrVerticalAlign[] = {'v','e','r','t','i','c','a','l','-','a','l','i','g','n',0}; static const WCHAR attrVisibility[] = {'v','i','s','i','b','i','l','i','t','y',0}; +static const WCHAR attrWhiteSpace[] = + {'w','h','i','t','e','-','s','p','a','c','e',0}; static const WCHAR attrWidth[] = {'w','i','d','t','h',0}; static const WCHAR attrWordSpacing[] = @@ -257,6 +259,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrTop, DISPID_IHTMLSTYLE_TOP}, {attrVerticalAlign, DISPID_IHTMLSTYLE_VERTICALALIGN}, {attrVisibility, DISPID_IHTMLSTYLE_VISIBILITY}, + {attrWhiteSpace, DISPID_IHTMLSTYLE_WHITESPACE}, {attrWidth, DISPID_IHTMLSTYLE_WIDTH}, {attrWordSpacing, DISPID_IHTMLSTYLE_WORDSPACING}, {attrWordWrap, DISPID_IHTMLSTYLE3_WORDWRAP}, @@ -2214,15 +2217,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_whiteSpace(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_nsstyle_attr(This->nsstyle, STYLEID_WHITE_SPACE, v, 0); } static HRESULT WINAPI HTMLStyle_get_whiteSpace(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_nsstyle_attr(This->nsstyle, STYLEID_WHITE_SPACE, p, 0); } static HRESULT WINAPI HTMLStyle_put_top(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 0a45e05..4f2e5ab 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -101,6 +101,7 @@ typedef enum { STYLEID_TOP, STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, + STYLEID_WHITE_SPACE, STYLEID_WIDTH, STYLEID_WORD_SPACING, STYLEID_WORD_WRAP, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index a32991b..e42bcb7 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2028,6 +2028,22 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); ok(!str, "pageBreakBefore = %s\n", wine_dbgstr_w(str)); + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_whiteSpace(style, &str); + ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(!str, "whiteSpace = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("nowrap"); + hres = IHTMLStyle_put_whiteSpace(style, str); + SysFreeString(str); + ok(hres == S_OK, "put_whiteSpace failed: %08x\n", hres); + + str = NULL; + hres = IHTMLStyle_get_whiteSpace(style, &str); + ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(!strcmp_wa(str, "nowrap"), "whiteSpace = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Francois Gouget : oleaut32/tests: Add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: a205171b4fbb7f9f8ca6fcb57a477f5fa79afb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a205171b4fbb7f9f8ca6fcb57… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 28 16:25:31 2013 +0200 oleaut32/tests: Add a trailing '\n' to a couple of ok() calls. --- dlls/oleaut32/tests/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 57e289a..8b91212 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4897,7 +4897,7 @@ static void test_SetTypeDescAlias(SYSKIND kind) ok(hr == S_OK, "got %08x\n", hr); ITypeLib_Release(tl); - ok(0 == ICreateTypeLib2_Release(ctl), "typelib should have been released"); + ok(0 == ICreateTypeLib2_Release(ctl), "typelib should have been released\n"); trace("after save...\n"); @@ -4919,7 +4919,7 @@ static void test_SetTypeDescAlias(SYSKIND kind) for(i = 0; TDATests[i].vt; ++i) testTDA(tl, &TDATests[i], ptr_size, hreftype, href_cbSizeInstance, href_cbAlignment, FALSE); - ok(0 == ITypeLib_Release(tl), "typelib should have been released"); + ok(0 == ITypeLib_Release(tl), "typelib should have been released\n"); DeleteFileA(filenameA); }

1 0

Hans Leidekker : rpcrt4: Only accept status code HTTP_STATUS_OK.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 0b900f2fd4cc1047eac98113744051e24d1d6d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b900f2fd4cc1047eac981137… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 13:31:55 2013 +0200 rpcrt4: Only accept status code HTTP_STATUS_OK. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b039959..8932f10 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2039,7 +2039,7 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status_code, &size, &index); if (!ret) return GetLastError(); - if (status_code < 400) + if (status_code == HTTP_STATUS_OK) return RPC_S_OK; index = 0; size = sizeof(buf);

1 0

Jacek Caban : wbemdisp: Register WINMGMTS object.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 782cee32ca1c3dc013465645a9c31e13c560042f URL: http://source.winehq.org/git/wine.git/?a=commit;h=782cee32ca1c3dc013465645a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 28 12:14:09 2013 +0200 wbemdisp: Register WINMGMTS object. --- dlls/wbemdisp/wbemdisp_classes.idl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wbemdisp/wbemdisp_classes.idl b/dlls/wbemdisp/wbemdisp_classes.idl index 660c950..1d468ec 100644 --- a/dlls/wbemdisp/wbemdisp_classes.idl +++ b/dlls/wbemdisp/wbemdisp_classes.idl @@ -25,3 +25,11 @@ vi_progid("WbemScripting.SWbemLocator") ] coclass SWbemLocator { interface ISWbemLocator; } + +[ + threading(apartment), + uuid(172bddf8-ceea-11d1-8b05-00600806d9b6), + progid("WINMGMTS.1"), + vi_progid("WINMGMTS") +] +coclass WinMGMTS { interface IParseDisplayName; }

1 0