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

Alexandre Julliard : ntdll: Implement the RunOnce functions.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: fcb3e60332b153ce69b579aa33b1074b8cc5295a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb3e60332b153ce69b579aa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 28 21:10:50 2013 +0200 ntdll: Implement the RunOnce functions. --- dlls/ntdll/ntdll.spec | 3 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/sync.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/thread.c | 2 + include/winnt.h | 2 +- 5 files changed, 122 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e4ed913..dbef513 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -816,6 +816,9 @@ @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString @ stub RtlRunEncodeUnicodeString +@ stdcall RtlRunOnceBeginInitialize(ptr long ptr) +@ stdcall RtlRunOnceComplete(ptr long ptr) +@ stdcall RtlRunOnceExecuteOnce(ptr ptr ptr ptr) @ stdcall RtlRunOnceInitialize(ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 908b72f..3d9264d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -241,6 +241,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) } extern mode_t FILE_umask DECLSPEC_HIDDEN; +extern HANDLE keyed_event DECLSPEC_HIDDEN; /* Register functions */ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3198d96..f466dab 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <errno.h> @@ -60,6 +61,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +HANDLE keyed_event = NULL; + /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, data_size_t *server_sd_len) @@ -1236,7 +1239,117 @@ NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, return status; } -VOID NTAPI RtlRunOnceInitialize(PRTL_RUN_ONCE initonce) +/****************************************************************** + * RtlRunOnceInitialize (NTDLL.@) + */ +void WINAPI RtlRunOnceInitialize( RTL_RUN_ONCE *once ) +{ + once->Ptr = NULL; +} + +/****************************************************************** + * RtlRunOnceBeginInitialize (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +{ + if (flags & RTL_RUN_ONCE_CHECK_ONLY) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + } + + for (;;) + { + ULONG_PTR next, val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 0: /* first time */ + if (!interlocked_cmpxchg_ptr( &once->Ptr, + (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) + return STATUS_PENDING; + break; + + case 1: /* in progress, wait */ + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + next = val & ~3; + if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), + (void *)val ) == (void *)val) + NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); + break; + + case 2: /* done */ + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + return STATUS_PENDING; + } + } +} + +/****************************************************************** + * RtlRunOnceComplete (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +{ + if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; + + if (flags & RTL_RUN_ONCE_INIT_FAILED) + { + if (context) return STATUS_INVALID_PARAMETER; + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + } + else context = (void *)((ULONG_PTR)context | 2); + + for (;;) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 1: /* in progress */ + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + val &= ~3; + while (val) + { + ULONG_PTR next = *(ULONG_PTR *)val; + NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); + val = next; + } + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + return STATUS_SUCCESS; + + default: + return STATUS_UNSUCCESSFUL; + } + } +} + +/****************************************************************** + * RtlRunOnceExecuteOnce (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ) { - initonce->Ptr = NULL; + DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); + + if (ret != STATUS_PENDING) return ret; + + if (!func( once, param, context )) + { + RtlRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + return STATUS_UNSUCCESSFUL; + } + + return RtlRunOnceComplete( once, 0, context ? *context : NULL ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c93a0cd..703e83c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -308,6 +308,8 @@ HANDLE thread_init(void) fill_cpu_info(); + NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); + return exe_file; } diff --git a/include/winnt.h b/include/winnt.h index 171141e..1f71423 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5163,7 +5163,7 @@ typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; NTSYSAPI VOID WINAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); NTSYSAPI DWORD WINAPI RtlRunOnceExecuteOnce(PRTL_RUN_ONCE,PRTL_RUN_ONCE_INIT_FN,PVOID,PVOID*); -NTSYSAPI DWORD WINAPI RtlRunOnceBeginInitialize(PRTL_RUN_ONCE, DWORD, PBOOL, PVOID*); +NTSYSAPI DWORD WINAPI RtlRunOnceBeginInitialize(PRTL_RUN_ONCE, DWORD, PVOID*); NTSYSAPI DWORD WINAPI RtlRunOnceComplete(PRTL_RUN_ONCE, DWORD, PVOID); #include <pshpack8.h>

1 0

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

Aug. 29, 2013

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

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

Aug. 28, 2013

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

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_hash implementation.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

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 Aug. 28, 2013

Aug. 28, 2013

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

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

Aug. 28, 2013

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: Skip vdmx records with charset == 0.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

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: Add vdmx tests.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

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

Huw Davies : gdi32: Reset ppem to zero if we fail to find a matching height .
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: d089ca67e3df8b930ebebb29dd9bf2a80ecda726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d089ca67e3df8b930ebebb29d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 28 14:21:12 2013 +0100 gdi32: Reset ppem to zero if we fail to find a matching height. --- dlls/gdi32/freetype.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3f3b480..3d61ad1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4580,14 +4580,20 @@ static LONG load_VDMX(GdiFont *font, LONG height) } else { ppem = -height; if(ppem < startsz || ppem > endsz) - goto end; + { + ppem = 0; + goto end; + } for(i = 0; i < recs; i++) { USHORT yPelHeight; yPelHeight = GET_BE_WORD(vTable[i * 3]); if(yPelHeight > ppem) - break; /* failed */ + { + ppem = 0; + break; /* failed */ + } if(yPelHeight == ppem) { font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]);

1 0

Huw Davies : gdi32/tests: Add an option to match metrics exactly.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 18edb16aced749978ae533a7282f7f747d5fa05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18edb16aced749978ae533a72… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 28 14:21:10 2013 +0100 gdi32/tests: Add an option to match metrics exactly. --- dlls/gdi32/tests/font.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 17891e3..513d33e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -31,7 +31,7 @@ #include "wine/test.h" /* Do not allow more than 1 deviation here */ -#define match_off_by_1(a, b) (abs((a) - (b)) <= 1) +#define match_off_by_1(a, b, exact) (abs((a) - (b)) <= ((exact) ? 0 : 1)) #define near_match(a, b) (abs((a) - (b)) <= 6) #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) @@ -1575,9 +1575,9 @@ static void test_GetKerningPairs(void) uiRet = GetOutlineTextMetricsW(hdc, sizeof(otm), &otm); ok(uiRet == sizeof(otm), "GetOutlineTextMetricsW error %d\n", GetLastError()); - ok(match_off_by_1(kd[i].tmHeight, otm.otmTextMetrics.tmHeight), "expected %d, got %d\n", + ok(match_off_by_1(kd[i].tmHeight, otm.otmTextMetrics.tmHeight, FALSE), "expected %d, got %d\n", kd[i].tmHeight, otm.otmTextMetrics.tmHeight); - ok(match_off_by_1(kd[i].tmAscent, otm.otmTextMetrics.tmAscent), "expected %d, got %d\n", + ok(match_off_by_1(kd[i].tmAscent, otm.otmTextMetrics.tmAscent, FALSE), "expected %d, got %d\n", kd[i].tmAscent, otm.otmTextMetrics.tmAscent); ok(kd[i].tmDescent == otm.otmTextMetrics.tmDescent, "expected %d, got %d\n", kd[i].tmDescent, otm.otmTextMetrics.tmDescent); @@ -1668,6 +1668,7 @@ struct font_data const char face_name[LF_FACESIZE]; int requested_height; int weight, height, ascent, descent, int_leading, ext_leading, dpi; + BOOL exact; }; static void test_height( HDC hdc, const struct font_data *fd ) @@ -1700,9 +1701,9 @@ static void test_height( HDC hdc, const struct font_data *fd ) { trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmWeight, fd[i].weight); - ok(match_off_by_1(tm.tmHeight, fd[i].height), "%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), "%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), "%s(%d): tm.tmDescent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmDescent, fd[i].descent); + 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 @@ -1718,17 +1719,17 @@ static void test_height_selection(void) { static const struct font_data tahoma[] = { - {"Tahoma", -12, FW_NORMAL, 14, 12, 2, 2, 0, 96 }, - {"Tahoma", -24, FW_NORMAL, 29, 24, 5, 5, 0, 96 }, - {"Tahoma", -48, FW_NORMAL, 58, 48, 10, 10, 0, 96 }, - {"Tahoma", -96, FW_NORMAL, 116, 96, 20, 20, 0, 96 }, - {"Tahoma", -192, FW_NORMAL, 232, 192, 40, 40, 0, 96 }, - {"Tahoma", 12, FW_NORMAL, 12, 10, 2, 2, 0, 96 }, - {"Tahoma", 24, FW_NORMAL, 24, 20, 4, 4, 0, 96 }, - {"Tahoma", 48, FW_NORMAL, 48, 40, 8, 8, 0, 96 }, - {"Tahoma", 96, FW_NORMAL, 96, 80, 16, 17, 0, 96 }, - {"Tahoma", 192, FW_NORMAL, 192, 159, 33, 33, 0, 96 }, - {"", 0, 0, 0, 0, 0, 0, 0, 0 } + {"Tahoma", -12, FW_NORMAL, 14, 12, 2, 2, 0, 96, TRUE }, + {"Tahoma", -24, FW_NORMAL, 29, 24, 5, 5, 0, 96, TRUE }, + {"Tahoma", -48, FW_NORMAL, 58, 48, 10, 10, 0, 96, TRUE }, + {"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", 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 }, + {"", 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; HDC hdc = CreateCompatibleDC(0); assert(hdc); @@ -3966,7 +3967,7 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) SelectObject(hdc, of); DeleteObject(hf); - if (match_off_by_1(tm.tmAveCharWidth, ave_width) || width / height > 200) + if (match_off_by_1(tm.tmAveCharWidth, ave_width, FALSE) || width / height > 200) break; }

1 0