December 2021 - Wine-Commits

Zebediah Figura : configure: Try to detect MinGW libmpg123 using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 3869f5e6b1a10694dc66f3e473cabd4288c2be08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3869f5e6b1a10694dc66f3e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:42 2021 -0600 configure: Try to detect MinGW libmpg123 using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ 2 files changed, 119 insertions(+) diff --git a/configure b/configure index 9a6a1aa868a..5948756e7ae 100755 --- a/configure +++ b/configure @@ -12684,6 +12684,116 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|liblcms2 ${notice_platform}MinGW development files not found; using bundled version." fi + if ${MPG123_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + MPG123_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libmpg123 2>/dev/null` +fi +fi +if ${MPG123_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + MPG123_PE_LIBS=`$MINGW_PKG_CONFIG --libs libmpg123 2>/dev/null` +fi +fi +MPG123_PE_LIBS=${MPG123_PE_LIBS:-"-lmpg123"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $MPG123_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW mpg123.h" >&5 +printf %s "checking for MinGW mpg123.h... " >&6; } +if test ${ac_cv_mingw_header_mpg123_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <mpg123.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_mpg123_h=yes +else $as_nop + ac_cv_mingw_header_mpg123_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_mpg123_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_mpg123_h" >&6; } +if test "x$ac_cv_mingw_header_mpg123_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in MinGW -lmpg123" >&5 +printf %s "checking for mpg123_feed in MinGW -lmpg123... " >&6; } +if test ${ac_cv_mingw_lib_mpg123+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lmpg123 $MPG123_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char mpg123_feed (); +int +main (void) +{ +return mpg123_feed (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_mpg123=yes +else $as_nop + ac_cv_mingw_lib_mpg123=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_mpg123" >&5 +printf "%s\n" "$ac_cv_mingw_lib_mpg123" >&6; } +if test "x$ac_cv_mingw_lib_mpg123" = xyes +then : + : +else $as_nop + MPG123_PE_CFLAGS=""; MPG123_PE_LIBS="" +fi +else $as_nop + MPG123_PE_CFLAGS=""; MPG123_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$MPG123_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libmpg123 ${notice_platform}MinGW development files not found (or too old); using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index 2a9a397ec01..2fe4b186fd6 100644 --- a/configure.ac +++ b/configure.ac @@ -1064,6 +1064,15 @@ then WINE_NOTICE([liblcms2 ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(MPG123,[libmpg123],[-lmpg123], + [WINE_CHECK_MINGW_HEADER(mpg123.h, + [WINE_CHECK_MINGW_LIB(mpg123,mpg123_feed,[:],[MPG123_PE_CFLAGS=""; MPG123_PE_LIBS=""],[$MPG123_PE_LIBS])], + [MPG123_PE_CFLAGS=""; MPG123_PE_LIBS=""])]) + if test "x$MPG123_PE_LIBS" = "x" + then + WINE_NOTICE([libmpg123 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Rémi Bernon : dinput8/tests: Add more effect direction tests.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 8feeb883e13121bc592885e49f21697c1cc5c3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8feeb883e13121bc592885e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:42 2021 +0100 dinput8/tests: Add more effect direction tests. Making sure we are actually writing the correctly values to PID reports, regardless of user provided coordinate space. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 14 +++++- dlls/dinput8/tests/hid.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 99fe98d95ce..49a8f28e864 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2764,6 +2764,13 @@ static void set_parameter_value_us( struct hid_joystick_effect *impl, char *repo set_parameter_value( impl, report_buf, caps, value ); } +static BOOL is_axis_usage_enabled( struct hid_joystick_effect *impl, USAGE usage ) +{ + DWORD i = impl->params.cAxes; + while (i--) if (LOWORD(impl->params.rgdwAxes[i]) == usage) return TRUE; + return FALSE; +} + static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) { static const DWORD complete_mask = DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS; @@ -2937,7 +2944,12 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) spherical.rglDirection = directions; convert_directions_to_spherical( &impl->params, &spherical ); - for (i = 0; i < min( effect_update->direction_count, spherical.cAxes ); ++i) + /* FIXME: as far as the test cases go, directions are only written if + * either X or Y axes are enabled, maybe need more tests though */ + if (!is_axis_usage_enabled( impl, HID_USAGE_GENERIC_X ) && + !is_axis_usage_enabled( impl, HID_USAGE_GENERIC_Y )) + WARN( "neither X or Y axes are selected, skipping direction\n" ); + else for (i = 0; i < min( effect_update->direction_count, spherical.cAxes ); ++i) { tmp = directions[i] + (i == 0 ? 9000 : 0); caps = effect_update->direction_caps[effect_update->direction_count - i - 1]; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d9ecf4a5dd5..2efa817f00e 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6357,6 +6357,54 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO for (i = 1; i < 4; i++) { + struct hid_expect expect_directions[] = + { + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 5, + .report_len = 2, + .report_buf = {0x05,0x19}, + }, + /* set envelope */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 7, + .report_buf = {0x06,0x19,0x4c,0x02,0x00,0x04,0x00}, + }, + /* update effect */ + {0}, + /* effect control */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {0x02,0x01,0x03,0x00}, + }, + }; + struct hid_expect expect_spherical = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x55 : 0,i >= 3 ? 0x1c : 0}, + }; + struct hid_expect expect_cartesian = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x63 : 0,i >= 3 ? 0x1d : 0}, + }; + struct hid_expect expect_polar = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x3f : 0,i >= 3 ? 0x00 : 0}, + }; + winetest_push_context( "%u axes", i ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); @@ -6465,6 +6513,61 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); + + desc = expect_desc; + desc.dwFlags = DIEFF_SPHERICAL | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 3000; + desc.rglDirection[1] = 4000; + desc.rglDirection[2] = 5000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_spherical; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + + desc = expect_desc; + desc.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 6000; + desc.rglDirection[1] = 7000; + desc.rglDirection[2] = 8000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_cartesian; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + + if (i == 2) + { + desc = expect_desc; + desc.dwFlags = DIEFF_POLAR | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 9000; + desc.rglDirection[1] = 10000; + desc.rglDirection[2] = 11000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_polar; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + } + winetest_pop_context(); }

1 0

Rémi Bernon : winebus.sys: Rotate directions to match the backend conventions.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: b431dceeca9aa0d4229c3597b833bcaf04de7110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b431dceeca9aa0d4229c3597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:43 2021 +0100 winebus.sys: Rotate directions to match the backend conventions. The first direction in HID PID reports seems to be in polar space, rotated by 90° compared to the spherical coordinate space used in dinput. We need to fixup the directions to match Linux FF or SDL direction coordinate space. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 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 | 11 ++++++++--- dlls/winebus.sys/bus_udev.c | 11 +++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 003f6652f05..254971e1185 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -565,6 +565,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT struct sdl_device *impl = impl_from_unix_device(iface); int id = impl->effect_ids[index]; SDL_HapticEffect effect = {0}; + UINT16 direction; NTSTATUS status; TRACE("iface %p, index %u, params %p.\n", iface, index, params); @@ -572,6 +573,10 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT if (params->effect_type == PID_USAGE_UNDEFINED) return STATUS_SUCCESS; if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; + /* The first direction we get from PID is in polar coordinate space, so we need to + * remove 90° to make it match SDL spherical coordinates. */ + direction = (params->direction[0] - 9000) % 36000; + switch (params->effect_type) { case PID_USAGE_ET_SINE: @@ -584,7 +589,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.periodic.button = params->trigger_button; effect.periodic.interval = params->trigger_repeat_interval; effect.periodic.direction.type = SDL_HAPTIC_SPHERICAL; - effect.periodic.direction.dir[0] = params->direction[0]; + effect.periodic.direction.dir[0] = direction; effect.periodic.direction.dir[1] = params->direction[1]; effect.periodic.period = params->periodic.period; effect.periodic.magnitude = params->periodic.magnitude; @@ -605,7 +610,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.condition.button = params->trigger_button; effect.condition.interval = params->trigger_repeat_interval; effect.condition.direction.type = SDL_HAPTIC_SPHERICAL; - effect.condition.direction.dir[0] = params->direction[0]; + effect.condition.direction.dir[0] = direction; effect.condition.direction.dir[1] = params->direction[1]; if (params->condition_count >= 1) { @@ -633,7 +638,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.constant.button = params->trigger_button; effect.constant.interval = params->trigger_repeat_interval; effect.constant.direction.type = SDL_HAPTIC_SPHERICAL; - effect.constant.direction.dir[0] = params->direction[0]; + effect.constant.direction.dir[0] = direction; effect.constant.direction.dir[1] = params->direction[1]; effect.constant.level = params->constant_force.magnitude; effect.constant.attack_length = params->envelope.attack_time; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 521ae4192b5..2ec15ecb6ad 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1031,8 +1031,15 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B effect.replay.delay = params->start_delay; effect.trigger.button = params->trigger_button; effect.trigger.interval = params->trigger_repeat_interval; - /* only supports polar with one direction angle */ - effect.direction = params->direction[0] * 0x800 / 1125; + + /* Linux FF only supports polar direction, and uses an inverted convention compared + * to SDL or dinput (see SDL src/haptic/linux/SDL_syshaptic.c), where the force pulls + * into the specified direction, instead of coming from it. + * + * The first direction we get from PID is in polar coordinate space, so we need to + * add 180° to make it match Linux coordinates. */ + effect.direction = (params->direction[0] + 18000) % 36000; + effect.direction = effect.direction * 0x800 / 1125; switch (params->effect_type) {

1 0

Rémi Bernon : winebus.sys: Add a PID effect state input report.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: c42933f5ecd580d301e334ece0ddde6465409a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c42933f5ecd580d301e334ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:45 2021 +0100 winebus.sys: Add a PID effect state input report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 18 ++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index beb2ebe8ad9..29d5debcfe2 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -475,6 +475,12 @@ struct pid_set_ramp_force INT16 ramp_start; INT16 ramp_end; }; + +struct pid_effect_state +{ + BYTE flags; + BYTE index; +}; #include "poppack.h" static BOOL hid_descriptor_add_set_periodic(struct unix_device *iface) @@ -883,6 +889,33 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co UNIT(1, 0), /* None */ END_COLLECTION, }; + + const BYTE effect_state_report = ++desc->next_report_id[HidP_Input]; + const BYTE effect_state_template[] = + { + /* Report effect state */ + USAGE(1, PID_USAGE_STATE_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, effect_state_report), + + USAGE(1, PID_USAGE_DEVICE_PAUSED), + USAGE(1, PID_USAGE_ACTUATORS_ENABLED), + USAGE(1, PID_USAGE_EFFECT_PLAYING), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + }; + struct hid_effect_state *effect_state = &iface->hid_physical.effect_state; BOOL periodic = FALSE; BOOL envelope = FALSE; BOOL condition = FALSE; @@ -953,6 +986,9 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co if (ramp_force && !hid_descriptor_add_set_ramp_force(iface)) return FALSE; + if (!hid_report_descriptor_append(desc, effect_state_template, sizeof(effect_state_template))) + return FALSE; + /* HID nary collection indexes start at 1 */ memcpy(iface->hid_physical.effect_types + 1, usages, count * sizeof(*usages)); @@ -960,6 +996,12 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co iface->hid_physical.device_gain_report = device_gain_report; iface->hid_physical.effect_control_report = effect_control_report; iface->hid_physical.effect_update_report = effect_update_report; + + effect_state->id = effect_state_report; + effect_state->report_len = sizeof(struct pid_effect_state) + 1; + if (!(effect_state->report_buf = calloc(1, effect_state->report_len))) return FALSE; + effect_state->report_buf[0] = effect_state->id; + return TRUE; } diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 10784652a2b..564fec9fc3a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -151,6 +151,22 @@ struct hid_haptics BYTE waveform_report; }; +/* must match the order and number of usages in the + * PID_USAGE_STATE_REPORT report */ +enum effect_state_flags +{ + EFFECT_STATE_DEVICE_PAUSED = 0x01, + EFFECT_STATE_ACTUATORS_ENABLED = 0x02, + EFFECT_STATE_EFFECT_PLAYING = 0x04, +}; + +struct hid_effect_state +{ + USHORT report_len; + BYTE *report_buf; + BYTE id; +}; + struct hid_physical { USAGE effect_types[32]; @@ -165,6 +181,8 @@ struct hid_physical BYTE set_condition_report; BYTE set_constant_force_report; BYTE set_ramp_force_report; + + struct hid_effect_state effect_state; }; struct hid_device_state

1 0

Zebediah Figura : configure: Try to detect MinGW zlib using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 9ac28955cfb3a56f891dd537cca1c65df8474c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac28955cfb3a56f891dd537… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:38 2021 -0600 configure: Try to detect MinGW zlib using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 69 ++++++++++++++++++++++++ configure | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 +++++ 3 files changed, 250 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 07a0359a3f1..a8d1ecad275 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -64,6 +64,15 @@ AC_CHECK_TOOL(READELF,[readelf],true)]) AC_DEFUN([WINE_PATH_PKG_CONFIG], [WINE_CHECK_HOST_TOOL(PKG_CONFIG,[pkg-config])]) +AC_DEFUN([WINE_PATH_MINGW_PKG_CONFIG], +[case "$host_cpu" in + i[[3456789]]86*) + ac_prefix_list="m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-pkg-config ])" ;; + *) + ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;; +esac +AC_CHECK_PROGS(MINGW_PKG_CONFIG,[$ac_prefix_list],false)]) + dnl **** Extract the soname of a library **** dnl dnl Usage: WINE_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) @@ -124,6 +133,28 @@ CPPFLAGS=$ac_save_CPPFLAGS AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl +dnl **** Get flags from MinGW pkg-config or alternate xxx-config program **** +dnl +dnl Usage: WINE_MINGW_PACKAGE_FLAGS(var,pkg-name,[default-lib,[checks]]) +dnl +AC_DEFUN([WINE_MINGW_PACKAGE_FLAGS], +[AC_REQUIRE([WINE_PATH_MINGW_PKG_CONFIG])dnl +AS_VAR_PUSHDEF([ac_cflags],[[$1]_PE_CFLAGS])dnl +AS_VAR_PUSHDEF([ac_libs],[[$1]_PE_LIBS])dnl +AS_VAR_IF([ac_cflags],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_cflags=`$MINGW_PKG_CONFIG --cflags [$2] 2>/dev/null`])]) +AS_VAR_IF([ac_libs],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_libs=`$MINGW_PKG_CONFIG --libs [$2] 2>/dev/null`])]) +m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $ac_cflags" +$4 +CPPFLAGS=$ac_save_CPPFLAGS +AS_VAR_POPDEF([ac_libs])dnl +AS_VAR_POPDEF([ac_cflags])])dnl + dnl **** Get flags for an external lib program **** dnl dnl Usage: WINE_EXTLIB_FLAGS(var,pkg-name,default-libs,default-cflags) @@ -189,6 +220,44 @@ ac_exeext=$ac_wine_try_cflags_saved_exeext]) AS_VAR_IF([ac_var],[yes],[m4_default([$2], [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS $1"])], [$3])dnl AS_VAR_POPDEF([ac_var])]) +dnl **** Check whether the given MinGW header is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_HEADER(header,[action-if-found],[action-if-not-found],[other-includes]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_HEADER], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_header_$1])dnl +AC_CACHE_CHECK([for MinGW $1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4 +#include <$1>]])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext]) +AS_VAR_IF([ac_var],[yes],[$2],[$3])dnl +AS_VAR_POPDEF([ac_var])]) + +dnl **** Check whether the given MinGW library is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_LIB(library,function,[action-if-found],[action-if-not-found],[other-libraries]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_LIB], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_lib_$1])dnl +AC_CACHE_CHECK([for $2 in MinGW -l$1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-l$1 $5 $LIBS" +AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs]) +AS_VAR_IF([ac_var],[yes],[$3],[$4])dnl +AS_VAR_POPDEF([ac_var])]) + dnl **** Check if we can link an empty shared lib (no main) with special CFLAGS **** dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) diff --git a/configure b/configure index 8e3ec2a1363..990d28a37fc 100755 --- a/configure +++ b/configure @@ -734,6 +734,7 @@ GSM_PE_LIBS GSM_PE_CFLAGS FAUDIO_PE_LIBS FAUDIO_PE_CFLAGS +MINGW_PKG_CONFIG EXCESS_PRECISION_CFLAGS CROSSDEBUG DELAYLOADFLAG @@ -12296,6 +12297,173 @@ esac fi +if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" +then + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-w64-mingw32-pkg-config i586-w64-mingw32-pkg-config i486-w64-mingw32-pkg-config i386-w64-mingw32-pkg-config " ;; + *) + ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;; +esac +for ac_prog in $ac_prefix_list +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MINGW_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$MINGW_PKG_CONFIG"; then + ac_cv_prog_MINGW_PKG_CONFIG="$MINGW_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_MINGW_PKG_CONFIG="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MINGW_PKG_CONFIG=$ac_cv_prog_MINGW_PKG_CONFIG +if test -n "$MINGW_PKG_CONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MINGW_PKG_CONFIG" >&5 +printf "%s\n" "$MINGW_PKG_CONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$MINGW_PKG_CONFIG" && break +done +test -n "$MINGW_PKG_CONFIG" || MINGW_PKG_CONFIG="false" + +if ${ZLIB_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + ZLIB_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags zlib 2>/dev/null` +fi +fi +if ${ZLIB_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + ZLIB_PE_LIBS=`$MINGW_PKG_CONFIG --libs zlib 2>/dev/null` +fi +fi +ZLIB_PE_LIBS=${ZLIB_PE_LIBS:-"-lz"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $ZLIB_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW zlib.h" >&5 +printf %s "checking for MinGW zlib.h... " >&6; } +if test ${ac_cv_mingw_header_zlib_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <zlib.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_zlib_h=yes +else $as_nop + ac_cv_mingw_header_zlib_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_zlib_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_zlib_h" >&6; } +if test "x$ac_cv_mingw_header_zlib_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inflate in MinGW -lz" >&5 +printf %s "checking for inflate in MinGW -lz... " >&6; } +if test ${ac_cv_mingw_lib_z+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lz $ZLIB_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char inflate (); +int +main (void) +{ +return inflate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_z=yes +else $as_nop + ac_cv_mingw_lib_z=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_z" >&5 +printf "%s\n" "$ac_cv_mingw_lib_z" >&6; } +if test "x$ac_cv_mingw_lib_z" = xyes +then : + : +else $as_nop + ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS="" +fi +else $as_nop + ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$ZLIB_PE_LIBS" = "x" + then + as_fn_append wine_notices "|zlib ${notice_platform}MinGW development files not found; using bundled version." + fi +fi + if ${FAUDIO_PE_LIBS:+false} : then : FAUDIO_PE_LIBS="faudio mfplat mfreadwrite mfuuid propsys" @@ -22958,6 +23126,7 @@ CROSSLDFLAGS = $CROSSLDFLAGS DELAYLOADFLAG = $DELAYLOADFLAG CROSSDEBUG = $CROSSDEBUG EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS +MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS GSM_PE_CFLAGS = $GSM_PE_CFLAGS diff --git a/configure.ac b/configure.ac index 9d88ea7cf6e..ef542dee171 100644 --- a/configure.ac +++ b/configure.ac @@ -1033,6 +1033,18 @@ WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], dnl **** External libraries **** +if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" +then + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], + [WINE_CHECK_MINGW_HEADER(zlib.h, + [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])], + [ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""])]) + if test "x$ZLIB_PE_LIBS" = "x" + then + WINE_NOTICE([zlib ${notice_platform}MinGW development files not found; using bundled version.]) + fi +fi + WINE_EXTLIB_FLAGS(FAUDIO, faudio, "faudio mfplat mfreadwrite mfuuid propsys", "-I\$(top_srcdir)/libs/faudio/include") WINE_EXTLIB_FLAGS(GSM, gsm, gsm, "-I\$(top_srcdir)/libs/gsm/inc") WINE_EXTLIB_FLAGS(JPEG, jpeg, jpeg, "-I\$(top_srcdir)/libs/jpeg")

1 0

Alexandre Julliard : ntdll: Add fallback implementations for the Unix library functions.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: d10410eac2b598699a3619d6e3f908e256af3afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10410eac2b598699a3619d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:40 2021 +0100 ntdll: Add fallback implementations for the Unix library functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/loader.c | 8 ++++---- dlls/ntdll/unixlib.h | 15 ++++++--------- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 665c4480ad4..c33acd71759 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -76,8 +76,6 @@ static DWORD (WINAPI *pCtrlRoutine)(void *); SYSTEM_DLL_INIT_BLOCK LdrSystemDllInitBlock = { 0xf0 }; -const struct unix_funcs *unix_funcs = NULL; - /* windows directory */ const WCHAR windows_dir[] = L"C:\\windows"; /* system directory with trailing backslash */ @@ -4443,6 +4441,44 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } +static NTSTATUS CDECL load_so_dll_fallback( UNICODE_STRING *nt_name, void **module ) +{ + return STATUS_INVALID_IMAGE_FORMAT; +} + +static void CDECL init_builtin_dll_fallback( void *module ) +{ +} + +static NTSTATUS CDECL init_unix_lib_fallback( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + return STATUS_DLL_NOT_FOUND; +} + +static NTSTATUS CDECL unwind_builtin_dll_fallback( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, + CONTEXT *context ) +{ + return STATUS_UNSUCCESSFUL; +} + +static LONGLONG WINAPI RtlGetSystemTimePrecise_fallback(void) +{ + LARGE_INTEGER now; + NtQuerySystemTime( &now ); + return now.QuadPart; +} + +static const struct unix_funcs unix_fallbacks = +{ + load_so_dll_fallback, + init_builtin_dll_fallback, + init_unix_lib_fallback, + unwind_builtin_dll_fallback, + RtlGetSystemTimePrecise_fallback, +}; + +const struct unix_funcs *unix_funcs = &unix_fallbacks; + /*********************************************************************** * __wine_set_unix_funcs */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 61041061b32..82d099de3be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2156,14 +2156,14 @@ static ULONG_PTR get_image_address(void) */ static struct unix_funcs unix_funcs = { -#ifdef __aarch64__ - NtCurrentTeb, -#endif - RtlGetSystemTimePrecise, load_so_dll, init_builtin_dll, init_unix_lib, unwind_builtin_dll, + RtlGetSystemTimePrecise, +#ifdef __aarch64__ + NtCurrentTeb, +#endif }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 803b6a082bb..d60f8cc50e4 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,24 +26,21 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 132 +#define NTDLL_UNIXLIB_VERSION 133 struct unix_funcs { - /* Nt* functions */ -#ifdef __aarch64__ - TEB * (WINAPI *NtCurrentTeb)(void); -#endif - - /* other Win32 API functions */ - LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); - /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); + /* other Win32 API functions */ + LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); +#ifdef __aarch64__ + TEB * (WINAPI *NtCurrentTeb)(void); +#endif }; #endif /* __NTDLL_UNIXLIB_H */

1 0

Alexandre Julliard : wow64: Map the parent process handle in NtCreateUserProcess().
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: be6ccdf51c98a45b661b12548bda60f8daf572b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6ccdf51c98a45b661b1254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:01 2021 +0100 wow64: Map the parent process handle in NtCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index fbe501ed034..50562390860 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -213,6 +213,10 @@ static PS_ATTRIBUTE_LIST *ps_attributes_32to64( PS_ATTRIBUTE_LIST **attr, const LongToHandle( ((LONG *)ULongToPtr(attr32->Attributes[i].Value))[j] ); } break; + case PS_ATTRIBUTE_PARENT_PROCESS: + ret->Attributes[i].Size = sizeof(HANDLE); + ret->Attributes[i].ValuePtr = LongToHandle( attr32->Attributes[i].Value ); + break; case PS_ATTRIBUTE_CLIENT_ID: ret->Attributes[i].Size = sizeof(CLIENT_ID); ret->Attributes[i].ValuePtr = Wow64AllocateTemp( ret->Attributes[i].Size );

1 0

Alexandre Julliard : wow64: Add support for user callbacks.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 716599703671fe0e003c022a21f39621fe064d67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=716599703671fe0e003c022a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:08 2021 +0100 wow64: Add support for user callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/wow64.spec | 2 +- include/winternl.h | 7 ++-- 4 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index bee186456cc..75a5df5c453 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -70,6 +70,18 @@ struct mem_header BYTE data[1]; }; +/* stack frame for user callbacks */ +struct user_callback_frame +{ + struct user_callback_frame *prev_frame; + struct mem_header *temp_list; + void **ret_ptr; + ULONG *ret_len; + NTSTATUS status; + __wine_jmp_buf jmpbuf; +}; + + SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; /* wow64win syscall table */ @@ -143,6 +155,26 @@ NTSTATUS WINAPI wow64_NtAllocateUuids( UINT *args ) } +/*********************************************************************** + * wow64_NtCallbackReturn + */ +NTSTATUS WINAPI wow64_NtCallbackReturn( UINT *args ) +{ + void *ret_ptr = get_ptr( &args ); + ULONG ret_len = get_ulong( &args ); + NTSTATUS status = get_ulong( &args ); + + struct user_callback_frame *frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; + + if (!frame) return STATUS_NO_CALLBACK_ACTIVE; + + *frame->ret_ptr = ret_ptr; + *frame->ret_len = ret_len; + frame->status = status; + __wine_longjmp( &frame->jmpbuf, 1 ); +} + + /********************************************************************** * wow64_NtClose */ @@ -793,6 +825,86 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON } +/********************************************************************** + * Wow64KiUserCallbackDispatcher (wow64.@) + */ +NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, + void **ret_ptr, ULONG *ret_len ) +{ + struct user_callback_frame frame; + + frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; + frame.temp_list = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; + frame.ret_ptr = ret_ptr; + frame.ret_len = ret_len; + + NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = &frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = NULL; + + /* cf. 32-bit KeUserModeCallback */ + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT orig_ctx, ctx = { CONTEXT_I386_FULL }; + void *args_data; + ULONG *stack; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + + stack = args_data = ULongToPtr( (ctx.Esp - len) & ~15 ); + memcpy( args_data, args, len ); + *(--stack) = 0; + *(--stack) = len; + *(--stack) = PtrToUlong( args_data ); + *(--stack) = id; + *(--stack) = 0xdeadbabe; + + orig_ctx = ctx; + ctx.Esp = PtrToUlong( stack ); + ctx.Eip = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + + if (!__wine_setjmpex( &frame.jmpbuf, NULL )) + cpu_simulate(); + else + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, + &orig_ctx, sizeof(orig_ctx) ); + } + break; + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT orig_ctx, ctx = { CONTEXT_ARM_FULL }; + void *args_data; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + + args_data = ULongToPtr( (ctx.Sp - len) & ~15 ); + memcpy( args_data, args, len ); + + ctx.R0 = id; + ctx.R1 = PtrToUlong( args ); + ctx.R2 = len; + ctx.Sp = PtrToUlong( args_data ); + ctx.Pc = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + + if (!__wine_setjmpex( &frame.jmpbuf, NULL )) + cpu_simulate(); + else + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, + &orig_ctx, sizeof(orig_ctx) ); + } + break; + } + + NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; + return frame.status; +} + + /********************************************************************** * Wow64LdrpInitialize (wow64.@) */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index cb8fed9b99c..1e122e97314 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -37,6 +37,7 @@ SYSCALL_ENTRY( NtAllocateVirtualMemoryEx ) \ SYSCALL_ENTRY( NtAreMappedFilesTheSame ) \ SYSCALL_ENTRY( NtAssignProcessToJobObject ) \ + SYSCALL_ENTRY( NtCallbackReturn ) \ SYSCALL_ENTRY( NtCancelIoFile ) \ SYSCALL_ENTRY( NtCancelIoFileEx ) \ SYSCALL_ENTRY( NtCancelTimer ) \ diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 5c3f39c50f1..e05a608d319 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -9,7 +9,7 @@ @ stub Wow64GetWow64ImageOption @ stub Wow64IsControlFlowGuardEnforced @ stub Wow64IsStackExtentsCheckEnforced -@ stub Wow64KiUserCallbackDispatcher +@ stdcall Wow64KiUserCallbackDispatcher(long ptr long ptr ptr) @ stdcall Wow64LdrpInitialize(ptr) @ stub Wow64LogPrint @ stub Wow64NotifyUnsimulateComplete diff --git a/include/winternl.h b/include/winternl.h index 5c2a1c07aeb..5b6ba98be42 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1080,9 +1080,10 @@ typedef struct _TEB64 } TEB64; /* reserved TEB64 TLS slots for Wow64 */ -#define WOW64_TLS_CPURESERVED 1 -#define WOW64_TLS_TEMPLIST 3 -#define WOW64_TLS_FILESYSREDIR 8 +#define WOW64_TLS_CPURESERVED 1 +#define WOW64_TLS_TEMPLIST 3 +#define WOW64_TLS_USERCALLBACKDATA 5 +#define WOW64_TLS_FILESYSREDIR 8 /***********************************************************************

1 0

Huw Davies : netapi32: Return the length in characters not bytes.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 8a02f6dd0af647c4c804f0bbb0e768d994072ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a02f6dd0af647c4c804f0bb… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 07:46:17 2021 +0000 netapi32: Return the length in characters not bytes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 23881b470d9..c6b389950f7 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -72,7 +72,7 @@ static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) static DWORD netapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) { - if (!dst) return (strlen( src ) + 1) * sizeof(WCHAR); + if (!dst) return strlen( src ) + 1; return ntdll_umbstowcs( src, strlen( src ) + 1, dst, dstlen ); }

1 0

Brendan Shanks : server: Remove workarounds for Mac OS X 10.4.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: f6cefaa9e0aadfab38a92aef4827d4c2e6bffbf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6cefaa9e0aadfab38a92aef… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Dec 1 13:28:19 2021 -0800 server: Remove workarounds for Mac OS X 10.4. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/server/mach.c b/server/mach.c index 77f1fdcdb86..d31e4025776 100644 --- a/server/mach.c +++ b/server/mach.c @@ -193,22 +193,12 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int else #endif { -/* work around silly renaming of struct members in OS X 10.5 */ -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) context->debug.i386_regs.dr0 = state.uds.ds32.__dr0; context->debug.i386_regs.dr1 = state.uds.ds32.__dr1; context->debug.i386_regs.dr2 = state.uds.ds32.__dr2; context->debug.i386_regs.dr3 = state.uds.ds32.__dr3; context->debug.i386_regs.dr6 = state.uds.ds32.__dr6; context->debug.i386_regs.dr7 = state.uds.ds32.__dr7; -#else - context->debug.i386_regs.dr0 = state.uds.ds32.dr0; - context->debug.i386_regs.dr1 = state.uds.ds32.dr1; - context->debug.i386_regs.dr2 = state.uds.ds32.dr2; - context->debug.i386_regs.dr3 = state.uds.ds32.dr3; - context->debug.i386_regs.dr6 = state.uds.ds32.dr6; - context->debug.i386_regs.dr7 = state.uds.ds32.dr7; -#endif } context->flags |= SERVER_CTX_DEBUG_REGISTERS; } @@ -262,7 +252,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.dsh.flavor = x86_DEBUG_STATE32; state.dsh.count = sizeof(state.uds.ds32) / sizeof(int); -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) state.uds.ds32.__dr0 = context->debug.i386_regs.dr0; state.uds.ds32.__dr1 = context->debug.i386_regs.dr1; state.uds.ds32.__dr2 = context->debug.i386_regs.dr2; @@ -271,16 +260,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds32.__dr5 = 0; state.uds.ds32.__dr6 = context->debug.i386_regs.dr6; state.uds.ds32.__dr7 = dr7; -#else - state.uds.ds32.dr0 = context->debug.i386_regs.dr0; - state.uds.ds32.dr1 = context->debug.i386_regs.dr1; - state.uds.ds32.dr2 = context->debug.i386_regs.dr2; - state.uds.ds32.dr3 = context->debug.i386_regs.dr3; - state.uds.ds32.dr4 = 0; - state.uds.ds32.dr5 = 0; - state.uds.ds32.dr6 = context->debug.i386_regs.dr6; - state.uds.ds32.dr7 = dr7; -#endif } thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); mach_port_deallocate( mach_task_self(), port );

1 0