December 2021 - Wine-Commits

Rémi Bernon : winmm: Fill and return szRegKey when index is -1.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 4258f0e79d711cd577e1b2c2882977fff2a4b3f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4258f0e79d711cd577e1b2c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:04 2021 +0100 winmm: Fill and return szRegKey when index is -1. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 39 --------------------------------------- dlls/winmm/joystick.c | 4 ++++ 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 3eb541364d3..e53afd26337 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -9765,61 +9765,33 @@ static void test_winmm_joystick(void) memset( &caps, 0xcd, sizeof(caps) ); ret = joyGetDevCapsW( -1, (JOYCAPSW *)&caps, sizeof(caps) ); - todo_wine ok( ret == 0, "joyGetDevCapsW returned %u\n", ret ); - todo_wine check_member( caps, expect_regcaps, "%#x", wMid ); - todo_wine check_member( caps, expect_regcaps, "%#x", wPid ); - todo_wine check_member_wstr( caps, expect_regcaps, szPname ); - todo_wine check_member( caps, expect_regcaps, "%#x", wXmin ); - todo_wine check_member( caps, expect_regcaps, "%#x", wXmax ); - todo_wine check_member( caps, expect_regcaps, "%#x", wYmin ); - todo_wine check_member( caps, expect_regcaps, "%#x", wYmax ); - todo_wine check_member( caps, expect_regcaps, "%#x", wZmin ); - todo_wine check_member( caps, expect_regcaps, "%#x", wZmax ); - todo_wine check_member( caps, expect_regcaps, "%#x", wNumButtons ); - todo_wine check_member( caps, expect_regcaps, "%#x", wPeriodMin ); - todo_wine check_member( caps, expect_regcaps, "%#x", wPeriodMax ); - todo_wine check_member( caps, expect_regcaps, "%#x", wRmin ); - todo_wine check_member( caps, expect_regcaps, "%#x", wRmax ); - todo_wine check_member( caps, expect_regcaps, "%#x", wUmin ); - todo_wine check_member( caps, expect_regcaps, "%#x", wUmax ); - todo_wine check_member( caps, expect_regcaps, "%#x", wVmin ); - todo_wine check_member( caps, expect_regcaps, "%#x", wVmax ); - todo_wine check_member( caps, expect_regcaps, "%#x", wCaps ); - todo_wine check_member( caps, expect_regcaps, "%#x", wMaxAxes ); - todo_wine check_member( caps, expect_regcaps, "%#x", wNumAxes ); - todo_wine check_member( caps, expect_regcaps, "%#x", wMaxButtons ); - todo_wine check_member_wstr( caps, expect_regcaps, szRegKey ); - todo_wine check_member_wstr( caps, expect_regcaps, szOEMVxD ); - todo_wine check_member_guid( caps, expect_regcaps, ManufacturerGuid ); - todo_wine check_member_guid( caps, expect_regcaps, ProductGuid ); - todo_wine check_member_guid( caps, expect_regcaps, NameGuid ); if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; @@ -9849,15 +9821,12 @@ static void test_winmm_joystick(void) check_member( caps, expect_caps, "%#x", wPid ); todo_wine check_member_wstr( caps, expect_caps, szPname ); - todo_wine check_member( caps, expect_caps, "%#x", wXmin ); todo_wine check_member( caps, expect_caps, "%#x", wXmax ); - todo_wine check_member( caps, expect_caps, "%#x", wYmin ); todo_wine check_member( caps, expect_caps, "%#x", wYmax ); - todo_wine check_member( caps, expect_caps, "%#x", wZmin ); todo_wine check_member( caps, expect_caps, "%#x", wZmax ); @@ -9865,15 +9834,12 @@ static void test_winmm_joystick(void) check_member( caps, expect_caps, "%#x", wNumButtons ); check_member( caps, expect_caps, "%#x", wPeriodMin ); check_member( caps, expect_caps, "%#x", wPeriodMax ); - todo_wine check_member( caps, expect_caps, "%#x", wRmin ); todo_wine check_member( caps, expect_caps, "%#x", wRmax ); - todo_wine check_member( caps, expect_caps, "%#x", wUmin ); todo_wine check_member( caps, expect_caps, "%#x", wUmax ); - todo_wine check_member( caps, expect_caps, "%#x", wVmin ); todo_wine check_member( caps, expect_caps, "%#x", wVmax ); @@ -9885,15 +9851,10 @@ static void test_winmm_joystick(void) check_member( caps, expect_caps, "%#x", wNumAxes ); todo_wine check_member( caps, expect_caps, "%#x", wMaxButtons ); - todo_wine check_member_wstr( caps, expect_caps, szRegKey ); - todo_wine check_member_wstr( caps, expect_caps, szOEMVxD ); - todo_wine check_member_guid( caps, expect_caps, ManufacturerGuid ); - todo_wine check_member_guid( caps, expect_caps, ProductGuid ); - todo_wine check_member_guid( caps, expect_caps, NameGuid ); ret = joyGetDevCapsW( 0, (JOYCAPSW *)&caps, sizeof(JOYCAPSW) ); diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index bb8142a29a9..234dd4db594 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -174,6 +174,10 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, U if (!caps) return MMSYSERR_INVALPARAM; if (size != sizeof(JOYCAPSW) && size != sizeof(JOYCAPS2W)) return JOYERR_PARMS; + memset( caps, 0, size ); + wcscpy( caps->szRegKey, L"DINPUT.DLL" ); + if (id == ~(UINT_PTR)0) return JOYERR_NOERROR; + if (id >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER;

1 0

Alexandre Julliard : configure: Assume that termios.h is available on Unix.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 7d5af6559104169a9fe37e557edd5e1527da62a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d5af6559104169a9fe37e55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:55:02 2021 +0100 configure: Assume that termios.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/serial.c | 2 -- include/config.h.in | 3 --- server/serial.c | 4 +--- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/configure b/configure index c2f114b9a0e..d1a52a116f4 100755 --- a/configure +++ b/configure @@ -8713,12 +8713,6 @@ if test "x$ac_cv_header_syscall_h" = xyes then : printf "%s\n" "#define HAVE_SYSCALL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" -if test "x$ac_cv_header_termios_h" = xyes -then : - printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" if test "x$ac_cv_header_unistd_h" = xyes diff --git a/configure.ac b/configure.ac index d023f77a275..d032c60e5c3 100644 --- a/configure.ac +++ b/configure.ac @@ -511,7 +511,6 @@ AC_CHECK_HEADERS(\ sys/vnode.h \ sys/wait.h \ syscall.h \ - termios.h \ unistd.h \ utime.h \ valgrind/memcheck.h \ diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 83244d02d41..ff2786ada70 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -31,9 +31,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_TERMIOS_H #include <termios.h> -#endif #include <unistd.h> #include <fcntl.h> #include <sys/stat.h> diff --git a/include/config.h.in b/include/config.h.in index 2affc4d6329..9ff8a89f888 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -751,9 +751,6 @@ /* Define to 1 if you have the `tcdrain' function. */ #undef HAVE_TCDRAIN -/* Define to 1 if you have the <termios.h> header file. */ -#undef HAVE_TERMIOS_H - /* Define to 1 if you have the `thr_kill2' function. */ #undef HAVE_THR_KILL2 diff --git a/server/serial.c b/server/serial.c index e84da228125..905bde4d69a 100644 --- a/server/serial.c +++ b/server/serial.c @@ -31,14 +31,12 @@ #include <sys/time.h> #include <sys/types.h> #include <time.h> +#include <termios.h> #include <unistd.h> #include <poll.h> #ifdef HAVE_UTIME_H #include <utime.h> #endif -#ifdef HAVE_TERMIOS_H -#include <termios.h> -#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif

1 0

Alexandre Julliard : configure: Assume that dirent.h is available on Unix.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: f8faa8ced5f57b3dad269baeae6ce522fd065a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8faa8ced5f57b3dad269bae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:53:44 2021 +0100 configure: Assume that dirent.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/nsiproxy.sys/tcp.c | 10 ++-------- dlls/win32u/freetype.c | 4 +--- dlls/wineps.drv/mkagl.c | 4 +--- include/config.h.in | 3 --- 6 files changed, 4 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 82fa88755bd..c2f114b9a0e 100755 --- a/configure +++ b/configure @@ -8251,12 +8251,6 @@ if test "x$ac_cv_header_asm_user_h" = xyes then : printf "%s\n" "#define HAVE_ASM_USER_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default" -if test "x$ac_cv_header_dirent_h" = xyes -then : - printf "%s\n" "#define HAVE_DIRENT_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" if test "x$ac_cv_header_elf_h" = xyes diff --git a/configure.ac b/configure.ac index 4fdb1ef33df..d023f77a275 100644 --- a/configure.ac +++ b/configure.ac @@ -434,7 +434,6 @@ AC_CHECK_HEADERS(\ arpa/nameser.h \ asm/types.h \ asm/user.h \ - dirent.h \ elf.h \ float.h \ gettext-po.h \ diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 1ed80afbe4b..9a089ba3de2 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -25,19 +25,13 @@ #include "config.h" #include <stdarg.h> +#include <sys/types.h> +#include <dirent.h> #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - -#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 3894478a846..48fae25a87e 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -37,9 +37,7 @@ # include <sys/mman.h> #endif #include <string.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#endif +#include <dirent.h> #include <stdio.h> #include <assert.h> #include <unistd.h> diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index d3ca67ee37d..ca9702656ae 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -19,9 +19,7 @@ #include "config.h" #include <sys/types.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#endif +#include <dirent.h> #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/include/config.h.in b/include/config.h.in index a0165765a85..2affc4d6329 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -49,9 +49,6 @@ /* Define to 1 if you have the <cups/ppd.h> header file. */ #undef HAVE_CUPS_PPD_H -/* Define to 1 if you have the <dirent.h> header file. */ -#undef HAVE_DIRENT_H - /* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H

1 0

Rémi Bernon : dinput8/tests: Add some winmm joystick input tests.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 41015a7cefa2f8d3179a306b4b42e180264d33be URL: https://source.winehq.org/git/wine.git/?a=commit;h=41015a7cefa2f8d3179a306b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:03 2021 +0100 dinput8/tests: Add some winmm joystick input tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 173 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 145 insertions(+), 28 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 3cd95582177..3eb541364d3 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -9688,21 +9688,37 @@ static void test_winmm_joystick(void) .wMaxButtons = 32, .szRegKey = L"DINPUT.DLL", }; - static const JOYINFOEX expect_infoex = - { - .dwSize = sizeof(JOYINFOEX), - .dwFlags = 0xff, - .dwXpos = 0x7fff, - .dwYpos = 0x7fff, - .dwZpos = 0x7fff, - .dwRpos = 0x7fff, - .dwUpos = 0x7fff, - .dwVpos = 0x7fff, - .dwButtons = 0, - .dwButtonNumber = 0, - .dwPOV = 0xffff, - .dwReserved1 = 0xcdcdcdcd, - .dwReserved2 = 0xcdcdcdcd, + struct hid_expect injected_input[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x00,0x00,0x00,0x08,0x00,0x10,0x00,0x18,0x00,0x20,0x00,0x28,0x00,0x30,0x00,0x38,0xf1}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x00,0x38,0x00,0x30,0x00,0x28,0x00,0x20,0x00,0x18,0x00,0x10,0x00,0x08,0x00,0x00,0x63}, + }, + }; + static const JOYINFOEX expect_infoex[] = + { + { + .dwSize = sizeof(JOYINFOEX), .dwFlags = 0xff, + .dwXpos = 0x7fff, .dwYpos = 0x7fff, .dwZpos = 0x7fff, .dwRpos = 0x7fff, .dwUpos = 0x7fff, .dwVpos = 0x7fff, + .dwButtons = 0, .dwButtonNumber = 0, .dwPOV = 0xffff, + .dwReserved1 = 0xcdcdcdcd, .dwReserved2 = 0xcdcdcdcd, + }, + { + .dwSize = sizeof(JOYINFOEX), .dwFlags = 0xff, + .dwXpos = 0, .dwYpos = 0x07ff, .dwZpos = 0x17ff, .dwRpos = 0x37ff, .dwUpos = 0x1fff, .dwVpos = 0x27ff, + .dwButtons = 0xf, .dwButtonNumber = 0x4, .dwPOV = 0, + .dwReserved1 = 0xcdcdcdcd, .dwReserved2 = 0xcdcdcdcd, + }, + { + .dwSize = sizeof(JOYINFOEX), .dwFlags = 0xff, + .dwXpos = 0x37ff, .dwYpos = 0x2fff, .dwZpos = 0x1fff, .dwRpos = 0, .dwUpos = 0x17ff, .dwVpos = 0x0fff, + .dwButtons = 0x6, .dwButtonNumber = 0x2, .dwPOV = 0x2328, + .dwReserved1 = 0xcdcdcdcd, .dwReserved2 = 0xcdcdcdcd, + }, }; static const JOYINFO expect_info = { @@ -9712,9 +9728,22 @@ static void test_winmm_joystick(void) .wButtons = 0, }; JOYINFOEX infoex = {.dwSize = sizeof(JOYINFOEX)}; + DIPROPGUIDANDPATH prop_guid_path = + { + .diph = + { + .dwSize = sizeof(DIPROPGUIDANDPATH), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + DIDEVICEINSTANCEW devinst = {0}; + IDirectInputDevice8W *device; JOYCAPS2W caps = {0}; JOYINFO info = {0}; + HANDLE event, file; + HRESULT hr; UINT ret; GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -9892,28 +9921,28 @@ static void test_winmm_joystick(void) ret = joyGetPosEx( 0, &infoex ); todo_wine ok( ret == 0, "joyGetPosEx returned %u\n", ret ); - check_member( infoex, expect_infoex, "%#x", dwSize ); - check_member( infoex, expect_infoex, "%#x", dwFlags ); + check_member( infoex, expect_infoex[0], "%#x", dwSize ); + check_member( infoex, expect_infoex[0], "%#x", dwFlags ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwXpos ); + check_member( infoex, expect_infoex[0], "%#x", dwXpos ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwYpos ); + check_member( infoex, expect_infoex[0], "%#x", dwYpos ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwZpos ); + check_member( infoex, expect_infoex[0], "%#x", dwZpos ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwRpos ); + check_member( infoex, expect_infoex[0], "%#x", dwRpos ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwUpos ); + check_member( infoex, expect_infoex[0], "%#x", dwUpos ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwVpos ); - check_member( infoex, expect_infoex, "%#x", dwButtons ); - check_member( infoex, expect_infoex, "%#x", dwButtonNumber ); + check_member( infoex, expect_infoex[0], "%#x", dwVpos ); + check_member( infoex, expect_infoex[0], "%#x", dwButtons ); + check_member( infoex, expect_infoex[0], "%#x", dwButtonNumber ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwPOV ); + check_member( infoex, expect_infoex[0], "%#x", dwPOV ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwReserved1 ); + check_member( infoex, expect_infoex[0], "%#x", dwReserved1 ); todo_wine - check_member( infoex, expect_infoex, "%#x", dwReserved2 ); + check_member( infoex, expect_infoex[0], "%#x", dwReserved2 ); infoex.dwSize = sizeof(JOYINFOEX) - 4; ret = joyGetPosEx( 0, &infoex ); @@ -9935,6 +9964,94 @@ static void test_winmm_joystick(void) check_member( info, expect_info, "%#x", wZpos ); check_member( info, expect_info, "%#x", wButtons ); + if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; + + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( event != NULL, "CreateEventW failed, last error %u\n", GetLastError() ); + hr = IDirectInputDevice8_SetEventNotification( device, event ); + ok( hr == DI_OK, "SetEventNotification returned: %#x\n", hr ); + + hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); + ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); + file = CreateFileW( prop_guid_path.wszPath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL ); + ok( file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError() ); + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + + send_hid_input( file, &injected_input[0], sizeof(struct hid_expect) ); + ret = WaitForSingleObject( event, 100 ); + ok( ret != WAIT_TIMEOUT, "WaitForSingleObject returned %#x\n", ret ); + Sleep( 50 ); /* leave some time for winmm to keep up */ + + memset( &infoex, 0xcd, sizeof(infoex) ); + infoex.dwSize = sizeof(JOYINFOEX); + infoex.dwFlags = JOY_RETURNALL; + ret = joyGetPosEx( 0, &infoex ); + todo_wine + ok( ret == 0, "joyGetPosEx returned %u\n", ret ); + check_member( infoex, expect_infoex[1], "%#x", dwSize ); + check_member( infoex, expect_infoex[1], "%#x", dwFlags ); + check_member( infoex, expect_infoex[1], "%#x", dwXpos ); + todo_wine + check_member( infoex, expect_infoex[1], "%#x", dwYpos ); + todo_wine + check_member( infoex, expect_infoex[1], "%#x", dwZpos ); + todo_wine + check_member( infoex, expect_infoex[1], "%#x", dwRpos ); + todo_wine + check_member( infoex, expect_infoex[1], "%#x", dwUpos ); + todo_wine + check_member( infoex, expect_infoex[1], "%#x", dwVpos ); + todo_wine + check_member( infoex, expect_infoex[1], "%#x", dwButtons ); + todo_wine + check_member( infoex, expect_infoex[1], "%#x", dwButtonNumber ); + check_member( infoex, expect_infoex[1], "%#x", dwPOV ); + + send_hid_input( file, &injected_input[1], sizeof(struct hid_expect) ); + ret = WaitForSingleObject( event, 100 ); + ok( ret != WAIT_TIMEOUT, "WaitForSingleObject returned %#x\n", ret ); + Sleep( 50 ); /* leave some time for winmm to keep up */ + + memset( &infoex, 0xcd, sizeof(infoex) ); + infoex.dwSize = sizeof(JOYINFOEX); + infoex.dwFlags = JOY_RETURNALL; + ret = joyGetPosEx( 0, &infoex ); + todo_wine + ok( ret == 0, "joyGetPosEx returned %u\n", ret ); + check_member( infoex, expect_infoex[2], "%#x", dwSize ); + check_member( infoex, expect_infoex[2], "%#x", dwFlags ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwXpos ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwYpos ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwZpos ); + check_member( infoex, expect_infoex[2], "%#x", dwRpos ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwUpos ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwVpos ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwButtons ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwButtonNumber ); + todo_wine + check_member( infoex, expect_infoex[2], "%#x", dwPOV ); + + ret = IDirectInputDevice8_Release( device ); + ok( ret == 0, "Release returned %d\n", ret ); + + CloseHandle( event ); + CloseHandle( file ); + done: pnp_driver_stop(); cleanup_registry_keys();

1 0

Jan Sikorski : wined3d: Decrement reference count and take the lock atomically for cached objects.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 996728315afb01d4f9ed8a81a14d812d8e866081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=996728315afb01d4f9ed8a81… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Dec 1 13:31:33 2021 +0100 wined3d: Decrement reference count and take the lock atomically for cached objects. Samplers, blend states, rasterizer states and depth stencil states can be retrieved from the cache in struct d3d_device even after the reference count reaches zero, causing memory corruption. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 3 +-- dlls/wined3d/state.c | 9 +++------ dlls/wined3d/wined3d_private.h | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index a6259bd3f82..600442ac6f3 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -34,13 +34,12 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) { - ULONG refcount = InterlockedDecrement(&sampler->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&sampler->refcount); TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) { - wined3d_mutex_lock(); sampler->parent_ops->wined3d_object_destroyed(sampler->parent); sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bc214f73b63..865c60d189e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -51,14 +51,13 @@ static void wined3d_blend_state_destroy_object(void *object) ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); wined3d_mutex_unlock(); @@ -127,14 +126,13 @@ static void wined3d_depth_stencil_state_destroy_object(void *object) ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); wined3d_mutex_unlock(); @@ -192,14 +190,13 @@ static void wined3d_rasterizer_state_destroy_object(void *object) ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b30a4108b0b..369f69913a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4155,6 +4155,26 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; +static inline ULONG wined3d_atomic_decrement_mutex_lock(volatile LONG *refcount) +{ + ULONG count, old_count = *refcount; + do + { + if ((count = old_count) == 1) + { + wined3d_mutex_lock(); + count = InterlockedDecrement(refcount); + if (count) wined3d_mutex_unlock(); + return count; + } + + old_count = InterlockedCompareExchange(refcount, count - 1, count); + } + while (old_count != count); + + return count - 1; +} + struct wined3d_client_resource { /* The resource's persistently mapped address, which we may use to perform

1 0

Dmitry Timoshkov : d2d1: Implement ID2D1Factory2::CreateStrokeStyle1().
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: ac34ebf891bb70185b30fac272b348073731520e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac34ebf891bb70185b30fac2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 6 16:29:00 2021 +0300 d2d1: Implement ID2D1Factory2::CreateStrokeStyle1(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 6 ++-- dlls/d2d1/factory.c | 35 +++++++++++++++++++--- dlls/d2d1/stroke.c | 75 ++++++++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac34ebf891bb70185b30…

1 0

Henri Verbeet : wined3d: Pass a wined3d_device_gl pointer to wined3d_device_create_primary_opengl_context_cs().
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: c22970af57bd804c5659ee51a21eab80bdbc3550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c22970af57bd804c5659ee51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 22:26:20 2021 -0600 wined3d: Pass a wined3d_device_gl pointer to wined3d_device_create_primary_opengl_context_cs(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 9864093c999..fc7a8964923 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4564,7 +4564,7 @@ static HRESULT adapter_gl_init_3d(struct wined3d_device *device) { TRACE("device %p.\n", device); - wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); + wined3d_cs_init_object(device->cs, wined3d_device_gl_create_primary_opengl_context_cs, wined3d_device_gl(device)); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!wined3d_swapchain_gl(device->swapchains[0])->context_count) return E_FAIL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c516594c269..067d54d58e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -989,17 +989,19 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) } } -void wined3d_device_create_primary_opengl_context_cs(void *object) +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) { - struct wined3d_device *device = object; + struct wined3d_device_gl *device_gl = object; struct wined3d_context_gl *context_gl; struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; + struct wined3d_device *device; HRESULT hr; - TRACE("device %p.\n", device); + TRACE("device %p.\n", device_gl); + device = &device_gl->d; swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; if (!(context = context_acquire(device, target, 0))) @@ -1032,7 +1034,7 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); + wined3d_device_gl_create_dummy_textures(device_gl, context_gl); wined3d_device_create_default_samplers(device, context); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 369f69913a8..e814cff5c39 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3920,7 +3920,6 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, @@ -3964,6 +3963,8 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo;

1 0

Alexandre Julliard : ntdll: Remove __wine_init_unix_lib() and the old Unix library interface.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 4f58d8144c5c1d3b86e988f925de7eb02c848e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f58d8144c5c1d3b86e988f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:43:56 2021 +0100 ntdll: Remove __wine_init_unix_lib() and the old Unix library interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 24 ----------- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/unix/loader.c | 98 +----------------------------------------- dlls/ntdll/unix/unix_private.h | 4 +- dlls/ntdll/unix/virtual.c | 62 +++----------------------- dlls/ntdll/unixlib.h | 3 +- dlls/winecrt0/unix_lib.c | 12 ------ include/winternl.h | 2 +- 8 files changed, 9 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f58d8144c5c1d3b86e9…

1 0

Alistair Leslie-Hughes : dbghelp: Fix possible memory leak (Coverity).
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 33308a577cb05681ce132910def1345f8681c06b URL: https://source.winehq.org/git/wine.git/?a=commit;h=33308a577cb05681ce132910… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 9 07:33:57 2021 +1100 dbghelp: Fix possible memory leak (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 67440e97fe8..7515e540778 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2314,7 +2314,10 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) * Actual thunks will be created in elf_module from the symbol table */ if (elf_is_in_thunk_area(di->unit_ctx->module_ctx->load_offset + addr_ranges[0].low, di->unit_ctx->module_ctx->thunks) >= 0) + { + free(addr_ranges); return NULL; + } ret_type = dwarf2_lookup_type(di); /* FIXME: assuming C source code */

1 0

Alistair Leslie-Hughes : wininet: Fix misleading indentation.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: ac1628c9d67ff52b836a9557797b1e6b43060147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1628c9d67ff52b836a9557… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 9 07:33:59 2021 +1100 wininet: Fix misleading indentation. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b0fe8a5e3fb..59fae2fbc95 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2887,9 +2887,10 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } else if(dwBufferLength != sizeof(ULONG)) { SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH); ret = FALSE; - } else + } else { TRACE("INTERNET_OPTION_ERROR_MASK: %x\n", *(ULONG*)lpBuffer); lpwhh->ErrorMask = *(ULONG*)lpBuffer; + } } break; case INTERNET_OPTION_PROXY:

1 0