November 2021 - Wine-commits

Julian Rüger : German translation for release 6.19.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: website Branch: master Commit: 6dc18b4b3bc0b66c41d3b65ab24767e69711ea03 URL: https://source.winehq.org/git/website.git/?a=commit;h=6dc18b4b3bc0b66c41d3b… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 22 17:14:02 2021 +0100 German translation for release 6.19. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021100801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2021100801.xml b/news/de/2021100801.xml new file mode 100644 index 00000000..38d69809 --- /dev/null +++ b/news/de/2021100801.xml @@ -0,0 +1,17 @@ +<news> +<date>8. Oktober 2021</date> +<title>Wine 6.19 freigegeben</title> +<body> + Die Entwicklungsversion 6.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>IPHlpApi, NsiProxy, WineDbg und weitere Module nach PE konvertiert.</li> + <li>Weitere Arbeit am HID-Joystick-Backend.</li> + <li>Kernelteile von GDI nach Win32u verschoben.</li> + <li>Weitere Arbeit Richtung Dwarf-3/4-Debugunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.19.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.20.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: website Branch: master Commit: c0814eff273294eab8a970c979ce6137aab17cf8 URL: https://source.winehq.org/git/website.git/?a=commit;h=c0814eff273294eab8a97… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 22 17:17:16 2021 +0100 German translation for release 6.20. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021102201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2021102201.xml b/news/de/2021102201.xml new file mode 100644 index 00000000..23688ccc --- /dev/null +++ b/news/de/2021102201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. Oktober 2021</date> +<title>Wine 6.20 freigegeben</title> +<body> + Die Entwicklungsversion 6.20 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.20">Neuerungen (en)</a> in dieser Version: +<ul> + <li>MSXml, XAudio, DInput und weitere Module nach PE konvertiert.</li> + <li>Einige Systembibliotheken werden nun im Quelltext mitgeliefert, um PE-Builds zu unterstützen.</li> + <li>HID-Joystick ist nun das einzige unterstützte Backend in DirectInput.</li> + <li>Bessere Unterstützung von MSVCRT-Builds in Winelib.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.20.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0.2.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: website Branch: master Commit: 3f8b416f4247190efb89c529f088495b7e5b1c82 URL: https://source.winehq.org/git/website.git/?a=commit;h=3f8b416f4247190efb89c… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 22 17:19:58 2021 +0100 German translation for release 6.0.2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021102601.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2021102601.xml b/news/de/2021102601.xml new file mode 100644 index 00000000..e7298e27 --- /dev/null +++ b/news/de/2021102601.xml @@ -0,0 +1,15 @@ +<news> +<date>26. Oktober 2021</date> +<title>Wine 6.0.2 freigegeben</title> +<body> + Die Wartungsversion 6.0.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.0.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Kompilierungs-Korrekturen (Freetype, GCC 11).</li> + <li>GnuTLS-Unterstützung nun Standard unter MacOS, wenn verfügbar.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for WWN issue 406.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: website Branch: master Commit: bc4526ab282f5080ef990194a737d8d504df01f7 URL: https://source.winehq.org/git/website.git/?a=commit;h=bc4526ab282f5080ef990… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 22 17:22:22 2021 +0100 German translation for WWN issue 406. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021102901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2021102901.xml b/news/de/2021102901.xml new file mode 100644 index 00000000..1d68a48a --- /dev/null +++ b/news/de/2021102901.xml @@ -0,0 +1,14 @@ +<news> + <date>29. Oktober 2021</date> + <title>World-Wine-News Ausgabe 406</title> + <body> + Die <a href="{$root}/wwn/406">WWN-Ausgabe 406 (en)</a> wurde heute veröffentlicht. + <ul> + <li><a href="{$root}/wwn/406#New Author">Neuer Autor</a>.</li> + <li><a href="{$root}/wwn/406#Highlights From Wine 6.18 to Today">Highlights von Wine 6.18 bis heute</a>.</li> + <li><a href="{$root}/wwn/406#Dinput Now Uses HID">Dinput verwendet nun HID</a>.</li> + <li><a href="{$root}/wwn/406#Unicode 14">Unicode 14</a>.</li> + <li><a href="{$root}/wwn/406#Wine Mono">Wine-Mono</a>.</li> + </ul> + </body> +</news>

1 0

Julian Rüger : German translation for release 6.21.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: website Branch: master Commit: a17b257d3cae1a057a78c1410ab9cb8df933f119 URL: https://source.winehq.org/git/website.git/?a=commit;h=a17b257d3cae1a057a78c… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 22 17:26:57 2021 +0100 German translation for release 6.21. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021110501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2021110501.xml b/news/de/2021110501.xml new file mode 100644 index 00000000..3c4ddbc9 --- /dev/null +++ b/news/de/2021110501.xml @@ -0,0 +1,16 @@ +<news> +<date>5. November 2021</date> +<title>Wine 6.21 freigegeben</title> +<body> + Die Entwicklungsversion 6.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>WinSpool, GPhoto und einige weitere Module nach PE konvertiert.</li> + <li>Bessere Unterstützung von Inline-Funktionen in DbgHelp.</li> + <li>Anfänge einer MSDASQL-Implementierung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.21.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 6.22
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: website Branch: master Commit: 0f0431eb436cdc9cb2125bff362ec9223b566693 URL: https://source.winehq.org/git/website.git/?a=commit;h=0f0431eb436cdc9cb2125… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 19 22:45:51 2021 +0100 Wine release 6.22 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021111901.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021111901.xml b/news/en/2021111901.xml new file mode 100644 index 00000000..a3cad8c4 --- /dev/null +++ b/news/en/2021111901.xml @@ -0,0 +1,18 @@ +<news> +<date>November 19, 2021</date> +<title>Wine 6.22 Released</title> +<body> + The Wine development release 6.22 is now available. + <a href="{$root}/announce/6.22">What's new</a> in this release: +<ul> + <li>Mono engine updated to version 7.0.0.</li> + <li>Exception unwinding on ARM.</li> + <li>More improvements to HID joystick support.</li> + <li>WoW64 thunks in a number of Unix libraries.</li> + <li>Beginnings of moving USER32 to Win32u.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.22.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Rémi Bernon : dinput8/tests: Add tests for device managed effect creation.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 72138673dd46549c979af66235343a0692948701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72138673dd46549c979af662… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 19 12:37:17 2021 +0100 dinput8/tests: Add tests for device managed effect creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 587 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 587 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72138673dd46549c979a…

1 0

Ivo Ivanov : dinput: Look for the device managed effect creation reports.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 21171bec319adf508ba8cf1fac1fd3f19073a134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21171bec319adf508ba8cf1f… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 19 12:37:18 2021 +0100 dinput: Look for the device managed effect creation reports. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 73 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 0910c870762..858755140d1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -132,6 +132,33 @@ struct pid_device_gain struct hid_value_caps *device_gain_caps; }; +struct pid_device_pool +{ + BYTE id; + ULONG collection; + struct hid_value_caps *device_managed_caps; +}; + +struct pid_block_free +{ + BYTE id; + ULONG collection; +}; + +struct pid_block_load +{ + BYTE id; + ULONG collection; + ULONG status_coll; +}; + +struct pid_new_effect +{ + BYTE id; + ULONG collection; + ULONG type_coll; +}; + struct hid_joystick { struct dinput_device base; @@ -161,6 +188,10 @@ struct hid_joystick struct pid_set_constant_force pid_set_constant_force; struct pid_set_ramp_force pid_set_ramp_force; struct pid_device_gain pid_device_gain; + struct pid_device_pool pid_device_pool; + struct pid_block_free pid_block_free; + struct pid_block_load pid_block_load; + struct pid_new_effect pid_new_effect; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -441,7 +472,7 @@ static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DWORD flags, enum_object_callback callback, void *data ) { - DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, j, len; + DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, j, count, len; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; @@ -573,7 +604,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, } } - for (caps = HID_OUTPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->output_caps_count; + count = preparsed->output_caps_count + preparsed->feature_caps_count; + for (caps = HID_OUTPUT_VALUE_CAPS( preparsed ), caps_end = caps + count; caps != caps_end; ++caps) { if (!caps->usage_page) continue; @@ -1519,6 +1551,10 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * struct pid_set_periodic *set_periodic = &impl->pid_set_periodic; struct pid_set_envelope *set_envelope = &impl->pid_set_envelope; struct pid_device_gain *device_gain = &impl->pid_device_gain; + struct pid_device_pool *device_pool = &impl->pid_device_pool; + struct pid_block_free *block_free = &impl->pid_block_free; + struct pid_block_load *block_load = &impl->pid_block_load; + struct pid_new_effect *new_effect = &impl->pid_new_effect; #define SET_COLLECTION( rep ) \ do \ @@ -1550,15 +1586,22 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * case PID_USAGE_SET_CONSTANT_FORCE_REPORT: SET_COLLECTION( set_constant_force ); break; case PID_USAGE_SET_RAMP_FORCE_REPORT: SET_COLLECTION( set_ramp_force ); break; case PID_USAGE_DEVICE_GAIN_REPORT: SET_COLLECTION( device_gain ); break; + case PID_USAGE_POOL_REPORT: SET_COLLECTION( device_pool ); break; + case PID_USAGE_BLOCK_FREE_REPORT: SET_COLLECTION( block_free ); break; + case PID_USAGE_BLOCK_LOAD_REPORT: SET_COLLECTION( block_load ); break; + case PID_USAGE_CREATE_NEW_EFFECT_REPORT: SET_COLLECTION( new_effect ); break; case PID_USAGE_DEVICE_CONTROL: SET_SUB_COLLECTION( device_control, control_coll ); break; case PID_USAGE_EFFECT_OPERATION: SET_SUB_COLLECTION( effect_control, control_coll ); break; case PID_USAGE_EFFECT_TYPE: if (instance->wCollectionNumber == effect_update->collection) SET_SUB_COLLECTION( effect_update, type_coll ); + else if (instance->wCollectionNumber == new_effect->collection) + SET_SUB_COLLECTION( new_effect, type_coll ); break; case PID_USAGE_AXES_ENABLE: SET_SUB_COLLECTION( effect_update, axes_coll ); break; case PID_USAGE_DIRECTION: SET_SUB_COLLECTION( effect_update, direction_coll ); break; + case PID_USAGE_BLOCK_LOAD_STATUS: SET_SUB_COLLECTION( block_load, status_coll ); break; } } @@ -1580,6 +1623,10 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap struct pid_set_periodic *set_periodic = &impl->pid_set_periodic; struct pid_set_envelope *set_envelope = &impl->pid_set_envelope; struct pid_device_gain *device_gain = &impl->pid_device_gain; + struct pid_device_pool *device_pool = &impl->pid_device_pool; + struct pid_block_free *block_free = &impl->pid_block_free; + struct pid_block_load *block_load = &impl->pid_block_load; + struct pid_new_effect *new_effect = &impl->pid_new_effect; if (!(instance->dwType & DIDFT_OUTPUT)) return DIENUM_CONTINUE; @@ -1756,6 +1803,22 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap device_gain->device_gain_caps = caps; } } + if (instance->wCollectionNumber == device_pool->collection) + { + SET_REPORT_ID( device_pool ); + if (instance->wUsage == PID_USAGE_DEVICE_MANAGED_POOL) + device_pool->device_managed_caps = caps; + } + if (instance->wCollectionNumber == block_free->collection) + SET_REPORT_ID( block_free ); + if (instance->wCollectionNumber == block_load->collection) + SET_REPORT_ID( block_load ); + if (instance->wCollectionNumber == block_load->status_coll) + SET_REPORT_ID( block_load ); + if (instance->wCollectionNumber == new_effect->collection) + SET_REPORT_ID( new_effect ); + if (instance->wCollectionNumber == new_effect->type_coll) + SET_REPORT_ID( new_effect ); #undef SET_REPORT_ID @@ -1854,6 +1917,12 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, impl->pid_set_constant_force.collection ); TRACE( "set ramp force id %u, coll %u\n", impl->pid_set_ramp_force.id, impl->pid_set_ramp_force.collection ); TRACE( "device gain id %u, coll %u\n", impl->pid_device_gain.id, impl->pid_device_gain.collection ); + TRACE( "device pool id %u, coll %u\n", impl->pid_device_pool.id, impl->pid_device_pool.collection ); + TRACE( "block free id %u, coll %u\n", impl->pid_block_free.id, impl->pid_block_free.collection ); + TRACE( "block load id %u, coll %u, status_coll %u\n", impl->pid_block_load.id, + impl->pid_block_load.collection, impl->pid_block_load.status_coll ); + TRACE( "create new effect id %u, coll %u, type_coll %u\n", impl->pid_new_effect.id, + impl->pid_new_effect.collection, impl->pid_new_effect.type_coll ); if (impl->pid_device_control.id) {

1 0

Ivo Ivanov : dinput: Write PID_USAGE_PARAMETER_BLOCK_OFFSET in the set condition report.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: b510558cb69feb67666b35ed0a3caf0553ea99c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b510558cb69feb67666b35ed… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 19 12:37:19 2021 +0100 dinput: Write PID_USAGE_PARAMETER_BLOCK_OFFSET in the set condition report. Required by the PID spec for devices with device managed blocks. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 858755140d1..21e430a819f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2765,6 +2765,10 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) case PID_USAGE_ET_FRICTION: for (i = 0; i < impl->params.cbTypeSpecificParams / sizeof(DICONDITION); ++i) { + status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_PARAMETER_BLOCK_OFFSET, + i, impl->joystick->preparsed, impl->type_specific_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue %04x:%04x returned %#x\n", + HID_USAGE_PAGE_PID, PID_USAGE_PARAMETER_BLOCK_OFFSET, status ); set_parameter_value( impl, impl->type_specific_buf, set_condition->center_point_offset_caps, impl->condition[i].lOffset ); set_parameter_value( impl, impl->type_specific_buf, set_condition->positive_coefficient_caps,

1 0

Ivo Ivanov : dinput: Support creating effects using device managed reports.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 02951f12a4a3b3110756cda8bfd6bd3e1dbb44fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02951f12a4a3b3110756cda8… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 19 12:37:20 2021 +0100 dinput: Support creating effects using device managed reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 81 ++++++++++++++++++++++++++++++++++++++++------ dlls/dinput8/tests/hid.c | 3 -- 2 files changed, 72 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 21e430a819f..3d90e721fb6 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -174,6 +174,7 @@ struct hid_joystick char *input_report_buf; char *output_report_buf; + char *feature_report_buf; USAGE_AND_PAGE *usages_buf; ULONG usages_count; @@ -401,15 +402,54 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance ) } } -static HRESULT find_next_effect_id( struct hid_joystick *impl, ULONG *index ) +static HRESULT find_next_effect_id( struct hid_joystick *impl, DWORD *index, USAGE type ) { - ULONG i; + struct pid_device_pool *device_pool = &impl->pid_device_pool; + struct pid_new_effect *new_effect = &impl->pid_new_effect; + struct pid_block_load *block_load = &impl->pid_block_load; + ULONG i, count, report_len = impl->caps.FeatureReportByteLength; + NTSTATUS status; + USAGE usage; + + if (!device_pool->device_managed_caps) + { + for (i = 0; i < ARRAY_SIZE(impl->effect_inuse); ++i) + if (!impl->effect_inuse[i]) break; + if (i == ARRAY_SIZE(impl->effect_inuse)) return DIERR_DEVICEFULL; + impl->effect_inuse[i] = TRUE; + *index = i + 1; + } + else + { + status = HidP_InitializeReportForID( HidP_Feature, new_effect->id, impl->preparsed, + impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + count = 1; + status = HidP_SetUsages( HidP_Feature, HID_USAGE_PAGE_PID, new_effect->type_coll, + &type, &count, impl->preparsed, impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + if (!HidD_SetFeature( impl->device, impl->feature_report_buf, report_len )) return DIERR_INPUTLOST; - for (i = 0; i < ARRAY_SIZE(impl->effect_inuse); ++i) - if (!impl->effect_inuse[i]) break; - if (i == ARRAY_SIZE(impl->effect_inuse)) return DIERR_DEVICEFULL; - impl->effect_inuse[i] = TRUE; - *index = i + 1; + status = HidP_InitializeReportForID( HidP_Feature, block_load->id, impl->preparsed, + impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + if (!HidD_GetFeature( impl->device, impl->feature_report_buf, report_len )) return DIERR_INPUTLOST; + + count = 1; + status = HidP_GetUsages( HidP_Feature, HID_USAGE_PAGE_PID, block_load->status_coll, + &usage, &count, impl->preparsed, impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + if (count != 1 || usage == PID_USAGE_BLOCK_LOAD_ERROR) return DIERR_INPUTLOST; + if (usage == PID_USAGE_BLOCK_LOAD_FULL) return DIERR_DEVICEFULL; + + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + index, impl->preparsed, impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + } return DI_OK; } @@ -736,6 +776,7 @@ static void hid_joystick_release( IDirectInputDevice8W *iface ) if (!ref) { free( impl->usages_buf ); + free( impl->feature_report_buf ); free( impl->output_report_buf ); free( impl->input_report_buf ); HidD_FreePreparsedData( impl->preparsed ); @@ -1897,6 +1938,9 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, size = impl->caps.OutputReportByteLength; if (!(buffer = malloc( size ))) goto failed; impl->output_report_buf = buffer; + size = impl->caps.FeatureReportByteLength; + if (!(buffer = malloc( size ))) goto failed; + impl->feature_report_buf = buffer; impl->usages_count = HidP_MaxUsageListLength( HidP_Input, 0, impl->preparsed ); size = impl->usages_count * sizeof(USAGE_AND_PAGE); if (!(usages = malloc( size ))) goto failed; @@ -2720,7 +2764,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((impl->flags & complete_mask) != complete_mask) hr = DIERR_INCOMPLETEEFFECT; - else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index ))) + else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index, impl->type ))) { if (!impl->type_specific_buf[0]) status = HIDP_STATUS_SUCCESS; else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, @@ -2873,7 +2917,11 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) { struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); struct hid_joystick *joystick = impl->joystick; + struct pid_device_pool *device_pool = &joystick->pid_device_pool; + struct pid_block_free *block_free = &joystick->pid_block_free; + ULONG report_len = joystick->caps.OutputReportByteLength; HRESULT hr = DI_OK; + NTSTATUS status; TRACE( "iface %p\n", iface ); @@ -2882,7 +2930,22 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) hr = DI_NOEFFECT; else if (SUCCEEDED(hr = IDirectInputEffect_Stop( iface ))) { - impl->joystick->effect_inuse[impl->index - 1] = FALSE; + if (!device_pool->device_managed_caps) + joystick->effect_inuse[impl->index - 1] = FALSE; + else if (block_free->id) + { + status = HidP_InitializeReportForID( HidP_Output, block_free->id, joystick->preparsed, + joystick->output_report_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, joystick->preparsed, joystick->output_report_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else if (WriteFile( joystick->device, joystick->output_report_buf, report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + } + impl->index = 0; } LeaveCriticalSection( &joystick->base.crit ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f7c8001881d..cbb202530ac 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8445,7 +8445,6 @@ static void test_device_managed_effect(void) .report_id = 9, .report_len = 2, .report_buf = {9,0x03}, - .todo = TRUE, }, /* block load */ { @@ -8453,7 +8452,6 @@ static void test_device_managed_effect(void) .report_id = 10, .report_len = 3, .report_buf = {10,0x01,0x01}, - .todo = TRUE, }, /* set condition */ { @@ -8492,7 +8490,6 @@ static void test_device_managed_effect(void) .report_id = 11, .report_len = 2, .report_buf = {11,0x01}, - .todo = TRUE, }, }; static const DWORD expect_axes[3] =

1 0