October 2021 - Wine-Commits

Nikolay Sivov : evr/mixer: Improve output type candidates attributes configuration.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 059a0c0b56bf2b03b705a8dc52aefb793576be09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=059a0c0b56bf2b03b705a8dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 17:23:02 2021 +0300 evr/mixer: Improve output type candidates attributes configuration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 35 ++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index f821dc7e6d9..1db2fd3a9f4 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -675,14 +675,27 @@ static unsigned int video_mixer_get_interlace_mode_from_video_desc(const DXVA2_V } } +static void mf_get_attribute_uint32(IMFMediaType *media_type, const GUID *key, UINT32 *value, + UINT32 default_value) +{ + if (FAILED(IMFMediaType_GetUINT32(media_type, key, value))) + *value = default_value; +} + +static void mf_get_attribute_uint64(IMFMediaType *media_type, const GUID *key, UINT64 *value, + UINT64 default_value) +{ + if (FAILED(IMFMediaType_GetUINT64(media_type, key, value))) + *value = default_value; +} + static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { - unsigned int i, j, format_count, count, interlace_mode; struct rt_format *rt_formats = NULL, *ptr; + unsigned int i, j, format_count, count; HRESULT hr = MF_E_INVALIDMEDIATYPE; - MFVideoArea aperture; D3DFORMAT *formats; GUID subtype; @@ -710,6 +723,10 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { + UINT32 fixed_samples, interlace_mode; + MFVideoArea aperture; + UINT64 par; + if (!(mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) { free(rt_formats); @@ -718,9 +735,16 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); memset(&aperture, 0, sizeof(aperture)); - aperture.Area.cx = video_desc->SampleWidth; - aperture.Area.cy = video_desc->SampleHeight; + if (FAILED(IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, + sizeof(aperture), NULL))) + { + aperture.Area.cx = video_desc->SampleWidth; + aperture.Area.cy = video_desc->SampleHeight; + } interlace_mode = video_mixer_get_interlace_mode_from_video_desc(video_desc); + mf_get_attribute_uint64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &par, (UINT64)1 << 32 | 1); + mf_get_attribute_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &fixed_samples, 1); + for (i = 0; i < count; ++i) { IMFMediaType *rt_media_type; @@ -731,9 +755,12 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const MFCreateMediaType(&rt_media_type); IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + IMFMediaType_SetUINT64(rt_media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture.Area.cx << 32 | aperture.Area.cy); IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetUINT32(rt_media_type, &MF_MT_INTERLACE_MODE, interlace_mode); + IMFMediaType_SetUINT64(rt_media_type, &MF_MT_PIXEL_ASPECT_RATIO, par); + IMFMediaType_SetUINT32(rt_media_type, &MF_MT_FIXED_SIZE_SAMPLES, fixed_samples); mixer->output.rt_formats[i].media_type = rt_media_type; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bf03fa49f8..818731e1e55 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -946,6 +946,7 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; + MFVideoArea aperture; DWORD index, count; IUnknown *unk; HWND window; @@ -1020,10 +1021,19 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + memset(&aperture, 0, sizeof(aperture)); + aperture.Area.cx = 100; aperture.Area.cy = 200; + hr = IMFMediaType_SetBlob(video_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTransform_SetInputType(transform, 0, video_type, MFT_SET_TYPE_TEST_ONLY); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); @@ -1040,25 +1050,69 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Modified after type was set. */ + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, (UINT64)56 << 32 | 55); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Check attributes on available output types. */ index = 0; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) { - UINT64 frame_size; + UINT64 frame_size, ratio; + MFVideoArea aperture; GUID subtype, major; UINT32 value; hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &major); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&major, &MFMediaType_Video), "Unexpected major type.\n"); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(frame_size == ((UINT64)100 << 32 | 200), "Unexpected frame size %s.\n", wine_dbgstr_longlong(frame_size)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); + /* Ratio from input type */ + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ratio == ((UINT64)1 << 32 | 1), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); + hr = IMFMediaType_GetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 2, "Unexpected value %u.\n", value); + + IMFMediaType_Release(media_type); + } + ok(index > 1, "Unexpected number of available types.\n"); + + hr = IMFMediaType_DeleteItem(video_type, &MF_MT_FIXED_SIZE_SAMPLES); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + index = 0; + while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) + { + UINT32 value; + UINT64 ratio; + + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ratio == ((UINT64)56 << 32 | 55), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected value %u.\n", value); IMFMediaType_Release(media_type); }

1 0

Rémi Bernon : dinput: Rename SysKeyboardImpl to struct keyboard.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 80f4cce671edc66dedfd801cab0cd92542884312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80f4cce671edc66dedfd801c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 09:41:00 2021 +0200 dinput: Rename SysKeyboardImpl to struct keyboard. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 713c5310322..ef125176ecb 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -36,16 +36,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); static const struct dinput_device_vtbl keyboard_vtbl; -typedef struct SysKeyboardImpl SysKeyboardImpl; -struct SysKeyboardImpl +struct keyboard { struct dinput_device base; }; -static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +static inline struct keyboard *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) { return CONTAINING_RECORD( CONTAINING_RECORD( iface, struct dinput_device, IDirectInputDevice8W_iface ), - SysKeyboardImpl, base ); + struct keyboard, base ); } static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD version) @@ -86,9 +85,9 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); - BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); - int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); + BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType ); + int dik_code, ret = impl->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; DWORD scan_code; @@ -109,21 +108,21 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa default: scan_code = hook->scanCode & 0xff; if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; - dik_code = map_dik_code( scan_code, hook->vkCode, subtype, This->base.dinput->dwVersion ); + dik_code = map_dik_code( scan_code, hook->vkCode, subtype, impl->base.dinput->dwVersion ); } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; /* returns now if key event already known */ - if (new_diks == This->base.device_state[dik_code]) return ret; + if (new_diks == impl->base.device_state[dik_code]) return ret; - This->base.device_state[dik_code] = new_diks; - TRACE( " setting key %02x to %02x\n", dik_code, This->base.device_state[dik_code] ); + impl->base.device_state[dik_code] = new_diks; + TRACE( " setting key %02x to %02x\n", dik_code, impl->base.device_state[dik_code] ); - EnterCriticalSection(&This->base.crit); - queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, - new_diks, GetCurrentTime(), This->base.dinput->evsequence++); - if (This->base.hEvent) SetEvent( This->base.hEvent ); - LeaveCriticalSection(&This->base.crit); + EnterCriticalSection( &impl->base.crit ); + queue_event( iface, DIDFT_MAKEINSTANCE( dik_code ) | DIDFT_PSHBUTTON, new_diks, + GetCurrentTime(), impl->base.dinput->evsequence++ ); + if (impl->base.hEvent) SetEvent( impl->base.hEvent ); + LeaveCriticalSection( &impl->base.crit ); return ret; } @@ -177,7 +176,7 @@ HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instan HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - SysKeyboardImpl *impl; + struct keyboard *impl; HRESULT hr; TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); @@ -185,9 +184,9 @@ HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDir *out = NULL; if (!IsEqualGUID( &GUID_SysKeyboard, guid )) return DIERR_DEVICENOTREG; - if (FAILED(hr = dinput_device_alloc( sizeof(SysKeyboardImpl), &keyboard_vtbl, guid, dinput, (void **)&impl ))) + if (FAILED(hr = dinput_device_alloc( sizeof(struct keyboard), &keyboard_vtbl, guid, dinput, (void **)&impl ))) return hr; - impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": struct keyboard*->base.crit"); keyboard_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); impl->base.caps.dwDevType = impl->base.instance.dwDevType; @@ -217,8 +216,8 @@ static HRESULT keyboard_acquire( IDirectInputDevice8W *iface ) static HRESULT keyboard_unacquire( IDirectInputDevice8W *iface ) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); - memset( This->base.device_state, 0, sizeof(This->base.device_state) ); + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); + memset( impl->base.device_state, 0, sizeof(impl->base.device_state) ); return DI_OK; } @@ -245,7 +244,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { - SysKeyboardImpl *impl = impl_from_IDirectInputDevice8W( iface ); + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType ); DIDEVICEOBJECTINSTANCEW instance = {

1 0

Zebediah Figura : ntdll/tests: Move some tests to a new sync.c file.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 127ad286ce019e70ef3243844c9bd6a2e4669de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=127ad286ce019e70ef324384… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 27 10:01:19 2021 -0500 ntdll/tests: Move some tests to a new sync.c file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/om.c | 574 --------------------------------------- dlls/ntdll/tests/sync.c | 631 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 632 insertions(+), 574 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=127ad286ce019e70ef32…

1 0

Rémi Bernon : dinput: Rename SysMouseImpl to struct mouse.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: b7e23884915920d4c8b7bb62a47b95aba23786d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e23884915920d4c8b7bb62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 09:41:01 2021 +0200 dinput: Rename SysMouseImpl to struct mouse. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 91 ++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7e23884915920d4c8b7…

1 0

Rémi Bernon : winebus.sys: Drop the hid_report channel.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 3ad0c002da26cb3a9a022614490b86b6d3eaef28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad0c002da26cb3a9a022614… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 10:39:11 2021 +0200 winebus.sys: Drop the hid_report channel. 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 | 4 +--- dlls/winebus.sys/bus_udev.c | 22 ++++++++++------------ dlls/winebus.sys/main.c | 7 +++---- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index fe3a960649c..d172d5382fd 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -59,8 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef SONAME_LIBSDL2 -WINE_DECLARE_DEBUG_CHANNEL(hid_report); - static pthread_mutex_t sdl_cs = PTHREAD_MUTEX_INITIALIZER; static struct sdl_bus_options options; @@ -847,7 +845,7 @@ static void process_device_event(SDL_Event *event) struct sdl_device *impl; SDL_JoystickID id; - TRACE_(hid_report)("Received action %x\n", event->type); + TRACE("Received action %x\n", event->type); pthread_mutex_lock(&sdl_cs); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 4c00fe6ad39..780af549916 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -101,8 +101,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef HAVE_UDEV -WINE_DECLARE_DEBUG_CHANNEL(hid_report); - static pthread_mutex_t udev_cs = PTHREAD_MUTEX_INITIALIZER; static struct udev *udev_context = NULL; @@ -344,9 +342,9 @@ static void hidraw_device_read_report(struct unix_device *iface) int size = read(impl->base.device_fd, report_buffer, sizeof(report_buffer)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); + TRACE("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); else if (size == 0) - TRACE_(hid_report)("Failed to read report\n"); + TRACE("Failed to read report\n"); else { /* As described in the Linux kernel driver, when connected over bluetooth, DS4 controllers @@ -380,7 +378,7 @@ static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_ if ((buffer[0] = packet->reportId)) count = write(impl->base.device_fd, packet->reportBuffer, length); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot write\n", packet->reportId, length); else { memcpy(buffer + 1, packet->reportBuffer, length); @@ -394,7 +392,7 @@ static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_ } else { - ERR_(hid_report)("id %d write failed error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d write failed error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -412,7 +410,7 @@ static void hidraw_device_get_feature_report(struct unix_device *iface, HID_XFER if ((buffer[0] = packet->reportId) && length <= 0x1fff) count = ioctl(impl->base.device_fd, HIDIOCGFEATURE(length), packet->reportBuffer); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot read\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot read\n", packet->reportId, length); else { count = ioctl(impl->base.device_fd, HIDIOCGFEATURE(length + 1), buffer); @@ -426,7 +424,7 @@ static void hidraw_device_get_feature_report(struct unix_device *iface, HID_XFER } else { - ERR_(hid_report)("id %d read failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d read failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -448,7 +446,7 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER if ((buffer[0] = packet->reportId) && length <= 0x1fff) count = ioctl(impl->base.device_fd, HIDIOCSFEATURE(length), packet->reportBuffer); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot write\n", packet->reportId, length); else { memcpy(buffer + 1, packet->reportBuffer, length); @@ -462,7 +460,7 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER } else { - ERR_(hid_report)("id %d write failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d write failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -802,9 +800,9 @@ static void lnxev_device_read_report(struct unix_device *iface) size = read(impl->base.device_fd, &ie, sizeof(ie)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); + TRACE("Read failed. Likely an unplugged device\n"); else if (size == 0) - TRACE_(hid_report)("Failed to read report\n"); + TRACE("Failed to read report\n"); else if (set_report_from_event(iface, &ie)) bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 433963b44d4..1353df7d000 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -41,7 +41,6 @@ #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -WINE_DECLARE_DEBUG_CHANNEL(hid_report); static DRIVER_OBJECT *driver_obj; @@ -1045,21 +1044,21 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_WRITE_REPORT: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); + TRACE("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); unix_device_set_output_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_GET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_GET_FEATURE\n"); + TRACE("IOCTL_HID_GET_FEATURE\n"); unix_device_get_feature_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_SET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_SET_FEATURE\n"); + TRACE("IOCTL_HID_SET_FEATURE\n"); unix_device_set_feature_report(device, packet, &irp->IoStatus); break; }

1 0

Rémi Bernon : winebus.sys: Consistently trace HID reports.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 13453bb9a0cb63fa53f7fff85f20be55f7038b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13453bb9a0cb63fa53f7fff8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 10:39:12 2021 +0200 winebus.sys: Consistently trace HID reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 75 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 1353df7d000..0e7889386dc 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -401,6 +401,7 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) { struct hid_report *report; struct list *entry; + ULONG i; if (!(entry = list_head(&ext->reports))) return FALSE; report = LIST_ENTRY(entry, struct hid_report, entry); @@ -410,6 +411,19 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; + if (TRACE_ON(plugplay)) + { + TRACE("read input report length %u:\n", report->length); + for (i = 0; i < report->length;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", report->buffer[i]); } + while (++i % 16 && i < report->length); + TRACE("%s\n", buffer); + } + } + RtlFreeHeap(GetProcessHeap(), 0, report); return TRUE; } @@ -937,11 +951,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - ULONG code, buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + ULONG i, code, buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; NTSTATUS status; - TRACE("(%p, %p)\n", device, irp); - if (device == bus_fdo) { IoSkipCurrentIrpStackLocation(irp); @@ -1026,6 +1038,18 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) memcpy(packet->reportBuffer, ext->last_reports[packet->reportId], packet->reportBufferLen); irp->IoStatus.Information = packet->reportBufferLen; irp->IoStatus.Status = STATUS_SUCCESS; + if (TRACE_ON(plugplay)) + { + TRACE("read input report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } break; } case IOCTL_HID_READ_REPORT: @@ -1043,22 +1067,55 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: case IOCTL_HID_WRITE_REPORT: { - HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; + if (TRACE_ON(plugplay)) + { + TRACE("write output report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } unix_device_set_output_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_GET_FEATURE: { - HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE("IOCTL_HID_GET_FEATURE\n"); + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; unix_device_get_feature_report(device, packet, &irp->IoStatus); + if (!irp->IoStatus.Status && TRACE_ON(plugplay)) + { + TRACE("read feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } break; } case IOCTL_HID_SET_FEATURE: { - HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE("IOCTL_HID_SET_FEATURE\n"); + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; + if (TRACE_ON(plugplay)) + { + TRACE("write feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } unix_device_set_feature_report(device, packet, &irp->IoStatus); break; }

1 0

Nikolay Sivov : evr/tests: Add some more presenter tests for shutdown state.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: f7e31f715df557288ba02265580c7dbc6fca1ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e31f715df557288ba02265… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 17:23:05 2021 +0300 evr/tests: Add some more presenter tests for shutdown state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 8e3288afaec..b7e3ad174df 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2323,8 +2323,19 @@ done: static void test_presenter_shutdown(void) { IMFTopologyServiceLookupClient *lookup_client; + IMFVideoDisplayControl *display_control; + IMFVideoMediaType *media_type; IMFVideoPresenter *presenter; + IMFVideoDeviceID *deviceid; + HWND window, window2; HRESULT hr; + DWORD mode; + RECT rect; + SIZE size; + IID iid; + + window = create_window(); + ok(!!window, "Failed to create test window.\n"); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); @@ -2332,6 +2343,12 @@ static void test_presenter_shutdown(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2350,12 +2367,56 @@ todo_wine todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_GetCurrentMediaType(presenter, &media_type); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &size); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, &size, &size); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + SetRect(&rect, 0, 0, 10, 10); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, NULL, &rect); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_None); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &window2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_RepaintVideo(display_control); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoDeviceID_Release(deviceid); + IMFVideoDisplayControl_Release(display_control); IMFTopologyServiceLookupClient_Release(lookup_client); IMFVideoPresenter_Release(presenter); + + DestroyWindow(window); } static void test_mixer_output_rectangle(void)

1 0

Francisco Casas : gdi32: Do not sign extend 64-bit gdi handles.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 379333e3c789573c6d1a7bdad2a785b43772d526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=379333e3c789573c6d1a7bda… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 27 09:47:07 2021 -0300 gdi32: Do not sign extend 64-bit gdi handles. Testing on Windows shows typically handles are not sign extended, however sometimes they are. It's not clear what triggers the change in behaviour. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 2 +- dlls/win32u/gdiobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 196cea9ba92..04b91cfd60f 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -102,7 +102,7 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) static HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - get_gdi_shared()->Handles; - return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); + return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static DWORD get_object_type( HGDIOBJ obj ) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index d097ba158fd..0310609afc0 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -55,7 +55,7 @@ const struct user_callbacks *user_callbacks = NULL; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - gdi_shared->Handles; - return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); + return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle )

1 0

Rémi Bernon : dinput: Rename IDirectInputDeviceImpl to struct dinput_device.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: dac2e0b18779f8713681b88929a415eb7b5d2a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac2e0b18779f8713681b889… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 09:40:59 2021 +0200 dinput: Rename IDirectInputDeviceImpl to struct dinput_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 72 ++++++------ dlls/dinput/device.c | 258 +++++++++++++++++++++---------------------- dlls/dinput/device_private.h | 11 +- dlls/dinput/dinput_main.c | 124 ++++++++++----------- dlls/dinput/dinput_private.h | 6 +- dlls/dinput/joystick_hid.c | 12 +- dlls/dinput/keyboard.c | 10 +- dlls/dinput/mouse.c | 9 +- 8 files changed, 244 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dac2e0b18779f8713681…

1 0

Nikolay Sivov : evr/tests: Skip tests if default presenter can't be created.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 393ea6c60854eeebd0b86ca3265a2892ffc6996d URL: https://source.winehq.org/git/wine.git/?a=commit;h=393ea6c60854eeebd0b86ca3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 17:23:03 2021 +0300 evr/tests: Skip tests if default presenter can't be created. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 818731e1e55..6fb92d9ced1 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1246,9 +1246,7 @@ static void test_default_presenter(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr); - if (FAILED(hr)) - return; + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); check_interface(presenter, &IID_IQualProp, TRUE); check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE); @@ -2820,8 +2818,19 @@ static void test_MFIsFormatYUV(void) START_TEST(evr) { + IMFVideoPresenter *presenter; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter))) + { + win_skip("Failed to create default presenter, hr %#x. Skipping tests.\n", hr); + CoUninitialize(); + return; + } + IMFVideoPresenter_Release(presenter); + test_aggregation(); test_interfaces(); test_enum_pins();

1 0