February 2021 - Wine-Commits

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

Feb. 11, 2021

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

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

Feb. 11, 2021

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

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

Feb. 11, 2021

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

Alexandre Julliard : server: Remove the load/unload_dll requests and the dll list.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: e7fa4fd14702d008431bed68a548037d606ef7a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7fa4fd14702d008431bed68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 16:19:40 2021 +0100 server: Remove the load/unload_dll requests and the dll list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 19 --------- include/wine/server_protocol.h | 36 +---------------- server/process.c | 87 ------------------------------------------ server/process.h | 10 ----- server/protocol.def | 14 ------- server/request.h | 9 ----- server/trace.c | 19 +-------- 7 files changed, 2 insertions(+), 192 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7fa4fd14702d008431b…

1 0

Alexandre Julliard : ntdll/tests: Relax a broken result on Windows.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: 7c85b365d109dfe7dcb947b9377e96d3e78724c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c85b365d109dfe7dcb947b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 15:27:58 2021 +0100 ntdll/tests: Relax a broken result on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1878a480cb8..e93f11e1126 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2500,7 +2500,7 @@ static void test_object_types(void) memset( info, 0xcc, sizeof(*info) ); status = pNtQueryObject( NULL, ObjectTypesInformation, info, len, &retlen ); ok( retlen <= len + 16, "wrong len %x/%x\n", len, retlen ); - ok( len == retlen || broken( retlen == len + 16 || retlen == len - 16 ), /* wow64 */ + ok( len == retlen || broken( retlen >= len - 32 && retlen <= len + 32 ), /* wow64 */ "wrong len %x/%x\n", len, retlen ); ok( !status, "NtQueryObject failed %x\n", status ); if (!status)

1 0

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

Feb. 11, 2021

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

Brendan Shanks : dinput: Map Xbox One controller triggers (accelerator/brake) to Rx/Ry on Mac.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: e9dda86273ed0e6946f6c0048ded372b60836fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dda86273ed0e6946f6c004… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 11 11:21:21 2021 -0800 dinput: Map Xbox One controller triggers (accelerator/brake) to Rx/Ry on Mac. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index bd39ca41b51..805b75639fe 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -621,6 +621,7 @@ static void get_osx_device_elements(JoystickImpl *device, uint64_t axis_map[8]) IOHIDElementRef device_main_element; CFMutableArrayRef elements; DWORD sliders = 0; + BOOL use_accel_brake_for_rx_ry = TRUE; TRACE("device %p device->id %d\n", device, device->id); @@ -644,6 +645,23 @@ static void get_osx_device_elements(JoystickImpl *device, uint64_t axis_map[8]) CFMutableArrayRef buttons = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); CFMutableArrayRef povs = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + /* Scan the elements to see if Rx/Ry is present, if not then Accelerator/Brake can be mapped to it. + * (Xbox One controller triggers use accelerator/brake) + */ + for ( idx = 0; idx < cnt; idx++ ) + { + IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elements, idx ); + IOHIDElementType type = IOHIDElementGetType( element ); + uint32_t usage_page = IOHIDElementGetUsagePage( element ); + uint32_t usage = IOHIDElementGetUsage( element ); + + if (type == kIOHIDElementTypeInput_Misc && usage_page == kHIDPage_GenericDesktop && + (usage == kHIDUsage_GD_Rx || usage == kHIDUsage_GD_Ry)) + { + use_accel_brake_for_rx_ry = FALSE; + } + } + for ( idx = 0; idx < cnt; idx++ ) { IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elements, idx ); @@ -701,7 +719,17 @@ static void get_osx_device_elements(JoystickImpl *device, uint64_t axis_map[8]) case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rx): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rz): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): { + if (usage == kHIDUsage_Sim_Accelerator || usage == kHIDUsage_Sim_Brake) + { + if (use_accel_brake_for_rx_ry) + TRACE("Using Sim_Accelerator/Brake for GD_Rx/Ry\n"); + else + break; + } + TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_* (%d)\n", usage); axis_map[CFArrayGetCount(axes)]=MAKEUINT64(usage_page, usage); CFArrayAppendValue(axes, element); @@ -864,6 +892,8 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rz): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Slider): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): { int wine_obj = -1; @@ -895,12 +925,14 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) device->generic.js.lZ = newVal; break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rx): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Rx\n"); wine_obj = 3; oldVal = device->generic.js.lRx; device->generic.js.lRx = newVal; break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Ry\n"); wine_obj = 4; oldVal = device->generic.js.lRy; @@ -1200,10 +1232,12 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_Z); break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rx): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): wine_obj = 3; has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RX); break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): wine_obj = 4; has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RY); break;

1 0

Brendan Shanks : dinput: On Mac, always use both HID usage page and usage for comparisons.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: e8332dece8209d331285622f4e960f27e328bd3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8332dece8209d331285622f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 11 11:21:20 2021 -0800 dinput: On Mac, always use both HID usage page and usage for comparisons. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 77 ++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8332dece8209d331285…

1 0

Alexandre Julliard : ntdll: Close the debug port on thread exit.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: 7163c78234ecce7e2b5aa531927f573c7d4e5d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7163c78234ecce7e2b5aa531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 14:17:03 2021 +0100 ntdll: Close the debug port on thread exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 95 ++++++++++++++++++++++++++++++++++++++---- dlls/ntdll/loader.c | 2 + dlls/ntdll/thread.c | 1 - 3 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 55bcd62f379..118984eec75 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1779,12 +1779,49 @@ static char *cmd; static DWORD WINAPI debug_and_exit(void *arg) { STARTUPINFOA si = { sizeof(si) }; + HANDLE debug; + ULONG val = 0; + NTSTATUS status; BOOL ret; ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + debug = pDbgUiGetThreadDebugObject(); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + *(HANDLE *)arg = debug; Sleep(200); + ExitThread(0); +} + +static DWORD WINAPI debug_and_wait(void *arg) +{ + STARTUPINFOA si = { sizeof(si) }; + HANDLE debug = *(HANDLE *)arg; + ULONG val = 0; + NTSTATUS status; + BOOL ret; + + pDbgUiSetThreadDebugObject( debug ); + ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + debug = pDbgUiGetThreadDebugObject(); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + Sleep(INFINITE); + ExitThread(0); +} + +static DWORD WINAPI create_debug_port(void *arg) +{ + STARTUPINFOA si = { sizeof(si) }; + NTSTATUS status = pDbgUiConnectToDbg(); + + ok( !status, "DbgUiConnectToDbg failed %x\n", status ); *(HANDLE *)arg = pDbgUiGetThreadDebugObject(); + Sleep( INFINITE ); ExitThread(0); } @@ -1844,19 +1881,23 @@ static void test_kill_on_exit(const char *argv0) exit_code = run_child_wait( cmd, event ); ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08x\n", exit_code); - /* test that threads don't close the debug port on exit */ + /* test that threads close the debug port on exit */ thread = CreateThread(NULL, 0, debug_and_exit, &debug, 0, &tid); WaitForSingleObject( thread, 1000 ); ok( debug != 0, "no debug port\n" ); - SetEvent( event ); - WaitForSingleObject( pi.hProcess, 100 ); - GetExitCodeProcess( pi.hProcess, &exit_code ); - ok( exit_code == STILL_ACTIVE, "exit code = %08x\n", exit_code); val = 0; status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); - CloseHandle( debug ); + ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_SUCCESS), /* wow64 */ + "NtSetInformationDebugObject failed %x\n", status ); + SetEvent( event ); + if (!status) + { + WaitForSingleObject( pi.hProcess, 100 ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ok( exit_code == STILL_ACTIVE, "exit code = %08x\n", exit_code); + CloseHandle( debug ); + } WaitForSingleObject( pi.hProcess, 1000 ); GetExitCodeProcess( pi.hProcess, &exit_code ); ok( exit_code == 0, "exit code = %08x\n", exit_code); @@ -1864,6 +1905,46 @@ static void test_kill_on_exit(const char *argv0) CloseHandle( pi.hThread ); CloseHandle( thread ); + /* but not on forced exit */ + status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, DEBUG_KILL_ON_CLOSE ); + ok( !status, "NtCreateDebugObject failed %x\n", status ); + thread = CreateThread(NULL, 0, debug_and_wait, &debug, 0, &tid); + Sleep( 100 ); + ok( debug != 0, "no debug port\n" ); + val = 1; + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + TerminateThread( thread, 0 ); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + WaitForSingleObject( pi.hProcess, 300 ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + todo_wine + ok( exit_code == STATUS_DEBUGGER_INACTIVE || broken(exit_code == STILL_ACTIVE), /* wow64 */ + "exit code = %08x\n", exit_code); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + CloseHandle( thread ); + CloseHandle( debug ); + + debug = 0; + thread = CreateThread(NULL, 0, create_debug_port, &debug, 0, &tid); + Sleep(100); + ok( debug != 0, "no debug port\n" ); + val = 0; + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + TerminateThread( thread, 0 ); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + CloseHandle( debug ); + CloseHandle( thread ); + + CloseHandle( event ); heap_free(cmd); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 378b812868c..84cb7a04ba0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3278,6 +3278,8 @@ void WINAPI LdrShutdownThread(void) RtlReleasePebLock(); RtlLeaveCriticalSection( &loader_section ); + if (DbgUiGetThreadDebugObject()) NtClose( DbgUiGetThreadDebugObject() ); + RtlFreeThreadActivationContextStack(); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8e5a3a3a3a3..425e8770294 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -85,7 +85,6 @@ void WINAPI RtlExitUserThread( ULONG status ) NtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &last, sizeof(last), NULL ); if (last) RtlExitUserProcess( status ); LdrShutdownThread(); - RtlFreeThreadActivationContextStack(); for (;;) NtTerminateThread( GetCurrentThread(), status ); }

1 0

Alexandre Julliard : kernelbase: Implement GetMappedFileNameA/W.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

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