February 2022 - Wine-Commits

Ziqing Hui : wininet: Support more internet time format.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 64b2ce4bcbe898834768b020f2d005846bc525c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b2ce4bcbe898834768b020… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Feb 21 11:00:36 2022 +0800 wininet: Support more internet time format. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 59 ++++++++++++++++++++++++++++++------------- dlls/wininet/tests/internet.c | 16 ++++++------ 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c17916bb2bd..4d512e4ef39 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3302,6 +3302,11 @@ static const WCHAR WININET_month[12][4] = L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec"}; +static inline BOOL is_time_digit(const WCHAR c) +{ + return c >= '0' && c <= '9'; +} + /*********************************************************************** * InternetTimeFromSystemTimeA (WININET.@) */ @@ -3400,54 +3405,72 @@ BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD r * a SYSTEMTIME structure. */ - while (*s && !iswalpha( *s )) s++; - if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + while (*s && !iswalpha(*s) && !is_time_digit(*s)) s++; + if (*s == '\0') return TRUE; time->wDayOfWeek = 7; - for (i = 0; i < 7; i++) + if (iswalpha(*s)) { - if (!wcsnicmp( WININET_wkday[i], s, 3 )) + if (s[1] == '\0' || s[2] == '\0') return TRUE; + for (i = 0; i < 7; i++) { - time->wDayOfWeek = i; - break; + if (!wcsnicmp(WININET_wkday[i], s, 3)) + { + time->wDayOfWeek = i; + break; + } } } - + else if (is_time_digit(*s)) + { + time->wDayOfWeek = wcstol(s, &end, 10); + s = end; + } if (time->wDayOfWeek > 6) return TRUE; - while (*s && !iswdigit( *s )) s++; + + while (*s && !is_time_digit(*s)) s++; time->wDay = wcstol( s, &end, 10 ); s = end; - while (*s && !iswalpha( *s )) s++; - if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + while (*s && !iswalpha(*s) && !is_time_digit(*s)) s++; + if (*s == '\0') return TRUE; time->wMonth = 0; - for (i = 0; i < 12; i++) + if (iswalpha(*s)) { - if (!wcsnicmp( WININET_month[i], s, 3 )) + if (s[1] == '\0' || s[2] == '\0') return TRUE; + for (i = 0; i < 12; i++) { - time->wMonth = i + 1; - break; + if (!wcsnicmp(WININET_month[i], s, 3)) + { + time->wMonth = i + 1; + break; + } } } + else if (is_time_digit(*s)) + { + time->wMonth = wcstol(s, &end, 10); + s = end; + } if (time->wMonth == 0) return TRUE; - while (*s && !iswdigit( *s )) s++; + while (*s && !is_time_digit(*s)) s++; if (*s == '\0') return TRUE; time->wYear = wcstol( s, &end, 10 ); s = end; - while (*s && !iswdigit( *s )) s++; + while (*s && !is_time_digit(*s)) s++; if (*s == '\0') return TRUE; time->wHour = wcstol( s, &end, 10 ); s = end; - while (*s && !iswdigit( *s )) s++; + while (*s && !is_time_digit(*s)) s++; if (*s == '\0') return TRUE; time->wMinute = wcstol( s, &end, 10 ); s = end; - while (*s && !iswdigit( *s )) s++; + while (*s && !is_time_digit(*s)) s++; if (*s == '\0') return TRUE; time->wSecond = wcstol( s, &end, 10 ); s = end; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8fc72be8431..19d6ae7e639 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -917,14 +917,14 @@ static void test_InternetTimeToSystemTime(void) { { "Fri, 07 Jan 2005 12:06:35 GMT", &expect1, TRUE }, { " fri, 7 jan 2005 12 06 35", &expect1, TRUE }, - { "Fri, 07-01-2005 12:06:35", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE, TRUE }, - { "2, 11 01 2022 11 13 05", &expect2, TRUE, TRUE }, - { "2, 11-01-2022 11#13^05", &expect2, TRUE, TRUE }, - { "2, 11*01/2022 11+13=05", &expect2, TRUE, TRUE }, - { "2, 11-Jan-2022 11:13:05", &expect2, TRUE, TRUE }, + { "Fri, 07-01-2005 12:06:35", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE }, + { "2, 11 01 2022 11 13 05", &expect2, TRUE }, + { "2, 11-01-2022 11#13^05", &expect2, TRUE }, + { "2, 11*01/2022 11+13=05", &expect2, TRUE }, + { "2, 11-Jan-2022 11:13:05", &expect2, TRUE }, { "Fr", NULL, FALSE }, };

1 0

Rémi Bernon : winegstreamer: Add a bin container element to wg_transform.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: d84d9054f5466212e122fac70265eae841438764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d84d9054f5466212e122fac7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 12:23:23 2022 -0600 winegstreamer: Add a bin container element to wg_transform. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index c309523dd36..ad30653c147 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -44,6 +44,7 @@ GST_DEBUG_CATEGORY_EXTERN(wine); struct wg_transform { + GstElement *container; GstPad *my_src, *my_sink; }; @@ -62,6 +63,8 @@ NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; + gst_element_set_state(transform->container, GST_STATE_NULL); + g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); free(transform); @@ -84,9 +87,11 @@ NTSTATUS wg_transform_create(void *args) if (!(transform = calloc(1, sizeof(*transform)))) return STATUS_NO_MEMORY; + if (!(transform->container = gst_bin_new("wg_transform"))) + goto out_free_transform; if (!(src_caps = wg_format_to_caps(&input_format))) - goto out_free_transform; + goto out_free_container; if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) goto out_free_src_caps; transform->my_src = gst_pad_new_from_template(template, "src"); @@ -106,6 +111,10 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); + gst_element_set_state(transform->container, GST_STATE_PAUSED); + if (!gst_element_get_state(transform->container, NULL, NULL, -1)) + goto out_free_sink_pad; + gst_caps_unref(sink_caps); gst_caps_unref(src_caps); @@ -113,12 +122,16 @@ NTSTATUS wg_transform_create(void *args) params->transform = transform; return STATUS_SUCCESS; +out_free_sink_pad: + gst_object_unref(transform->my_sink); out_free_sink_caps: gst_caps_unref(sink_caps); out_free_src_pad: gst_object_unref(transform->my_src); out_free_src_caps: gst_caps_unref(src_caps); +out_free_container: + gst_object_unref(transform->container); out_free_transform: free(transform); GST_ERROR("Failed to create winegstreamer transform.");

1 0

Rémi Bernon : winegstreamer: Append audioconvert and audioresample elements.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 0052ffbfa0e7672278b3d5fcdb767d604fa0f565 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0052ffbfa0e7672278b3d5fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 12:23:24 2022 -0600 winegstreamer: Append audioconvert and audioresample elements. So that we can decode WMA to something else than the default avdec_wmav2 F32LE / non-interleaved format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/wg_parser.c | 2 +- dlls/winegstreamer/wg_transform.c | 52 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index f9c4da2f6ea..d3f32484ee6 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -26,6 +26,7 @@ #include <gst/gst.h> extern bool init_gstreamer(void) DECLSPEC_HIDDEN; +extern GstElement *create_element(const char *name, const char *plugin_set) DECLSPEC_HIDDEN; extern void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) DECLSPEC_HIDDEN; extern bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e5ed496387e..85c28895159 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -692,7 +692,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) } } -static GstElement *create_element(const char *name, const char *plugin_set) +GstElement *create_element(const char *name, const char *plugin_set) { GstElement *element; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index ad30653c147..d20d7640ded 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -72,11 +72,36 @@ NTSTATUS wg_transform_destroy(void *args) return STATUS_SUCCESS; } +static bool transform_append_element(struct wg_transform *transform, GstElement *element, + GstElement **first, GstElement **last) +{ + gchar *name = gst_element_get_name(element); + bool success = false; + + if (!gst_bin_add(GST_BIN(transform->container), element) || + (*last && !gst_element_link(*last, element))) + { + GST_ERROR("Failed to link %s element.", name); + } + else + { + GST_DEBUG("Linked %s element %p.", name, element); + if (!*first) + *first = element; + *last = element; + success = true; + } + + g_free(name); + return success; +} + NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; + GstElement *first = NULL, *last = NULL, *element; GstCaps *src_caps = NULL, *sink_caps = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; @@ -111,6 +136,33 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); + switch (output_format.major_type) + { + case WG_MAJOR_TYPE_AUDIO: + /* The MF audio decoder transforms allow decoding to various formats + * as well as resampling the audio at the same time, whereas + * GStreamer decoder plugins usually only support decoding to a + * single format and at the original rate. + * + * The WMA decoder transform also has output samples interleaved on + * Windows, whereas GStreamer avdec_wmav2 output uses + * non-interleaved format. + */ + if (!(element = create_element("audioconvert", "base")) + || !transform_append_element(transform, element, &first, &last)) + goto out_free_sink_pad; + if (!(element = create_element("audioresample", "base")) + || !transform_append_element(transform, element, &first, &last)) + goto out_free_sink_pad; + break; + + case WG_MAJOR_TYPE_VIDEO: + case WG_MAJOR_TYPE_WMA: + case WG_MAJOR_TYPE_UNKNOWN: + GST_FIXME("Format %u not implemented!", output_format.major_type); + goto out_free_sink_pad; + } + gst_element_set_state(transform->container, GST_STATE_PAUSED); if (!gst_element_get_state(transform->container, NULL, NULL, -1)) goto out_free_sink_pad;

1 0

Jacek Caban : win32u: Move user_handles from user32.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 018f8014a3bbb9caf4ae36d13f835948b05a72ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=018f8014a3bbb9caf4ae36d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:52:53 2022 +0100 win32u: Move user_handles from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 13 ------ dlls/user32/win.c | 83 +++----------------------------- dlls/user32/win.h | 37 --------------- dlls/win32u/ntuser_private.h | 53 +++++++++++++++++++++ dlls/win32u/sysparams.c | 11 +++++ dlls/win32u/window.c | 109 +++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 ++ 7 files changed, 185 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=018f8014a3bbb9caf4ae…

1 0

Rémi Bernon : dinput/tests: Add more tests for simulation HID usages.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 21cdca2d8c14070a9deb46b46199ee7261e17e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21cdca2d8c14070a9deb46b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 13:04:30 2022 +0100 dinput/tests: Add more tests for simulation HID usages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 0bfdd113633..9c700c00971 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2590,6 +2590,238 @@ static BOOL test_device_types( DWORD version ) return success; } +static void test_driving_wheel_axes(void) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Report), + REPORT_ID(1, 1), + + USAGE_PAGE(1, HID_USAGE_PAGE_SIMULATION), + USAGE(1, HID_USAGE_SIMULATION_RUDDER), + USAGE(1, HID_USAGE_SIMULATION_THROTTLE), + USAGE(1, HID_USAGE_SIMULATION_ACCELERATOR), + USAGE(1, HID_USAGE_SIMULATION_BRAKE), + USAGE(1, HID_USAGE_SIMULATION_CLUTCH), + USAGE(1, HID_USAGE_SIMULATION_STEERING), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 6), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#undef REPORT_ID_OR_USAGE_PAGE +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 7, + }; + const DIDEVCAPS expect_caps = + { + .dwSize = sizeof(DIDEVCAPS), + .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEDRIVING_LIMITED << 8) | DI8DEVTYPE_DRIVING, + .dwAxes = 6, + }; + const DIDEVICEINSTANCEW expect_devinst = + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = expect_guid_product, + .guidProduct = expect_guid_product, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEDRIVING_LIMITED << 8) | DI8DEVTYPE_DRIVING, + .tszInstanceName = L"Wine test root driver", + .tszProductName = L"Wine test root driver", + .guidFFDriver = GUID_NULL, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }; + const DIDEVICEOBJECTINSTANCEW expect_objects[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = 0, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Steering", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_STEERING, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwOfs = 0x4, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(6), + .dwFlags = 0, + .tszName = L"Clutch", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_CLUTCH, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = 0x8, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(5), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Brake", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_BRAKE, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = 0xc, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Accelerator", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_ACCELERATOR, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Slider, + .dwOfs = 0x10, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(2), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Throttle", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_THROTTLE, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = 0x14, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(7), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Rudder", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_RUDDER, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_COLLECTION|DIDFT_NODATA|DIDFT_MAKEINSTANCE(0), + .tszName = L"Collection 0 - Joystick", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_COLLECTION|DIDFT_NODATA|DIDFT_MAKEINSTANCE(1), + .tszName = L"Collection 1 - Joystick", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + }; + struct check_objects_todos object_todos[ARRAY_SIZE(expect_objects)] = + { + {.name = TRUE}, + {.name = TRUE}, + {.name = TRUE}, + {.name = TRUE}, + {.name = TRUE}, + }; + struct check_objects_params check_objects_params = + { + .version = DIRECTINPUT_VERSION, + .expect_count = ARRAY_SIZE(expect_objects), + .expect_objs = expect_objects, + .todo_objs = object_todos, + }; + + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + DIDEVICEINSTANCEW devinst = {0}; + IDirectInputDevice8W *device; + DIDEVCAPS caps = {0}; + HRESULT hr; + ULONG ref; + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; + + check_dinput_devices( DIRECTINPUT_VERSION, &devinst ); + + memset( &devinst, 0, sizeof(devinst) ); + devinst.dwSize = sizeof(DIDEVICEINSTANCEW); + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DI_OK, "GetDeviceInfo returned %#lx\n", hr ); + check_member( devinst, expect_devinst, "%lu", dwSize ); + todo_wine + check_member_guid( devinst, expect_devinst, guidInstance ); + check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine + check_member( devinst, expect_devinst, "%#lx", dwDevType ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszInstanceName ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszProductName ); + check_member_guid( devinst, expect_devinst, guidFFDriver ); + check_member( devinst, expect_devinst, "%04x", wUsagePage ); + check_member( devinst, expect_devinst, "%04x", wUsage ); + + hr = IDirectInputDevice8_GetCapabilities( device, NULL ); + ok( hr == E_POINTER, "GetCapabilities returned %#lx\n", hr ); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + ok( hr == DIERR_INVALIDPARAM, "GetCapabilities returned %#lx\n", hr ); + caps.dwSize = sizeof(DIDEVCAPS); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + ok( hr == DI_OK, "GetCapabilities returned %#lx\n", hr ); + check_member( caps, expect_caps, "%lu", dwSize ); + check_member( caps, expect_caps, "%#lx", dwFlags ); + todo_wine + check_member( caps, expect_caps, "%#lx", dwDevType ); + check_member( caps, expect_caps, "%lu", dwAxes ); + check_member( caps, expect_caps, "%lu", dwButtons ); + check_member( caps, expect_caps, "%lu", dwPOVs ); + check_member( caps, expect_caps, "%lu", dwFFSamplePeriod ); + check_member( caps, expect_caps, "%lu", dwFFMinTimeResolution ); + check_member( caps, expect_caps, "%lu", dwFirmwareRevision ); + check_member( caps, expect_caps, "%lu", dwHardwareRevision ); + check_member( caps, expect_caps, "%lu", dwFFDriverVersion ); + + hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); + ok( hr == DI_OK, "EnumObjects returned %#lx\n", hr ); + ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", + check_objects_params.expect_count - check_objects_params.index ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %ld\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + winetest_pop_context(); +} + static BOOL test_winmm_joystick(void) { #include "psh_hid_macros.h" @@ -2966,6 +3198,8 @@ START_TEST( joystick8 ) test_simple_joystick( 0x500 ); test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + + test_driving_wheel_axes(); } CoUninitialize();

1 0

Rémi Bernon : winegstreamer: Lookup and instantiate a WMA decoder element.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 4dd187b2227767524825e51eddd14f206ffd03dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dd187b2227767524825e51e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 12:23:25 2022 -0600 winegstreamer: Lookup and instantiate a WMA decoder element. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 76 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d20d7640ded..d316071cf60 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -72,6 +72,50 @@ NTSTATUS wg_transform_destroy(void *args) return STATUS_SUCCESS; } +static GstElement *transform_find_element(GstElementFactoryListType type, GstCaps *src_caps, GstCaps *sink_caps) +{ + GstElement *element = NULL; + GList *tmp, *transforms; + const gchar *name; + + if (!(transforms = gst_element_factory_list_get_elements(type, GST_RANK_MARGINAL))) + goto done; + + tmp = gst_element_factory_list_filter(transforms, src_caps, GST_PAD_SINK, FALSE); + gst_plugin_feature_list_free(transforms); + if (!(transforms = tmp)) + goto done; + + tmp = gst_element_factory_list_filter(transforms, sink_caps, GST_PAD_SRC, FALSE); + gst_plugin_feature_list_free(transforms); + if (!(transforms = tmp)) + goto done; + + transforms = g_list_sort(transforms, gst_plugin_feature_rank_compare_func); + for (tmp = transforms; tmp != NULL && element == NULL; tmp = tmp->next) + { + name = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(tmp->data)); + if (!(element = gst_element_factory_create(GST_ELEMENT_FACTORY(tmp->data), NULL))) + GST_WARNING("Failed to create %s element.", name); + } + gst_plugin_feature_list_free(transforms); + +done: + if (element) + { + GST_DEBUG("Created %s element %p.", name, element); + } + else + { + gchar *src_str = gst_caps_to_string(src_caps), *sink_str = gst_caps_to_string(sink_caps); + GST_WARNING("Failed to create transform matching caps %s / %s.", src_str, sink_str); + g_free(sink_str); + g_free(src_str); + } + + return element; +} + static bool transform_append_element(struct wg_transform *transform, GstElement *element, GstElement **first, GstElement **last) { @@ -99,13 +143,14 @@ static bool transform_append_element(struct wg_transform *transform, GstElement NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; + GstCaps *raw_caps = NULL, *src_caps = NULL, *sink_caps = NULL; struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; GstElement *first = NULL, *last = NULL, *element; - GstCaps *src_caps = NULL, *sink_caps = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; + const gchar *media_type; if (!init_gstreamer()) return STATUS_UNSUCCESSFUL; @@ -136,6 +181,35 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); + /* Since we append conversion elements, we don't want to filter decoders + * based on the actual output caps now. Matching decoders with the + * raw output media type should be enough. + */ + media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); + if (!(raw_caps = gst_caps_new_empty_simple(media_type))) + goto out_free_sink_pad; + + switch (input_format.major_type) + { + case WG_MAJOR_TYPE_WMA: + if (!(element = transform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps)) + || !transform_append_element(transform, element, &first, &last)) + { + gst_caps_unref(raw_caps); + goto out_free_sink_pad; + } + break; + + case WG_MAJOR_TYPE_AUDIO: + case WG_MAJOR_TYPE_VIDEO: + case WG_MAJOR_TYPE_UNKNOWN: + GST_FIXME("Format %u not implemented!", input_format.major_type); + gst_caps_unref(raw_caps); + goto out_free_sink_pad; + } + + gst_caps_unref(raw_caps); + switch (output_format.major_type) { case WG_MAJOR_TYPE_AUDIO:

1 0

Jacek Caban : win32u: Move cursor icon handle management from user32.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: bb895f4f59b440e0dda0620cbd26c6cde5ab0e98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb895f4f59b440e0dda0620c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:53:11 2022 +0100 win32u: Move cursor icon handle management from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 241 +++---------------------------------------- dlls/user32/driver.c | 7 +- dlls/user32/user_main.c | 6 ++ dlls/win32u/cursoricon.c | 217 ++++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 2 + dlls/win32u/ntuser_private.h | 34 ++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 9 ++ dlls/win32u/wrappers.c | 13 +++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 15 +++ include/ntuser.h | 18 ++++ 16 files changed, 339 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb895f4f59b440e0dda0…

1 0

Rémi Bernon : winebus.sys: Use a local variable to access hid_device_state.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 389b962f2acff689f8b7e9c2070f8af44c69e05d URL: https://source.winehq.org/git/wine.git/?a=commit;h=389b962f2acff689f8b7e9c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 13:04:28 2022 +0100 winebus.sys: Use a local variable to access hid_device_state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 64e4f2955ae..df648a2019a 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -237,28 +237,29 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count) { - USHORT offset = iface->hid_device_state.bit_size / 8; + struct hid_device_state *state = &iface->hid_device_state; + USHORT offset = state->bit_size / 8; - if (!rel && iface->hid_device_state.rel_axis_count) + if (!rel && state->rel_axis_count) ERR("absolute axes should be added before relative axes!\n"); - else if (iface->hid_device_state.button_count || iface->hid_device_state.hatswitch_count) + else if (state->button_count || state->hatswitch_count) ERR("axes should be added before buttons or hatswitches!\n"); - else if ((iface->hid_device_state.bit_size % 8)) + else if ((state->bit_size % 8)) ERR("axes should be byte aligned, missing padding!\n"); - else if (iface->hid_device_state.bit_size + 32 * count > 0x80000) + else if (state->bit_size + 32 * count > 0x80000) ERR("report size overflow, too many elements!\n"); else if (rel) { - if (!iface->hid_device_state.rel_axis_count) iface->hid_device_state.rel_axis_start = offset; - iface->hid_device_state.rel_axis_count += count; - iface->hid_device_state.bit_size += 32 * count; + if (!state->rel_axis_count) state->rel_axis_start = offset; + state->rel_axis_count += count; + state->bit_size += 32 * count; return TRUE; } else { - if (!iface->hid_device_state.abs_axis_count) iface->hid_device_state.abs_axis_start = offset; - iface->hid_device_state.abs_axis_count += count; - iface->hid_device_state.bit_size += 32 * count; + if (!state->abs_axis_count) state->abs_axis_start = offset; + state->abs_axis_count += count; + state->bit_size += 32 * count; return TRUE; }

1 0

Jacek Caban : win32u: Move user lock from user32.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 3e4f83f762943b4f3fe026754c2e87ec02209237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4f83f762943b4f3fe02675… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:43:44 2022 +0100 win32u: Move user lock from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 2 -- dlls/user32/user_main.c | 20 +++----------------- dlls/win32u/hook.c | 2 ++ dlls/win32u/sysparams.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 6 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 1ccd69f5a98..c068231cca7 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -651,8 +651,6 @@ BOOL WINAPI User32CallWinEventHook( const struct win_hook_proc_params *params, U WINEVENTPROC proc = params->proc; HMODULE free_module = 0; - USER_CheckNotLock(); /* FIXME: move to NtUserNotifyWinEvent */ - if (params->module[0] && !(proc = get_hook_proc( proc, params->module, &free_module ))) return FALSE; TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index ea30772067d..47f7ec7513a 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -35,15 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); HMODULE user32_module = 0; -static CRITICAL_SECTION user_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &user_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": user_section") } -}; -static CRITICAL_SECTION user_section = { &critsect_debug, -1, 0, 0, 0, 0 }; - static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); @@ -53,7 +44,7 @@ extern void WDML_NotifyThreadDetach(void); */ void USER_Lock(void) { - EnterCriticalSection( &user_section ); + NtUserCallOneParam( 0, NtUserLock ); } @@ -62,7 +53,7 @@ void USER_Lock(void) */ void USER_Unlock(void) { - LeaveCriticalSection( &user_section ); + NtUserCallOneParam( 1, NtUserLock ); } @@ -73,11 +64,7 @@ void USER_Unlock(void) */ void USER_CheckNotLock(void) { - if (RtlIsCriticalSectionLockedByThread(&user_section)) - { - ERR( "BUG: holding USER lock\n" ); - DebugBreak(); - } + NtUserCallOneParam( 2, NtUserLock ); } @@ -237,7 +224,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_DETACH: USER_unload_driver(); FreeLibrary(imm32_module); - DeleteCriticalSection(&user_section); break; } return ret; diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index b390676fc60..427f4cc8527 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -254,6 +254,8 @@ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG c TRACE( "%04x, %p, %d, %d\n", event, hwnd, object_id, child_id ); + user_check_not_lock(); + if (!hwnd) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 58bd22a3adf..c2b09689c2b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -25,6 +25,8 @@ #endif #include <pthread.h> +#include <assert.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "ntgdi_private.h" @@ -360,6 +362,30 @@ static RECT work_area; static HDC display_dc; static pthread_mutex_t display_dc_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t user_mutex; +static unsigned int user_lock_thread, user_lock_rec; + +void user_lock(void) +{ + pthread_mutex_lock( &user_mutex ); + if (!user_lock_rec++) user_lock_thread = GetCurrentThreadId(); +} + +void user_unlock(void) +{ + if (!--user_lock_rec) user_lock_thread = 0; + pthread_mutex_unlock( &user_mutex ); +} + +void user_check_not_lock(void) +{ + if (user_lock_thread == GetCurrentThreadId()) + { + ERR( "BUG: holding USER lock\n" ); + assert( 0 ); + } +} + static HANDLE get_display_device_init_mutex( void ) { static const WCHAR display_device_initW[] = @@ -3008,6 +3034,7 @@ void sysparams_init(void) DWORD i, dispos, dpi_scaling; WCHAR layout[KL_NAMELENGTH]; + pthread_mutexattr_t attr; HKEY hkey; static const WCHAR software_wineW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e'}; @@ -3018,6 +3045,11 @@ void sysparams_init(void) static const WCHAR kl_preloadW[] = {'K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','\\','P','r','e','l','o','a','d'}; + pthread_mutexattr_init( &attr ); + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( &user_mutex, &attr ); + pthread_mutexattr_destroy( &attr ); + if ((hkey = reg_create_key( hkcu_key, kl_preloadW, sizeof(kl_preloadW), 0, NULL ))) { if (NtUserGetKeyboardLayoutName( layout )) @@ -4550,6 +4582,13 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); case NtUserIncrementKeyStateCounter: return InterlockedAdd( &global_key_state_counter, arg ); + case NtUserLock: + switch( arg ) + { + case 0: user_lock(); return 0; + case 1: user_unlock(); return 0; + default: user_check_not_lock(); return 0; + } case NtUserSetCallbacks: return (UINT_PTR)InterlockedExchangePointer( (void **)&user_callbacks, (void *)arg ); default: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3017b7e6a72..34b3b545129 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -263,6 +263,9 @@ extern HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) DEC extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; +extern void user_lock(void) DECLSPEC_HIDDEN; +extern void user_unlock(void) DECLSPEC_HIDDEN; +extern void user_check_not_lock(void) DECLSPEC_HIDDEN; extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index a54da6095f1..f36549250bd 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -87,6 +87,7 @@ enum NtUserFlushWindowSurfaces, NtUserGetDeskPattern, NtUserIncrementKeyStateCounter, + NtUserLock, NtUserSetCallbacks, };

1 0

Jacek Caban : user32: Use ntuser object type constants.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: b86842bb15775ce8df997aafe44d6a52a5c0d2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86842bb15775ce8df997aaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:40:33 2022 +0100 user32: Use ntuser object type constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 10 +++++----- dlls/user32/menu.c | 8 ++++---- dlls/user32/resource.c | 10 +++++----- dlls/user32/user_private.h | 19 +++++-------------- dlls/user32/win.c | 14 +++++++------- dlls/user32/winpos.c | 6 +++--- include/ntuser.h | 8 ++++++++ 7 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b86842bb15775ce8df99…

1 0