November 2014 - Wine-Commits

Alex Henrie : kernel32/tests: Add UTF-7 non-encoded surrounding characters tests.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 7c1580a4a805fce66adb1512bf9d9aa6bb280a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1580a4a805fce66adb1512b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 6 00:11:24 2014 -0700 kernel32/tests: Add UTF-7 non-encoded surrounding characters tests. --- dlls/kernel32/tests/codepage.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8423c75..89bbd60 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <limits.h> #include "wine/test.h" @@ -412,6 +413,76 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } +static void test_utf7_encoding(void) +{ + WCHAR input[16]; + char output[16], expected[16]; + int i, len, expected_len; + + static const BOOL directly_encodable_table[] = + { + 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, /* 0x00 - 0x0F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x1F */ + 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, /* 0x20 - 0x2F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 0x30 - 0x3F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x40 - 0x4F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 0x50 - 0x5F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x60 - 0x6F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 /* 0x70 - 0x7F */ + }; + static const char base64_encoding_table[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + if (WideCharToMultiByte(CP_UTF7, 0, foobarW, -1, NULL, 0, NULL, NULL) == 0 && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("UTF-7 encoding not implemented\n"); + return; + } + + /* test which characters are encoded if surrounded by non-encoded characters */ + for (i = 0; i <= 0xFFFF; i++) + { + input[0] = ' '; + input[1] = i; + input[2] = ' '; + input[3] = 0; + + memset(output, '#', sizeof(output) - 1); + output[sizeof(output) - 1] = 0; + + len = WideCharToMultiByte(CP_UTF7, 0, input, 4, output, sizeof(output) - 1, NULL, NULL); + + if (i == '+') + { + /* '+' is a special case and is encoded as "+-" */ + expected_len = 5; + strcpy(expected, " +- "); + } + else if (i <= 0x7F && directly_encodable_table[i]) + { + /* encodes directly */ + expected_len = 4; + sprintf(expected, " %c ", i); + } + else + { + /* base64-encodes */ + expected_len = 8; + sprintf(expected, " +%c%c%c- ", + base64_encoding_table[(i & 0xFC00) >> 10], + base64_encoding_table[(i & 0x03F0) >> 4], + base64_encoding_table[(i & 0x000F) << 2]); + } + + ok(len == expected_len, "i=0x%04x: expected len=%i, got len=%i\n", i, expected_len, len); + ok(memcmp(output, expected, expected_len) == 0, + "i=0x%04x: expected output='%s', got output='%s'\n", i, expected, output); + ok(output[expected_len] == '#', "i=0x%04x: expected output[%i]='#', got output[%i]=%i\n", + i, expected_len, expected_len, output[expected_len]); + } +} + static void test_undefined_byte_char(void) { static const struct tag_testset { @@ -618,6 +689,8 @@ START_TEST(codepage) test_string_conversion(NULL); test_string_conversion(&bUsedDefaultChar); + test_utf7_encoding(); + test_undefined_byte_char(); test_threadcp(); }

1 0

Jacek Caban : mshtml: Added IHTMLTable: cellPadding property implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: c19b6dbf6be66d7f955d87a125ac9ef5cd86295e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19b6dbf6be66d7f955d87a12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 6 11:42:45 2014 +0100 mshtml: Added IHTMLTable:cellPadding property implementation. --- dlls/mshtml/htmltable.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/mshtml_private.h | 7 +++++++ dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 8e64efa..0e8e55b 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -288,15 +288,37 @@ static HRESULT WINAPI HTMLTable_get_cellSpacing(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_cellPadding(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString val; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + hres = var2str(&v, &val); + if(FAILED(hres)) + return hres; + + nsres = nsIDOMHTMLTableElement_SetCellPadding(This->nstable, &val); + nsAString_Finish(&val); + if(NS_FAILED(nsres)) { + ERR("Set Width(%s) failed, err = %08x\n", debugstr_variant(&v), nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTable_get_cellPadding(IHTMLTable *iface, VARIANT *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableElement_GetCellPadding(This->nstable, &val); + return return_nsstr_variant(nsres, &val, p); } static HRESULT WINAPI HTMLTable_put_background(IHTMLTable *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1c932f2..abe7995 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -833,8 +833,15 @@ BOOL nsAString_Init(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; + HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; +static inline HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) +{ + V_VT(p) = VT_BSTR; + return return_nsstr(nsres, nsstr, &V_BSTR(p)); +} + nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; void get_editor_controller(NSContainer*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c1ca092..f0f03b8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6335,6 +6335,23 @@ static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const cha VariantClear(&v); } +#define test_table_cell_padding(a,b) _test_table_cell_padding(__LINE__,a,b) +static void _test_table_cell_padding(unsigned line, IHTMLTable *table, const char *exstr) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_ERROR; + hres = IHTMLTable_get_cellPadding(table, &v); + ok_(__FILE__,line)(hres == S_OK, "get_cellPadding failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + if(exstr) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exstr), "cellPadding = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exstr); + else + ok_(__FILE__,line)(!V_BSTR(&v), "cellPadding = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + static void test_table_modify(IHTMLTable *table) { IDispatch *disp; @@ -6437,6 +6454,27 @@ static void test_table_elem(IHTMLElement *elem) test_table_cell_spacing(table, "11"); VariantClear(&v); + test_table_cell_padding(table, NULL); + + V_VT(&v) = VT_I4; + V_I4(&v) = 10; + hres = IHTMLTable_put_cellPadding(table, v); + ok(hres == S_OK, "put_cellPadding = %08x\n", hres); + test_table_cell_padding(table, "10"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11"); + hres = IHTMLTable_put_cellPadding(table, v); + ok(hres == S_OK, "put_cellPadding = %08x\n", hres); + test_table_cell_padding(table, "11"); + VariantClear(&v); + + V_VT(&v) = VT_R8; + V_R8(&v) = 5; + hres = IHTMLTable_put_cellPadding(table, v); + ok(hres == S_OK, "put_cellPadding = %08x\n", hres); + test_table_cell_padding(table, "5"); + bstr = a2bstr("left"); hres = IHTMLTable_put_align(table, bstr); ok(hres == S_OK, "set_align failed: %08x\n", hres); @@ -6531,7 +6569,6 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); - bstr = a2bstr("box"); hres = IHTMLTable_put_frame(table, bstr); ok(hres == S_OK, "put_frame = %08x\n", hres);

1 0

Sebastian Lackner : user32/tests: Add tests for MsgWaitForMultipleObjectsEx.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 3326cad0dd7acca41d5e0286861a93423967c7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3326cad0dd7acca41d5e02868… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 6 00:13:42 2014 +0100 user32/tests: Add tests for MsgWaitForMultipleObjectsEx. --- dlls/user32/tests/msg.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90b87cb..a55852b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4542,6 +4542,11 @@ static const struct message WmZOrder[] = { { 0 } }; +static void CALLBACK apc_test_proc(ULONG_PTR param) +{ + /* nothing */ +} + static void test_MsgWaitForMultipleObjects(HWND hwnd) { DWORD ret; @@ -4583,6 +4588,37 @@ static void test_MsgWaitForMultipleObjects(HWND hwnd) ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* MWMO_INPUTAVAILABLE should succeed even if the message was already seen */ + PostMessageA( hwnd, WM_USER, 0, 0 ); + ok(PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_INPUTAVAILABLE ); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* without MWMO_ALERTABLE the result is never WAIT_IO_COMPLETION */ + ret = QueueUserAPC( apc_test_proc, GetCurrentThread(), 0 ); + ok(ret, "QueueUserAPC failed %u\n", GetLastError()); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, 0 ); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + /* but even with MWMO_ALERTABLE window events are preferred */ + PostMessageA( hwnd, WM_USER, 0, 0 ); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE ); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* the APC call is still queued */ + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE ); + ok(ret == WAIT_IO_COMPLETION, "MsgWaitForMultipleObjectsEx returned %x\n", ret); } /* test if we receive the right sequence of messages */

1 0

Chen Yuan : mshtml: Add IHTMLStyle5::maxWidth property implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 94209192e7666ffcfd521091c632146688a380ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=94209192e7666ffcfd521091c… Author: Chen Yuan <huddsinyuan2014(a)gmail.com> Date: Wed Nov 5 01:32:42 2014 +0800 mshtml: Add IHTMLStyle5::maxWidth property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 52d15f9..755507c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -144,6 +144,8 @@ static const WCHAR attrMarginRight[] = {'m','a','r','g','i','n','-','r','i','g','h','t',0}; static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; +static const WCHAR attrMaxWidth[] = + {'m','a','x','-','w','i','d','t','h',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR attrMinWidth[] = @@ -264,6 +266,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, + {attrMaxWidth, DISPID_IHTMLSTYLE5_MAXWIDTH}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrMinWidth, DISPID_IHTMLSTYLE5_MINWIDTH}, {attrOutline, DISPID_IHTMLSTYLE6_OUTLINE}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 1ae8d8c..d2834ac 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -87,6 +87,7 @@ typedef enum { STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, + STYLEID_MAX_WIDTH, STYLEID_MIN_HEIGHT, STYLEID_MIN_WIDTH, STYLEID_OUTLINE, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index c704f08..658f879 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -562,15 +562,19 @@ static HRESULT WINAPI HTMLStyle5_get_minWidth(IHTMLStyle5 *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle5_put_maxWidth(IHTMLStyle5 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_WIDTH, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle5_get_maxWidth(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_WIDTH, p, 0); } static const IHTMLStyle5Vtbl HTMLStyle5Vtbl = { diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ed9338d..1c230f4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -548,6 +548,38 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_put_minWidth(style5, vdefault); ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); VariantClear(&vdefault); + + /* maxWidth */ + hres = IHTMLStyle5_get_maxWidth(style5, &vdefault); + ok(hres == S_OK, "get_maxWidth failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("200px"); + hres = IHTMLStyle5_put_maxWidth(style5, v); + ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxWidth(style5, &v); + ok(hres == S_OK, "get_maxWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n",V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "200px"), "expect 200px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("70%"); + hres = IHTMLStyle5_put_maxWidth(style5, v); + ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxWidth(style5, &v); + ok(hres == S_OK, "get maxWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "70%"), "expect 70%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle5_put_maxWidth(style5,vdefault); + ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + VariantClear(&vdefault); } static void test_style6(IHTMLStyle6 *style)

1 0

Nikolay Sivov : dwrite: File and factory are always set now for all collections.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 3fd93c0d1d823fe7b773f22cc19180cf513b5b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd93c0d1d823fe7b773f22cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 12:51:52 2014 +0300 dwrite: File and factory are always set now for all collections. --- dlls/dwrite/font.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7dea8e5..16172b6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -203,11 +203,8 @@ static void release_font_data(struct dwrite_font_data *data) IDWriteLocalizedStrings_Release(data->info_strings[i]); } - /* FIXME: factory and file will be always set once system collection is working */ - if (data->file) - IDWriteFontFile_Release(data->file); - if (data->factory) - IDWriteFactory_Release(data->factory); + IDWriteFontFile_Release(data->file); + IDWriteFactory_Release(data->factory); heap_free(data->facename); heap_free(data); }

1 0

Nikolay Sivov : user32/tests: Use win_skip() where appropriate.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 3c24481dea4e724f9c8ec8a4d66754cbfd254cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c24481dea4e724f9c8ec8a4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 15:11:18 2014 +0300 user32/tests: Use win_skip() where appropriate. --- dlls/user32/tests/class.c | 2 +- dlls/user32/tests/input.c | 2 +- dlls/user32/tests/winstation.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2218e79..95cfc3c 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1115,7 +1115,7 @@ static void test_IME(void) if (!GetProcAddress(GetModuleHandleA("user32.dll"), "BroadcastSystemMessageExA")) { - skip("BroadcastSystemMessageExA not available, skipping IME class test\n"); + win_skip("BroadcastSystemMessageExA not available, skipping IME class test\n"); return; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3ce0570..9b898d3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1361,7 +1361,7 @@ static void test_GetMouseMovePointsEx(void) /* Get a valid content for the input struct */ if(!GetCursorPos(&point)) { - skip("GetCursorPos() failed with error %u\n", GetLastError()); + win_skip("GetCursorPos() failed with error %u\n", GetLastError()); return; } memset(&in, 0, sizeof(MOUSEMOVEPOINT)); diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 0889dac..c09ebb1 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -932,7 +932,7 @@ START_TEST(winstation) GetProcessWindowStation(); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("WindowStation calls not supported on this platform\n"); + win_skip("WindowStation calls not supported on this platform\n"); return; }

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_SetColor().
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 94cd81a45d2ebcb6b737a37842860fc5b0277932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cd81a45d2ebcb6b737a3784… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:15 2014 +0100 d2d1: Implement d2d_solid_color_brush_SetColor(). --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b2a1664..04b273a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -243,7 +243,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColor static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrush *iface, const D2D1_COLOR_F *color) { - FIXME("iface %p, color %p stub!\n", iface, color); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + + TRACE("iface %p, color %p.\n", iface, color); + + brush->u.solid.color = *color; } static D2D1_COLOR_F * STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface, D2D1_COLOR_F *color)

1 0

Nikolay Sivov : dwrite: Implement GetMetrics() for fontface.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: c8bc7ea849d4cca6d9b40ce27cd33d9b79743cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bc7ea849d4cca6d9b40ce27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 6 08:50:12 2014 +0300 dwrite: Implement GetMetrics() for fontface. --- dlls/dwrite/font.c | 16 +++++++++++++--- dlls/dwrite/tests/font.c | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6c62056..e6154b4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -112,6 +112,7 @@ struct dwrite_fontface { USHORT simulations; DWRITE_FONT_FACE_TYPE type; + DWRITE_FONT_METRICS metrics; struct dwrite_fonttable cmap; }; @@ -313,7 +314,8 @@ static BOOL WINAPI dwritefontface_IsSymbolFont(IDWriteFontFace2 *iface) static void WINAPI dwritefontface_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FONT_METRICS *metrics) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%p): stub\n", This, metrics); + TRACE("(%p)->(%p)\n", This, metrics); + *metrics = This->metrics; } static UINT16 WINAPI dwritefontface_GetGlyphCount(IDWriteFontFace2 *iface) @@ -615,11 +617,18 @@ static void get_font_properties_from_stream(IDWriteFontFileStream *stream, DWRIT { const void *tt_os2 = NULL, *tt_head = NULL, *tt_post = NULL; void *os2_context, *head_context, *post_context; + DWRITE_FONT_STRETCH fontstretch; + DWRITE_FONT_WEIGHT fontweight; + DWRITE_FONT_STYLE fontstyle; opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, &tt_os2, &os2_context, NULL, NULL); opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); opentype_get_font_table(stream, face_type, face_index, MS_POST_TAG, &tt_post, &post_context, NULL, NULL); + if (!stretch) stretch = &fontstretch; + if (!weight) weight = &fontweight; + if (!style) style = &fontstyle; + opentype_get_font_properties(tt_os2, tt_head, stretch, weight, style); opentype_get_font_metrics(tt_os2, tt_head, tt_post, metrics); @@ -1930,6 +1939,8 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->cmap.data = NULL; fontface->cmap.context = NULL; fontface->cmap.size = 0; + fontface->index = index; + fontface->simulations = simulations; for (i = 0; i < fontface->file_count; i++) { hr = get_stream_from_file(font_files[i], &fontface->streams[i]); @@ -1942,8 +1953,7 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW IDWriteFontFile_AddRef(font_files[i]); } - fontface->index = index; - fontface->simulations = simulations; + get_font_properties_from_stream(fontface->streams[0], facetype, index, &fontface->metrics, NULL, NULL, NULL); *ret = &fontface->IDWriteFontFace2_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e51b702..51a07c7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -957,6 +957,7 @@ static void test_GetMetrics(void) { IDWriteGdiInterop *interop; DWRITE_FONT_METRICS metrics; + IDWriteFontFace *fontface; IDWriteFactory *factory; OUTLINETEXTMETRICW otm; IDWriteFont *font; @@ -1009,6 +1010,26 @@ todo_wine ok(metrics.strikethroughPosition > 0, "strikethroughPosition %d\n", metrics.strikethroughPosition); ok(metrics.strikethroughThickness != 0, "strikethroughThickness %u\n", metrics.strikethroughThickness); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&metrics, 0, sizeof(metrics)); + IDWriteFontFace_GetMetrics(fontface, &metrics); + + ok(metrics.designUnitsPerEm != 0, "designUnitsPerEm %u\n", metrics.designUnitsPerEm); + ok(metrics.ascent != 0, "ascent %u\n", metrics.ascent); + ok(metrics.descent != 0, "descent %u\n", metrics.descent); +todo_wine + ok(metrics.lineGap == 0, "lineGap %d\n", metrics.lineGap); + ok(metrics.capHeight, "capHeight %u\n", metrics.capHeight); + ok(metrics.xHeight != 0, "xHeight %u\n", metrics.xHeight); + ok(metrics.underlinePosition < 0, "underlinePosition %d\n", metrics.underlinePosition); + ok(metrics.underlineThickness != 0, "underlineThickness %u\n", metrics.underlineThickness); + ok(metrics.strikethroughPosition > 0, "strikethroughPosition %d\n", metrics.strikethroughPosition); + ok(metrics.strikethroughThickness != 0, "strikethroughThickness %u\n", metrics.strikethroughThickness); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Use public APIs to get file streams from fontface.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 90753adaafb8ef925983a6e1837aa52eb06cbc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90753adaafb8ef925983a6e18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 23:30:32 2014 +0300 dwrite: Use public APIs to get file streams from fontface. --- dlls/dwrite/font.c | 99 +++++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d5d6b41..6c62056 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -105,6 +105,7 @@ struct dwrite_fontface { IDWriteFontFace2 IDWriteFontFace2_iface; LONG ref; + IDWriteFontFileStream **streams; IDWriteFontFile **files; UINT32 file_count; UINT32 index; @@ -170,25 +171,6 @@ static inline void* get_fontface_cmap(struct dwrite_fontface *fontface) return fontface->cmap.data; } -static HRESULT _dwritefontfile_GetFontFileStream(IDWriteFontFile *iface, IDWriteFontFileStream **stream) -{ - HRESULT hr; - struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); - if (!This->stream) - { - hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &This->stream); - if (FAILED(hr)) - return hr; - } - if (This->stream) - { - IDWriteFontFileStream_AddRef(This->stream); - *stream = This->stream; - return S_OK; - } - return E_FAIL; -} - static void release_font_data(struct dwrite_font_data *data) { int i; @@ -264,8 +246,12 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) if (This->cmap.context) IDWriteFontFace2_ReleaseFontTable(iface, This->cmap.context); - for (i = 0; i < This->file_count; i++) - IDWriteFontFile_Release(This->files[i]); + for (i = 0; i < This->file_count; i++) { + if (This->streams[i]) + IDWriteFontFileStream_Release(This->streams[i]); + if (This->files[i]) + IDWriteFontFile_Release(This->files[i]); + } heap_free(This); } @@ -381,15 +367,8 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace2 *iface, UI *exists = FALSE; for (i = 0; i < This->file_count && !(*exists); i++) { - IDWriteFontFileStream *stream; - hr = _dwritefontfile_GetFontFileStream(This->files[i], &stream); - if (FAILED(hr)) - continue; + hr = opentype_get_font_table(This->streams[i], This->type, This->index, table_tag, table_data, &tablecontext->context, table_size, exists); tablecontext->file_index = i; - - hr = opentype_get_font_table(stream, This->type, This->index, table_tag, table_data, &tablecontext->context, table_size, exists); - - IDWriteFontFileStream_Release(stream); } if (FAILED(hr) && !*exists) heap_free(tablecontext); @@ -403,8 +382,7 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace2 *iface, void { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); struct dwrite_fonttablecontext *tablecontext = (struct dwrite_fonttablecontext*)table_context; - IDWriteFontFileStream *stream; - HRESULT hr; + TRACE("(%p)->(%p)\n", This, table_context); if (tablecontext->magic != DWRITE_FONTTABLE_MAGIC) @@ -413,11 +391,7 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace2 *iface, void return; } - hr = _dwritefontfile_GetFontFileStream(This->files[tablecontext->file_index], &stream); - if (FAILED(hr)) - return; - IDWriteFontFileStream_ReleaseFileFragment(stream, tablecontext->context); - IDWriteFontFileStream_Release(stream); + IDWriteFontFileStream_ReleaseFileFragment(This->streams[tablecontext->file_index], tablecontext->context); heap_free(tablecontext); } @@ -1904,6 +1878,30 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } +static HRESULT get_stream_from_file(IDWriteFontFile *file, IDWriteFontFileStream **stream) +{ + IDWriteFontFileLoader *loader; + UINT32 key_size; + const void *key; + HRESULT hr; + + *stream = NULL; + hr = IDWriteFontFile_GetLoader(file, &loader); + if (FAILED(hr)) + return hr; + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + if (FAILED(hr)) { + IDWriteFontFileLoader_Release(loader); + return hr; + } + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, key, key_size, stream); + IDWriteFontFileLoader_Release(loader); + + return hr; +} + HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace2 **ret) { @@ -1915,8 +1913,12 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW if (!fontface) return E_OUTOFMEMORY; - fontface->files = heap_alloc(sizeof(*fontface->files) * files_number); - if (!fontface->files) { + fontface->files = heap_alloc_zero(sizeof(*fontface->files) * files_number); + fontface->streams = heap_alloc_zero(sizeof(*fontface->streams) * files_number); + + if (!fontface->files || !fontface->streams) { + heap_free(fontface->files); + heap_free(fontface->streams); heap_free(fontface); return E_OUTOFMEMORY; } @@ -1929,22 +1931,13 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->cmap.context = NULL; fontface->cmap.size = 0; - /* Verify font file streams */ - for (i = 0; i < fontface->file_count && SUCCEEDED(hr); i++) - { - IDWriteFontFileStream *stream; - hr = _dwritefontfile_GetFontFileStream(font_files[i], &stream); - if (SUCCEEDED(hr)) - IDWriteFontFileStream_Release(stream); - } - - if (FAILED(hr)) { - heap_free(fontface->files); - heap_free(fontface); - return hr; - } - for (i = 0; i < fontface->file_count; i++) { + hr = get_stream_from_file(font_files[i], &fontface->streams[i]); + if (FAILED(hr)) { + IDWriteFontFace2_Release(&fontface->IDWriteFontFace2_iface); + return hr; + } + fontface->files[i] = font_files[i]; IDWriteFontFile_AddRef(font_files[i]); }

1 0

Nikolay Sivov : dwrite: Added a separate helper to fill font metrics structure.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 19869997d49251a97f41d98a93a42c71dea90eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19869997d49251a97f41d98a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 23:03:32 2014 +0300 dwrite: Added a separate helper to fill font metrics structure. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 6 +++-- dlls/dwrite/opentype.c | 52 ++++++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 8386d92..c06a270 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -113,7 +113,8 @@ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_ extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; -extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; +extern void opentype_get_font_properties(const void*,const void*,DWRITE_FONT_STRETCH*,DWRITE_FONT_WEIGHT*,DWRITE_FONT_STYLE*) DECLSPEC_HIDDEN; +extern void opentype_get_font_metrics(const void*,const void*,const void*,DWRITE_FONT_METRICS*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 16172b6..d5d6b41 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -646,7 +646,8 @@ static void get_font_properties_from_stream(IDWriteFontFileStream *stream, DWRIT opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); opentype_get_font_table(stream, face_type, face_index, MS_POST_TAG, &tt_post, &post_context, NULL, NULL); - get_font_properties(tt_os2, tt_head, tt_post, metrics, stretch, weight, style); + opentype_get_font_properties(tt_os2, tt_head, stretch, weight, style); + opentype_get_font_metrics(tt_os2, tt_head, tt_post, metrics); if (tt_os2) IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); @@ -1489,7 +1490,8 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); opentype_get_font_table(stream, face_type, face_index, MS_POST_TAG, &tt_post, &post_context, NULL, NULL); - get_font_properties(tt_os2, tt_head, tt_post, &data->metrics, &data->stretch, &data->weight, &data->style); + opentype_get_font_properties(tt_os2, tt_head, &data->stretch, &data->weight, &data->style); + opentype_get_font_metrics(tt_os2, tt_head, tt_post, &data->metrics); if (tt_os2) IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8a14336..5d56899 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -858,28 +858,15 @@ HRESULT opentype_cmap_get_unicode_ranges(void *data, UINT32 max_count, DWRITE_UN return *count > max_count ? E_NOT_SUFFICIENT_BUFFER : S_OK; } -VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) +void opentype_get_font_metrics(const void *os2, const void *head, const void *post, DWRITE_FONT_METRICS *metrics) { TT_OS2_V2 *tt_os2 = (TT_OS2_V2*)os2; TT_HEAD *tt_head = (TT_HEAD*)head; TT_POST *tt_post = (TT_POST*)post; - /* default stretch, weight and style to normal */ - *stretch = DWRITE_FONT_STRETCH_NORMAL; - *weight = DWRITE_FONT_WEIGHT_NORMAL; - *style = DWRITE_FONT_STYLE_NORMAL; - memset(metrics, 0, sizeof(*metrics)); - /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ - if (tt_os2) - { - if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - *stretch = GET_BE_WORD(tt_os2->usWidthClass); - - *weight = GET_BE_WORD(tt_os2->usWeightClass); - TRACE("stretch=%d, weight=%d\n", *stretch, *weight); - + if (tt_os2) { metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); metrics->descent = GET_BE_WORD(tt_os2->sTypoDescender); metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); @@ -890,21 +877,40 @@ VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_ME } if (tt_head) - { - USHORT macStyle = GET_BE_WORD(tt_head->macStyle); metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); - if (macStyle & 0x0002) - *style = DWRITE_FONT_STYLE_ITALIC; - } - - if (tt_post) - { + if (tt_post) { metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } } +void opentype_get_font_properties(const void *os2, const void *head, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) +{ + TT_OS2_V2 *tt_os2 = (TT_OS2_V2*)os2; + TT_HEAD *tt_head = (TT_HEAD*)head; + + /* default stretch, weight and style to normal */ + *stretch = DWRITE_FONT_STRETCH_NORMAL; + *weight = DWRITE_FONT_WEIGHT_NORMAL; + *style = DWRITE_FONT_STYLE_NORMAL; + + /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ + if (tt_os2) { + if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + *stretch = GET_BE_WORD(tt_os2->usWidthClass); + + *weight = GET_BE_WORD(tt_os2->usWeightClass); + TRACE("stretch=%d, weight=%d\n", *stretch, *weight); + } + + if (tt_head) { + USHORT macStyle = GET_BE_WORD(tt_head->macStyle); + if (macStyle & 0x0002) + *style = DWRITE_FONT_STYLE_ITALIC; + } +} + static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT encoding) { UINT codepage = 0;

1 0