March 2022 - Wine-commits - list.winehq.org

Rémi Bernon : include: Add Windows.Gaming.Input.IGamepadStatics2 interface declaration.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: a9fbfa1b9c5e929ae99957eeb353565be5f3af13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9fbfa1b9c5e929ae99957ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 8 10:55:25 2022 +0100 include: Add Windows.Gaming.Input.IGamepadStatics2 interface declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index 6a5fc8af1ee..5bf94f78820 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -293,6 +293,18 @@ namespace Windows.Gaming.Input { [propget] HRESULT Gamepads([out, retval] Windows.Foundation.Collections.IVectorView<Gamepad *> **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.Gamepad), + uuid(42676dc5-0856-47c4-9213-b395504c3a3c) + ] + interface IGamepadStatics2 : IInspectable + requires Windows.Gaming.Input.IGamepadStatics + { + HRESULT FromGameController([in] Windows.Gaming.Input.IGameController *controller, + [out, retval] Windows.Gaming.Input.Gamepad **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Gaming.Input.Headset),

1 0

Rémi Bernon : windows.gaming.input: Implement IGamepadStatics2_FromGameController.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: da745fee16faa2fac785d841d2368f8d6cbf9b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=da745fee16faa2fac785d841… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 8 10:55:26 2022 +0100 windows.gaming.input: Implement IGamepadStatics2_FromGameController. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/gamepad.c | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 3793021d22c..50008541281 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -27,6 +27,7 @@ struct gamepad_statics { IActivationFactory IActivationFactory_iface; IGamepadStatics IGamepadStatics_iface; + IGamepadStatics2 IGamepadStatics2_iface; ICustomGameControllerFactory ICustomGameControllerFactory_iface; LONG ref; }; @@ -57,6 +58,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IGamepadStatics2 )) + { + IInspectable_AddRef( (*out = &impl->IGamepadStatics2_iface) ); + return S_OK; + } + if (IsEqualGUID( iid, &IID_ICustomGameControllerFactory )) { IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) ); @@ -188,6 +195,38 @@ static const struct IGamepadStaticsVtbl statics_vtbl = statics_get_Gamepads, }; +DEFINE_IINSPECTABLE( statics2, IGamepadStatics2, struct gamepad_statics, IActivationFactory_iface ) + +static HRESULT WINAPI statics2_FromGameController( IGamepadStatics2 *iface, IGameController *game_controller, IGamepad **value ) +{ + struct gamepad_statics *impl = impl_from_IGamepadStatics2( iface ); + IGameController *controller; + HRESULT hr; + + TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + + hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, + game_controller, &controller ); + if (FAILED(hr)) return hr; + + hr = IGameController_QueryInterface( controller, &IID_IGamepad, (void **)value ); + IGameController_Release( controller ); + return hr; +} + +static const struct IGamepadStatics2Vtbl statics2_vtbl = +{ + statics2_QueryInterface, + statics2_AddRef, + statics2_Release, + /* IInspectable methods */ + statics2_GetIids, + statics2_GetRuntimeClassName, + statics2_GetTrustLevel, + /* IGamepadStatics2 methods */ + statics2_FromGameController, +}; + DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct gamepad_statics, IActivationFactory_iface ) static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, @@ -228,6 +267,7 @@ static struct gamepad_statics gamepad_statics = { {&factory_vtbl}, {&statics_vtbl}, + {&statics2_vtbl}, {&controller_factory_vtbl}, 1, };

1 0

Paul Gofman : ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_LOOP with zero optlen.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: c593b2f48edc8810cdd2cde770a23fa8f80a8807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c593b2f48edc8810cdd2cde7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:44 2022 +0300 ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_LOOP with zero optlen. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index dacb41a0403..816ca828b90 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2981,6 +2981,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_IF, optval, optlen ); case IP_MULTICAST_LOOP: + if (!optlen) + { + SetLastError( WSAEFAULT ); + return -1; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP, optval, optlen ); case IP_MULTICAST_TTL:

1 0

Paul Gofman : ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_TTL with zero optlen.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 5f9da35af1a0d82ceffabac27c57122bda1fcf2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9da35af1a0d82ceffabac2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:45 2022 +0300 ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_TTL with zero optlen. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 816ca828b90..ed2889b3eb0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2989,6 +2989,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP, optval, optlen ); case IP_MULTICAST_TTL: + if (!optlen) + { + SetLastError( WSAEFAULT ); + return -1; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL, optval, optlen ); case IP_OPTIONS:

1 0

Paul Gofman : ws2_32: Return WSAEFAULT from setsockopt() for IP_TTL with zero optlen.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 0baf44e320cfaa64d4a87cc8a8c47c5b6e85448a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0baf44e320cfaa64d4a87cc8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:46 2022 +0300 ws2_32: Return WSAEFAULT from setsockopt() for IP_TTL with zero optlen. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ed2889b3eb0..e708d0d2f5e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3023,6 +3023,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TOS, optval, optlen ); case IP_TTL: + if (!optlen) + { + SetLastError( WSAEFAULT ); + return -1; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TTL, optval, optlen ); case IP_UNBLOCK_SOURCE:

1 0

Eric Pouech : kernel32/tests/virtual: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: d87cc188897a03bb8f1729548ead47c9744f58f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87cc188897a03bb8f172954… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:08 2022 +0100 kernel32/tests/virtual: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 1839 +++++++++++++++++++++-------------------- 1 file changed, 920 insertions(+), 919 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d87cc188897a03bb8f17…

1 0

Eric Pouech : kernel32/tests/volume: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 0f430425431408faa681746bcaa48225be18b3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f430425431408faa681746b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:14 2022 +0100 kernel32/tests/volume: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 423 ++++++++++++++++++++++--------------------- 1 file changed, 212 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f430425431408faa681…

1 0

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

08 Mar '22

Module: wine Branch: master Commit: f0c165ed5cc37217e985bf5e64bdbaab4e0967ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c165ed5cc37217e985bf5e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:27 2022 +0100 userenv/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/tests/Makefile.in | 1 - dlls/userenv/tests/userenv.c | 46 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/userenv/tests/Makefile.in b/dlls/userenv/tests/Makefile.in index 4eca08ed851..c4aa8d0db4a 100644 --- a/dlls/userenv/tests/Makefile.in +++ b/dlls/userenv/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = userenv.dll IMPORTS = userenv advapi32 diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index c7a6791e2be..3f2b3442832 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -33,7 +33,7 @@ #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define expect_env(EXPECTED,GOT,VAR) ok((GOT)==(EXPECTED), "Expected %d, got %d for %s (%d)\n", (EXPECTED), (GOT), (VAR), j) -#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %d\n", (EXPECTED), GetLastError()) +#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %ld\n", (EXPECTED), GetLastError()) static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); @@ -115,13 +115,13 @@ static void test_create_env(void) expect(TRUE, r); r = GetEnvironmentVariableA("SystemRoot", systemroot, sizeof(systemroot)); - ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + ok(r != 0, "GetEnvironmentVariable failed (%ld)\n", GetLastError()); r = SetEnvironmentVariableA("SystemRoot", "overwrite"); expect(TRUE, r); r = GetEnvironmentVariableA("ProgramData", programdata, sizeof(programdata)); - ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + ok(r != 0, "GetEnvironmentVariable failed (%ld)\n", GetLastError()); r = SetEnvironmentVariableA("ProgramData", "overwrite"); expect(TRUE, r); @@ -250,7 +250,7 @@ static void test_get_profiles_dir(void) char *profiles_dir, *buf, small_buf[1]; l = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ProfileListA, 0, KEY_READ, &key); - ok(!l, "RegOpenKeyExA failed: %d\n", GetLastError()); + ok(!l, "RegOpenKeyExA failed: %ld\n", GetLastError()); l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, NULL, &cch); if (l) @@ -282,7 +282,7 @@ static void test_get_profiles_dir(void) /* MSDN claims the returned character count includes the NULL terminator * when the buffer is too small, but that's not in fact what gets returned. */ - ok(cch == profiles_len - 1, "expected %d, got %d\n", profiles_len - 1, cch); + ok(cch == profiles_len - 1, "expected %ld, got %ld\n", profiles_len - 1, cch); /* Allocate one more character than the return value to prevent a buffer * overrun. */ @@ -291,7 +291,7 @@ static void test_get_profiles_dir(void) /* Rather than a BOOL, the return value is also the number of characters * stored in the buffer. */ - expect(profiles_len - 1, r); + ok(profiles_len - 1 == r, "expected %ld, got %d\n", profiles_len - 1, r); ok(!strcmp(buf, profiles_dir), "expected %s, got %s\n", profiles_dir, buf); HeapFree(GetProcessHeap(), 0, buf); @@ -330,26 +330,26 @@ static void test_get_user_profile_dir(void) } ret = OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( NULL, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); dirA = HeapAlloc( GetProcessHeap(), 0, 32 ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, dirA, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); HeapFree( GetProcessHeap(), 0, dirA ); len = 0; @@ -357,8 +357,8 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryA( token, NULL, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); - ok(!len, "expected 0, got %u\n", len); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); + ok(!len, "expected 0, got %lu\n", len); len = 0; dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 ); @@ -374,34 +374,34 @@ static void test_get_user_profile_dir(void) dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, dirA, &len ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ok(len, "expected len > 0\n"); - ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); + ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %ld - 1\n", lstrlenA( dirA ), len ); trace("%s\n", dirA); HeapFree( GetProcessHeap(), 0, dirA ); } else ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, - "unexpected error %u\n", error); + "unexpected error %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( NULL, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - todo_wine ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + todo_wine ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); dirW = HeapAlloc( GetProcessHeap(), 0, 32 ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, dirW, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); HeapFree( GetProcessHeap(), 0, dirW ); len = 0; @@ -409,15 +409,15 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryW( token, NULL, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", error); ok(len, "expected len > 0\n"); dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR) ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, dirW, &len ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ok(len, "expected len > 0\n"); - ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len ); + ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %ld - 1\n", lstrlenW( dirW ), len ); HeapFree( GetProcessHeap(), 0, dirW ); len2 = 0; @@ -428,10 +428,10 @@ static void test_get_user_profile_dir(void) ok(!ret, "expected failure\n"); HeapFree( GetProcessHeap(), 0, dirW ); if (error == ERROR_INSUFFICIENT_BUFFER) - ok(len2 == len, "expected %d, got %d\n", len, len2); + ok(len2 == len, "expected %ld, got %ld\n", len, len2); else ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, - "unexpected error %u\n", error); + "unexpected error %lu\n", error); CloseHandle( token ); }

1 0

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

08 Mar '22

Module: wine Branch: master Commit: bba6d8ac3996d7867d9e369133889fbc581eb15b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bba6d8ac3996d7867d9e3691… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:32 2022 +0100 uxtheme/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/Makefile.in | 1 - dlls/uxtheme/tests/msg.h | 16 +- dlls/uxtheme/tests/system.c | 404 ++++++++++++++++++++--------------------- dlls/uxtheme/tests/v6util.h | 4 +- 4 files changed, 212 insertions(+), 213 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bba6d8ac3996d7867d9e…

1 0

Eric Pouech : user32/tests: Use correct integral type.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 0d910e6ad90878957b102a5f5abf53c5c0e9d1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d910e6ad90878957b102a5f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:39 2022 +0100 user32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index c7d3a99b228..e2e27480645 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -816,6 +816,7 @@ static void test_ddeml_server(void) HANDLE client; MSG msg; UINT res; + DWORD exit_code; BOOL ret; HSZ server; HDDEDATA hdata; @@ -839,8 +840,8 @@ static void test_ddeml_server(void) } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess(client, &res); - ok( !res, "client failed with %u error(s)\n", res ); + GetExitCodeProcess(client, &exit_code); + ok( !res, "client failed with %u error(s)\n", exit_code ); CloseHandle(client); }

1 0