November 2018 - Wine-Commits

Jacek Caban : ntdll: Update debug trace.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 2172855fbae29a911836d08038c6e35075afbea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2172855fbae29a911836d080… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:41:16 2018 +0100 ntdll: Update debug trace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4d2fa7a..7c8b8ed 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -837,7 +837,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; BOOL send_completion = FALSE, async_read, timeout_init_done = FALSE; - TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", + TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); if (!io_status) return STATUS_ACCESS_VIOLATION; @@ -1204,7 +1204,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, BOOL send_completion = FALSE, async_write, append_write = FALSE, timeout_init_done = FALSE; LARGE_INTEGER offset_eof; - TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", + TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); if (!io_status) return STATUS_ACCESS_VIOLATION;

1 0

Zebediah Figura : widl: Fix FC_ALLOCED_ON_STACK for interpreted stubs.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

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

Nikolay Sivov : gdiplus: Skip failed font family when building system collection.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

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

Zebediah Figura : oleaut32/tests: Add some more tests for marshalling structs.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 09a81b30f8ca458db22d73c33545f02fd510702a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09a81b30f8ca458db22d73c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 10:20:02 2018 -0500 oleaut32/tests: Add some more tests for marshalling structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 153 +++++++++++++++++++++++++-------------- dlls/oleaut32/tests/tmarshal.idl | 26 ++++++- 2 files changed, 121 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09a81b30f8ca458db22d…

1 0

Nikolay Sivov : gdiplus/tests: Add parameter validation test for GdipGetFontCollectionFamilyCount().
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

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

Zebediah Figura : rpcrt4/tests: Add some tests for marshalling interface pointers.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

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

Zhiyi Zhang : comctl32/pager: Support header notification conversion.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

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

Henri Verbeet : wined3d: Prefer bind flags over usage flags in wined3d_texture_prepare_texture().
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 220c078ed919aa09e5cc045d1fedeb08420598b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=220c078ed919aa09e5cc045d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 1 11:25:27 2018 +0330 wined3d: Prefer bind flags over usage flags in wined3d_texture_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5ee86d3..e01becd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1783,7 +1783,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (srgb) internal = format_gl->srgb_internal; - else if (resource->usage & WINED3DUSAGE_RENDERTARGET && wined3d_resource_is_offscreen(resource)) + else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) internal = format_gl->rt_internal; else internal = format_gl->internal;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: e2ec160e3ca2d11fe430190303f517e0a6b9d53f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ec160e3ca2d11fe4301903… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Nov 1 08:21:50 2018 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index c10e649..b7b5a5f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-24 08:54+0300\n" +"PO-Revision-Date: 2018-11-01 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -2449,16 +2449,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Sėkmingai baigėte liudijimo eksporto vediklį." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Išrinkite liudijimų saugyklą" +msgstr "Išrinkite liudijimą" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Išrinkite liudijimų saugyklą, kurią norite naudoti:" +msgstr "Išrinkite liudijimą, kurį norite naudoti" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2987,20 +2983,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Pastaba: šio liudijimo privatusis raktas neišeksportuojamas." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Numatytosios paskirtys:" +msgstr "Numatyta paskirtis" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Vieta" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Išrinkite liudijimų saugyklą" +msgstr "Išrinkite liudijimą" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented"

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in wined3d_texture_init().
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 14434751dd852cd4664df4ac2ee23afbedd98664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14434751dd852cd4664df4ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 1 11:25:25 2018 +0330 wined3d: Prefer bind flags over usage flags in wined3d_texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 45de4a1..df92b53 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2906,10 +2906,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } - if (!(desc->usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL)) - && (flags & WINED3D_TEXTURE_CREATE_MAPPABLE)) + if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) + || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - if (desc->usage & WINED3DUSAGE_RENDERTARGET && desc->access & WINED3D_RESOURCE_ACCESS_CPU) + if (desc->bind_flags & WINED3D_BIND_RENDER_TARGET && desc->access & WINED3D_RESOURCE_ACCESS_CPU) FIXME("Trying to create a CPU accessible render target.\n"); pow2_width = desc->width; @@ -2955,7 +2955,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->pow2_height = pow2_height; if ((pow2_width > d3d_info->limits.texture_size || pow2_height > d3d_info->limits.texture_size) - && (desc->usage & WINED3DUSAGE_TEXTURE)) + && (desc->bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { /* One of four options: * 1: Do the same as we do with NPOT and scale the texture. (Any

1 0