wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Paul Gofman : ws2_32: Manage shorter length for IPV6_UNICAST_HOPS.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: ed09d9a4c0f80758e80f0c133bca491f4852edf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed09d9a4c0f80758e80f0c13… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:52 2022 +0300 ws2_32: Manage shorter length for IPV6_UNICAST_HOPS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4bb852cc103..7a4a60df8d6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1878,6 +1878,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); case IPV6_UNICAST_IF: @@ -3259,7 +3265,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, (char *)&value, sizeof(value) ); case IPV6_UNICAST_IF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87ae422f9f1..0746b07f4f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1195,6 +1195,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_RECVTCLASS, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_UNICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_RECVTCLASS.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 91aa6b2828665e18dadcb632c1c0d2a8988c2290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91aa6b2828665e18dadcb632… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:51 2022 +0300 ws2_32: Manage shorter length for IPV6_RECVTCLASS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 06b489ffd52..4bb852cc103 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1869,6 +1869,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_RECVTCLASS: + if (*optlen < sizeof(DWORD) || !optval) + { + if (optlen) *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: @@ -3245,6 +3251,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return 0; case IPV6_RECVTCLASS: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f58e86869f0..87ae422f9f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1194,6 +1194,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_RECVTCLASS, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_PKTINFO.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: adcff74cd2b00f45888b4f48bc26bf92590c9ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adcff74cd2b00f45888b4f48… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:50 2022 +0300 ws2_32: Manage shorter length for IPV6_PKTINFO. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 07f9d5b3d3d..06b489ffd52 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1860,6 +1860,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return 0; case IPV6_PKTINFO: + if (*optlen < sizeof(DWORD) || !optval) + { + *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_RECVTCLASS: @@ -3227,6 +3233,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, (char *)&value, sizeof(value) ); case IPV6_PKTINFO: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_PROTECTION_LEVEL: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3f01c54c307..f58e86869f0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1193,6 +1193,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_MULTICAST_LOOP.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 9890677b49e09456d9dd68c5faedd512d8aa6f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9890677b49e09456d9dd68c5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:49 2022 +0300 ws2_32: Manage shorter length for IPV6_MULTICAST_LOOP. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 15 ++++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f4e2f8f172c..07f9d5b3d3d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1840,6 +1840,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF, optval, optlen ); case IPV6_MULTICAST_LOOP: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); case IPV6_PROTECTION_LEVEL: @@ -3211,7 +3217,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); case IPV6_MULTICAST_LOOP: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + value = !!value; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, (char *)&value, sizeof(value) ); case IPV6_PKTINFO: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 001cfc0e98e..3f01c54c307 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1192,6 +1192,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_STREAM, IPPROTO_IPV6, IPV6_DONTFRAG, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_MULTICAST_HOPS.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 67ebbbf3368780c59f3109d89ee25d08efb8e39e URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ebbbf3368780c59f3109d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:48 2022 +0300 ws2_32: Manage shorter length for IPV6_MULTICAST_HOPS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a9e0898e2d7..f4e2f8f172c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1828,6 +1828,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT, optval, optlen ); case IPV6_MULTICAST_HOPS: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); case IPV6_MULTICAST_IF: @@ -3193,7 +3199,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT, optval, optlen ); case IPV6_MULTICAST_HOPS: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, (char *)&value, sizeof(value) ); case IPV6_MULTICAST_IF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 66bd5452046..001cfc0e98e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1191,6 +1191,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_STREAM, IPPROTO_IPV6, IPV6_DONTFRAG, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Rémi Bernon : windows.gaming.input: Always return S_OK from TryGetFactoryControllerFromGameController.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 0fc5a07770aaec7538538b29ad63fef41aebee3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc5a07770aaec7538538b29… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 11 09:43:48 2022 +0100 windows.gaming.input: Always return S_OK from TryGetFactoryControllerFromGameController. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 7 ++----- dlls/windows.gaming.input/controller.c | 3 ++- dlls/windows.gaming.input/gamepad.c | 3 ++- dlls/windows.gaming.input/manager.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 24f913dc140..a2072ca16de 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -1059,7 +1059,6 @@ static void test_windows_gaming_input(void) hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_statics2, &custom_factory.ICustomGameControllerFactory_iface, game_controller, &tmp_game_controller ); - todo_wine ok( hr == S_OK, "TryGetFactoryControllerFromGameController returned %#lx\n", hr ); ok( !tmp_game_controller, "got controller %p\n", tmp_game_controller ); @@ -1126,10 +1125,9 @@ static void test_windows_gaming_input(void) hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_statics2, &custom_factory.ICustomGameControllerFactory_iface, game_controller, &tmp_game_controller ); - todo_wine ok( hr == S_OK, "TryGetFactoryControllerFromGameController returned %#lx\n", hr ); ok( tmp_game_controller == custom_controller.IGameController_outer, "got controller %p\n", tmp_game_controller ); - if (hr != S_OK) goto next; + if (!tmp_game_controller) goto next; hr = IGameController_QueryInterface( tmp_game_controller, &IID_IInspectable, (void **)&tmp_inspectable ); ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); ok( tmp_inspectable == (void *)tmp_game_controller, "got inspectable %p\n", tmp_inspectable ); @@ -1153,11 +1151,10 @@ static void test_windows_gaming_input(void) next: hr = IRawGameControllerStatics_FromGameController( statics, custom_controller.IGameController_outer, &tmp_raw_controller ); - todo_wine ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); todo_wine ok( tmp_raw_controller == raw_controller, "got controller %p\n", tmp_raw_controller ); - if (hr == S_OK) IRawGameController_Release( tmp_raw_controller ); + if (tmp_raw_controller) IRawGameController_Release( tmp_raw_controller ); IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 3e00da917e7..03a3ae398cf 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -459,9 +459,10 @@ static HRESULT WINAPI statics_FromGameController( IRawGameControllerStatics *ifa TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + *value = NULL; hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, game_controller, &controller ); - if (FAILED(hr)) return hr; + if (FAILED(hr) || !controller) return hr; hr = IGameController_QueryInterface( controller, &IID_IRawGameController, (void **)value ); IGameController_Release( controller ); diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index b815d5c0a13..7e72609a277 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -484,9 +484,10 @@ static HRESULT WINAPI statics2_FromGameController( IGamepadStatics2 *iface, IGam TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + *value = NULL; hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, game_controller, &controller ); - if (FAILED(hr)) return hr; + if (FAILED(hr) || !controller) return hr; hr = IGameController_QueryInterface( controller, &IID_IGamepad, (void **)value ); IGameController_Release( controller ); diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index 393b5a850c8..af15849c521 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -392,7 +392,7 @@ statics2_TryGetFactoryControllerFromGameController( IGameControllerFactoryManage LeaveCriticalSection( &manager_cs ); - if (!found) return E_FAIL; + if (!found) *value = NULL; return S_OK; }

1 0

Rémi Bernon : windows.gaming.input: Return correct error from DllGetActivationFactory.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 6ebdf1bab9eafb039078916bbc244b674423d6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebdf1bab9eafb039078916b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 11 09:43:47 2022 +0100 windows.gaming.input: Return correct error from DllGetActivationFactory. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index c5b7f19c987..1ddd3a8fd23 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -169,7 +169,6 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); - HRESULT hr = REGDB_E_CLASSNOTREG; TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); @@ -178,13 +177,14 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** *factory = NULL; if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) - hr = ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) - hr = ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) - hr = IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); + IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); - return hr; + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; } BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )

1 0

Eric Pouech : user32/tests: Enable compilation with long types in resource.c.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: da8e060db2638473370d04fad77aea0beb67952a URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8e060db2638473370d04fa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 11 09:12:34 2022 +0100 user32/tests: Enable compilation with long types in resource.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/resource.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 5d4c4e2f968..904a1f43fab 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <assert.h> #include <windows.h> @@ -51,10 +52,10 @@ static void test_LoadStringW(void) return; } length2 = LoadStringW(hInst, 2, returnedstringw, ARRAY_SIZE(returnedstringw)); /* get resource string */ - ok(length2 > 0, "LoadStringW failed to load resource 2, ret %d, err %d\n", length2, GetLastError()); + ok(length2 > 0, "LoadStringW failed to load resource 2, ret %d, err %ld\n", length2, GetLastError()); ok(length1 == length2, "LoadStringW returned different values dependent on buflen. ret1 %d, ret2 %d\n", length1, length2); - ok(length1 > 0 && resourcepointer != NULL, "LoadStringW failed to get pointer to resource 2, ret %d, err %d\n", + ok(length1 > 0 && resourcepointer != NULL, "LoadStringW failed to get pointer to resource 2, ret %d, err %ld\n", length1, GetLastError()); /* Copy the resource since it is not '\0' terminated, and add '\0' to the end */ @@ -109,22 +110,22 @@ static void test_LoadStringA (void) } ret = LoadStringA(hInst, 1, buf, sizeof(buf) ); - ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret = LoadStringA(hInst, 65534, buf, sizeof(buf) ); - ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret = LoadStringA(hInst, 0, buf, 0); ok( ret == -1 || broken(ret == 0), - "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", + "LoadStringA did not return -1 when called with buflen = 0, got %d, err %ld\n", ret, GetLastError()); SetLastError(0xdeadbeef); @@ -132,7 +133,7 @@ static void test_LoadStringA (void) ret = LoadStringA(hInst, 1, buf, 1); ok( !ret, "LoadString returned %d\n", ret); ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); - ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %ld\n", GetLastError()); } static void test_accel1(void)

1 0

Eric Pouech : user32/tests: Enable compilation with long types in listbox.c.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 1b41c490e4588982d9cfd02148802da13b5e3136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b41c490e4588982d9cfd021… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 11 09:12:28 2022 +0100 user32/tests: Enable compilation with long types in listbox.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 211 ++++++++++++++++++++++---------------------- 1 file changed, 106 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b41c490e4588982d9cf…

1 0

Eric Pouech : winmm/tests: Enable compilation with long types.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: cb17000c3a321f863aeb5e72f43f939bcb96237a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb17000c3a321f863aeb5e72… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:23:07 2022 +0100 winmm/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/Makefile.in | 1 - dlls/winmm/tests/capture.c | 28 ++-- dlls/winmm/tests/joystick.c | 8 +- dlls/winmm/tests/mci.c | 58 ++++---- dlls/winmm/tests/mcicda.c | 56 ++++---- dlls/winmm/tests/midi.c | 164 +++++++++++------------ dlls/winmm/tests/mixer.c | 72 +++++----- dlls/winmm/tests/mmio.c | 306 +++++++++++++++++++++---------------------- dlls/winmm/tests/timer.c | 8 +- dlls/winmm/tests/wave.c | 42 +++--- 10 files changed, 371 insertions(+), 372 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb17000c3a321f863aeb…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022