August 2021 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Introduce throw_range_error helper.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 93455491fc6be9e73a0aeb66aac0e26385bba231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93455491fc6be9e73a0aeb66… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 13:48:29 2021 +0200 msvcp90: Introduce throw_range_error helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/details.c | 3 +-- dlls/msvcp90/exception.c | 15 ++++++++++----- dlls/msvcp90/msvcp90.h | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 9d79ca80e21..b8c29921db1 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -320,7 +320,6 @@ typedef enum __exception_type { EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_FAILURE, - EXCEPTION_RANGE_ERROR, } exception_type; void throw_exception(exception_type, const char *); diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index b7de12e6e90..1515286b4dd 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -475,8 +475,7 @@ void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4* switch(idx) { case 0: _Xout_of_range("Index out of range"); case 1: _Xout_of_range("Index out of segments table range"); - case 2: throw_exception(EXCEPTION_RANGE_ERROR, - "Index is inside segment which failed to be allocated"); + case 2: throw_range_error("Index is inside segment which failed to be allocated"); } } diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index f6a15ecc8d6..f93d92b601d 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1091,14 +1091,19 @@ void throw_exception(exception_type et, const char *str) MSVCP_failure_ctor(&e, name); _CxxThrowException(&e, &failure_cxx_type); } - case EXCEPTION_RANGE_ERROR: { - range_error e; - MSVCP_range_error_ctor(&e, name); - _CxxThrowException(&e, &range_error_cxx_type); - } } } +/* Internal: throws range_error exception */ +void DECLSPEC_NORETURN throw_range_error(const char *str) +{ + exception_name name = EXCEPTION_NAME(str); + range_error e; + + MSVCP_range_error_ctor(&e, name); + _CxxThrowException(&e, &range_error_cxx_type); +} + void init_exception(void *base) { #ifdef __x86_64__ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 7452a7f6a99..63ba36f7b38 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -669,3 +669,4 @@ void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); void __cdecl DECLSPEC_NORETURN _Xout_of_range(const char*); void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char*); +void DECLSPEC_NORETURN throw_range_error(const char*);

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_EnumObjects.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 1117f9f072020b5a95410301244703f4d94ff484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1117f9f072020b5a95410301… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:28 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_EnumObjects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4a05afe30c7..3e706dea0b1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -427,6 +427,49 @@ static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, return DI_OK; } +struct enum_objects_params +{ + LPDIENUMDEVICEOBJECTSCALLBACKW callback; + void *context; +}; + +static BOOL enum_objects_callback( struct hid_joystick *impl, struct hid_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct enum_objects_params *params = data; + return params->callback( instance, params->context ); +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *context, DWORD flags ) +{ + static const DIPROPHEADER filter = + { + .dwSize = sizeof(filter), + .dwHeaderSize = sizeof(filter), + .dwHow = DIPH_DEVICE, + }; + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct enum_objects_params params = + { + .callback = callback, + .context = context, + }; + BOOL ret; + + TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + ret = enum_value_objects( impl, &filter, flags, enum_objects_callback, &params ); + if (ret != DIENUM_CONTINUE) return S_OK; + ret = enum_button_objects( impl, &filter, flags, enum_objects_callback, &params ); + if (ret != DIENUM_CONTINUE) return S_OK; + enum_collections_objects( impl, &filter, flags, enum_objects_callback, &params ); + + return S_OK; +} + static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { @@ -619,7 +662,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_Release, /*** IDirectInputDevice methods ***/ hid_joystick_GetCapabilities, - IDirectInputDevice2WImpl_EnumObjects, + hid_joystick_EnumObjects, hid_joystick_GetProperty, hid_joystick_SetProperty, IDirectInputDevice2WImpl_Acquire,

1 0

Piotr Caban : msvcp90: Don't use throw_exception helper for runtime_error exception.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 73c4ae66c2a4721f34978915c90c9ce7a32500f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c4ae66c2a4721f34978915… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 13:48:21 2021 +0200 msvcp90: Don't use throw_exception helper for runtime_error exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/exception.c | 14 +++++++------- dlls/msvcp90/locale.c | 8 ++++---- dlls/msvcp90/msvcp90.h | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 5bdebb605d6..0b14806d95c 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -320,7 +320,6 @@ typedef enum __exception_type { EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_OUT_OF_RANGE, - EXCEPTION_RUNTIME_ERROR, EXCEPTION_FAILURE, EXCEPTION_RANGE_ERROR, } exception_type; diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index f635a80a90c..7b92b80d393 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -924,10 +924,15 @@ void __cdecl _Xout_of_range(const char *str) /* ?_Xruntime_error(a)std@@YAXPBD(a)Z */ /* ?_Xruntime_error(a)std@@YAXPEBD(a)Z */ -void __cdecl _Xruntime_error(const char *str) +void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char *str) { + exception_name name = EXCEPTION_NAME(str); + runtime_error e; + TRACE("(%s)\n", debugstr_a(str)); - throw_exception(EXCEPTION_RUNTIME_ERROR, str); + + MSVCP_runtime_error_ctor(&e, name); + _CxxThrowException(&e, &runtime_error_cxx_type); } /* ?uncaught_exception(a)std@@YA_NXZ */ @@ -1081,11 +1086,6 @@ void throw_exception(exception_type et, const char *str) MSVCP_out_of_range_ctor(&e, name); _CxxThrowException(&e, &out_of_range_cxx_type); } - case EXCEPTION_RUNTIME_ERROR: { - runtime_error e; - MSVCP_runtime_error_ctor(&e, name); - _CxxThrowException(&e, &runtime_error_cxx_type); - } case EXCEPTION_FAILURE: { failure e; MSVCP_failure_ctor(&e, name); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b0f1465fdce..0afe394ad2d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -520,7 +520,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); if(!locstr) - throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + _Xruntime_error("bad locale name"); _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); locale_string_char_ctor(&locinfo->days); @@ -625,7 +625,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con /* This function is probably modifying more global objects */ FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); if(!locstr) - throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + _Xruntime_error("bad locale name"); locale_string_char_dtor(&locinfo->newlocname); @@ -11984,7 +11984,7 @@ locale* __thiscall locale_ctor_locale_cstr(locale *this, const locale *loc, cons if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) { _Locinfo_dtor(&locinfo); operator_delete(this->ptr); - throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + _Xruntime_error("bad locale name"); } this->ptr = operator_new(sizeof(locale__Locimp)); @@ -12013,7 +12013,7 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) { _Locinfo_dtor(&locinfo); operator_delete(this->ptr); - throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + _Xruntime_error("bad locale name"); } locale__Locimp__Makeloc(&locinfo, cat, this->ptr, NULL); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 144bf4d3a9a..3f862f1b2c1 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -667,3 +667,4 @@ void WINAPI DECLSPEC_NORETURN _CxxThrowException(void*,const cxx_exception_type* void __cdecl DECLSPEC_NORETURN _Xinvalid_argument(const char*); void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); +void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char*);

1 0

Piotr Caban : msvcp90: Introduce throw_failure helper.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: d7e9190032310b7481b2802aaf92148a3b9153bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e9190032310b7481b2802a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 13:48:33 2021 +0200 msvcp90: Introduce throw_failure helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 8 ++++---- dlls/msvcp60/msvcp.h | 1 + dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/exception.c | 15 ++++++++++----- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/msvcp90.h | 1 + 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 8657fd9b3e5..495817a54db 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4849,13 +4849,13 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool if(reraise) _CxxThrowException(NULL, NULL); else if(this->state & this->except & IOSTATE_eofbit) - throw_exception(EXCEPTION_FAILURE, "eofbit is set"); + throw_failure("eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) - throw_exception(EXCEPTION_FAILURE, "failbit is set"); + throw_failure("failbit is set"); else if(this->state & this->except & IOSTATE_badbit) - throw_exception(EXCEPTION_FAILURE, "badbit is set"); + throw_failure("badbit is set"); else if(this->state & this->except & IOSTATE__Hardfail) - throw_exception(EXCEPTION_FAILURE, "_Hardfail is set"); + throw_failure("_Hardfail is set"); } /* ?clear(a)ios_base@std@@QAEXH(a)Z */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index bae75855c3a..19078a133e4 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -488,3 +488,4 @@ void WINAPI DECLSPEC_NORETURN _CxxThrowException(void*,const cxx_exception_type* void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); void __cdecl DECLSPEC_NORETURN _Xout_of_range(const char*); +void DECLSPEC_NORETURN throw_failure(const char*); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index b8c29921db1..58f6fe43586 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -319,7 +319,6 @@ typedef enum __exception_type { EXCEPTION, EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, - EXCEPTION_FAILURE, } exception_type; void throw_exception(exception_type, const char *); diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index f93d92b601d..977bdff9739 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1086,11 +1086,6 @@ void throw_exception(exception_type et, const char *str) MSVCP_logic_error_ctor(&e, name); _CxxThrowException(&e, &logic_error_cxx_type); } - case EXCEPTION_FAILURE: { - failure e; - MSVCP_failure_ctor(&e, name); - _CxxThrowException(&e, &failure_cxx_type); - } } } @@ -1104,6 +1099,16 @@ void DECLSPEC_NORETURN throw_range_error(const char *str) _CxxThrowException(&e, &range_error_cxx_type); } +/* Internal: throws failure exception */ +void DECLSPEC_NORETURN throw_failure(const char *str) +{ + exception_name name = EXCEPTION_NAME(str); + failure e; + + MSVCP_failure_ctor(&e, name); + _CxxThrowException(&e, &failure_cxx_type); +} + void init_exception(void *base) { #ifdef __x86_64__ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8275635096a..21cf33a505c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5266,13 +5266,13 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool if(reraise) _CxxThrowException(NULL, NULL); else if(this->state & this->except & IOSTATE_eofbit) - throw_exception(EXCEPTION_FAILURE, "eofbit is set"); + throw_failure("eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) - throw_exception(EXCEPTION_FAILURE, "failbit is set"); + throw_failure("failbit is set"); else if(this->state & this->except & IOSTATE_badbit) - throw_exception(EXCEPTION_FAILURE, "badbit is set"); + throw_failure("badbit is set"); else if(this->state & this->except & IOSTATE__Hardfail) - throw_exception(EXCEPTION_FAILURE, "_Hardfail is set"); + throw_failure("_Hardfail is set"); } /* ?clear(a)ios_base@std@@QAEXH(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 63ba36f7b38..e917fad4e28 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -669,4 +669,5 @@ void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); void __cdecl DECLSPEC_NORETURN _Xout_of_range(const char*); void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char*); +void DECLSPEC_NORETURN throw_failure(const char*); void DECLSPEC_NORETURN throw_range_error(const char*);

1 0

Rémi Bernon : dinput: Read HID reports from the internal thread.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: d1e0c5a732236f99c334f50a5d694543a58ba05d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e0c5a732236f99c334f50a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:29 2021 +0200 dinput: Read HID reports from the internal thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 245 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 242 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1e0c5a732236f99c334…

1 0

Rémi Bernon : dinput: Enumerate HID collections, input buttons and values.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 81c15d2d81951de8938613662861b5a2b875b443 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c15d2d81951de893861366… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:25 2021 +0200 dinput: Enumerate HID collections, input buttons and values. And initialize data format from them. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 417 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 415 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81c15d2d81951de89386…

1 0

Francois Gouget : ntdll: Fix the spelling of a comment.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 167c7a524fd0ebc8c3ef3afd1af463dbf2b374ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=167c7a524fd0ebc8c3ef3afd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:46 2021 +0200 ntdll: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 131b0e33683..47196067cd4 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -133,7 +133,7 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) * is_valid_directory * * Helper for RtlDosPathNameToNtPathName_U_WithStatus. - * Test if the path is an exisiting directory. + * Test if the path is an existing directory. */ static BOOL is_valid_directory(LPCWSTR path) {

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_SetProperty.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 2681caa3f8cdcf5555b90947bc2a70efe5cb306f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2681caa3f8cdcf5555b90947… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:26 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_SetProperty. For DIPROP_RANGE property on POVs and Axes, and initialize it on creation. This uses the value caps physical range, as it's exactly the purpose and we don't use it for anything else otherwise. We'll scale values from their logical range directly anyway to save a conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index e3654a38a6a..d58a8f5d919 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -427,6 +427,16 @@ static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, return DI_OK; } +static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + HIDP_VALUE_CAPS *value_caps = caps->value; + DIPROPRANGE *value = data; + value->lMin = value_caps->PhysicalMin; + value->lMax = value_caps->PhysicalMax; + return DIENUM_CONTINUE; +} + static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, const GUID *guid, DIPROPHEADER *header ) { @@ -439,6 +449,9 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con switch (LOWORD( guid )) { + case (DWORD_PTR)DIPROP_RANGE: + enum_value_objects( impl, header, DIDFT_AXIS, get_property_prop_range, header ); + return DI_OK; case (DWORD_PTR)DIPROP_PRODUCTNAME: { DIPROPSTRING *value = (DIPROPSTRING *)header; @@ -477,6 +490,41 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con return DI_OK; } +static BOOL set_property_prop_range( struct hid_joystick *impl, struct hid_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + HIDP_VALUE_CAPS *value_caps = caps->value; + DIPROPRANGE *value = data; + LONG range = value_caps->LogicalMax - value_caps->LogicalMin; + value_caps->PhysicalMin = value->lMin; + value_caps->PhysicalMax = value->lMax; + if (instance->dwType & DIDFT_POV && range > 0) + value_caps->PhysicalMax -= value->lMax / (range + 1); + return DIENUM_CONTINUE; +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, const GUID *guid, + const DIPROPHEADER *header ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + case (DWORD_PTR)DIPROP_RANGE: + enum_value_objects( impl, header, DIDFT_AXIS, set_property_prop_range, (void *)header ); + return DI_OK; + default: + return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } + + return DI_OK; +} + static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -536,7 +584,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, hid_joystick_GetProperty, - IDirectInputDevice2WImpl_SetProperty, + hid_joystick_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, hid_joystick_GetDeviceState, @@ -747,6 +795,15 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID .guidProduct = *guid, .guidInstance = *guid }; + DIPROPRANGE range = + { + .diph = + { + .dwSize = sizeof(range), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; HIDD_ATTRIBUTES attrs = {.Size = sizeof(attrs)}; HIDP_LINK_COLLECTION_NODE *nodes; struct hid_joystick *impl = NULL; @@ -826,6 +883,11 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID _dump_DIDATAFORMAT( impl->base.data_format.wine_df ); + range.lMax = 65535; + enum_value_objects( impl, &range.diph, DIDFT_AXIS, set_property_prop_range, &range ); + range.lMax = 36000; + enum_value_objects( impl, &range.diph, DIDFT_POV, set_property_prop_range, &range ); + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK;

1 0

Nikolay Sivov : d3dx9: Forward D3DXDisassembleShader() to d3dcompiler.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 4ad4e4a133e92f923f9eb3da5547c56601c81cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ad4e4a133e92f923f9eb3da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 11:41:17 2021 +0300 d3dx9: Forward D3DXDisassembleShader() to d3dcompiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 7033972af36..fe0f99180ac 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2336,10 +2336,13 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample return D3D_OK; } -HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, ID3DXBuffer **disassembly) +HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, + ID3DXBuffer **buffer) { - FIXME("%p %d %s %p: stub\n", shader, colorcode, debugstr_a(comments), disassembly); - return E_OUTOFMEMORY; + TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer); + + return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0, + comments, (ID3DBlob **)buffer); } struct d3dx9_texture_shader

1 0

Nikolay Sivov : d3dcompiler/tests: Add a D3DDisassemble() test with sm2 shader.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 0861b5447ff4dcd66b2febad204e1c66acdfa1ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0861b5447ff4dcd66b2febad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 11:42:57 2021 +0300 d3dcompiler/tests: Add a D3DDisassemble() test with sm2 shader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 749b1153267..bc5af487627 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -31,6 +31,7 @@ static HRESULT (WINAPI *pD3DAssemble)(const void *data, SIZE_T datasize, const c const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT flags, ID3DBlob **shader, ID3DBlob **error_messages); static pD3DPreprocess ppD3DPreprocess; +static pD3DDisassemble ppD3DDisassemble; struct shader_test { const char *text; @@ -1721,6 +1722,41 @@ static void d3dpreprocess_test(void) if (shader) ID3D10Blob_Release(shader); } +static const DWORD vs_2_0[] = +{ + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ + 0x0200001f, 0x80000005, 0x900f0003, /* dcl_texcoord0 v3 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0001, 0x90e40002, /* mov oD1, v2 */ + 0x02000001, 0xe0070000, 0x90e40003, /* mov oT0.xyz, v3 */ + 0x02000001, 0xc00f0001, 0x90ff0002, /* mov oFog, v2.w */ + 0x02000001, 0xc00f0002, 0x90ff0001, /* mov oPts, v1.w */ + 0x0000ffff +}; + +static void test_disassemble_shader(void) +{ + ID3DBlob *blob; + HRESULT hr; + + hr = ppD3DDisassemble(vs_2_0, 0, 0, NULL, &blob); +todo_wine +#if D3D_COMPILER_VERSION == 47 + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); +#else + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); +#endif + + hr = ppD3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Blob_Release(blob); +} + static BOOL load_d3dcompiler(void) { HMODULE module; @@ -1733,6 +1769,7 @@ static BOOL load_d3dcompiler(void) pD3DAssemble = (void*)GetProcAddress(module, "D3DAssemble"); ppD3DPreprocess = (void*)GetProcAddress(module, "D3DPreprocess"); + ppD3DDisassemble = (void *)GetProcAddress(module, "D3DDisassemble"); return TRUE; } @@ -1761,4 +1798,5 @@ START_TEST(asm) assembleshader_test(); d3dpreprocess_test(); + test_disassemble_shader(); }

1 0