February 2021 - Wine-commits

Rémi Bernon : ntdll: Re-implement RtlRegisterWait using TpSetWait.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 26ee9134d5d75ee515ccf06987cd024b64e498aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ee9134d5d75ee515ccf069… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 11 10:53:49 2021 +0100 ntdll: Re-implement RtlRegisterWait using TpSetWait. This adds several internal flags to TP_WAIT object to support the implementation: * WT_EXECUTEONLYONCE: waits are re-queued unless it is set. * WT_EXECUTEINWAITTHREAD: call the callback in the wait thread when set. * WT_EXECUTEINIOTHREAD: call alertable NtWaitForMultipleObjects in wait thread when set, as well the callback in the wait thread, as for WT_EXECUTEINWAITTHREAD. The worker threads use non-alertable waits otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47843 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 1 - dlls/ntdll/tests/threadpool.c | 6 +- dlls/ntdll/threadpool.c | 264 ++++++++++++++++-------------------------- 3 files changed, 100 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26ee9134d5d75ee515cc…

1 0

Rémi Bernon : kernel32: Write the wait handle before executing the callback.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: b922b5aeef18fd30b13a4e86c115d68e505c9393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b922b5aeef18fd30b13a4e86… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 11 10:53:50 2021 +0100 kernel32: Write the wait handle before executing the callback. Otherwise we may execute the callback before the value is actually returned from RegisterWaitForSingleObject. Gears Tactics shares a pointer to the returned handle with its callbacks and calls UnregisterWait from there. This creates a race condition that sometimes causes a double free. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47843 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 3 ++- dlls/kernel32/tests/thread.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/threadpool.c | 3 +++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index ab392c5d995..331cd80772a 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -110,7 +110,8 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) BOOL WINAPI RegisterWaitForSingleObject( HANDLE *wait, HANDLE object, WAITORTIMERCALLBACK callback, void *context, ULONG timeout, ULONG flags ) { - return (*wait = RegisterWaitForSingleObjectEx( object, callback, context, timeout, flags)) != NULL; + if (!set_ntstatus( RtlRegisterWait( wait, object, callback, context, timeout, flags ))) return FALSE; + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e861aa751e9..f33e05741a2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1346,6 +1346,15 @@ static void CALLBACK signaled_function(PVOID p, BOOLEAN TimerOrWaitFired) ok(!TimerOrWaitFired, "wait shouldn't have timed out\n"); } +static void CALLBACK wait_complete_function(PVOID p, BOOLEAN TimerOrWaitFired) +{ + HANDLE event = p; + DWORD res; + ok(!TimerOrWaitFired, "wait shouldn't have timed out\n"); + res = WaitForSingleObject(event, INFINITE); + ok(res == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", res); +} + static void CALLBACK timeout_function(PVOID p, BOOLEAN TimerOrWaitFired) { HANDLE event = p; @@ -1371,6 +1380,23 @@ static void CALLBACK waitthread_test_function(PVOID p, BOOLEAN TimerOrWaitFired) SetEvent(param->complete_event); } +struct unregister_params +{ + HANDLE wait_handle; + HANDLE complete_event; +}; + +static void CALLBACK unregister_function(PVOID p, BOOLEAN TimerOrWaitFired) +{ + struct unregister_params *param = p; + HANDLE wait_handle = param->wait_handle; + BOOL ret; + ok(wait_handle != INVALID_HANDLE_VALUE, "invalid wait handle\n"); + ret = pUnregisterWait(param->wait_handle); + todo_wine ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + SetEvent(param->complete_event); +} + static void test_RegisterWaitForSingleObject(void) { BOOL ret; @@ -1379,6 +1405,8 @@ static void test_RegisterWaitForSingleObject(void) HANDLE complete_event; HANDLE waitthread_trigger_event, waitthread_wait_event; struct waitthread_test_param param; + struct unregister_params unregister_param; + DWORD i; if (!pRegisterWaitForSingleObject || !pUnregisterWait) { @@ -1411,8 +1439,26 @@ static void test_RegisterWaitForSingleObject(void) ret = pUnregisterWait(wait_handle); ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + /* test unregister while running */ + + SetEvent(handle); + ret = pRegisterWaitForSingleObject(&wait_handle, handle, wait_complete_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + /* give worker thread chance to start */ + Sleep(50); + ret = pUnregisterWait(wait_handle); + ok(!ret, "UnregisterWait succeeded\n"); + ok(GetLastError() == ERROR_IO_PENDING, "UnregisterWait failed with error %d\n", GetLastError()); + + /* give worker thread chance to complete */ + SetEvent(complete_event); + Sleep(50); + /* test timeout case */ + ResetEvent(handle); + ret = pRegisterWaitForSingleObject(&wait_handle, handle, timeout_function, complete_event, 0, WT_EXECUTEONLYONCE); ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); @@ -1442,6 +1488,21 @@ static void test_RegisterWaitForSingleObject(void) ret = pUnregisterWait(wait_handle); ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + /* the callback execution should be sequentially consistent with the wait handle return, + even if the event is already set */ + + for (i = 0; i < 100; ++i) + { + SetEvent(handle); + unregister_param.complete_event = complete_event; + unregister_param.wait_handle = INVALID_HANDLE_VALUE; + + ret = pRegisterWaitForSingleObject(&unregister_param.wait_handle, handle, unregister_function, &unregister_param, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTEINWAITTHREAD); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + WaitForSingleObject(complete_event, INFINITE); + } + /* test multiple waits with WT_EXECUTEINWAITTHREAD. * Windows puts multiple waits on the same wait thread, and using WT_EXECUTEINWAITTHREAD causes the callbacks to run serially. */ diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 331149855ab..bdc1ebddd7d 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -3226,9 +3226,12 @@ NTSTATUS WINAPI RtlRegisterWait( HANDLE *out, HANDLE handle, RTL_WAITORTIMERCALL object = impl_from_TP_WAIT(wait); object->u.wait.rtl_callback = callback; + RtlEnterCriticalSection( &waitqueue.cs ); TpSetWait( (TP_WAIT *)object, handle, get_nt_timeout( &timeout, milliseconds ) ); *out = object; + RtlLeaveCriticalSection( &waitqueue.cs ); + return STATUS_SUCCESS; }

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in existing_new_pad().
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 070612814bfd4c6e1e010a1ff98bbaa26b787d60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=070612814bfd4c6e1e010a1f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 16:18:27 2021 -0600 winegstreamer: Avoid using Wine debug functions in existing_new_pad(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 12e06ed9fd5..bc1bc71a907 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1585,17 +1585,10 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser { struct wg_parser_stream *stream; const char *typename; - char *name; GstCaps *caps; GstStructure *arg; int ret; - TRACE("parser %p, bin %p, pad %p.\n", parser, bin, pad); - - name = gst_pad_get_name(pad); - TRACE("Name: %s\n", name); - g_free(name); - caps = gst_pad_query_caps(pad, NULL); caps = gst_caps_make_writable(caps); arg = gst_caps_get_structure(caps, 0); @@ -1612,7 +1605,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser * necessarily consume it. In particular, the video renderer can't. */ if (!(deinterlace = gst_element_factory_make("deinterlace", NULL))) { - ERR("Failed to create deinterlace, are %u-bit GStreamer \"good\" plugins installed?\n", + fprintf(stderr, "winegstreamer: failed to create deinterlace, are %u-bit GStreamer \"good\" plugins installed?\n", 8 * (int)sizeof(void *)); goto out; } @@ -1622,7 +1615,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser * formats either. Add a videoconvert to swap color spaces. */ if (!(vconv = gst_element_factory_make("videoconvert", NULL))) { - ERR("Failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + fprintf(stderr, "winegstreamer: failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", 8 * (int)sizeof(void *)); goto out; } @@ -1630,7 +1623,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ if (!(flip = gst_element_factory_make("videoflip", NULL))) { - ERR("Failed to create videoflip, are %u-bit GStreamer \"good\" plugins installed?\n", + fprintf(stderr, "winegstreamer: failed to create videoflip, are %u-bit GStreamer \"good\" plugins installed?\n", 8 * (int)sizeof(void *)); goto out; } @@ -1639,7 +1632,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser * to do the final conversion. */ if (!(vconv2 = gst_element_factory_make("videoconvert", NULL))) { - ERR("Failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + fprintf(stderr, "winegstreamer: failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", 8 * (int)sizeof(void *)); goto out; } @@ -1672,7 +1665,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser * depth and channel count. */ if (!(convert = gst_element_factory_make("audioconvert", NULL))) { - ERR("Failed to create audioconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + fprintf(stderr, "winegstreamer: failed to create audioconvert, are %u-bit GStreamer \"base\" plugins installed?\n", 8 * (int)sizeof(void *)); goto out; } @@ -1688,7 +1681,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser { if ((ret = gst_pad_link(pad, stream->post_sink)) < 0) { - ERR("Failed to link decodebin source pad to post-processing elements, error %s.\n", + GST_ERROR("Failed to link decodebin source pad to post-processing elements, error %s.", gst_pad_link_get_name(ret)); gst_object_unref(stream->post_sink); stream->post_sink = NULL; @@ -1697,7 +1690,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser if ((ret = gst_pad_link(stream->post_src, stream->my_sink)) < 0) { - ERR("Failed to link post-processing elements to our sink pad, error %s.\n", + GST_ERROR("Failed to link post-processing elements to our sink pad, error %s.", gst_pad_link_get_name(ret)); gst_object_unref(stream->post_src); stream->post_src = NULL; @@ -1708,7 +1701,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser } else if ((ret = gst_pad_link(pad, stream->my_sink)) < 0) { - ERR("Failed to link decodebin source pad to our sink pad, error %s.\n", + GST_ERROR("Failed to link decodebin source pad to our sink pad, error %s.", gst_pad_link_get_name(ret)); goto out; } @@ -1723,7 +1716,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) { struct wg_parser *This = user; - TRACE("%p %p %p\n", This, bin, pad); + GST_LOG("parser %p, bin %p, pad %p.", This, bin, pad); if (gst_pad_is_linked(pad)) return;

1 0

Zebediah Figura : winegstreamer: Don't force existing_new_pad() onto a Wine thread.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 2d8add43a725f6898d6c163ba5e652dc8053c650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8add43a725f6898d6c163b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 16:18:28 2021 -0600 winegstreamer: Don't force existing_new_pad() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 16 +--------------- dlls/winegstreamer/gst_cbs.h | 4 ---- dlls/winegstreamer/gstdemux.c | 21 ++------------------- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 312c12fd194..d037c195971 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -47,10 +47,7 @@ static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) { struct cb_data *cbdata = user; - if (cbdata->type < GSTDEMUX_MAX) - perform_cb_gstdemux(cbdata); - else if (cbdata->type < MEDIA_SOURCE_MAX) - perform_cb_media_source(cbdata); + perform_cb_media_source(cbdata); pthread_mutex_lock(&cbdata->lock); cbdata->finished = 1; @@ -136,17 +133,6 @@ static void call_cb(struct cb_data *cbdata) pthread_mutex_destroy(&cbdata->lock); } -void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) -{ - struct cb_data cbdata = { EXISTING_NEW_PAD }; - - cbdata.u.pad_added_data.element = bin; - cbdata.u.pad_added_data.pad = pad; - cbdata.u.pad_added_data.user = user; - - call_cb(&cbdata); -} - GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) { diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index f6f1ffb526b..fd90373d900 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -30,8 +30,6 @@ typedef enum { } GstAutoplugSelectResult; enum CB_TYPE { - EXISTING_NEW_PAD, - GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, BYTESTREAM_QUERY, BYTESTREAM_PAD_MODE_ACTIVATE, @@ -102,10 +100,8 @@ struct cb_data { }; void mark_wine_thread(void) DECLSPEC_HIDDEN; -void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; -void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bc1bc71a907..1e14f073480 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2198,7 +2198,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) gst_bin_add(GST_BIN(parser->container), element); - g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), parser); + g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad), parser); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), parser); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), parser); @@ -2917,23 +2917,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) return S_OK; } -void perform_cb_gstdemux(struct cb_data *cbdata) -{ - switch(cbdata->type) - { - case EXISTING_NEW_PAD: - { - struct pad_added_data *data = &cbdata->u.pad_added_data; - existing_new_pad(data->element, data->pad, data->user); - break; - } - default: - { - assert(0); - } - } -} - static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) { return IsEqualGUID(&a->majortype, &b->majortype) @@ -3103,7 +3086,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) gst_bin_add(GST_BIN(parser->container), element); - g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), parser); + g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad), parser); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), parser);

1 0

Nikolay Sivov : dwrite: Fix setting canBreakShapingAfter when applying ligatures.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: b91548d05955cf8e29e95b0397087bb6ed33c5b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b91548d05955cf8e29e95b03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 11:10:18 2021 +0300 dwrite: Fix setting canBreakShapingAfter when applying ligatures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7dc4a1f7b55..8885306a84d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5126,10 +5126,28 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, return TRUE; } -static void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int idx) +/* Marks text segment as unsafe to break between [start, end) glyphs. */ +static void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int start, + unsigned int end) { - if (context->u.buffer.glyph_props[idx].isClusterStart) - context->u.buffer.text_props[context->glyph_infos[idx].start_text_idx].canBreakShapingAfter = 0; + unsigned int i; + + while (start && !context->u.buffer.glyph_props[start].isClusterStart) + --start; + + while (--end && !context->u.buffer.glyph_props[end].isClusterStart) + ; + + if (start == end) + { + context->u.buffer.text_props[context->glyph_infos[start].start_text_idx].canBreakShapingAfter = 0; + return; + } + + for (i = context->glyph_infos[start].start_text_idx; i < context->glyph_infos[end].start_text_idx; ++i) + { + context->u.buffer.text_props[i].canBreakShapingAfter = 0; + } } static void opentype_layout_delete_glyph(struct scriptshaping_context *context, unsigned int idx) @@ -5194,10 +5212,8 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context { context->u.buffer.glyph_props[j++].lig_component = comp_count - i; } - opentype_layout_unsafe_to_break(context, i); - context->u.buffer.glyph_props[i].isClusterStart = 0; - context->glyph_infos[i].start_text_idx = 0; } + opentype_layout_unsafe_to_break(context, match_positions[0], match_positions[comp_count - 1] + 1); /* Delete ligated glyphs, backwards to preserve index. */ for (i = 1; i < comp_count; ++i)

1 0

Nikolay Sivov : dwrite/arabic: Use resolved codepoint for joining types.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 7d264424ce0e850cd501f65e318cfe403d0c4940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d264424ce0e850cd501f65e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 11:10:19 2021 +0300 dwrite/arabic: Use resolved codepoint for joining types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 1 + dlls/dwrite/shapers/arabic.c | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fa36e92bde5..e03ad6c6c6d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -521,6 +521,7 @@ struct shaping_glyph_info int attach_chain; /* Only relevant for isClusterStart glyphs. Indicates text position for this cluster. */ unsigned int start_text_idx; + unsigned int codepoint; }; struct shaping_glyph_properties diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8885306a84d..515d2440fcf 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5949,6 +5949,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c if (*context->u.subst.digits && codepoint >= '0' && codepoint <= '9') codepoint = context->u.subst.digits[codepoint - '0']; + context->glyph_infos[g].codepoint = codepoint; context->u.buffer.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; opentype_set_subst_glyph_props(context, g); diff --git a/dlls/dwrite/shapers/arabic.c b/dlls/dwrite/shapers/arabic.c index cc701150a56..cc598f834e5 100644 --- a/dlls/dwrite/shapers/arabic.c +++ b/dlls/dwrite/shapers/arabic.c @@ -147,9 +147,9 @@ static void arabic_setup_masks(struct scriptshaping_context *context, unsigned int i, prev = ~0u, state = 0; unsigned int masks[NUM_FEATURES]; - for (i = 0; i < context->length; ++i) + for (i = 0; i < context->glyph_count; ++i) { - unsigned short this_type = arabic_get_joining_type(context->text[i]); + unsigned short this_type = arabic_get_joining_type(context->glyph_infos[i].codepoint); const struct arabic_state_table_entry *entry; if (this_type == JOINING_TYPE_T) @@ -173,7 +173,7 @@ static void arabic_setup_masks(struct scriptshaping_context *context, masks[i] = shape_get_feature_1_mask(features, arabic_features[i]); /* Unaffected glyphs get action NONE with zero mask. */ - for (i = 0; i < context->length; ++i) + for (i = 0; i < context->glyph_count; ++i) context->glyph_infos[i].mask |= masks[arabic_get_shaping_action(context, i)]; }

1 0

Nikolay Sivov : dwrite/arabic: Mark glyphs with assigned action as unsafe to break.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 8c4b47c6f94054b60c3830ee76edd81886375365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4b47c6f94054b60c3830ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 11:10:20 2021 +0300 dwrite/arabic: Mark glyphs with assigned action as unsafe to break. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/opentype.c | 2 +- dlls/dwrite/shapers/arabic.c | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index e03ad6c6c6d..fa82a8d4376 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -690,6 +690,8 @@ extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *co extern BOOL opentype_layout_check_feature(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, struct shaping_feature *feature, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; +extern void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int start, + unsigned int end) DECLSPEC_HIDDEN; extern BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) DECLSPEC_HIDDEN; extern HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, unsigned int glyph_count, const UINT16 *nominal_glyphs, UINT16 *glyphs) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 515d2440fcf..afae1b69d07 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5127,7 +5127,7 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, } /* Marks text segment as unsafe to break between [start, end) glyphs. */ -static void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int start, +void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int start, unsigned int end) { unsigned int i; diff --git a/dlls/dwrite/shapers/arabic.c b/dlls/dwrite/shapers/arabic.c index cc598f834e5..720f18915a4 100644 --- a/dlls/dwrite/shapers/arabic.c +++ b/dlls/dwrite/shapers/arabic.c @@ -174,7 +174,12 @@ static void arabic_setup_masks(struct scriptshaping_context *context, /* Unaffected glyphs get action NONE with zero mask. */ for (i = 0; i < context->glyph_count; ++i) - context->glyph_infos[i].mask |= masks[arabic_get_shaping_action(context, i)]; + { + enum arabic_shaping_action action = arabic_get_shaping_action(context, i); + if (action != NONE) + opentype_layout_unsafe_to_break(context, i, i + 1); + context->glyph_infos[i].mask |= masks[action]; + } } const struct shaper arabic_shaper =

1 0

Nikolay Sivov : explorerframe: Handle NSTCS_SINGLECLICKEXPAND style.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 6832c6e1f91b599d54dc1b29be3da4cb10c7724c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6832c6e1f91b599d54dc1b29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 11:34:10 2021 +0300 explorerframe: Handle NSTCS_SINGLECLICKEXPAND style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index b1ecace5fae..0698e6fa065 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -68,7 +68,7 @@ typedef struct { } NSTC2Impl; static const DWORD unsupported_styles = - NSTCS_SINGLECLICKEXPAND | NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | + NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | NSTCS_EMPTYTEXT | NSTCS_ALLOWJUNCTIONS | NSTCS_SHOWTABSBUTTON | NSTCS_SHOWDELETEBUTTON | NSTCS_SHOWREFRESHBUTTON | NSTCS_SPRINGEXPAND | NSTCS_RICHTOOLTIP | NSTCS_NOINDENTCHECKS; static const DWORD unsupported_styles2 = @@ -213,6 +213,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, if(nstcs_mask & NSTCS_DISABLEDRAGDROP) tv_mask |= TVS_DISABLEDRAGDROP; if(nstcs_mask & NSTCS_NOEDITLABELS) tv_mask |= TVS_EDITLABELS; if(nstcs_mask & NSTCS_CHECKBOXES) tv_mask |= TVS_CHECKBOXES; + if(nstcs_mask & NSTCS_SINGLECLICKEXPAND) tv_mask |= TVS_SINGLEEXPAND; *new_style = 0; @@ -227,6 +228,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, if(nstcs & NSTCS_DISABLEDRAGDROP) *new_style |= TVS_DISABLEDRAGDROP; if(!(nstcs & NSTCS_NOEDITLABELS)) *new_style |= TVS_EDITLABELS; if(nstcs & NSTCS_CHECKBOXES) *new_style |= TVS_CHECKBOXES; + if(nstcs & NSTCS_SINGLECLICKEXPAND) *new_style |= TVS_SINGLEEXPAND; *new_style = (old_style & ~tv_mask) | (*new_style & tv_mask);

1 0

Alexandre Julliard : kernelbase: Also export the non-K32 names for the psapi functions.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: a66c383709e3c956c579a848d441043d8c5b267c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66c383709e3c956c579a848… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 10:16:04 2021 +0100 kernelbase: Also export the non-K32 names for the psapi functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 104 ++++++++++++++++++++++++-------------- dlls/kernelbase/kernelbase.spec | 108 ++++++++++++++++++++-------------------- 2 files changed, 120 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a66c383709e3c956c579…

1 0

Alexandre Julliard : kernelbase: Implement GetMappedFileNameA/W.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: bd0a3c1a59db9e75500db6df0f3598c981abf44e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0a3c1a59db9e75500db6df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 11:01:28 2021 +0100 kernelbase: Implement GetMappedFileNameA/W. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 40 ++++++++++++++++++++++++++++++++++------ dlls/psapi/tests/psapi_main.c | 28 ++++------------------------ server/mapping.c | 5 +++-- 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 55d5fcd3551..cbc53e22ac1 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1130,9 +1130,23 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverFileNameW( void *image_base, WCHAR */ DWORD WINAPI DECLSPEC_HOTPATCH GetMappedFileNameA( HANDLE process, void *addr, char *name, DWORD size ) { - FIXME( "(%p, %p, %p, %d): stub\n", process, addr, name, size ); - if (name && size) name[0] = 0; - return 0; + WCHAR nameW[MAX_PATH]; + DWORD len; + + if (size && !name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (!GetMappedFileNameW( process, addr, nameW, MAX_PATH )) return 0; + if (!size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + len = file_name_WtoA( nameW, wcslen(nameW), name, size ); + name[min(len, size - 1)] = 0; + return len; } @@ -1142,9 +1156,23 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetMappedFileNameA( HANDLE process, void *addr, c */ DWORD WINAPI DECLSPEC_HOTPATCH GetMappedFileNameW( HANDLE process, void *addr, WCHAR *name, DWORD size ) { - FIXME( "(%p, %p, %p, %d): stub\n", process, addr, name, size ); - if (name && size) name[0] = 0; - return 0; + ULONG_PTR buffer[(sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)) / sizeof(ULONG_PTR)]; + MEMORY_SECTION_NAME *mem = (MEMORY_SECTION_NAME *)buffer; + DWORD len; + + if (size && !name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (!set_ntstatus( NtQueryVirtualMemory( process, addr, MemorySectionName, mem, sizeof(buffer), NULL ))) + return 0; + + len = mem->SectionFileName.Length / sizeof(WCHAR); + memcpy( name, mem->SectionFileName.Buffer, min( mem->SectionFileName.Length, size * sizeof(WCHAR) )); + if (len >= size) SetLastError( ERROR_INSUFFICIENT_BUFFER ); + name[min(len, size - 1)] = 0; + return len; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 91100d30e94..8f94e0b5798 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -402,27 +402,22 @@ static void test_GetMappedFileName(void) SetLastError(0xdeadbeef); ret = GetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError( 0xdeadbeef ); ret = GetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); -todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); if (ret) { ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); - todo_wine ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ - todo_wine ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); if (szMapBaseName) { @@ -460,36 +455,30 @@ todo_wine SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, 1); -todo_wine ok(ret == 1, "GetMappedFileName error %d\n", GetLastError()); ok(!map_name[0] || broken(map_name[0] == device_name[0]) /* before win2k */, "expected 0, got %c\n", map_name[0]); SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); -todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); + todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); -} SetLastError(0xdeadbeef); ret = GetMappedFileNameW(GetCurrentProcess(), base, map_nameW, ARRAY_SIZE(map_nameW)); -todo_wine { ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); -} if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name, ARRAY_SIZE(nt_map_name))) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); @@ -500,28 +489,24 @@ todo_wine { SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); -todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); + todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); -} SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), NULL, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetMappedFileNameA(0, base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); UnmapViewOfFile(base); @@ -540,7 +525,6 @@ todo_wine SetLastError(0xdeadbeef); ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); -todo_wine ok(GetLastError() == ERROR_FILE_INVALID, "expected ERROR_FILE_INVALID, got %d\n", GetLastError()); UnmapViewOfFile(base); @@ -562,11 +546,7 @@ static void test_GetProcessImageFileName(void) win_skip("GetProcessImageFileName not implemented\n"); return; } - - if(GetLastError() == 0xdeadbeef) - todo_wine ok(0, "failed without error code\n"); - else - todo_wine ok(0, "failed with %d\n", GetLastError()); + ok(0, "failed with %d\n", GetLastError()); } SetLastError(0xdeadbeef); @@ -586,7 +566,7 @@ static void test_GetProcessImageFileName(void) if(ret && ret1) { /* Windows returns 2*strlen-1 */ - todo_wine ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); + ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } diff --git a/server/mapping.c b/server/mapping.c index be026e63f25..9728beca959 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1234,8 +1234,9 @@ DECL_HANDLER(get_mapping_filename) if ((view = find_mapped_addr( process, req->addr )) && get_view_nt_name( view, &name )) { reply->len = name.len; - if (name.len <= get_reply_max_size()) set_reply_data( name.str, name.len ); - else set_error( STATUS_BUFFER_OVERFLOW ); + if (name.len > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); + else if (!name.len) set_error( STATUS_FILE_INVALID ); + else set_reply_data( name.str, name.len ); } else set_error( STATUS_INVALID_ADDRESS );

1 0