February 2022 - Wine-Commits

Huw Davies : winealsa: Introduce a helper to retrieve the card name.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 6b15b4e437e3cc76e02fddec4c4fee9982804c3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b15b4e437e3cc76e02fddec… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 15 13:09:50 2022 +0000 winealsa: Introduce a helper to retrieve the card name. This is primarily to simplify the code. It does however add name collision detection if there are two unknown cards. 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 | 86 ++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6accd1bab4f..534667040a2 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -266,6 +266,19 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static WCHAR *strdupAtoW(const char *str) +{ + unsigned int len; + WCHAR *ret; + + if(!str) return NULL; + + len = MultiByteToWideChar(CP_UNIXCP, 0, str, -1, NULL, 0); + ret = malloc(len * sizeof(WCHAR)); + if(ret) MultiByteToWideChar(CP_UNIXCP, 0, str, -1, ret, len); + return ret; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -553,6 +566,36 @@ static BOOL need_card_number(int card, const char *string) return FALSE; } +static WCHAR *alsa_get_card_name(int card) +{ + char *cardname; + WCHAR *ret; + int err; + + if((err = snd_card_get_name(card, &cardname)) < 0){ + /* FIXME: Should be localized */ + WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); + cardname = strdup("Unknown soundcard"); + } + + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } + + ret = strdupAtoW(cardname); + free(cardname); + + return ret; +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { @@ -571,13 +614,10 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, get_reg_devices(flow, ids, guids, num); - for(err = snd_card_next(&card); card != -1 && err >= 0; - err = snd_card_next(&card)){ + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; - char *cardname; - WCHAR *cardnameW; + WCHAR *cardname; snd_ctl_t *ctl; - DWORD len; sprintf(cardpath, "hw:%u", card); @@ -587,39 +627,9 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, continue; } - if(snd_card_get_name(card, &cardname) < 0) { - /* FIXME: Should be localized */ - static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; - WARN("Unable to get card name for ALSA device %s: %d (%s)\n", - cardpath, err, snd_strerror(err)); - alsa_get_card_devices(flow, ids, guids, num, ctl, card, nameW); - }else{ - if(need_card_number(card, cardname)){ - char *cardnameN; - /* - * For identical card names, second and subsequent instances get - * card number prefix to distinguish them (like Windows). - */ - if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ - free(cardname); - cardname = cardnameN; - } - } - len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); - cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - if(!cardnameW){ - free(cardname); - snd_ctl_close(ctl); - return E_OUTOFMEMORY; - } - MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - - alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardnameW); - - HeapFree(GetProcessHeap(), 0, cardnameW); - free(cardname); - } + cardname = alsa_get_card_name(card); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardname); + free(cardname); snd_ctl_close(ctl); }

1 0

Huw Davies : winealsa: Pass EDataFlow to alsa_try_open().
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: ab1d8e5b57fd4cb23cd3ea8d55c4ed3362a0b185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab1d8e5b57fd4cb23cd3ea8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 15 13:09:49 2022 +0000 winealsa: Pass EDataFlow to alsa_try_open(). Part of the motivation for this patch is to eliminate variables named "stream", in order to avoid confusion with audio streams. It also avoids cases where both "flow" and "stream" are passed to the same function, conveying the same information. 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 | 55 +++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9d051796765..6accd1bab4f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -338,16 +338,20 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) +static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) +{ + return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; +} + +static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; int err; - TRACE("devnode: %s, stream: %d\n", devnode, stream); + TRACE("devnode: %s, flow: %d\n", devnode, flow); - if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open: %d (%s).\n", - devnode, err, snd_strerror(err)); + if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); return FALSE; } @@ -407,9 +411,8 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha return ret; } -static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, - WCHAR ***ids, GUID **guids, UINT *num, snd_ctl_t *ctl, int card, - const WCHAR *cardnameW) +static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, + snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { int err, device; snd_pcm_info_t *info; @@ -419,7 +422,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return E_OUTOFMEMORY; snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, stream); + snd_pcm_info_set_stream(info, alsa_get_direction(flow)); device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; @@ -440,7 +443,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, } sprintf(devnode, "plughw:%d,%d", card, device); - if(!alsa_try_open(devnode, stream)) + if(!alsa_try_open(devnode, flow)) continue; if(*num){ @@ -473,15 +476,14 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return S_OK; } -static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***ids, - GUID **guids, UINT *num) +static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; HKEY key; WCHAR reg_devices[256]; DWORD size = sizeof(reg_devices), type; - const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; + const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ @@ -500,7 +502,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***id WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); - if(alsa_try_open(devname, stream)){ + if(alsa_try_open(devname, flow)){ if(*num){ *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); @@ -554,14 +556,12 @@ static BOOL need_card_number(int card, const char *string) static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { - snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : - SND_PCM_STREAM_CAPTURE); int err, card; card = -1; *num = 0; - if(alsa_try_open(defname, stream)){ + if(alsa_try_open(defname, flow)){ *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); (*ids)[0] = construct_device_id(flow, defaultW, NULL); *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); @@ -569,7 +569,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, ++*num; } - get_reg_devices(flow, stream, ids, guids, num); + get_reg_devices(flow, ids, guids, num); for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ @@ -592,7 +592,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; WARN("Unable to get card name for ALSA device %s: %d (%s)\n", cardpath, err, snd_strerror(err)); - alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, nameW); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, nameW); }else{ if(need_card_number(card, cardname)){ char *cardnameN; @@ -615,7 +615,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, cardnameW); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardnameW); HeapFree(GetProcessHeap(), 0, cardnameW); free(cardname); @@ -730,7 +730,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient { ACImpl *This; int err; - snd_pcm_stream_t stream; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -740,6 +739,9 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(!get_alsa_name_by_guid(guid, alsa_name, sizeof(alsa_name), &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; + if(dataflow != eRender && dataflow != eCapture) + return E_UNEXPECTED; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; @@ -751,15 +753,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioClock2_iface.lpVtbl = &AudioClock2_Vtbl; This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; - if(dataflow == eRender) - stream = SND_PCM_STREAM_PLAYBACK; - else if(dataflow == eCapture) - stream = SND_PCM_STREAM_CAPTURE; - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_UNEXPECTED; - } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); @@ -767,7 +760,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); + err = snd_pcm_open(&This->pcm_handle, alsa_name, alsa_get_direction(dataflow), 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

Nikolay Sivov : mfplay: Enable rate control methods.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 194e90da4f56391e6358d9365839ee789f69f757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194e90da4f56391e6358d936… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 15 18:51:49 2022 +0300 mfplay: Enable rate control methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 62 +++++++++++++++++++++++++++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 37 ++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 5 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f0df707c6d8..d36bde8fec7 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1094,16 +1094,44 @@ static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID p static HRESULT WINAPI media_player_SetRate(IMFPMediaPlayer *iface, float rate) { - FIXME("%p, %f.\n", iface, rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateControl *rate_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, rate); + + if (rate == 0.0f) + return MF_E_OUT_OF_RANGE; + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, + (void **)&rate_control))) + { + hr = IMFRateControl_SetRate(rate_control, FALSE, rate); + IMFRateControl_Release(rate_control); + } + + return hr; } static HRESULT WINAPI media_player_GetRate(IMFPMediaPlayer *iface, float *rate) { - FIXME("%p, %p.\n", iface, rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateControl *rate_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, rate); + + if (!rate) + return E_POINTER; + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, + (void **)&rate_control))) + { + hr = IMFRateControl_GetRate(rate_control, NULL, rate); + IMFRateControl_Release(rate_control); + } + + return hr; } static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOOL forward, @@ -2080,6 +2108,17 @@ static void media_player_playback_ended(struct media_player *player, HRESULT eve LeaveCriticalSection(&player->cs); } +static void media_player_rate_changed(struct media_player *player, HRESULT event_status, + float rate, struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_RATE_SET, event_status, player->item, event))) + (*event)->u.rate_set.flRate = rate; + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -2092,6 +2131,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFTopology *topology; unsigned int status; PROPVARIANT value; + float rate; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; @@ -2146,6 +2186,20 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba break; + case MESessionRateChanged: + + rate = 0.0f; + if (SUCCEEDED(IMFMediaEvent_GetValue(session_event, &value))) + { + if (value.vt == VT_R4) + rate = value.fltVal; + PropVariantClear(&value); + } + + media_player_rate_changed(player, event_status, rate, &event); + + break; + case MEBufferingStarted: case MEBufferingStopped: case MEExtendedType: diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 12825ba29da..50ecb1b09b9 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -171,10 +171,10 @@ static void test_create_player(void) static void test_shutdown(void) { SIZE size, min_size, max_size; + float slowest, fastest, rate; MFP_MEDIAPLAYER_STATE state; MFVideoNormalizedRect rect; IMFPMediaPlayer *player; - float slowest, fastest; IMFPMediaItem *item; PROPVARIANT propvar; COLORREF color; @@ -263,6 +263,15 @@ static void test_shutdown(void) hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaPlayer_SetRate(player, 2.0f); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -548,6 +557,31 @@ static void test_duration(void) IMFPMediaPlayer_Release(player); } +static void test_playback_rate(void) +{ + IMFPMediaPlayer *player; + float rate; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_SetRate(player, 0.0f); + ok(hr == MF_E_OUT_OF_RANGE, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_SetRate(player, 2.0f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, &rate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); @@ -555,4 +589,5 @@ START_TEST(mfplay) test_media_item(); test_video_control(); test_duration(); + test_playback_rate(); }

1 0

Rémi Bernon : xinput1_3: Use WM_DEVICECHANGE device path to add or remove devices.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: baf66e12efefa7b0993db5fe8aaefafc31476141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf66e12efefa7b0993db5fe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 15 09:07:25 2022 +0100 xinput1_3: Use WM_DEVICECHANGE device path to add or remove devices. Instead of iterating the entire device list every time. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 95 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 2966028491e..0e5bd7283c4 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -127,7 +127,7 @@ static HANDLE stop_event; static HANDLE done_event; static HANDLE update_event; -static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +static BOOL find_opened_device(const WCHAR *device_path, int *free_slot) { int i; @@ -135,7 +135,7 @@ static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *f for (i = XUSER_MAX_COUNT; i > 0; i--) { if (!controllers[i - 1].device) *free_slot = i - 1; - else if (!wcscmp(detail->DevicePath, controllers[i - 1].device_path)) return TRUE; + else if (!wcsicmp(device_path, controllers[i - 1].device_path)) return TRUE; } return FALSE; } @@ -399,7 +399,7 @@ static void controller_disable(struct xinput_controller *controller) } static BOOL controller_init(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, - HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) + HIDP_CAPS *caps, HANDLE device, const WCHAR *device_path) { HANDLE event = NULL; @@ -481,19 +481,60 @@ static BOOL device_is_overriden(HANDLE device) return disable; } -static void update_controller_list(void) +static BOOL try_add_device(const WCHAR *device_path) { - char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; PHIDP_PREPARSED_DATA preparsed; HIDP_CAPS caps; NTSTATUS status; - HDEVINFO set; HANDLE device; + int i; + + if (find_opened_device(device_path, &i)) return TRUE; /* already opened */ + if (i == XUSER_MAX_COUNT) return FALSE; /* no more slots */ + + device = CreateFileW(device_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + if (device == INVALID_HANDLE_VALUE) return TRUE; + + preparsed = NULL; + if (!HidD_GetPreparsedData(device, &preparsed)) + WARN("ignoring HID device, HidD_GetPreparsedData failed with error %lu\n", GetLastError()); + else if ((status = HidP_GetCaps(preparsed, &caps)) != HIDP_STATUS_SUCCESS) + WARN("ignoring HID device, HidP_GetCaps returned %#lx\n", status); + else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) + WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); + else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && + caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) + WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); + else if (device_is_overriden(device)) + WARN("ignoring HID device, overriden for dinput\n"); + else if (!controller_init(&controllers[i], preparsed, &caps, device, device_path)) + WARN("ignoring HID device, failed to initialize\n"); + else + return TRUE; + + CloseHandle(device); + HidD_FreePreparsedData(preparsed); + return TRUE; +} + +static void try_remove_device(const WCHAR *device_path) +{ + int i; + + if (find_opened_device(device_path, &i)) + controller_destroy(&controllers[i], TRUE); +} + +static void update_controller_list(void) +{ + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + HDEVINFO set; DWORD idx; GUID guid; - int i; guid = GUID_DEVINTERFACE_WINEXINPUT; @@ -505,34 +546,8 @@ static void update_controller_list(void) { if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, sizeof(buffer), NULL, NULL)) continue; - - if (find_opened_device(detail, &i)) continue; /* already opened */ - if (i == XUSER_MAX_COUNT) break; /* no more slots */ - - device = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); - if (device == INVALID_HANDLE_VALUE) continue; - - preparsed = NULL; - if (!HidD_GetPreparsedData(device, &preparsed)) - WARN("ignoring HID device, HidD_GetPreparsedData failed with error %lu\n", GetLastError()); - else if ((status = HidP_GetCaps(preparsed, &caps)) != HIDP_STATUS_SUCCESS) - WARN("ignoring HID device, HidP_GetCaps returned %#lx\n", status); - else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) - WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); - else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && - caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) - WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (device_is_overriden(device)) - WARN("ignoring HID device, overriden for dinput\n"); - else if (!controller_init(&controllers[i], preparsed, &caps, device, detail->DevicePath)) - WARN("ignoring HID device, failed to initialize\n"); - else - continue; - - CloseHandle(device); - HidD_FreePreparsedData(preparsed); + if (!try_add_device(detail->DevicePath)) + break; } SetupDiDestroyDeviceInfoList(set); @@ -686,7 +701,13 @@ static void read_controller_state(struct xinput_controller *controller) static LRESULT CALLBACK xinput_devnotify_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_DEVICECHANGE && wparam == DBT_DEVICEARRIVAL) update_controller_list(); + if (msg == WM_DEVICECHANGE) + { + DEV_BROADCAST_DEVICEINTERFACE_W *iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + if (wparam == DBT_DEVICEARRIVAL) try_add_device(iface->dbcc_name); + if (wparam == DBT_DEVICEREMOVECOMPLETE) try_remove_device(iface->dbcc_name); + } + return DefWindowProcW(hwnd, msg, wparam, lparam); }

1 0

Rémi Bernon : xinput1_3: Use the implicit None waveform to trigger both waveforms.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 7b72d09f59a943bc73128a567a518f9a03634062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b72d09f59a943bc73128a56… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 15 09:03:41 2022 +0100 xinput1_3: Use the implicit None waveform to trigger both waveforms. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index bc0baa21ebf..2966028491e 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -321,7 +321,7 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO 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); + 0, 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)) { @@ -338,6 +338,21 @@ 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, + 0, 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()); + return GetLastError(); + } + + /* trigger haptics waveforms */ + 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_none_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);

1 0

Rémi Bernon : winebus.sys: Pack the HID haptics waveform report struct.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: c2c730a3302d1b0e1e559a7c675ffa2446be4180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c730a3302d1b0e1e559a7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 15 09:03:39 2022 +0100 winebus.sys: Pack the HID haptics waveform report struct. And only keep previously set waveform intensity in the 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 | 40 ++++++++++++++++++++++++---------------- dlls/winebus.sys/unix_private.h | 8 +------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 529ca97aa7a..d308e7f276b 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -309,6 +309,14 @@ BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page return TRUE; } +#include "pshpack1.h" +struct hid_haptics_waveform +{ + UINT16 intensity; + BYTE manual_trigger; +}; +#include "poppack.h" + BOOL hid_device_add_haptics(struct unix_device *iface) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; @@ -352,19 +360,19 @@ BOOL hid_device_add_haptics(struct unix_device *iface) UNIT_EXPONENT(1, 0), REPORT_ID(1, haptics_waveform_report), - USAGE(1, HID_USAGE_HAPTICS_MANUAL_TRIGGER), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 4), - REPORT_SIZE(1, 16), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - USAGE(1, HID_USAGE_HAPTICS_INTENSITY), LOGICAL_MINIMUM(4, 0x00000000), LOGICAL_MAXIMUM(4, 0x0000ffff), REPORT_SIZE(1, 16), REPORT_COUNT(1, 1), OUTPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_HAPTICS_MANUAL_TRIGGER), + LOGICAL_MINIMUM(1, HAPTICS_WAVEFORM_NONE_ORDINAL), + LOGICAL_MAXIMUM(1, HAPTICS_WAVEFORM_LAST_ORDINAL), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), END_COLLECTION, }; @@ -1037,28 +1045,28 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC if (packet->reportId == haptics->waveform_report) { - struct hid_haptics_waveform *waveform = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); - struct hid_haptics_waveform *rumble = haptics->waveforms + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; - struct hid_haptics_waveform *buzz = haptics->waveforms + HAPTICS_WAVEFORM_BUZZ_ORDINAL; + struct hid_haptics_waveform *report = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); + UINT16 *rumble_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; + UINT16 *buzz_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_BUZZ_ORDINAL; ULONG duration_ms; - io->Information = sizeof(*waveform) + 1; + io->Information = sizeof(*report) + 1; assert(packet->reportBufferLen == io->Information); - if (waveform->manual_trigger == 0 || waveform->manual_trigger > HAPTICS_WAVEFORM_LAST_ORDINAL) + if (report->manual_trigger == 0 || report->manual_trigger > HAPTICS_WAVEFORM_LAST_ORDINAL) io->Status = STATUS_INVALID_PARAMETER; else { - if (waveform->manual_trigger == HAPTICS_WAVEFORM_STOP_ORDINAL) + if (report->manual_trigger == HAPTICS_WAVEFORM_STOP_ORDINAL) { - memset(haptics->waveforms, 0, sizeof(haptics->waveforms)); + memset(haptics->waveform_intensity, 0, sizeof(haptics->waveform_intensity)); io->Status = iface->hid_vtbl->haptics_stop(iface); } else { - haptics->waveforms[waveform->manual_trigger] = *waveform; + 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); + io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, *rumble_intensity, *buzz_intensity); } } } diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 6b498c46ad7..04545b7eb98 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -144,16 +144,10 @@ struct hid_haptics_features UINT waveform_cutoff_time_ms; }; -struct hid_haptics_waveform -{ - WORD manual_trigger; - WORD intensity; -}; - struct hid_haptics { struct hid_haptics_features features; - struct hid_haptics_waveform waveforms[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; + UINT16 waveform_intensity[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; BYTE waveform_report; };

1 0

Rémi Bernon : winebus.sys: Use a separate hid_device_vtbl function to stop haptics.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 7c93adbdd5eb988766c5990516c895aadf6f7bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c93adbdd5eb988766c59905… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 15 09:03:38 2022 +0100 winebus.sys: Use a separate hid_device_vtbl function to stop haptics. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 29 +++++++++++++++++------------ dlls/winebus.sys/bus_udev.c | 24 ++++++++++++++++++++++++ dlls/winebus.sys/hid.c | 10 +++++++--- dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 12 ++++++++++++ 5 files changed, 61 insertions(+), 15 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 7fc95b54f95..93ba58ec9d6 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -417,18 +417,6 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duration_ms, effect.leftright.large_magnitude = rumble_intensity; effect.leftright.small_magnitude = buzz_intensity; - if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude) - { - if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) - pSDL_HapticStopAll(impl->sdl_haptic); - else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE) - pSDL_HapticRumbleStop(impl->sdl_haptic); - else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) - pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); - - return STATUS_SUCCESS; - } - if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) { if (impl->haptic_effect_id >= 0) @@ -451,6 +439,22 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duration_ms, return STATUS_SUCCESS; } +NTSTATUS sdl_device_haptics_stop(struct unix_device *iface) +{ + struct sdl_device *impl = impl_from_unix_device(iface); + + TRACE("iface %p.\n", iface); + + if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) + pSDL_HapticStopAll(impl->sdl_haptic); + else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE) + pSDL_HapticRumbleStop(impl->sdl_haptic); + else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); + + return STATUS_SUCCESS; +} + static NTSTATUS sdl_device_physical_device_control(struct unix_device *iface, USAGE control) { struct sdl_device *impl = impl_from_unix_device(iface); @@ -695,6 +699,7 @@ static const struct hid_device_vtbl sdl_device_vtbl = sdl_device_start, sdl_device_stop, sdl_device_haptics_start, + sdl_device_haptics_stop, sdl_device_physical_device_control, sdl_device_physical_device_set_gain, sdl_device_physical_effect_control, diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 9881b625086..08034c8a07e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -906,6 +906,29 @@ static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, UINT durat return STATUS_SUCCESS; } +static NTSTATUS lnxev_device_haptics_stop(struct unix_device *iface) +{ + struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); + struct ff_effect effect = + { + .id = impl->haptic_effect_id, + .type = FF_RUMBLE, + }; + struct input_event event; + + TRACE("iface %p.\n", iface); + + if (effect.id == -1) return STATUS_SUCCESS; + + event.type = EV_FF; + event.code = effect.id; + event.value = 0; + if (write(impl->base.device_fd, &event, sizeof(event)) == -1) + WARN("couldn't stop haptics rumble effect: %d %s\n", errno, strerror(errno)); + + return STATUS_SUCCESS; +} + static NTSTATUS lnxev_device_physical_effect_run(struct lnxev_device *impl, BYTE index, int iterations) { @@ -1185,6 +1208,7 @@ static const struct hid_device_vtbl lnxev_device_vtbl = lnxev_device_start, lnxev_device_stop, lnxev_device_haptics_start, + lnxev_device_haptics_stop, lnxev_device_physical_device_control, lnxev_device_physical_device_set_gain, lnxev_device_physical_effect_control, diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index ec2250fbe80..529ca97aa7a 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1050,12 +1050,16 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC else { if (waveform->manual_trigger == HAPTICS_WAVEFORM_STOP_ORDINAL) + { memset(haptics->waveforms, 0, sizeof(haptics->waveforms)); + io->Status = iface->hid_vtbl->haptics_stop(iface); + } else + { haptics->waveforms[waveform->manual_trigger] = *waveform; - - duration_ms = haptics->features.waveform_cutoff_time_ms; - io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, rumble->intensity, buzz->intensity); + duration_ms = haptics->features.waveform_cutoff_time_ms; + io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, rumble->intensity, buzz->intensity); + } } } else if (packet->reportId == physical->device_control_report) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 74c1f4c092a..6b498c46ad7 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -107,6 +107,7 @@ struct hid_device_vtbl void (*stop)(struct unix_device *iface); NTSTATUS (*haptics_start)(struct unix_device *iface, UINT duration_ms, USHORT rumble_intensity, USHORT buzz_intensity); + NTSTATUS (*haptics_stop)(struct unix_device *iface); NTSTATUS (*physical_device_control)(struct unix_device *iface, USAGE control); NTSTATUS (*physical_device_set_gain)(struct unix_device *iface, BYTE percent); NTSTATUS (*physical_effect_control)(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 96bd41e67f7..f251e8e6af7 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -107,6 +107,11 @@ static NTSTATUS mouse_haptics_start(struct unix_device *iface, UINT duration, return STATUS_NOT_SUPPORTED; } +static NTSTATUS mouse_haptics_stop(struct unix_device *iface) +{ + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS mouse_physical_device_control(struct unix_device *iface, USAGE control) { return STATUS_NOT_SUPPORTED; @@ -135,6 +140,7 @@ static const struct hid_device_vtbl mouse_vtbl = mouse_start, mouse_stop, mouse_haptics_start, + mouse_haptics_stop, mouse_physical_device_control, mouse_physical_device_set_gain, mouse_physical_effect_control, @@ -190,6 +196,11 @@ static NTSTATUS keyboard_haptics_start(struct unix_device *iface, UINT duration, return STATUS_NOT_SUPPORTED; } +static NTSTATUS keyboard_haptics_stop(struct unix_device *iface) +{ + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS keyboard_physical_device_control(struct unix_device *iface, USAGE control) { return STATUS_NOT_SUPPORTED; @@ -218,6 +229,7 @@ static const struct hid_device_vtbl keyboard_vtbl = keyboard_start, keyboard_stop, keyboard_haptics_start, + keyboard_haptics_stop, keyboard_physical_device_control, keyboard_physical_device_set_gain, keyboard_physical_effect_control,

1 0

Roman Pišl : server: Add console process list ioctl.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 6559134702cea8aca0547e2c0059efe6f0e5211c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6559134702cea8aca0547e2c… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat Feb 12 12:56:03 2022 +0100 server: Add console process list ioctl. 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> --- include/wine/condrv.h | 1 + server/console.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index b5e294b9401..4515249a673 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -43,6 +43,7 @@ #define IOCTL_CONDRV_BEEP CTL_CODE(FILE_DEVICE_CONSOLE, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_CONDRV_FLUSH CTL_CODE(FILE_DEVICE_CONSOLE, 21, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_CONDRV_GET_WINDOW CTL_CODE(FILE_DEVICE_CONSOLE, 22, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_CONDRV_GET_PROCESS_LIST CTL_CODE(FILE_DEVICE_CONSOLE, 23, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) diff --git a/server/console.c b/server/console.c index 5407fba1411..3fb7d8ab237 100644 --- a/server/console.c +++ b/server/console.c @@ -707,6 +707,27 @@ static void propagate_console_signal( struct console *console, enum_processes(propagate_console_signal_cb, &csi); } +struct console_process_list +{ + unsigned int size; + unsigned int count; + process_id_t *processes; + struct console *console; +}; + +static int console_process_list_cb(struct process *process, void *user) +{ + struct console_process_list *cpl = user; + + if (process->console == cpl->console) + { + if (cpl->count < cpl->size) cpl->processes[cpl->count] = process->id; + cpl->count++; + } + + return 0; +} + /* dumb dump */ static void console_dump( struct object *obj, int verbose ) { @@ -963,6 +984,33 @@ static void console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async return; } + case IOCTL_CONDRV_GET_PROCESS_LIST: + { + struct console_process_list cpl; + if (get_reply_max_size() < sizeof(unsigned int)) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + cpl.count = 0; + cpl.size = 0; + cpl.console = console; + enum_processes( console_process_list_cb, &cpl ); + if (cpl.count * sizeof(process_id_t) > get_reply_max_size()) + { + set_reply_data( &cpl.count, sizeof(cpl.count) ); + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + cpl.size = cpl.count; + cpl.count = 0; + if ((cpl.processes = set_reply_data_size( cpl.size * sizeof(process_id_t) ))) + enum_processes( console_process_list_cb, &cpl ); + return; + } + default: if (!console->server || code >> 16 != FILE_DEVICE_CONSOLE) {

1 0

Santino Mazza : ncrypt/tests: Test key import of an rsa key.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: e7a91b0a1c20a3fc7a8b1f4ec2c8ebc8da29e498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a91b0a1c20a3fc7a8b1f4e… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Feb 15 12:28:27 2022 +0100 ncrypt/tests: Test key import of an rsa key. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ncrypt/Makefile.in | 1 + dlls/ncrypt/tests/Makefile.in | 5 ++ dlls/ncrypt/tests/ncrypt.c | 146 ++++++++++++++++++++++++++++++++++++++++++ include/ncrypt.h | 4 ++ 6 files changed, 158 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7a91b0a1c20a3fc7a8b…

1 0

Roman Pišl : kernel32: Implement GetConsoleProcessList.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 3a95a4a0120e231eb9054ca4632a7e05762928f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a95a4a0120e231eb9054ca4… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat Feb 12 12:56:04 2022 +0100 kernel32: Implement 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/console.c | 21 ++++++++++++++++++++- dlls/kernel32/tests/console.c | 6 ------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 395d539a5dc..2aa59374c4f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -252,7 +252,11 @@ DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer, */ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) { - FIXME("(%p,%ld): stub\n", processlist, processcount); + DWORD saved; + NTSTATUS status; + IO_STATUS_BLOCK io; + + TRACE("(%p,%ld)\n", processlist, processcount); if (!processlist || processcount < 1) { @@ -260,6 +264,21 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) return 0; } + saved = *processlist; + status = NtDeviceIoControlFile( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + NULL, NULL, NULL, &io, IOCTL_CONDRV_GET_PROCESS_LIST, + NULL, 0, processlist, processcount * sizeof(DWORD) ); + + if (!status) return io.Information / sizeof(DWORD); + if (status == STATUS_BUFFER_TOO_SMALL) + { + DWORD ret = *processlist; + *processlist = saved; + return ret; + } + + *processlist = saved; + set_ntstatus( status ); return 0; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5a399768d9e..5f5f0698040 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1318,7 +1318,6 @@ static void test_GetConsoleProcessList(void) SetLastError(0xdeadbeef); ret = pGetConsoleProcessList(list, 1); - todo_wine ok(ret == 1, "Expected 1, got %d\n", ret); HeapFree(GetProcessHeap(), 0, list); @@ -1327,7 +1326,6 @@ static void test_GetConsoleProcessList(void) SetLastError(0xdeadbeef); ret = pGetConsoleProcessList(list, ret); - todo_wine ok(ret == 1, "Expected 1, got %d\n", ret); if (ret == 1) @@ -4361,16 +4359,12 @@ static void test_AttachConsole_child(DWORD console_pid) 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()); }

1 0