February 2022 - Wine-Commits

Nikolay Sivov : winegstreamer: Raise MESourceRateChanged on SetRate().
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: a1e125e4fbee222db0777a7dd29736821010f675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e125e4fbee222db0777a7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 15 18:02:12 2022 +0300 winegstreamer: Raise MESourceRateChanged on SetRate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 85ec31d2498..9a77cf72c07 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1109,6 +1109,8 @@ static ULONG WINAPI media_source_rate_control_Release(IMFRateControl *iface) static HRESULT WINAPI media_source_rate_control_SetRate(IMFRateControl *iface, BOOL thin, float rate) { + struct media_source *source = impl_from_IMFRateControl(iface); + FIXME("%p, %d, %f.\n", iface, thin, rate); if (rate < 0.0f) @@ -1120,7 +1122,7 @@ static HRESULT WINAPI media_source_rate_control_SetRate(IMFRateControl *iface, B if (rate != 1.0f) return MF_E_UNSUPPORTED_RATE; - return S_OK; + return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceRateChanged, &GUID_NULL, S_OK, NULL); } static HRESULT WINAPI media_source_rate_control_GetRate(IMFRateControl *iface, BOOL *thin, float *rate)

1 0

Huw Davies : winealsa: Pass a unicode chunk2 to construct_device_id().
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: dde06247a700947fdece115c831ffe1d51bb7d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dde06247a700947fdece115c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 15 13:09:51 2022 +0000 winealsa: Pass a unicode chunk2 to construct_device_id(). This makes construct_device_id() rather more sane. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 534667040a2..a6ca3827e5f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -372,11 +372,11 @@ static BOOL alsa_try_open(const char *devnode, EDataFlow flow) return TRUE; } -static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const char *chunk2) +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) { WCHAR *ret; const WCHAR *prefix; - DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len; + size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; static const WCHAR dashW[] = {' ','-',' ',0}; static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; @@ -398,8 +398,10 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha } if(chunk1 && chunk2) len_wchars += dashW_len; - if(chunk2) - len_wchars += MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, NULL, 0) - 1; + if(chunk2){ + chunk2_len = strlenW(chunk2); + len_wchars += chunk2_len; + } len_wchars += 1; /* NULL byte */ ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); @@ -415,9 +417,10 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha copied += dashW_len; } if(chunk2){ - MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, ret + copied, len_wchars - copied); - }else - ret[copied] = 0; + memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); + copied += chunk2_len; + } + ret[copied] = 0; TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); @@ -425,7 +428,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha } static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, - snd_ctl_t *ctl, int card, const WCHAR *cardnameW) + snd_ctl_t *ctl, int card, const WCHAR *cardname) { int err, device; snd_pcm_info_t *info; @@ -440,8 +443,8 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; err = snd_ctl_pcm_next_device(ctl, &device)){ - const char *devname; char devnode[32]; + WCHAR *devname; snd_pcm_info_set_device(info, device); @@ -467,15 +470,15 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); } - devname = snd_pcm_info_get_name(info); + devname = strdupAtoW(snd_pcm_info_get_name(info)); if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, - device); + WARN("Unable to get device name for card %d, device %d\n", card, device); continue; } - (*ids)[*num] = construct_device_id(flow, cardnameW, devname); + (*ids)[*num] = construct_device_id(flow, cardname, devname); get_device_guid(flow, devnode, &(*guids)[*num]); + free(devname); ++(*num); }

1 0

Nikolay Sivov : mf/session: Initial implementation of playback rate change.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 9c12ca85e5121ec018f378cb9ddc5ac19fd5aefc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c12ca85e5121ec018f378cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 15 18:02:14 2022 +0300 mf/session: Initial implementation of playback rate change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 458 +++++++++++++++++++++++++++++++++-------------------- dlls/mf/tests/mf.c | 2 - 2 files changed, 283 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c12ca85e5121ec018f3…

1 0

Nikolay Sivov : mf/session: Use nameless union for command structure.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 72afc3f27d3051a990cf7ff11b881772b3641c73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72afc3f27d3051a990cf7ff1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 15 18:02:13 2022 +0300 mf/session: Use nameless union for command structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6ee3c454c6e..1cf515ef4f0 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -77,7 +77,7 @@ struct session_op { TOPOID node_id; } sa_ready; - } u; + }; struct list entry; }; @@ -397,15 +397,15 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) switch (op->command) { case SESSION_CMD_SET_TOPOLOGY: - if (op->u.set_topology.topology) - IMFTopology_Release(op->u.set_topology.topology); + if (op->set_topology.topology) + IMFTopology_Release(op->set_topology.topology); break; case SESSION_CMD_START: - PropVariantClear(&op->u.start.start_position); + PropVariantClear(&op->start.start_position); break; case SESSION_CMD_QM_NOTIFY_TOPOLOGY: - if (op->u.notify_topology.topology) - IMFTopology_Release(op->u.notify_topology.topology); + if (op->notify_topology.topology) + IMFTopology_Release(op->notify_topology.topology); break; default: ; @@ -1295,7 +1295,7 @@ static HRESULT WINAPI node_sample_allocator_cb_NotifyRelease(IMFVideoSampleAlloc if (SUCCEEDED(create_session_op(SESSION_CMD_SA_READY, &op))) { - op->u.sa_ready.node_id = topo_node->node_id; + op->sa_ready.node_id = topo_node->node_id; MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &topo_node->session->commands_callback, &op->IUnknown_iface); IUnknown_Release(&op->IUnknown_iface); } @@ -1460,8 +1460,8 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo { if (SUCCEEDED(create_session_op(SESSION_CMD_QM_NOTIFY_TOPOLOGY, &op))) { - op->u.notify_topology.topology = topology; - IMFTopology_AddRef(op->u.notify_topology.topology); + op->notify_topology.topology = topology; + IMFTopology_AddRef(op->notify_topology.topology); session_submit_command(session, op); IUnknown_Release(&op->IUnknown_iface); } @@ -1740,10 +1740,10 @@ static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, if (FAILED(hr = create_session_op(SESSION_CMD_SET_TOPOLOGY, &op))) return hr; - op->u.set_topology.flags = flags; - op->u.set_topology.topology = topology; - if (op->u.set_topology.topology) - IMFTopology_AddRef(op->u.set_topology.topology); + op->set_topology.flags = flags; + op->set_topology.topology = topology; + if (op->set_topology.topology) + IMFTopology_AddRef(op->set_topology.topology); hr = session_submit_command(session, op); IUnknown_Release(&op->IUnknown_iface); @@ -1774,8 +1774,8 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format if (FAILED(hr = create_session_op(SESSION_CMD_START, &op))) return hr; - op->u.start.time_format = format ? *format : GUID_NULL; - hr = PropVariantCopy(&op->u.start.start_position, start_position); + op->start.time_format = format ? *format : GUID_NULL; + hr = PropVariantCopy(&op->start.start_position, start_position); if (SUCCEEDED(hr)) hr = session_submit_command(session, op); @@ -2142,11 +2142,11 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, session_clear_topologies(session); break; case SESSION_CMD_SET_TOPOLOGY: - session_set_topology(session, op->u.set_topology.flags, op->u.set_topology.topology); + session_set_topology(session, op->set_topology.flags, op->set_topology.topology); session_command_complete(session); break; case SESSION_CMD_START: - session_start(session, &op->u.start.time_format, &op->u.start.start_position); + session_start(session, &op->start.time_format, &op->start.start_position); break; case SESSION_CMD_PAUSE: session_pause(session); @@ -2158,11 +2158,11 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, session_close(session); break; case SESSION_CMD_QM_NOTIFY_TOPOLOGY: - IMFQualityManager_NotifyTopology(session->quality_manager, op->u.notify_topology.topology); + IMFQualityManager_NotifyTopology(session->quality_manager, op->notify_topology.topology); session_command_complete(session); break; case SESSION_CMD_SA_READY: - topo_node = session_get_node_by_id(session, op->u.sa_ready.node_id); + topo_node = session_get_node_by_id(session, op->sa_ready.node_id); if (topo_node->u.sink.requests) {

1 0

Rémi Bernon : winebus.sys: Add a repeat count value to haptics output report.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: b65a76de53862a4e883fdfb2804d1ccda9b40e33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65a76de53862a4e883fdfb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 15 09:03:40 2022 +0100 winebus.sys: Add a repeat count value to haptics output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 11 ++++++++++- dlls/xinput1_3/main.c | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index d308e7f276b..1b2681fdb94 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -314,6 +314,7 @@ struct hid_haptics_waveform { UINT16 intensity; BYTE manual_trigger; + BYTE repeat_count; }; #include "poppack.h" @@ -373,6 +374,13 @@ BOOL hid_device_add_haptics(struct unix_device *iface) REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), OUTPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_HAPTICS_REPEAT_COUNT), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), END_COLLECTION, }; @@ -1066,7 +1074,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC { haptics->waveform_intensity[report->manual_trigger] = report->intensity; duration_ms = haptics->features.waveform_cutoff_time_ms; - io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, *rumble_intensity, *buzz_intensity); + if (!report->repeat_count) io->Status = STATUS_SUCCESS; + else io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, *rumble_intensity, *buzz_intensity); } } } diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 2179da1db72..bc0baa21ebf 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -320,6 +320,9 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, controller->hid.haptics_rumble_ordinal, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 1, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) { WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); @@ -335,6 +338,9 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, controller->hid.haptics_buzz_ordinal, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 1, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) { WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError());

1 0

Rémi Bernon : xinput1_3: Use the implicit Stop waveform ordinal to stop the effects.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: a4f7ef298c127fbff3b2d004a9b6ab1d358b9187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f7ef298c127fbff3b2d004… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 15 09:03:37 2022 +0100 xinput1_3: Use the implicit Stop waveform ordinal to stop the effects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index e669fa0af71..2179da1db72 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -81,6 +81,8 @@ struct xinput_controller char *feature_report_buf; BYTE haptics_report; + BYTE haptics_none_ordinal; + BYTE haptics_stop_ordinal; BYTE haptics_rumble_ordinal; BYTE haptics_buzz_ordinal; } hid; @@ -244,6 +246,8 @@ static BOOL controller_check_caps(struct xinput_controller *controller, HANDLE d return TRUE; } + controller->hid.haptics_none_ordinal = 1; /* implicit None waveform ordinal, from the HID spec */ + controller->hid.haptics_stop_ordinal = 2; /* implicit Stop waveform ordinal, from the HID spec */ controller->hid.haptics_buzz_ordinal = 0; controller->hid.haptics_rumble_ordinal = 0; for (i = 3; status == HIDP_STATUS_SUCCESS; ++i) @@ -291,6 +295,22 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO if (!controller->enabled) return ERROR_SUCCESS; + if (!state->wLeftMotorSpeed && !state->wRightMotorSpeed) + { + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_stop_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } + + return 0; + } + /* send haptics rumble report (left motor) */ status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status);

1 0

Roman Pišl : kernel32/tests: Add test for GetConsoleProcessList.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: ac4dd0773f6594b0b169a1970c0ff354cf5cc2df URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac4dd0773f6594b0b169a197… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat Feb 12 12:56:02 2022 +0100 kernel32/tests: Add test for GetConsoleProcessList. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5443a611f80..5a399768d9e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1304,8 +1304,8 @@ static void test_GetConsoleProcessList(void) GetLastError()); /* We should only have 1 process but only for these specific unit tests as - * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would - * give us two processes for example. + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) + * gives us two processes - see test_AttachConsole. */ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); @@ -4354,6 +4354,27 @@ static void test_AttachConsole_child(DWORD console_pid) res = AttachConsole(ATTACH_PARENT_PROCESS); ok(res, "AttachConsole failed: %u\n", GetLastError()); + if (pGetConsoleProcessList) + { + DWORD list[2] = { 0xbabebabe }; + DWORD pid = GetCurrentProcessId(); + + SetLastError(0xdeadbeef); + len = pGetConsoleProcessList(list, 1); + todo_wine + ok(len == 2, "Expected 2 processes, got %d\n", len); + ok(list[0] == 0xbabebabe, "Unexpected value in list %u\n", list[0]); + + len = pGetConsoleProcessList(list, 2); + todo_wine + ok(len == 2, "Expected 2 processes, got %d\n", len); + todo_wine + ok(list[0] == console_pid || list[1] == console_pid, "Parent PID not in list\n"); + todo_wine + ok(list[0] == pid || list[1] == pid, "PID not in list\n"); + ok(GetLastError() == 0xdeadbeef, "Unexpected last error: %u\n", GetLastError()); + } + ok(pipe_in != GetStdHandle(STD_INPUT_HANDLE), "std handle not set to console\n"); ok(pipe_out != GetStdHandle(STD_OUTPUT_HANDLE), "std handle not set to console\n");

1 0

Jacek Caban : win32u: Move ThreadDetach driver call from user32.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 9f6c004bb0426a502862c8bfbefe34c596a5483b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f6c004bb0426a502862c8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 13:16:12 2022 +0100 win32u: Move ThreadDetach driver call 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/driver.c | 7 +------ dlls/user32/user_main.c | 1 - dlls/win32u/driver.c | 2 ++ dlls/win32u/sysparams.c | 2 ++ 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 6dbc07d318a..7e9f63ad1c7 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -266,10 +266,6 @@ static void CDECL nulldrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT s { } -static void CDECL nulldrv_ThreadDetach( void ) -{ -} - /********************************************************************** * Lazy loading user driver @@ -398,7 +394,7 @@ static struct user_driver_funcs lazy_load_driver = /* vulkan support */ NULL, /* thread management */ - nulldrv_ThreadDetach + NULL }; void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) @@ -445,7 +441,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(WindowMessage); SET_USER_FUNC(WindowPosChanging); SET_USER_FUNC(WindowPosChanged); - SET_USER_FUNC(ThreadDetach); #undef SET_USER_FUNC prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 939271aeb17..91c466aff11 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -254,7 +254,6 @@ static void thread_detach(void) exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); - USER_Driver->pThreadDetach(); NtUserCallNoParam( NtUserThreadDetach ); destroy_thread_windows(); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index e332a03b0db..b3a3e70f83f 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1070,6 +1070,8 @@ static const struct user_driver_funcs lazy_load_driver = .pSystemParametersInfo = nulldrv_SystemParametersInfo, /* vulkan support */ .pwine_get_vulkan_driver = loaderdrv_wine_get_vulkan_driver, + /* thread management */ + .pThreadDetach = nulldrv_ThreadDetach, }; const struct user_driver_funcs *user_driver = &lazy_load_driver; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7aee5eae0b9..93fda23a31e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4488,6 +4488,8 @@ static void thread_detach(void) { struct user_thread_info *thread_info = get_user_thread_info(); + user_driver->pThreadDetach(); + free( thread_info->key_state ); thread_info->key_state = 0; }

1 0

Huw Davies : winealsa: Remove alsa-pulse handle underrun workaround.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 14fc47b5e1395a6d7879463ecab355417261548b URL: https://source.winehq.org/git/wine.git/?a=commit;h=14fc47b5e1395a6d7879463e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 15 13:09:48 2022 +0000 winealsa: Remove alsa-pulse handle underrun workaround. Pulse-based systems should be using winepulse.drv. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 102 +------------------------------------------ 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5aa1b4aab63..9d051796765 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #include <alsa/asoundlib.h> WINE_DEFAULT_DEBUG_CHANNEL(alsa); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -666,89 +665,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -/* Using the pulse PCM device from alsa-plugins 1.0.24 triggers a bug - * which causes audio to cease playing after a few minutes of playback. - * Setting handle_underrun=1 on pulse-backed ALSA devices seems to work - * around this issue. */ -static snd_config_t *make_handle_underrun_config(const char *name) -{ - snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[260]; - const char *type_str; - int err; - - snd_config_update(); - - if((err = snd_config_copy(&lconf, snd_config)) < 0){ - WARN("snd_config_copy failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - sprintf(dev_node_name, "pcm.%s", name); - err = snd_config_search(lconf, dev_node_name, &dev_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - /* ALSA is extremely fragile. If it runs into a config setting it doesn't - * recognize, it tends to fail or assert. So we only want to inject - * handle_underrun=1 on devices that we know will recognize it. */ - err = snd_config_search(dev_node, "type", &type_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_get_string(type_node, &type_str)) < 0){ - snd_config_delete(lconf); - return NULL; - } - - if(strcmp(type_str, "pulse") != 0){ - snd_config_delete(lconf); - return NULL; - } - - err = snd_config_search(dev_node, "handle_underrun", &hu_node); - if(err >= 0){ - /* user already has an explicit handle_underrun setting, so don't - * use a local config */ - snd_config_delete(lconf); - return NULL; - } - if(err != -ENOENT){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_imake_integer(&hu_node, "handle_underrun", 1)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_imake_integer failed: %d (%s)\n", err, - snd_strerror(err)); - return NULL; - } - - if((err = snd_config_add(dev_node, hu_node)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_add failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - return lconf; -} - static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) { HKEY devices_key; @@ -815,8 +731,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; int err; snd_pcm_stream_t stream; - snd_config_t *lconf; - static BOOL handle_underrun = TRUE; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -853,21 +767,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - if(handle_underrun && ((lconf = make_handle_underrun_config(alsa_name)))){ - err = snd_pcm_open_lconf(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK, lconf); - TRACE("Opening PCM device \"%s\" with handle_underrun: %d\n", alsa_name, err); - snd_config_delete(lconf); - /* Pulse <= 2010 returns EINVAL, it does not know handle_underrun. */ - if(err == -EINVAL){ - ERR_(winediag)("PulseAudio \"%s\" %d without handle_underrun. Audio may hang." - " Please upgrade to alsa_plugins >= 1.0.24\n", alsa_name, err); - handle_underrun = FALSE; - } - }else - err = -EINVAL; - if(err == -EINVAL){ - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); - } + err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err));

1 0

Zebediah Figura : wined3d: Move struct wined3d_buffer_ops to buffer.c.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: a2653a94557c50d2d36e94af5eb1c0b400194119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2653a94557c50d2d36e94af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:17 2022 -0600 wined3d: Move struct wined3d_buffer_ops to buffer.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 902ab720396..bb8f9753468 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -37,6 +37,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ +struct wined3d_buffer_ops +{ + BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_unload_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); +}; + static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) { if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0e4f0cdfaf..51a7c2ffb10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5122,18 +5122,6 @@ enum wined3d_buffer_conversion_type CONV_POSITIONT, }; -struct wined3d_buffer_ops -{ - BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_unload_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); - void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); -}; - struct wined3d_buffer { struct wined3d_resource resource;

1 0