November 2018 - Wine-commits

Zhiyi Zhang : comctl32/pager: Support header notification conversion.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 0e795d538241e704b26a437f3bc1595188329a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e795d538241e704b26a437f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 29 15:28:38 2018 +0800 comctl32/pager: Support header notification conversion. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 44 +++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 421dbed..4763ed5 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -1051,6 +1051,16 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) case DTN_FORMATQUERYW: return DTN_FORMATQUERYA; case DTN_USERSTRINGW: return DTN_USERSTRINGA; case DTN_WMKEYDOWNW: return DTN_WMKEYDOWNA; + /* Header */ + case HDN_BEGINTRACKW: return HDN_BEGINTRACKA; + case HDN_DIVIDERDBLCLICKW: return HDN_DIVIDERDBLCLICKA; + case HDN_ENDTRACKW: return HDN_ENDTRACKA; + case HDN_GETDISPINFOW: return HDN_GETDISPINFOA; + case HDN_ITEMCHANGEDW: return HDN_ITEMCHANGEDA; + case HDN_ITEMCHANGINGW: return HDN_ITEMCHANGINGA; + case HDN_ITEMCLICKW: return HDN_ITEMCLICKA; + case HDN_ITEMDBLCLICKW: return HDN_ITEMDBLCLICKA; + case HDN_TRACKW: return HDN_TRACKA; /* List View */ case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; @@ -1252,6 +1262,40 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) NMDATETIMESTRINGW *nmdts = (NMDATETIMESTRINGW *)hdr; return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, (WCHAR **)&nmdts->pszUserString, NULL, CONVERT_SEND); } + /* Header */ + case HDN_BEGINTRACKW: + case HDN_DIVIDERDBLCLICKW: + case HDN_ENDTRACKW: + case HDN_ITEMCHANGEDW: + case HDN_ITEMCHANGINGW: + case HDN_ITEMCLICKW: + case HDN_ITEMDBLCLICKW: + case HDN_TRACKW: + { + NMHEADERW *nmh = (NMHEADERW *)hdr; + WCHAR *oldText = NULL, *oldFilterText = NULL; + HD_TEXTFILTERW *tf = NULL; + + hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + + if (!nmh->pitem) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + if (nmh->pitem->mask & HDI_TEXT) oldText = PAGER_ConvertText(&nmh->pitem->pszText); + if ((nmh->pitem->mask & HDI_FILTER) && (nmh->pitem->type == HDFT_ISSTRING) && nmh->pitem->pvFilter) + { + tf = (HD_TEXTFILTERW *)nmh->pitem->pvFilter; + oldFilterText = PAGER_ConvertText(&tf->pszText); + } + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + PAGER_RestoreText(&nmh->pitem->pszText, oldText); + if (tf) PAGER_RestoreText(&tf->pszText, oldFilterText); + return ret; + } + case HDN_GETDISPINFOW: + { + NMHDDISPINFOW *nmhddi = (NMHDDISPINFOW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmhddi->mask, HDI_TEXT, &nmhddi->pszText, &nmhddi->cchTextMax, + SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE); + } /* List View */ case LVN_BEGINLABELEDITW: case LVN_ENDLABELEDITW: diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index ff10be8..718df25 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -282,6 +282,14 @@ static const struct message set_pos_empty_seq[] = { { 0 } }; +static CHAR *heap_strdup(const CHAR *str) +{ + int len = lstrlenA(str) + 1; + CHAR *ret = heap_alloc(len * sizeof(CHAR)); + lstrcpyA(ret, str); + return ret; +} + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -643,6 +651,10 @@ static void notify_generic_text_handler(CHAR **text, INT *text_max) if (receive_data->write_text) memcpy(*text, receive_data->write_text, receive_data->write_text_size); + /* 64bit Windows will try to free the text pointer even if it's application provided when handling + * HDN_GETDISPINFOW. Deliberate leak here. */ + else if(notify_test_info.unicode == HDN_GETDISPINFOW) + *text = heap_strdup(receive_data->write_pointer); else *text = receive_data->write_pointer; if (text_max && receive_data->write_text_max != -1) *text_max = receive_data->write_text_max; @@ -759,6 +771,45 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L notify_generic_text_handler((CHAR **)&nmdts->pszUserString, NULL); break; } + /* Header */ + case HDN_BEGINDRAG: + case HDN_ENDDRAG: + case HDN_BEGINFILTEREDIT: + case HDN_ENDFILTEREDIT: + case HDN_DROPDOWN: + case HDN_FILTERCHANGE: + case HDN_ITEMKEYDOWN: + case HDN_ITEMSTATEICONCLICK: + case HDN_OVERFLOWCLICK: + { + NMHEADERW *nmhd = (NMHEADERW *)hdr; + ok(!lstrcmpW(nmhd->pitem->pszText, test_w), "Expect %s, got %s\n", wine_dbgstr_w(test_w), + wine_dbgstr_w(nmhd->pitem->pszText)); + ok(!lstrcmpW(((HD_TEXTFILTERW *)nmhd->pitem->pvFilter)->pszText, test_w), "Expect %s, got %s\n", + wine_dbgstr_w(test_w), wine_dbgstr_w(((HD_TEXTFILTERW *)nmhd->pitem->pvFilter)->pszText)); + break; + } + case HDN_BEGINTRACKA: + case HDN_DIVIDERDBLCLICKA: + case HDN_ENDTRACKA: + case HDN_ITEMCHANGEDA: + case HDN_ITEMCHANGINGA: + case HDN_ITEMCLICKA: + case HDN_ITEMDBLCLICKA: + case HDN_TRACKA: + { + NMHEADERA *nmhd = (NMHEADERA *)hdr; + ok(!lstrcmpA(nmhd->pitem->pszText, test_a), "Expect %s, got %s\n", test_a, nmhd->pitem->pszText); + ok(!lstrcmpA(((HD_TEXTFILTERA *)nmhd->pitem->pvFilter)->pszText, test_a), "Expect %s, got %s\n", test_a, + ((HD_TEXTFILTERA *)nmhd->pitem->pvFilter)->pszText); + break; + } + case HDN_GETDISPINFOA: + { + NMHDDISPINFOA *nmhddi = (NMHDDISPINFOA *)hdr; + notify_generic_text_handler(&nmhddi->pszText, &nmhddi->cchTextMax); + break; + } /* List View */ case LVN_BEGINLABELEDITA: case LVN_ENDLABELEDITA: @@ -1046,6 +1097,36 @@ static void test_wm_notify_datetime(HWND pager) } } +static void test_wm_notify_header(HWND pager) +{ + NMHEADERW nmh = {0}; + HDITEMW hdi = {0}; + HD_TEXTFILTERW hdtf = {0}; + + hdi.mask = HDI_TEXT | HDI_FILTER; + hdi.pszText = test_w; + hdtf.pszText = test_w; + nmh.pitem = &hdi; + nmh.pitem->pvFilter = &hdtf; + send_notify(pager, HDN_BEGINDRAG, HDN_BEGINDRAG, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ENDDRAG, HDN_ENDDRAG, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_BEGINFILTEREDIT, HDN_BEGINFILTEREDIT, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ENDFILTEREDIT, HDN_ENDFILTEREDIT, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_DROPDOWN, HDN_DROPDOWN, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_FILTERCHANGE, HDN_FILTERCHANGE, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMKEYDOWN, HDN_ITEMKEYDOWN, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMSTATEICONCLICK, HDN_ITEMSTATEICONCLICK, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_OVERFLOWCLICK, HDN_OVERFLOWCLICK, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_BEGINTRACKW, HDN_BEGINTRACKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_DIVIDERDBLCLICKW, HDN_DIVIDERDBLCLICKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ENDTRACKW, HDN_ENDTRACKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMCHANGEDW, HDN_ITEMCHANGEDA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMCHANGINGW, HDN_ITEMCHANGINGA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMCLICKW, HDN_ITEMCLICKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMDBLCLICKW, HDN_ITEMDBLCLICKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_TRACKW, HDN_TRACKA, (LPARAM)&nmh, TRUE); +} + static void test_wm_notify_tooltip(HWND pager) { NMTTDISPINFOW nmttdi; @@ -1094,6 +1175,8 @@ static void test_wm_notify(void) static NMDATETIMEFORMATQUERYW nmdtfq; static NMDATETIMEWMKEYDOWNW nmdtkd; static NMDATETIMESTRINGW nmdts; + /* Header */ + static NMHDDISPINFOW nmhddi; /* List View */ static NMLVDISPINFOW nmlvdi; static NMLVGETINFOTIPW nmlvgit; @@ -1124,6 +1207,9 @@ static void test_wm_notify(void) CONVERT_SEND}, {&nmdts, sizeof(nmdts), NULL, 0, (WCHAR **)&nmdts.pszUserString, NULL, DTN_USERSTRINGW, DTN_USERSTRINGA, CONVERT_SEND}, + /* Header */ + {&nmhddi, sizeof(nmhddi), &nmhddi.mask, HDI_TEXT, &nmhddi.pszText, &nmhddi.cchTextMax, HDN_GETDISPINFOW, + HDN_GETDISPINFOA, SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE}, /* List View */ {&nmlvfi, sizeof(nmlvfi), &nmlvfi.lvfi.flags, LVFI_STRING, (WCHAR **)&nmlvfi.lvfi.psz, NULL, LVN_INCREMENTALSEARCHW, LVN_INCREMENTALSEARCHA, CONVERT_SEND}, @@ -1212,6 +1298,7 @@ static void test_wm_notify(void) /* Tests for those that can't be covered by generic text test helper */ test_wm_notify_comboboxex(pager); test_wm_notify_datetime(pager); + test_wm_notify_header(pager); test_wm_notify_tooltip(pager); DestroyWindow(parent);

1 0

Zebediah Figura : widl: Only mark simple [out] pointers as on-stack if they are [ref] pointers.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 481c408a0246de51fa5a2cacf0057bce109877be URL: https://source.winehq.org/git/wine.git/?a=commit;h=481c408a0246de51fa5a2cac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 30 18:23:21 2018 -0500 widl: Only mark simple [out] pointers as on-stack if they are [ref] pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0301024..9cee15b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2145,7 +2145,7 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, else fc = get_basic_fc(ref); - if (out_attr && !in_attr) + if (out_attr && !in_attr && pointer_fc == FC_RP) flags |= FC_ALLOCED_ON_STACK; print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n",

1 0

Zebediah Figura : widl: Fix FC_ALLOCED_ON_STACK for interpreted stubs.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 76a665a1c676cb64d0fb6f76dee3d5c3d5f4f7f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a665a1c676cb64d0fb6f76… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 30 18:23:22 2018 -0500 widl: Fix FC_ALLOCED_ON_STACK for interpreted stubs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9cee15b..6151b1c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2093,8 +2093,32 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs out_attr = is_attr(attrs, ATTR_OUT); if (!in_attr && !out_attr) in_attr = 1; - if (out_attr && !in_attr && pointer_type == FC_RP) - flags |= FC_ALLOCED_ON_STACK; + if (!is_interpreted_func(current_iface, current_func)) + { + if (out_attr && !in_attr && pointer_type == FC_RP) + flags |= FC_ALLOCED_ON_STACK; + } + else if (get_stub_mode() == MODE_Oif) + { + if (context == TYPE_CONTEXT_TOPLEVELPARAM && is_ptr(type) && pointer_type == FC_RP) + { + switch (typegen_detect_type(type_pointer_get_ref(type), NULL, TDT_ALL_TYPES)) + { + case TGT_STRING: + case TGT_POINTER: + case TGT_CTXT_HANDLE: + case TGT_CTXT_HANDLE_POINTER: + flags |= FC_ALLOCED_ON_STACK; + break; + case TGT_IFACE_POINTER: + if (in_attr && out_attr) + flags |= FC_ALLOCED_ON_STACK; + break; + default: + break; + } + } + } if (is_ptr(type)) { @@ -2145,8 +2169,16 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, else fc = get_basic_fc(ref); - if (out_attr && !in_attr && pointer_fc == FC_RP) - flags |= FC_ALLOCED_ON_STACK; + if (!is_interpreted_func(current_iface, current_func)) + { + if (out_attr && !in_attr && pointer_fc == FC_RP) + flags |= FC_ALLOCED_ON_STACK; + } + else if (get_stub_mode() == MODE_Oif) + { + if (context == TYPE_CONTEXT_TOPLEVELPARAM && fc == FC_ENUM16 && pointer_fc == FC_RP) + flags |= FC_ALLOCED_ON_STACK; + } print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n", pointer_fc, flags, string_of_type(pointer_fc),

1 0

Zebediah Figura : rpcrt4/tests: Add some tests for marshalling interface pointers.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: b7cc627c6e0a814d99e9209f8d1d5d2a5e0a2e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7cc627c6e0a814d99e9209f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 30 18:28:52 2018 -0500 rpcrt4/tests: Add some tests for marshalling interface pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 276 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7cc627c6e0a814d99e9…

1 0

Hans Leidekker : webservices: Don't use MSG_PEEK.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 481ee636c1cc627fb7b6c20263fea778dde000cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=481ee636c1cc627fb7b6c202… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 1 10:16:32 2018 +0100 webservices: Don't use MSG_PEEK. As suggested by Jacek. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 94c3dc1..b945c7f 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1150,27 +1150,21 @@ static void set_blocking( SOCKET socket, BOOL blocking ) ioctlsocket( socket, FIONBIO, &state ); } -static int sock_peek( SOCKET socket ) +static int sock_recv( SOCKET socket, char *buf, int len ) { - int ret; - char byte; + int count, ret; - set_blocking( socket, FALSE ); - ret = recv( socket, &byte, 1, MSG_PEEK ); - set_blocking( socket, TRUE ); - return ret; -} + if ((ret = recv( socket, buf, len, 0 )) <= 0) return ret; + len -= ret; -static int sock_recv( SOCKET socket, char *buf, int len ) -{ - int count, ret = 0; + set_blocking( socket, FALSE ); for (;;) { if ((count = recv( socket, buf + ret, len, 0 )) <= 0) break; ret += count; len -= count; - if (sock_peek( socket ) != 1) break; } + set_blocking( socket, TRUE ); return ret; }

1 0

Nikolay Sivov : gdiplus/tests: Add parameter validation test for GdipGetFontCollectionFamilyCount().
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: a1ff2c44ea156c7d0f469341328d804bee8675b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ff2c44ea156c7d0f469341… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 12:53:27 2018 +0300 gdiplus/tests: Add parameter validation test for GdipGetFontCollectionFamilyCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 961d845..0a3a3be 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1238,6 +1238,27 @@ static void test_GdipGetFontCollectionFamilyList(void) GdipDeleteFontFamily(family2); } +static void test_GdipGetFontCollectionFamilyCount(void) +{ + GpFontCollection *collection; + GpStatus status; + INT count; + + status = GdipGetFontCollectionFamilyCount(NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + count = 123; + status = GdipGetFontCollectionFamilyCount(NULL, &count); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(count == 123, "Unexpected family count %d.\n", count); + + status = GdipNewInstalledFontCollection(&collection); + ok(status == Ok, "Failed to get system collection, status %d.\n", status); + + status = GdipGetFontCollectionFamilyCount(collection, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1269,6 +1290,7 @@ START_TEST(font) test_installedfonts(); test_heightgivendpi(); test_GdipGetFontCollectionFamilyList(); + test_GdipGetFontCollectionFamilyCount(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Return actual code on failed attempt to add a font.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 4aaa94111bbd56ee2bd3f6dd3bae9c4085f9b806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaa94111bbd56ee2bd3f6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 12:53:28 2018 +0300 gdiplus: Return actual code on failed attempt to add a font. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 64778bb..74cd29b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1493,6 +1493,12 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) return NULL; } +struct add_font_param +{ + GpFontCollection *collection; + GpStatus stat; +}; + static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam); /***************************************************************************** @@ -1520,6 +1526,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, ret = InvalidParameter; else { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1533,8 +1540,9 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, lstrcpyW(lfw.lfFaceName, name); lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) - ret = OutOfMemory; + param.collection = fontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) + ret = param.stat; DeleteDC(hdc); } @@ -1606,10 +1614,14 @@ void free_installed_fonts(void) static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - GpFontCollection* fonts = (GpFontCollection*)lParam; + struct add_font_param *param = (struct add_font_param *)lParam; + GpFontCollection *fonts = param->collection; GpFontFamily* family; + GpStatus stat; int i; + param->stat = Ok; + if (type == RASTER_FONTTYPE) return 1; @@ -1626,7 +1638,10 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, GpFontFamily** new_family_list = heap_alloc(new_alloc_count*sizeof(void*)); if (!new_family_list) + { + param->stat = OutOfMemory; return 0; + } memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); heap_free(fonts->FontFamilies); @@ -1634,8 +1649,11 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) + if ((stat = GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family)) != Ok) + { + param->stat = stat; return 0; + } /* skip duplicates */ for (i=0; i<fonts->count; i++) @@ -1662,6 +1680,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (installedFontCollection.count == 0) { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1671,11 +1690,12 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( lfw.lfFaceName[0] = 0; lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) + param.collection = &installedFontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) { free_installed_fonts(); DeleteDC(hdc); - return OutOfMemory; + return param.stat; } DeleteDC(hdc);

1 0

Nikolay Sivov : gdiplus: Skip failed font family when building system collection.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 455de70201da10c9b5347f2c381fb61e8cc696fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=455de70201da10c9b5347f2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 12:53:29 2018 +0300 gdiplus: Skip failed font family when building system collection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 74cd29b..729592b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1496,6 +1496,7 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) struct add_font_param { GpFontCollection *collection; + BOOL is_system; GpStatus stat; }; @@ -1541,6 +1542,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, lfw.lfPitchAndFamily = 0; param.collection = fontCollection; + param.is_system = FALSE; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) ret = param.stat; @@ -1651,6 +1653,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if ((stat = GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family)) != Ok) { + WARN("Failed to create font family for %s, status %d.\n", debugstr_w(lfw->lfFaceName), stat); + if (param->is_system) + return 1; param->stat = stat; return 0; } @@ -1691,6 +1696,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( lfw.lfPitchAndFamily = 0; param.collection = &installedFontCollection; + param.is_system = TRUE; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) { free_installed_fonts();

1 0

Jacek Caban : server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 3dacf82173a142fbcf26dec59614481f27f91d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dacf82173a142fbcf26dec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:40:04 2018 +0100 server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tests/pipe.c | 4 ---- server/fd.c | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 622b5de..2b62206 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2661,8 +2661,8 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, { FILE_IO_COMPLETION_NOTIFICATION_INFORMATION *info = ptr; - if (info->Flags & ~FILE_SKIP_COMPLETION_PORT_ON_SUCCESS) - FIXME( "Unsupported completion flags %x\n", info->Flags ); + if (info->Flags & FILE_SKIP_SET_USER_EVENT_ON_FAST_IO) + FIXME( "FILE_SKIP_SET_USER_EVENT_ON_FAST_IO not supported\n" ); SERVER_START_REQ( set_fd_completion_mode ) { diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 08bde6d..406d555 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1423,12 +1423,10 @@ static void test_completion(void) info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE; status = pNtSetInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); - todo_wine ok(!is_signaled(client), "client is not signaled\n"); ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); test_queued_completion(port, &io, STATUS_SUCCESS, sizeof(buf)); @@ -1439,12 +1437,10 @@ static void test_completion(void) ret = WriteFile(client, buf, 1, &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); CloseHandle(port); diff --git a/server/fd.c b/server/fd.c index 119fae6..fa174f5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1964,6 +1964,7 @@ int is_fd_removable( struct fd *fd ) /* set or clear the fd signaled state */ void set_fd_signaled( struct fd *fd, int signaled ) { + if (fd->comp_flags & FILE_SKIP_SET_EVENT_ON_HANDLE) return; fd->signaled = signaled; if (signaled) wake_up( fd->user, 0 ); } @@ -2647,7 +2648,9 @@ DECL_HANDLER(set_fd_completion_mode) { if (is_fd_overlapped( fd )) { - /* removing COMPLETION_SKIP_ON_SUCCESS is not allowed */ + if (req->flags & FILE_SKIP_SET_EVENT_ON_HANDLE) + set_fd_signaled( fd, 0 ); + /* removing flags is not allowed */ fd->comp_flags |= req->flags & ( FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_SET_USER_EVENT_ON_FAST_IO );

1 0

Jacek Caban : ntdll: Remove no longer needed event handle from async_irp.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 9ee34a5d92510ea2899940036b035a6fb6c4fb04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ee34a5d92510ea289994003… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:41:11 2018 +0100 ntdll: Remove no longer needed event handle from async_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2b62206..4d2fa7a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -375,7 +375,6 @@ struct async_fileio_write struct async_irp { struct async_fileio io; - HANDLE event; /* async event */ void *buffer; /* buffer for output */ ULONG size; /* size of buffer */ }; @@ -568,7 +567,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = buffer; async->size = size; @@ -612,7 +610,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = NULL; async->size = 0; @@ -1522,7 +1519,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = out_buffer; async->size = out_size; @@ -3321,7 +3317,6 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, hFile ))) return STATUS_NO_MEMORY; - async->event = NULL; async->buffer = NULL; async->size = 0;

1 0