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

Nikolay Sivov : dwrite: Don't cache fontface instance in font data.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 1e0b9341392e8c2035f137723fdfbe874d2c93ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0b9341392e8c2035f137723… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 12:48:45 2014 +0300 dwrite: Don't cache fontface instance in font data. --- dlls/dwrite/font.c | 65 ++++++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 1 - 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 95fbdc6..7dea8e5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -46,8 +46,6 @@ struct dwrite_font_data { IDWriteFontFile *file; UINT32 face_index; - IDWriteFontFace2 *face; - WCHAR *facename; }; @@ -210,8 +208,6 @@ static void release_font_data(struct dwrite_font_data *data) IDWriteFontFile_Release(data->file); if (data->factory) IDWriteFactory_Release(data->factory); - if (data->face) - IDWriteFontFace2_Release(data->face); heap_free(data->facename); heap_free(data); } @@ -707,24 +703,20 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { - HRESULT hr = S_OK; + struct dwrite_font_data *data = font->data; + IDWriteFontFace *face; + HRESULT hr; *fontface = NULL; - if (!font->data->face) { - struct dwrite_font_data *data = font->data; - IDWriteFontFace *face; - - hr = IDWriteFactory_CreateFontFace(data->factory, data->face_type, 1, &data->file, - data->face_index, font->simulations, &face); - if (FAILED(hr)) - return hr; + hr = IDWriteFactory_CreateFontFace(data->factory, data->face_type, 1, &data->file, + data->face_index, font->simulations, &face); + if (FAILED(hr)) + return hr; - hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->data->face); - IDWriteFontFace_Release(face); - } + hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)fontface); + IDWriteFontFace_Release(face); - *fontface = font->data->face; return hr; } @@ -1315,6 +1307,29 @@ static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection return collection_find_family(This, name, index, exists); } +static BOOL is_same_fontfile(IDWriteFontFile *left, IDWriteFontFile *right) +{ + UINT32 left_key_size, right_key_size; + const void *left_key, *right_key; + HRESULT hr; + + if (left == right) + return TRUE; + + hr = IDWriteFontFile_GetReferenceKey(left, &left_key, &left_key_size); + if (FAILED(hr)) + return FALSE; + + hr = IDWriteFontFile_GetReferenceKey(right, &right_key, &right_key_size); + if (FAILED(hr)) + return FALSE; + + if (left_key_size != right_key_size) + return FALSE; + + return !memcmp(left_key, right_key, left_key_size); +} + static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); @@ -1322,7 +1337,8 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec struct dwrite_font_data *found_font = NULL; DWRITE_FONT_SIMULATIONS simulations; IDWriteFontFamily *family; - UINT32 i, j; + UINT32 i, j, face_index; + IDWriteFontFile *file; HRESULT hr; TRACE("(%p)->(%p %p)\n", This, face, font); @@ -1332,11 +1348,19 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!face) return E_INVALIDARG; + i = 1; + hr = IDWriteFontFace_GetFiles(face, &i, &file); + if (FAILED(hr)) + return hr; + face_index = IDWriteFontFace_GetIndex(face); + for (i = 0; i < This->family_count; i++) { struct dwrite_fontfamily_data *family_data = This->family_data[i]; for (j = 0; j < family_data->font_count; j++) { - if ((IDWriteFontFace*)family_data->fonts[j]->face == face) { - found_font = family_data->fonts[j]; + struct dwrite_font_data *font_data = family_data->fonts[j]; + + if (face_index == font_data->face_index && is_same_fontfile(file, font_data->file)) { + found_font = font_data; found_family = family_data; break; } @@ -1459,7 +1483,6 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI data->factory = factory; data->file = file; - data->face = NULL; data->face_index = face_index; data->face_type = face_type; IDWriteFontFile_AddRef(file); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 950377c..e51b702 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2039,7 +2039,6 @@ static void test_GetSimulations(void) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); simulations = IDWriteFontFace_GetSimulations(fontface); -todo_wine ok(simulations == DWRITE_FONT_SIMULATIONS_NONE, "got %d\n", simulations); IDWriteFontFace_Release(fontface); IDWriteFont_Release(font);

1 0

Iván Matellanes : msvcrt: Added _putc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 755a54b2a7d72d731e444bbb3955ab68fdd4c665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755a54b2a7d72d731e444bbb3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:55:57 2014 +0100 msvcrt: Added _putc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0fbe506..0e1ec19 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1232,6 +1232,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 368ca37..609e7ba 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1590,6 +1590,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2b647b8..1afacf5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1598,6 +1598,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0137ac4..960a23c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -907,6 +907,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c028cba..8b74dea 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -882,6 +882,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 8b23def..d7316b5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -138,6 +138,7 @@ int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*); int __cdecl _getc_nolock(FILE*); +int __cdecl _putc_nolock(int,FILE*); int __cdecl _ungetc_nolock(int,FILE*); void __cdecl clearerr(FILE*);

1 0

Iván Matellanes : msvcrt: Added _getc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: caedfc89541194bcf860bc6269aa5b8a71d40355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caedfc89541194bcf860bc626… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:55:44 2014 +0100 msvcrt: Added _getc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 45a04cf..931d826 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -888,7 +888,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5fc4ee5..3939ccf 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1236,7 +1236,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c3edd61..2ee3800 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1234,7 +1234,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9877784..36421f3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -562,6 +562,7 @@ @ stub _get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4df9203..e9790be 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -539,7 +539,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 7512efc..9a2f338 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -137,6 +137,7 @@ int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*); +int __cdecl _getc_nolock(FILE*); int __cdecl _ungetc_nolock(int,FILE*); void __cdecl clearerr(FILE*);

1 0

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

Nov. 6, 2014

Module: wine Branch: master Commit: 743d80fea590c61ac2c6fb89c305ce6a6694813c URL: http://source.winehq.org/git/wine.git/?a=commit;h=743d80fea590c61ac2c6fb89c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:17 2014 +0100 d2d1: Implement d2d_solid_color_brush_SetOpacity(). --- dlls/d2d1/brush.c | 7 ++++++- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 11 +++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index eacbebb..8837cee 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -149,6 +149,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_ta { brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; + brush->opacity = desc ? desc->opacity : 1.0f; brush->type = type; } @@ -210,7 +211,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_GetFactory(ID2D1SolidColorBr static void STDMETHODCALLTYPE d2d_solid_color_brush_SetOpacity(ID2D1SolidColorBrush *iface, float opacity) { - FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; } static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColorBrush *iface, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0a99633..8504e68 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -107,6 +107,8 @@ struct d2d_brush ID2D1Brush ID2D1Brush_iface; LONG refcount; + float opacity; + enum d2d_brush_type type; union { diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 1dd5122..0f5907f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -501,6 +501,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; + D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; struct @@ -558,8 +559,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - buffer_desc.ByteWidth = sizeof(brush_impl->u.solid.color); - buffer_data.pSysMem = &brush_impl->u.solid.color; + color = brush_impl->u.solid.color; + color.r *= brush_impl->opacity; + color.g *= brush_impl->opacity; + color.b *= brush_impl->opacity; + color.a *= brush_impl->opacity; + + buffer_desc.ByteWidth = sizeof(color); + buffer_data.pSysMem = &color; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) {

1 0

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

Nov. 6, 2014

Module: wine Branch: master Commit: fd8b3ae57298bff9dcb1c7db36a67d4d3818400f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8b3ae57298bff9dcb1c7db3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:16 2014 +0100 d2d1: Implement d2d_solid_color_brush_GetColor(). --- dlls/d2d1/brush.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 04b273a..eacbebb 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -252,11 +252,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrus static D2D1_COLOR_F * STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface, D2D1_COLOR_F *color) { - static const D2D1_COLOR_F black = {0.0f, 0.0f, 0.0f, 1.0f}; + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - FIXME("iface %p, color %p stub!\n", iface, color); + TRACE("iface %p, color %p.\n", iface, color); - *color = black; + *color = brush->u.solid.color; return color; }

1 0

Henri Verbeet : d2d1: Add an initial d2d_d3d_render_target_FillRectangle() implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 7a72eb2dcd6ad8b0b6c1f8374ec5b0e4dda68cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a72eb2dcd6ad8b0b6c1f8374… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:14 2014 +0100 d2d1: Add an initial d2d_d3d_render_target_FillRectangle() implementation. --- dlls/d2d1/brush.c | 19 ++- dlls/d2d1/d2d1_private.h | 30 +++- dlls/d2d1/render_target.c | 348 ++++++++++++++++++++++++++++++---------------- 3 files changed, 269 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a72eb2dcd6ad8b0b6c1f…

1 0

Iván Matellanes : msvcrt: Added _putwc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 0ad3537d689df71fb0b7f1858b3597b4e2f4eb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad3537d689df71fb0b7f1858… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:56:11 2014 +0100 msvcrt: Added _putwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0e1ec19..cb45506 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1238,6 +1238,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 609e7ba..d41699d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1596,6 +1596,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1afacf5..fbf688e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1604,6 +1604,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 960a23c..efb4539 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -913,6 +913,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8b74dea..fa62366 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -888,6 +888,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index d7316b5..eda89e6 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -206,6 +206,7 @@ wint_t __cdecl _fputwc_nolock(wint_t,FILE*); wint_t __cdecl _fputwchar(wint_t); wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); +wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...);

1 0

Iván Matellanes : msvcrt: Added _getwc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: fb4248315f31d54460fbf6f3e31cec65325f2af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4248315f31d54460fbf6f3e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:55:50 2014 +0100 msvcrt: Added _getwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 931d826..0fbe506 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -906,6 +906,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3939ccf..368ca37 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1253,6 +1253,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2ee3800..2b647b8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1251,6 +1251,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 36421f3..0137ac4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -580,6 +580,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e9790be..c028cba 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -557,6 +557,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9a2f338..8b23def 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -203,6 +203,7 @@ wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwc_nolock(wint_t,FILE*); wint_t __cdecl _fputwchar(wint_t); +wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...);

1 0

Sebastian Lackner : usp10: Silence repeated GSUB_apply_ChainContext[ Subst|Pos] FIXMEs.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: ebd1b86bbb0b4fa8f36ada68dbf61eeb828a05ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd1b86bbb0b4fa8f36ada68d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 18 00:38:15 2014 +0200 usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs. --- dlls/usp10/opentype.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index dd9c8c4..e7f2dfd 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -937,12 +937,16 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { - FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) @@ -1648,12 +1652,16 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo if (GET_BE_WORD(ccpf3->PosFormat) == 1) { - FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); continue; } else if (GET_BE_WORD(ccpf3->PosFormat) == 2) { - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); continue; } else if (GET_BE_WORD(ccpf3->PosFormat) == 3)

1 0

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

Nov. 6, 2014

Module: wine Branch: master Commit: 9c7b91336a5f0c98776b8594673667645ce89e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7b91336a5f0c98776b85946… Author: Chen Yuan <huddsinyuan2014(a)gmail.com> Date: Wed Nov 5 01:36:10 2014 +0800 mshtml: Add IHTMLStyle5::maxHeight property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 755507c..d9898a9 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 attrMaxHeight[] = + {'m','a','x','-','h','e','i','g','h','t',0}; static const WCHAR attrMaxWidth[] = {'m','a','x','-','w','i','d','t','h',0}; static const WCHAR attrMinHeight[] = @@ -266,6 +268,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, + {attrMaxHeight, DISPID_IHTMLSTYLE5_MAXHEIGHT}, {attrMaxWidth, DISPID_IHTMLSTYLE5_MAXWIDTH}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrMinWidth, DISPID_IHTMLSTYLE5_MINWIDTH}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index d2834ac..de6f37e 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_HEIGHT, STYLEID_MAX_WIDTH, STYLEID_MIN_HEIGHT, STYLEID_MIN_WIDTH, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 658f879..6532bf4 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -530,15 +530,19 @@ static HRESULT WINAPI HTMLStyle5_get_msInterpolationMode(IHTMLStyle5 *iface, BST static HRESULT WINAPI HTMLStyle5_put_maxHeight(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_HEIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, debugstr_variant(p)); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_HEIGHT, p, 0); } static HRESULT WINAPI HTMLStyle5_put_minWidth(IHTMLStyle5 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1c230f4..ec66a71 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -580,6 +580,50 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_put_maxWidth(style5,vdefault); ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); VariantClear(&vdefault); + + /* maxHeight */ + hres = IHTMLStyle5_get_maxHeight(style5, &vdefault); + ok(hres == S_OK, "get maxHeight failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("200px"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get maxHeight 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_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get_maxHeight 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); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("100"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "100px"), "expect 100 got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle5_put_maxHeight(style5, vdefault); + ok(hres == S_OK, "put maxHeight failed:%08x\n", hres); + VariantClear(&vdefault); } static void test_style6(IHTMLStyle6 *style)

1 0

Marcus Meissner : PATCH: website: download: adjust opensuse versions
by Jeremy Newman Nov. 5, 2014

Nov. 5, 2014

Module: website Branch: master Commit: 83d96ce59e582b094a965a795dcfeef7518c630a URL: http://source.winehq.org/git/website.git/?a=commit;h=83d96ce59e582b094a965a… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Nov 5 12:58:10 2014 +0100 PATCH: website: download: adjust opensuse versions --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 2 +- templates/he/download.template | 2 +- templates/pl/download.template | 2 +- templates/pt/download.template | 2 +- templates/tr/download.template | 2 +- templates/uk/download.template | 2 +- templates/zh-cn/download.template | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index fbf449e..bc7717e 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -94,7 +94,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - stellt binär und Quellcode .rpms und tägliche snapshot RPMs für alle openSUSE Versionen (derzeit 11.4 bis 13.1) sowie SUSE Linux Enterprise 11 bereit. + stellt binär und Quellcode .rpms und tägliche snapshot RPMs für alle openSUSE Versionen (derzeit 12.3 bis 13.2) sowie SUSE Linux Enterprise 11 bereit. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 275fd05..ca13e58 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -93,7 +93,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Download SUSE packages</a> - - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (11.4 up to 13.1) and SUSE Linux Enterprise 11. + - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (12.3 up to 13.2) and SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 893c88f..4f7384e 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -99,7 +99,7 @@ center;">Voyez la </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Paquets SUSE</a> - .rpm binaires et sources et instantanés quotidiens pour openSUSE - 11.4 - 13.1 ainsi que SUSE Linux Enterprise 11. + 12.3 - 13.2 ainsi que SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index 1573b95..d17ea6f 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -93,7 +93,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">הורדת חבילות SUSE</a> - - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.4 - 13.1 and SUSE Linux Enterprise 11. + - release binary and source .rpms and daily snapshot RPMs for openSUSE 12.3 - 13.2 and SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 929f1c3..f3a4d00 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -92,7 +92,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Pobierz paczki dla SUSE</a> - - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 11.4 - 13.1 i SUSE Linux Enterprise 11. + - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 12.3 - 13.2 i SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index ba1b076..32055f0 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -90,7 +90,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Descarregar pacotes para SUSE</a> - - .rpms binários e do código fonte e RPMs com snapshots diários para openSUSE 11.4 - 13.1 e SUSE Linux Enterprise 11. + - .rpms binários e do código fonte e RPMs com snapshots diários para openSUSE 12.3 - 13.2 e SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index 77b7efe..d689dff 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -89,7 +89,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE paketleri indirin</a> - - sürüm ikili ve kaynak .rpm dosyaları ve günlük RPM derlemeleri. openSUSE 11.4 - 13.1 ve SUSE Linux Enterprise 11 için. + - sürüm ikili ve kaynak .rpm dosyaları ve günlük RPM derlemeleri. openSUSE 12.3 - 13.2 ve SUSE Linux Enterprise 11 için. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/uk/download.template b/templates/uk/download.template index 42350c1..fd2fae6 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -92,7 +92,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Завантажити пакунки SUSE</a> - - бінарні та вихідні .rpm файли та щоденні RPM знімки для всіх версій openSUSE (від 11.4 до 13.1) та SUSE Linux Enterprise 11. + - бінарні та вихідні .rpm файли та щоденні RPM знімки для всіх версій openSUSE (від 12.3 до 13.2) та SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 41eaffb..1b70cd7 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -91,7 +91,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">下载 SUSE 安装包</a> - - 所有版本的 openSUSE （11.4 至 13.1）和 SUSE Linux Enterprise 11 的发行二进制和源码 .rpms 及每日快照 RPMs。 + - 所有版本的 openSUSE （12.3 至 13.2）和 SUSE Linux Enterprise 11 的发行二进制和源码 .rpms 及每日快照 RPMs。 </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

Nikolay Sivov : dpnet/tests: Fix a test failure caused by uninitialized argument.
by Alexandre Julliard Nov. 5, 2014

Nov. 5, 2014

Module: wine Branch: master Commit: 552d9f3631dc5562a39b14e2cb15f0f5f8315734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552d9f3631dc5562a39b14e2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 14:35:05 2014 +0300 dpnet/tests: Fix a test failure caused by uninitialized argument. --- dlls/dpnet/tests/address.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 5908000..bad4fa4 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -105,12 +105,22 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_GetComponentByName(localaddr, NULL, &compguid, &size, &type); ok(hr == E_POINTER, "got 0x%08x\n", hr); + size = sizeof(GUID)-1; + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, NULL, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + size = sizeof(GUID); hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, NULL, &size, &type); ok(hr == E_POINTER, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, NULL, &type); ok(hr == E_POINTER, "got 0x%08x\n", hr); + size = sizeof(GUID)-1; + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + size = sizeof(GUID); hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr);

1 0

Jacek Caban : urlmon: Update existing session if user agent changes.
by Alexandre Julliard Nov. 5, 2014

Nov. 5, 2014

Module: wine Branch: master Commit: e385df0b8ee9dc57854986319bf2688dfaee4bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e385df0b8ee9dc57854986319… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 5 12:57:36 2014 +0100 urlmon: Update existing session if user agent changes. --- dlls/urlmon/protocol.c | 6 ++++++ dlls/urlmon/session.c | 1 + dlls/urlmon/urlmon_main.h | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 42ee8ed..1437152 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -302,6 +302,12 @@ HINTERNET get_internet_session(IInternetBindInfo *bind_info) return internet_session; } +void update_user_agent(WCHAR *user_agent) +{ + if(internet_session) + InternetSetOptionW(internet_session, INTERNET_OPTION_USER_AGENT, user_agent, strlenW(user_agent)); +} + HRESULT protocol_start(Protocol *protocol, IInternetProtocol *prot, IUri *uri, IInternetProtocolSink *protocol_sink, IInternetBindInfo *bind_info) { diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index bb41c31..e01e647 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -718,6 +718,7 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf heap_free(user_agent); user_agent = new_user_agent; + update_user_agent(user_agent); LeaveCriticalSection(&session_cs); break; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 14a4f08..e134761 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -72,7 +72,8 @@ IInternetProtocol *get_mime_filter(LPCWSTR) DECLSPEC_HIDDEN; BOOL is_registered_protocol(LPCWSTR) DECLSPEC_HIDDEN; HRESULT register_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL) DECLSPEC_HIDDEN; HINTERNET get_internet_session(IInternetBindInfo*) DECLSPEC_HIDDEN; -LPWSTR get_useragent(void) DECLSPEC_HIDDEN; +WCHAR *get_useragent(void) DECLSPEC_HIDDEN; +void update_user_agent(WCHAR*) DECLSPEC_HIDDEN; void free_session(void) DECLSPEC_HIDDEN; HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : msi: Simplify check for an empty string (PVS-Studio).
by Alexandre Julliard Nov. 5, 2014

Nov. 5, 2014

Module: wine Branch: master Commit: 481ff775ca281098b6c69d615a3e7c2f07ed10cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=481ff775ca281098b6c69d615… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 5 10:53:56 2014 +0100 msi: Simplify check for an empty string (PVS-Studio). --- dlls/msi/dialog.c | 2 +- dlls/msi/script.c | 2 +- dlls/msi/tests/action.c | 2 +- dlls/msi/tests/db.c | 4 ++-- dlls/msi/tests/package.c | 4 ++-- dlls/msi/tests/source.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4e1052e..4380879 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2171,7 +2171,7 @@ static void msi_dialog_update_pathedit( msi_dialog *dialog, msi_control *control /* FIXME: test when this should fail */ static BOOL msi_dialog_verify_path( LPWSTR path ) { - if ( !lstrlenW( path ) ) + if ( !path[0] ) return FALSE; if ( PathIsRelativeW( path ) ) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 0fec716..c70790f 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -356,7 +356,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function if (FAILED(hr)) goto done; /* Call a function if necessary through the IDispatch interface */ - if (function != NULL && strlenW(function) > 0) { + if (function && function[0]) { TRACE("Calling function %s\n", debugstr_w(function)); hr = IActiveScript_GetScriptDispatch(pActiveScript, NULL, &pDispatch); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index a8903d9..bd074a2 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2715,7 +2715,7 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase } if (!expected) - ok_(__FILE__, line)(lstrlenA(val) == 0, "Expected empty string, got %s\n", val); + ok_(__FILE__, line)(!val[0], "Expected empty string, got %s\n", val); else { if (bcase) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index af8ac8c..5ac9035 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4534,7 +4534,7 @@ static void test_update(void) size = MAX_PATH; r = MsiRecordGetStringA(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrlenA(result), "Expected an empty string, got %s\n", result); + ok(!result[0], "Expected an empty string, got %s\n", result); MsiCloseHandle(rec); @@ -4580,7 +4580,7 @@ static void test_update(void) size = MAX_PATH; r = MsiRecordGetStringA(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrlenA(result), "Expected an empty string, got %s\n", result); + ok(!result[0], "Expected an empty string, got %s\n", result); MsiCloseHandle(rec); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 1a5935d..28d3e54 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2194,7 +2194,7 @@ static void test_props(void) sz = 6; r = MsiGetPropertyA(hpkg, "property", buffer, &sz); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok( !strlen(buffer), "Expected empty string, got %s\n", buffer); + ok(!buffer[0], "Expected empty string, got %s\n", buffer); MsiCloseHandle( hpkg ); DeleteFileA(msifile); @@ -2347,7 +2347,7 @@ static void test_property_table(void) lstrcpyA(buffer, "aaa"); r = MsiGetPropertyA(hpkg, "dantes", buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(lstrlenA(buffer) == 0, "Expected empty string, got %s\n", buffer); + ok(!buffer[0], "Expected empty string, got %s\n", buffer); r = MsiSetPropertyA(hpkg, "dantes", "mercedes"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 9fddd90..1ef3c9d 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -176,7 +176,7 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase } if (!expected) - ok_(__FILE__, line)(lstrlenA(val) == 0, "Expected empty string, got %s\n", val); + ok_(__FILE__, line)(!val[0], "Expected empty string, got %s\n", val); else { if (bcase)

1 0

Nikolay Sivov : dwrite: Implement remaining methods of IDWriteLocalizedStrings.
by Alexandre Julliard Nov. 5, 2014

Nov. 5, 2014

Module: wine Branch: master Commit: e2eb760ffcb19c4da1460bbea27ad951d2f8a45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2eb760ffcb19c4da1460bbea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 08:49:48 2014 +0300 dwrite: Implement remaining methods of IDWriteLocalizedStrings. --- dlls/dwrite/main.c | 49 +++++++++++++++++++++++++++++++++++++++++------- dlls/dwrite/tests/font.c | 17 ++++++++++++++--- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index a523de0..023ae4f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -256,22 +256,57 @@ static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *i WCHAR const *locale_name, UINT32 *index, BOOL *exists) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_w(locale_name), index, exists); - return E_NOTIMPL; + UINT32 i; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(locale_name), index, exists); + + *exists = FALSE; + *index = ~0; + + for (i = 0; i < This->count; i++) { + if (!strcmpiW(This->data[i].locale, locale_name)) { + *exists = TRUE; + *index = i; + break; + } + } + + return S_OK; } static HRESULT WINAPI localizedstrings_GetLocaleNameLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, length); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p)\n", This, index, length); + + if (index >= This->count) { + *length = (UINT32)-1; + return E_FAIL; + } + + *length = strlenW(This->data[index].locale); + return S_OK; } -static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *locale_name, UINT32 size) +static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p)->(%u %p %u): stub\n", This, index, locale_name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p %u)\n", This, index, buffer, size); + + if (index >= This->count) { + if (buffer) *buffer = 0; + return E_FAIL; + } + + if (size < strlenW(This->data[index].locale)+1) { + if (buffer) *buffer = 0; + return E_NOT_SUFFICIENT_BUFFER; + } + + strcpyW(buffer, This->data[index].locale); + return S_OK; } static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dec90fe..950377c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2051,14 +2051,16 @@ todo_wine static void test_GetFaceNames(void) { static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; + static const WCHAR enus2W[] = {'e','n','-','U','s',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteLocalizedStrings *strings, *strings2; IDWriteGdiInterop *interop; IDWriteFactory *factory; + UINT32 count, index; IDWriteFont *font; LOGFONTW logfont; WCHAR buffW[255]; - UINT32 count; + BOOL exists; HRESULT hr; factory = create_factory(); @@ -2087,13 +2089,22 @@ static void test_GetFaceNames(void) count = IDWriteLocalizedStrings_GetCount(strings); ok(count == 1, "got %d\n", count); + index = 1; + exists = FALSE; + hr = IDWriteLocalizedStrings_FindLocaleName(strings, enus2W, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(index == 0 && exists, "got %d, %d\n", index, exists); + + count = 0; + hr = IDWriteLocalizedStrings_GetLocaleNameLength(strings, 1, &count); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(count == ~0, "got %d\n", count); + /* for simulated faces names are also simulated */ buffW[0] = 0; hr = IDWriteLocalizedStrings_GetLocaleName(strings, 0, buffW, sizeof(buffW)/sizeof(WCHAR)); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); -} buffW[0] = 0; hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, sizeof(buffW)/sizeof(WCHAR));

1 0