February 2022 - Wine-commits

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

22 Feb '22

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: Remove \n at the end of GST log messages.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 4d929972c341bff2da3616606b8cbeadf85dba26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d929972c341bff2da361660… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 12:23:21 2022 -0600 winegstreamer: Remove \n at the end of GST log messages. GStreamer already adds one. 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_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d0883c4c024..e5ed496387e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1436,7 +1436,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1465,7 +1465,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1486,7 +1486,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1496,7 +1496,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1520,7 +1520,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1531,7 +1531,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1559,7 +1559,7 @@ static void init_gstreamer_once(void) GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } @@ -1597,7 +1597,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering; - GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; }

1 0

Rémi Bernon : winegstreamer: Move the conditional cleanup to the create error path.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 34a55c7b96c97b178ea1ab519eb0e847096f2076 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a55c7b96c97b178ea1ab51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 12:23:22 2022 -0600 winegstreamer: Move the conditional cleanup to the create error path. 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 | 73 +++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index e4545774428..c309523dd36 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -62,12 +62,10 @@ NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; - if (transform->my_sink) - g_object_unref(transform->my_sink); - if (transform->my_src) - g_object_unref(transform->my_src); - + g_object_unref(transform->my_sink); + g_object_unref(transform->my_src); free(transform); + return STATUS_SUCCESS; } @@ -77,61 +75,52 @@ NTSTATUS wg_transform_create(void *args) struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; GstCaps *src_caps = NULL, *sink_caps = NULL; + NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; - NTSTATUS status; if (!init_gstreamer()) return STATUS_UNSUCCESSFUL; - status = STATUS_NO_MEMORY; - if (!(transform = calloc(1, sizeof(*transform)))) - goto done; + return STATUS_NO_MEMORY; if (!(src_caps = wg_format_to_caps(&input_format))) - goto done; - if (!(sink_caps = wg_format_to_caps(&output_format))) - goto done; - + goto out_free_transform; if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) - goto done; - if (!(transform->my_src = gst_pad_new_from_template(template, "src"))) - goto done; + goto out_free_src_caps; + transform->my_src = gst_pad_new_from_template(template, "src"); g_object_unref(template); - template = NULL; + if (!transform->my_src) + goto out_free_src_caps; + if (!(sink_caps = wg_format_to_caps(&output_format))) + goto out_free_src_pad; if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) - goto done; - if (!(transform->my_sink = gst_pad_new_from_template(template, "sink"))) - goto done; + goto out_free_sink_caps; + transform->my_sink = gst_pad_new_from_template(template, "sink"); g_object_unref(template); - template = NULL; + if (!transform->my_sink) + goto out_free_sink_caps; gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); - status = STATUS_SUCCESS; - -done: - if (template) - g_object_unref(template); - if (sink_caps) - gst_caps_unref(sink_caps); - if (src_caps) - gst_caps_unref(src_caps); - - if (status) - { - GST_ERROR("Failed to create winegstreamer transform."); - if (transform) - wg_transform_destroy(transform); - } - else - { - GST_INFO("Created winegstreamer transform %p.", transform); - params->transform = transform; - } + gst_caps_unref(sink_caps); + gst_caps_unref(src_caps); + + GST_INFO("Created winegstreamer transform %p.", transform); + params->transform = transform; + return STATUS_SUCCESS; +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_transform: + free(transform); + GST_ERROR("Failed to create winegstreamer transform."); return status; }

1 0

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

22 Feb '22

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 22 Feb '22

22 Feb '22

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

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

22 Feb '22

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

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

22 Feb '22

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

Giovanni Mascellani : winegstreamer: Do not block forever if EOS races with command queue.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 4853f65c844de8277b8b0420df1a2cdb1c5b17c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4853f65c844de8277b8b0420… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 9 09:40:52 2022 +0100 winegstreamer: Do not block forever if EOS races with command queue. Currently, the winegstreamer media source checks for EOS when RequestSample() is called, but doesn't handle the cases when EOS is detected between the RequestSample() call and the moment when the request is popped from the command queue and serviced. This can result in the media source waiting forever for a sample and get stuck. This commit fixes the bug by adding a check for EOS in wait_for_event(). This commit fixes Medieval Dynasty hanging on developer logos on the Steam Deck. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e40974bf73a..32006964f3b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -535,6 +535,12 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) TRACE("%p, %p\n", stream, token); + if (stream->eos) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEError, &GUID_NULL, MF_E_END_OF_STREAM, &empty_var); + return; + } + for (;;) { if (!wg_parser_stream_get_event(stream->wg_stream, &event))

1 0

Eric Pouech : wmvcore: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: dcc72808f039f46efda85c52c2f61ffd32070910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcc72808f039f46efda85c52… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:52 2022 +0100 wmvcore: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 1 - dlls/wmvcore/wmvcore_main.c | 10 +++++----- dlls/wmvcore/writer.c | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 56dd85bb191..6aed828abae 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index ff837921286..4be55cbb707 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -30,7 +30,7 @@ HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_async_reader(reader); } @@ -44,7 +44,7 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader) HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_sync_reader(reader); } @@ -144,7 +144,7 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -154,7 +154,7 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -200,7 +200,7 @@ static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { WMProfileManager *This = impl_from_IWMProfileManager2(iface); - FIXME("(%p)->(%d %p)\n", This, index, ret); + FIXME("(%p)->(%ld %p)\n", This, index, ret); return E_NOTIMPL; } diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index 717984db1af..5c62cd35143 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -69,7 +69,7 @@ static ULONG WINAPI WMWriter_AddRef(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI WMWriter_Release(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -118,21 +118,21 @@ static HRESULT WINAPI WMWriter_GetInputCount(IWMWriter *iface, DWORD *pcInputs) static HRESULT WINAPI WMWriter_GetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps **input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_SetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps *input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_GetInputFormatCount(IWMWriter *iface, DWORD dwInputNumber, DWORD *pcFormat) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNumber, pcFormat); + FIXME("(%p)->(%ld %p)\n", This, dwInputNumber, pcFormat); return E_NOTIMPL; } @@ -140,7 +140,7 @@ static HRESULT WINAPI WMWriter_GetInputFormat(IWMWriter *iface, DWORD dwInputNum IWMInputMediaProps **props) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %d %p)\n", This, dwInputNumber, dwFormatNumber, props); + FIXME("(%p)->(%ld %ld %p)\n", This, dwInputNumber, dwFormatNumber, props); return E_NOTIMPL; } @@ -161,7 +161,7 @@ static HRESULT WINAPI WMWriter_EndWriting(IWMWriter *iface) static HRESULT WINAPI WMWriter_AllocateSample(IWMWriter *iface, DWORD size, INSSBuffer **sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, size, sample); + FIXME("(%p)->(%ld %p)\n", This, size, sample); return E_NOTIMPL; } @@ -169,7 +169,7 @@ static HRESULT WINAPI WMWriter_WriteSample(IWMWriter *iface, DWORD dwInputNum, Q DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %s %x %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); + FIXME("(%p)->(%ld %s %lx %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetSinkCount(IWMWriterAdvanced3 *iface, D static HRESULT WINAPI WMWriterAdvanced_GetSink(IWMWriterAdvanced3 *iface, DWORD sink_num, IWMWriterSink **sink) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %p)\n", This, sink_num, sink); + FIXME("(%p)->(%lu %p)\n", This, sink_num, sink); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI WMWriterAdvanced_WriteStreamSample(IWMWriterAdvanced3 *ifa QWORD sample_time, DWORD sample_send_time, QWORD sample_duration, DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %u %s %x %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), + FIXME("(%p)->(%u %s %lu %s %lx %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), sample_send_time, wine_dbgstr_longlong(sample_duration), flags, sample); return E_NOTIMPL; } @@ -290,7 +290,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetStatistics(IWMWriterAdvanced3 *iface, static HRESULT WINAPI WMWriterAdvanced_SetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD window) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u)\n", This, window); + FIXME("(%p)->(%lu)\n", This, window); return E_NOTIMPL; } @@ -305,7 +305,7 @@ static HRESULT WINAPI WMWriterAdvanced2_GetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE *time, BYTE *value, WORD *length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); + FIXME("(%p)->(%lu %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); return E_NOTIMPL; } @@ -313,7 +313,7 @@ static HRESULT WINAPI WMWriterAdvanced2_SetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); + FIXME("(%p)->(%lu %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); return E_NOTIMPL; }

1 0

Eric Pouech : wnaspi32: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 5ea3d5111825d8b990bb7ea352c9864e435f57d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea3d5111825d8b990bb7ea3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:58 2022 +0100 wnaspi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wnaspi32/Makefile.in | 1 - dlls/wnaspi32/aspi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 6122ee8d8f6..5c3fa66e9d0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wnaspi32.dll IMPORTLIB = wnaspi32 IMPORTS = advapi32 diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 903c618f9ba..ae2d24489f6 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -74,7 +74,7 @@ int ASPI_GetNumControllers(void) } RegCloseKey(hkeyScsi); - TRACE("Returning %d host adapters\n", num_ha ); + TRACE("Returning %ld host adapters\n", num_ha ); return num_ha; }

1 0