Jacek Caban : win32u/tests: Build without -DWINE_NO_LONG_TYPES.
Alexandre Julliard
julliard at winehq.org
Fri Feb 18 15:15:00 CST 2022
Module: wine
Branch: master
Commit: 9b63ea13f313a93ce4a517a98b33c12bd7767202
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b63ea13f313a93ce4a517a98b33c12bd7767202
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Feb 18 14:06:14 2022 +0100
win32u/tests: Build without -DWINE_NO_LONG_TYPES.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/win32u/tests/Makefile.in | 1 -
dlls/win32u/tests/win32u.c | 52 +++++++++++++++++++++----------------------
2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/dlls/win32u/tests/Makefile.in b/dlls/win32u/tests/Makefile.in
index a89a6dd491f..c0fa70e4e08 100644
--- a/dlls/win32u/tests/Makefile.in
+++ b/dlls/win32u/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = win32u.dll
IMPORTS = user32 win32u
diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c
index 22ce38e2391..2348c21dd80 100644
--- a/dlls/win32u/tests/win32u.c
+++ b/dlls/win32u/tests/win32u.c
@@ -33,12 +33,12 @@ static void test_NtUserEnumDisplayDevices(void)
SetLastError( 0xdeadbeef );
ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 );
ok( !ret && GetLastError() == 0xdeadbeef,
- "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
+ "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() );
SetLastError( 0xdeadbeef );
ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 );
ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
- "NtUserEnumDisplayDevices returned %x %u\n", ret,
+ "NtUserEnumDisplayDevices returned %#lx %lu\n", ret,
GetLastError() );
info.cb = 0;
@@ -46,22 +46,22 @@ static void test_NtUserEnumDisplayDevices(void)
SetLastError( 0xdeadbeef );
ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 );
ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
- "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
+ "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() );
SetLastError( 0xdeadbeef );
ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 );
ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
- "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
+ "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() );
SetLastError( 0xdeadbeef );
ret = NtUserEnumDisplayDevices( NULL, 0, NULL, 0 );
ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
- "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
+ "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() );
SetLastError( 0xdeadbeef );
ret = NtUserEnumDisplayDevices( NULL, 12345, NULL, 0 );
ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
- "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
+ "NtUserEnumDisplayDevices returned %#lx %lu\n", ret, GetLastError() );
}
static void test_NtUserCloseWindowStation(void)
@@ -71,7 +71,7 @@ static void test_NtUserCloseWindowStation(void)
SetLastError( 0xdeadbeef );
ret = NtUserCloseWindowStation( 0 );
ok( !ret && GetLastError() == ERROR_INVALID_HANDLE,
- "NtUserCloseWindowStation returned %x %u\n", ret, GetLastError() );
+ "NtUserCloseWindowStation returned %x %lu\n", ret, GetLastError() );
}
static void test_window_props(void)
@@ -86,7 +86,7 @@ static void test_window_props(void)
atom = GlobalAddAtomW( L"test" );
ret = NtUserSetProp( hwnd, UlongToPtr(atom), UlongToHandle(0xdeadbeef) );
- ok( ret, "NtUserSetProp failed: %u\n", GetLastError() );
+ ok( ret, "NtUserSetProp failed: %lu\n", GetLastError() );
prop = GetPropW( hwnd, L"test" );
ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop );
@@ -119,41 +119,41 @@ static void test_NtUserBuildHwndList(void)
size = 0;
status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), ARRAYSIZE(buf), buf, &size );
- ok( !status, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == 1, "size = %u\n", size );
+ ok( !status, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == 1, "size = %lu\n", size );
ok( buf[0] == HWND_BOTTOM, "buf[0] = %p\n", buf[0] );
hwnd = CreateWindowExA( 0, "static", NULL, WS_POPUP, 0,0,0,0,GetDesktopWindow(),0,0, NULL );
size = 0;
status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), ARRAYSIZE(buf), buf, &size );
- ok( !status, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == 3, "size = %u\n", size );
+ ok( !status, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == 3, "size = %lu\n", size );
ok( buf[0] == hwnd, "buf[0] = %p\n", buf[0] );
ok( buf[2] == HWND_BOTTOM, "buf[0] = %p\n", buf[2] );
size = 0;
status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), 3, buf, &size );
- ok( !status, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == 3, "size = %u\n", size );
+ ok( !status, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == 3, "size = %lu\n", size );
size = 0;
status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), 2, buf, &size );
- ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == 3, "size = %u\n", size );
+ ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == 3, "size = %lu\n", size );
size = 0;
status = NtUserBuildHwndList( 0, 0, 0, 0, GetCurrentThreadId(), 1, buf, &size );
- ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == 3, "size = %u\n", size );
+ ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == 3, "size = %lu\n", size );
desktop_windows_cnt = 0;
EnumDesktopWindows( 0, count_win, (LPARAM)&desktop_windows_cnt );
size = 0;
status = NtUserBuildHwndList( 0, 0, 0, 1, 0, ARRAYSIZE(buf), buf, &size );
- ok( !status, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == desktop_windows_cnt + 1, "size = %u, expected %u\n", size, desktop_windows_cnt + 1 );
+ ok( !status, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == desktop_windows_cnt + 1, "size = %lu, expected %lu\n", size, desktop_windows_cnt + 1 );
desktop_windows_cnt = 0;
EnumDesktopWindows( GetThreadDesktop( GetCurrentThreadId() ), count_win, (LPARAM)&desktop_windows_cnt );
@@ -161,21 +161,21 @@ static void test_NtUserBuildHwndList(void)
size = 0;
status = NtUserBuildHwndList( GetThreadDesktop(GetCurrentThreadId()), 0, 0, 1, 0,
ARRAYSIZE(buf), buf, &size );
- ok( !status, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == desktop_windows_cnt + 1, "size = %u, expected %u\n", size, desktop_windows_cnt + 1 );
+ ok( !status, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == desktop_windows_cnt + 1, "size = %lu, expected %lu\n", size, desktop_windows_cnt + 1 );
size = 0;
status = NtUserBuildHwndList( GetThreadDesktop(GetCurrentThreadId()), 0, 0, 0, 0,
ARRAYSIZE(buf), buf, &size );
- ok( !status, "NtUserBuildHwndList failed: %#x\n", status );
+ ok( !status, "NtUserBuildHwndList failed: %#lx\n", status );
todo_wine
- ok( size > desktop_windows_cnt + 1, "size = %u, expected %u\n", size, desktop_windows_cnt + 1 );
+ ok( size > desktop_windows_cnt + 1, "size = %lu, expected %lu\n", size, desktop_windows_cnt + 1 );
size = 0xdeadbeef;
status = NtUserBuildHwndList( UlongToHandle(0xdeadbeef), 0, 0, 0, 0,
ARRAYSIZE(buf), buf, &size );
- ok( status == STATUS_INVALID_HANDLE, "NtUserBuildHwndList failed: %#x\n", status );
- ok( size == 0xdeadbeef, "size = %u\n", size );
+ ok( status == STATUS_INVALID_HANDLE, "NtUserBuildHwndList failed: %#lx\n", status );
+ ok( size == 0xdeadbeef, "size = %lu\n", size );
DestroyWindow( hwnd );
}
More information about the wine-cvs
mailing list