October 2018 - Wine-Commits

Alexander Morozov : cryptui: Partially implement CryptUIDlgSelectCertificate.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: 3056f9beb95f66e598ab51d5d37b21a548b3e5f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3056f9beb95f66e598ab51d5… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Oct 24 11:18:36 2018 +0300 cryptui: Partially implement CryptUIDlgSelectCertificate. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/cryptui.rc | 17 ++ dlls/cryptui/cryptuires.h | 12 + dlls/cryptui/main.c | 593 ++++++++++++++++++++++++++++++++++++++++++++-- po/ar.po | 221 +++++++++-------- po/bg.po | 220 +++++++++-------- po/ca.po | 221 +++++++++-------- po/cs.po | 221 +++++++++-------- po/da.po | 221 +++++++++-------- po/de.po | 221 +++++++++-------- po/el.po | 217 +++++++++-------- po/en.po | 213 +++++++++-------- po/en_US.po | 213 +++++++++-------- po/eo.po | 217 +++++++++-------- po/es.po | 221 +++++++++-------- po/fa.po | 217 +++++++++-------- po/fi.po | 221 +++++++++-------- po/fr.po | 221 +++++++++-------- po/he.po | 217 +++++++++-------- po/hi.po | 215 +++++++++-------- po/hr.po | 221 +++++++++-------- po/hu.po | 221 +++++++++-------- po/it.po | 221 +++++++++-------- po/ja.po | 221 +++++++++-------- po/ko.po | 221 +++++++++-------- po/lt.po | 221 +++++++++-------- po/ml.po | 215 +++++++++-------- po/nb_NO.po | 221 +++++++++-------- po/nl.po | 221 +++++++++-------- po/or.po | 215 +++++++++-------- po/pa.po | 215 +++++++++-------- po/pl.po | 221 +++++++++-------- po/pt_BR.po | 221 +++++++++-------- po/pt_PT.po | 221 +++++++++-------- po/rm.po | 217 +++++++++-------- po/ro.po | 221 +++++++++-------- po/ru.po | 221 +++++++++-------- po/sk.po | 220 +++++++++-------- po/sl.po | 221 +++++++++-------- po/sr_RS(a)cyrillic.po | 215 +++++++++-------- po/sr_RS(a)latin.po | 218 +++++++++-------- po/sv.po | 221 +++++++++-------- po/te.po | 215 +++++++++-------- po/th.po | 217 +++++++++-------- po/tr.po | 221 +++++++++-------- po/uk.po | 221 +++++++++-------- po/wa.po | 217 +++++++++-------- po/wine.pot | 213 +++++++++-------- po/zh_CN.po | 221 +++++++++-------- po/zh_TW.po | 221 +++++++++-------- 49 files changed, 6158 insertions(+), 4537 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3056f9beb95f66e598ab…

1 0

Stefan Dösinger : ntdll: Avoid more race conditions in RtlDeregisterWaitEx.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: 759e6f1d8d5c531291440299bad0c1ab5ae53d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=759e6f1d8d5c531291440299… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 28 22:14:14 2018 +0100 ntdll: Avoid more race conditions in RtlDeregisterWaitEx. af35aada9b078f8dc71dcc85e505da8eee4571da left some issues unfixed. Instead of running the callback and returning a retval that indicates the callback is not running, we sometimes wait for it when we are not supposed to. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1b0546a..bf7449c 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -81,7 +81,7 @@ struct wait_work_item ULONG Flags; HANDLE CompletionEvent; LONG DeleteCount; - BOOLEAN CallbackInProgress; + int CallbackInProgress; }; struct timer_queue; @@ -530,9 +530,14 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) wait_work_item->Context ); TimerOrWaitFired = TRUE; } - wait_work_item->CallbackInProgress = TRUE; + interlocked_xchg( &wait_work_item->CallbackInProgress, TRUE ); + if (wait_work_item->CompletionEvent) + { + TRACE( "Work has been canceled.\n" ); + break; + } wait_work_item->Callback( wait_work_item->Context, TimerOrWaitFired ); - wait_work_item->CallbackInProgress = FALSE; + interlocked_xchg( &wait_work_item->CallbackInProgress, FALSE ); if (wait_work_item->Flags & WT_EXECUTEONLYONCE) break; @@ -546,7 +551,8 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) { completion_event = wait_work_item->CompletionEvent; delete_wait_work_item( wait_work_item ); - if (completion_event) NtSetEvent( completion_event, NULL ); + if (completion_event && completion_event != INVALID_HANDLE_VALUE) + NtSetEvent( completion_event, NULL ); } return 0; @@ -637,14 +643,16 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) struct wait_work_item *wait_work_item = WaitHandle; NTSTATUS status; HANDLE LocalEvent = NULL; - BOOLEAN CallbackInProgress; + int CallbackInProgress; TRACE( "(%p %p)\n", WaitHandle, CompletionEvent ); if (WaitHandle == NULL) return STATUS_INVALID_HANDLE; + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, INVALID_HANDLE_VALUE ); CallbackInProgress = wait_work_item->CallbackInProgress; + TRACE( "callback in progress %u\n", CallbackInProgress ); if (CompletionEvent == INVALID_HANDLE_VALUE || !CallbackInProgress) { status = NtCreateEvent( &LocalEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); @@ -666,6 +674,7 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) } else if (LocalEvent) { + TRACE( "Waiting for completion event\n" ); NtWaitForSingleObject( LocalEvent, FALSE, NULL ); status = STATUS_SUCCESS; }

1 0

Brendan McGrath : dinput/tests: Test that the GUID is the same for Instance and Product.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: c357f3670f71f3fc40aad0d89f3c9553e653c246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c357f3670f71f3fc40aad0d8… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Wed Oct 31 21:01:40 2018 +1100 dinput/tests: Test that the GUID is the same for Instance and Product. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 11 +++++++++++ dlls/dinput8/tests/dinput.c | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 7e2da9f..d9d3279 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -392,6 +392,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo { struct enum_devices_test *enum_test = context; + if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + todo_wine + ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), + "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; } diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index b093437..403c4a8 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -377,6 +377,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo instance->wUsagePage, instance->wUsage); + if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + todo_wine + ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), + "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; }

1 0

Jacek Caban : ntdll/tests: Add more I/O blocking and completion tests.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: 36693cfb5fc893a86501d0bb99fde06c50728113 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36693cfb5fc893a86501d0bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 16:44:49 2018 +0100 ntdll/tests: Add more I/O blocking and completion tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 319 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36693cfb5fc893a86501…

1 0

Alexandre Julliard : explorer: Move the check for the magic root desktop to the X11 driver.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: 9f8049105db6a91527bd57c1e16db9c161bf4d3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f8049105db6a91527bd57c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 16:26:38 2018 +0100 explorer: Move the check for the magic root desktop to the X11 driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 11 ++++++++++- programs/explorer/desktop.c | 4 +--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 559efe2..d478cbd 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -173,12 +173,21 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) */ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) { + static const WCHAR rootW[] = {'r','o','o','t',0}; XSetWindowAttributes win_attr; Window win; Display *display = thread_init_display(); RECT rect; + WCHAR name[MAX_PATH]; - TRACE( "%u x %u\n", width, height ); + if (!GetUserObjectInformationW( GetThreadDesktop( GetCurrentThreadId() ), + UOI_NAME, name, sizeof(name), NULL )) + name[0] = 0; + + TRACE( "%s %ux%u\n", debugstr_w(name), width, height ); + + /* magic: desktop "root" means use the root window */ + if (!lstrcmpiW( name, rootW )) return FALSE; /* Create window */ win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index ff58204..d802bc3 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -670,12 +670,10 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR /* create the desktop and the associated driver window, and make it the current desktop */ static BOOL create_desktop( HMODULE driver, const WCHAR *name, unsigned int width, unsigned int height ) { - static const WCHAR rootW[] = {'r','o','o','t',0}; BOOL ret = FALSE; BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); - /* magic: desktop "root" means use the root window */ - if (driver && strcmpiW( name, rootW )) + if (driver) { create_desktop_func = (void *)GetProcAddress( driver, "wine_create_desktop" ); if (create_desktop_func) ret = create_desktop_func( width, height );

1 0

Hans Leidekker : webservices: Add support for UTF-8 encoded text in read_message_id.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: 57db798965e974d43fec84a1dbc9cf7f78f67cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57db798965e974d43fec84a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:30 2018 +0100 webservices: Add support for UTF-8 encoded text in read_message_id. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 22 +++++++++++++++++----- dlls/webservices/reader.c | 2 +- dlls/webservices/webservices_private.h | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 4ccf82e..a53fd92 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -846,21 +846,33 @@ static HRESULT read_message_id( WS_XML_READER *reader, GUID *ret ) { const WS_XML_NODE *node; const WS_XML_TEXT_NODE *text; - const WS_XML_UNIQUE_ID_TEXT *id; HRESULT hr; if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; if ((hr = WsGetReaderNode( reader, &node, NULL )) != S_OK) return hr; if (node->nodeType != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; text = (const WS_XML_TEXT_NODE *)node; - if (text->text->textType != WS_XML_TEXT_TYPE_UNIQUE_ID) + + switch (text->text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text->text; + if (utf8->value.length != 45 || memcmp( utf8->value.bytes, "urn:uuid:", 9 )) + return WS_E_INVALID_FORMAT; + + return str_to_guid( utf8->value.bytes + 9, utf8->value.length - 9, ret ); + } + case WS_XML_TEXT_TYPE_UNIQUE_ID: { + const WS_XML_UNIQUE_ID_TEXT *id = (const WS_XML_UNIQUE_ID_TEXT *)text->text; + *ret = id->value; + return S_OK; + } + default: FIXME( "unhandled text type %u\n", text->text->textType ); return E_NOTIMPL; } - id = (const WS_XML_UNIQUE_ID_TEXT *)text->text; - *ret = id->value; - return S_OK; } static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a5ff59a..8cf3f24 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3841,7 +3841,7 @@ static HRESULT str_to_float( const unsigned char *str, ULONG len, float *ret ) return S_OK; } -static HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) +HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) { static const unsigned char hex[] = { diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index d981527..b482b5b 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -71,6 +71,7 @@ HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING HRESULT create_header_buffer( WS_XML_READER *, WS_HEAP *, WS_XML_BUFFER ** ) DECLSPEC_HIDDEN; HRESULT text_to_text( const WS_XML_TEXT *, const WS_XML_TEXT *, ULONG *, WS_XML_TEXT ** ) DECLSPEC_HIDDEN; HRESULT text_to_utf8text( const WS_XML_TEXT *, const WS_XML_UTF8_TEXT *, ULONG *, WS_XML_UTF8_TEXT ** ) DECLSPEC_HIDDEN; +HRESULT str_to_guid( const unsigned char *, ULONG, GUID * ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Increase the maximum size of the channel writer buffer.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: ec2ea93bbbca1f6a6de66cbec17a83173fb84ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2ea93bbbca1f6a6de66cbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:29 2018 +0100 webservices: Increase the maximum size of the channel writer buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b995a86..de84b0e 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1316,9 +1316,14 @@ static HRESULT init_writer( struct channel *channel ) WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; + WS_XML_WRITER_PROPERTY prop; + ULONG max_size = (1 << 17); HRESULT hr; - if (!channel->writer && (hr = WsCreateWriter( NULL, 0, &channel->writer, NULL )) != S_OK) return hr; + prop.id = WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE; + prop.value = &max_size; + prop.valueSize = sizeof(max_size); + if (!channel->writer && (hr = WsCreateWriter( &prop, 1, &channel->writer, NULL )) != S_OK) return hr; switch (channel->encoding) {

1 0

Hans Leidekker : webservices: Add traces.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: 3b7fd4ffed6de134c5c0c4b7797fe0469f67ea0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b7fd4ffed6de134c5c0c4b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:28 2018 +0100 webservices: Add traces. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 91ffe5b..b995a86 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -395,6 +395,11 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, for (i = 0; i < count; i++) { + TRACE( "property id %u value ptr %p size %u\n", properties[i].id, properties[i].value, + properties[i].valueSize ); + if (properties[i].valueSize == sizeof(ULONG) && properties[i].value) + TRACE( " value %08x\n", *(ULONG *)properties[i].value ); + switch (properties[i].id) { case WS_CHANNEL_PROPERTY_ENCODING: @@ -623,6 +628,8 @@ static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS return E_NOTIMPL; } + TRACE( "endpoint %s\n", debugstr_wn(endpoint->url.chars, endpoint->url.length) ); + if (!(channel->addr.url.chars = heap_alloc( endpoint->url.length * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( channel->addr.url.chars, endpoint->url.chars, endpoint->url.length * sizeof(WCHAR) ); channel->addr.url.length = endpoint->url.length;

1 0

Nikolay Sivov : comctl32/edit: Handle focused cue text.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: 8bd48fd6d90fbf8e1f0e92a5ab0d6dab09faf439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd48fd6d90fbf8e1f0e92a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 31 15:57:50 2018 +0300 comctl32/edit: Handle focused cue text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 249e08b..06e1f49 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -129,7 +129,9 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ - WCHAR *cue_banner_text; + WCHAR *cue_banner_text; + BOOL cue_banner_draw_focused; + /* * only for multi line controls */ @@ -2181,7 +2183,7 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); - if (es->cue_banner_text && es->text_length == 0 && !(es->flags & EF_FOCUSED)) + if (es->cue_banner_text && es->text_length == 0 && (!(es->flags & EF_FOCUSED) || es->cue_banner_draw_focused)) { SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); @@ -4170,16 +4172,14 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) * EM_SETCUEBANNER * */ -static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text) +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL draw_focused, const WCHAR *cue_text) { if (es->style & ES_MULTILINE || !cue_text) return FALSE; - if (focus) - FIXME("cue banner for focused control not implemented.\n"); - heap_free(es->cue_banner_text); es->cue_banner_text = heap_strdupW(cue_text); + es->cue_banner_draw_focused = draw_focused; return TRUE; }

1 0

Nikolay Sivov : dwrite: Release file streams when building collections.
by Alexandre Julliard Oct. 31, 2018

Oct. 31, 2018

Module: wine Branch: master Commit: d19e34d8f072514cb903bda89767996ba078bae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19e34d8f072514cb903bda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 31 15:34:11 2018 +0300 dwrite: Release file streams when building collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5fc0de7..6666249 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3883,6 +3883,8 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; } + + IDWriteFontFileStream_Release(stream); } LIST_FOR_EACH_ENTRY_SAFE(fileenum, fileenum2, &scannedfiles, struct fontfile_enum, entry) {

1 0