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

[PATCH 00/20] Enabling compilation with long types
by Eric Pouech March 9, 2022

March 9, 2022

FWIW, I split user32/tests in 3 sub-patches in order to ease review A+ --- Eric Pouech (20): dlls/kernel32/tests/sync.c: enable compilation with long types dlls/kernel32/tests/thread.c: enable compilation with long types dlls/kernel32/tests/virtual.c: enable compilation with long types dlls/kernel32/tests/volume.c: enable compilation with long types dlls/urlmon/tests: enable compilation with long types dlls/userenv/tests: enable compilation with long types dlls/uxtheme/tests: enable compilation with long types dlls/user32/tests: use correct integral type dlls/user32/tests: wrap helper macro inside function dlls/user32/tests/[a-i]*.c: enable compilation with long types dlls/user32/tests/[j-u]*.c: enable compilation with long types dlls/user32/tests: enable compilation with long types dlls/vbscript/tests: enable compilation with long types dlls/vcomp110/tests: enable compilation with long types dlls/vcomp/tests: enable compilation with long types dlls/version/tests: enable compilation with long types dlls/virtdisk/tests: enable compilation with long types dlls/vulkan-1/tests: enable compilation with long types dlls/wer/tests: enable compilation with long types dlls/wevtapi/tests: enable compilation with long types dlls/kernel32/tests/sync.c | 463 ++++---- dlls/kernel32/tests/thread.c | 405 +++---- dlls/kernel32/tests/virtual.c | 1839 ++++++++++++++++--------------- dlls/kernel32/tests/volume.c | 423 +++---- dlls/urlmon/tests/Makefile.in | 1 - dlls/urlmon/tests/misc.c | 668 +++++------ dlls/urlmon/tests/protocol.c | 606 +++++----- dlls/urlmon/tests/sec_mgr.c | 382 +++---- dlls/urlmon/tests/stream.c | 32 +- dlls/urlmon/tests/uri.c | 1086 +++++++++--------- dlls/urlmon/tests/url.c | 558 +++++----- dlls/user32/tests/Makefile.in | 1 - dlls/user32/tests/broadcast.c | 60 +- dlls/user32/tests/class.c | 84 +- dlls/user32/tests/clipboard.c | 400 +++---- dlls/user32/tests/combo.c | 58 +- dlls/user32/tests/cursoricon.c | 300 ++--- dlls/user32/tests/dce.c | 24 +- dlls/user32/tests/dde.c | 481 ++++---- dlls/user32/tests/dialog.c | 108 +- dlls/user32/tests/edit.c | 207 ++-- dlls/user32/tests/input.c | 444 ++++---- dlls/user32/tests/listbox.c | 210 ++-- dlls/user32/tests/menu.c | 332 +++--- dlls/user32/tests/monitor.c | 434 ++++---- dlls/user32/tests/msg.c | 972 ++++++++-------- dlls/user32/tests/resource.c | 20 +- dlls/user32/tests/scroll.c | 92 +- dlls/user32/tests/static.c | 16 +- dlls/user32/tests/sysparams.c | 592 +++++----- dlls/user32/tests/text.c | 72 +- dlls/user32/tests/uitools.c | 4 +- dlls/user32/tests/win.c | 1498 ++++++++++++------------- dlls/user32/tests/winstation.c | 158 +-- dlls/user32/tests/wsprintf.c | 8 +- dlls/userenv/tests/Makefile.in | 1 - dlls/userenv/tests/userenv.c | 46 +- dlls/uxtheme/tests/Makefile.in | 1 - dlls/uxtheme/tests/msg.h | 16 +- dlls/uxtheme/tests/system.c | 404 +++---- dlls/uxtheme/tests/v6util.h | 4 +- dlls/vbscript/tests/Makefile.in | 1 - dlls/vbscript/tests/createobj.c | 84 +- dlls/vbscript/tests/run.c | 380 +++---- dlls/vbscript/tests/vbscript.c | 738 ++++++------- dlls/vcomp/tests/Makefile.in | 1 - dlls/vcomp/tests/vcomp.c | 156 +-- dlls/vcomp110/tests/Makefile.in | 1 - dlls/vcomp110/tests/vcomp110.c | 4 +- dlls/version/tests/Makefile.in | 1 - dlls/version/tests/info.c | 138 +-- dlls/version/tests/install.c | 76 +- dlls/virtdisk/tests/Makefile.in | 1 - dlls/virtdisk/tests/virtdisk.c | 16 +- dlls/vulkan-1/tests/Makefile.in | 1 - dlls/vulkan-1/tests/vulkan.c | 4 +- dlls/wer/tests/Makefile.in | 1 - dlls/wer/tests/main.c | 82 +- dlls/wevtapi/tests/Makefile.in | 1 - dlls/wevtapi/tests/wevtapi.c | 16 +- 60 files changed, 7604 insertions(+), 7608 deletions(-)

3 26

[PATCH 04/10] win32u: Move GetDesktopWindow implementation from user32.
by Jacek Caban March 9, 2022

March 9, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 3 +- dlls/user32/win.c | 82 +------------------------- dlls/win32u/message.c | 9 +++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/winstation.c | 110 ++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 6 files changed, 123 insertions(+), 85 deletions(-)

3 2

[PATCH 00/25] migration to long types
by Eric Pouech March 9, 2022

March 9, 2022

migrating dlls/oleaut32/tests required lot more effort than usual <g> - the current code didn't use the generic integer scheme of the rest of the file (likely because of LONG64 printf limitations) => test code is now converted to the generic integer scheme (making it a bit simpler) (I found it more straightforward to do it that way than trying to maintain a scheme that was meant to disapear at some time) - the long/LONG/int mixup showed up in automation as well. => most of the tests routines have been converted int => LONG (I didn't include the migration to long, which needs to be done *after* enabling LONG as long, please let me know if it's to be done) No regressions have been seen here with winetest. Tested also on testbot without regression. But review is more than welcomed! The rest of the changes are "as usual". A+ --- Eric Pouech (25): dlls/kernel32/tests/path.c: enable compilation with long types dlls/kernel32/tests/pipe.c: enable compilation with long types dlls/kernel32/tests/process.c: enable compilation with long types dlls/kernel32/tests/profile.c: enable compilation with long types dlls/oleaut32/tests: get rid of EXPECTI864 macro (vartype.c) dlls/oleaut32/tests: convert I8 to current integer test scheme (vartype.c) dlls/oleau32/tests: convert I8Copy to existing integer test scheme (vartype.c) dlls/oleaut32/tests: convert UI8 to existing integer test scheme (vartype.c) dlls/oleaut32/tests: convert UI8Copy to existing integer test scheme (vartype.c) dlls/oleaut32/tests: ensure (re)definition of EXPECTRES for all integer types (vartype.c) dlls/oleaut32/tests: use correct integral type dlls/oleaut32/tests: enable compilation with long types dlls/shdocvw/tests: enable compilation with long types dlls/shell32/tests: use correct integral type dlls/shell32/tests: enable compilation with long types dlls/shlwapi/tests: enable compilation with long types dlls/slc/tests: enable compilation with long types dlls/spoolss/tests: enable compilation with long types dlls/sti/tests: enable compilation with long types dlls/sxs/tests: enable compilation with long types dlls/tapi32/tests: enable compilation with long types dlls/taskschd/tests: enable compilation with long types dlls/twain_32/tests: enable compilation with long types dlls/uianimation/tests: enable compilation with long types dlls/uiautomationcore/tests: enable compilation with long types dlls/kernel32/tests/path.c | 401 ++--- dlls/kernel32/tests/pipe.c | 949 ++++++------ dlls/kernel32/tests/process.c | 939 ++++++------ dlls/kernel32/tests/profile.c | 347 ++--- dlls/oleaut32/tests/Makefile.in | 1 - dlls/oleaut32/tests/dispatch.c | 52 +- dlls/oleaut32/tests/olefont.c | 124 +- dlls/oleaut32/tests/olepicture.c | 268 ++-- dlls/oleaut32/tests/safearray.c | 426 +++--- dlls/oleaut32/tests/tmarshal.c | 503 +++--- dlls/oleaut32/tests/tmarshal.idl | 12 +- dlls/oleaut32/tests/typelib.c | 1596 ++++++++++---------- dlls/oleaut32/tests/usrmarshal.c | 324 ++-- dlls/oleaut32/tests/varformat.c | 60 +- dlls/oleaut32/tests/vartest.c | 336 ++--- dlls/oleaut32/tests/vartype.c | 648 ++++---- dlls/shdocvw/tests/Makefile.in | 1 - dlls/shdocvw/tests/shdocvw.c | 46 +- dlls/shdocvw/tests/shortcut.c | 12 +- dlls/shell32/tests/Makefile.in | 1 - dlls/shell32/tests/appbar.c | 18 +- dlls/shell32/tests/assoc.c | 80 +- dlls/shell32/tests/autocomplete.c | 76 +- dlls/shell32/tests/brsfolder.c | 34 +- dlls/shell32/tests/ebrowser.c | 314 ++-- dlls/shell32/tests/msg.h | 8 +- dlls/shell32/tests/recyclebin.c | 6 +- dlls/shell32/tests/shelldispatch.c | 438 +++--- dlls/shell32/tests/shelllink.c | 274 ++-- dlls/shell32/tests/shellole.c | 74 +- dlls/shell32/tests/shellpath.c | 260 ++-- dlls/shell32/tests/shfldr_special.c | 66 +- dlls/shell32/tests/shlexec.c | 202 +-- dlls/shell32/tests/shlfileop.c | 287 ++-- dlls/shell32/tests/shlfolder.c | 1086 ++++++------- dlls/shell32/tests/shlview.c | 194 +-- dlls/shlwapi/tests/Makefile.in | 1 - dlls/shlwapi/tests/assoc.c | 50 +- dlls/shlwapi/tests/clist.c | 4 +- dlls/shlwapi/tests/clsid.c | 10 +- dlls/shlwapi/tests/istream.c | 258 ++-- dlls/shlwapi/tests/ordinal.c | 306 ++-- dlls/shlwapi/tests/path.c | 210 +-- dlls/shlwapi/tests/shreg.c | 104 +- dlls/shlwapi/tests/string.c | 52 +- dlls/shlwapi/tests/thread.c | 34 +- dlls/shlwapi/tests/url.c | 276 ++-- dlls/slc/tests/Makefile.in | 1 - dlls/slc/tests/slc.c | 18 +- dlls/spoolss/tests/Makefile.in | 1 - dlls/spoolss/tests/spoolss.c | 6 +- dlls/sti/tests/Makefile.in | 1 - dlls/sti/tests/sti.c | 20 +- dlls/sxs/tests/Makefile.in | 1 - dlls/sxs/tests/cache.c | 70 +- dlls/sxs/tests/name.c | 66 +- dlls/sxs/tests/sxs.c | 38 +- dlls/tapi32/tests/Makefile.in | 1 - dlls/tapi32/tests/tapi.c | 14 +- dlls/taskschd/tests/Makefile.in | 1 - dlls/taskschd/tests/scheduler.c | 618 ++++---- dlls/twain_32/tests/Makefile.in | 1 - dlls/twain_32/tests/dsm.c | 42 +- dlls/uianimation/tests/Makefile.in | 1 - dlls/uianimation/tests/uianimation.c | 26 +- dlls/uiautomationcore/tests/Makefile.in | 1 - dlls/uiautomationcore/tests/uiautomation.c | 80 +- 67 files changed, 6347 insertions(+), 6428 deletions(-)

4 32

[PATCH 01/20] dlls/kernel32/tests/heap.c: enable compilation with long types
by Eric Pouech March 9, 2022

March 9, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/heap.c | 179 ++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 89 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 8558bd7f1b3..a910645e666 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -19,6 +19,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 <stdarg.h> #include <stdlib.h> @@ -107,7 +108,7 @@ static void test_heap(void) mem = HeapAlloc(GetProcessHeap(), 0, size); heap_size = HeapSize(GetProcessHeap(), 0, mem); ok(heap_size == size || heap_size == resize_9x(size), - "HeapSize returned %lu instead of %lu or %lu\n", heap_size, size, resize_9x(size)); + "HeapSize returned %Iu instead of %Iu or %Iu\n", heap_size, size, resize_9x(size)); HeapFree(GetProcessHeap(), 0, mem); } @@ -126,7 +127,7 @@ static void test_heap(void) ok(msecond != NULL, "HeapReAlloc(0) should have succeeded\n"); size = HeapSize(GetProcessHeap(), 0, msecond); ok(size == 0 || broken(size == 1) /* some vista and win7 */, - "HeapSize should have returned 0 instead of %lu\n", size); + "HeapSize should have returned 0 instead of %Iu\n", size); HeapFree(GetProcessHeap(), 0, msecond); /* large blocks must be 16-byte aligned */ @@ -143,16 +144,16 @@ static void test_heap(void) gbl = GlobalReAlloc(gbl, 10, GMEM_MOVEABLE); ok(gbl != NULL, "Can't realloc global memory\n"); size = GlobalSize(gbl); - ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld\n", size); + ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%Id\n", size); gbl = GlobalReAlloc(gbl, 0, GMEM_MOVEABLE); ok(gbl != NULL, "GlobalReAlloc should not fail on size 0\n"); size = GlobalSize(gbl); - ok(size == 0, "Memory not resized to size 0, instead size=%ld\n", size); + ok(size == 0, "Memory not resized to size 0, instead size=%Id\n", size); ok(GlobalFree(gbl) == NULL, "Memory not freed\n"); size = GlobalSize(gbl); - ok(size == 0, "Memory should have been freed, size=%ld\n", size); + ok(size == 0, "Memory should have been freed, size=%Id\n", size); gbl = GlobalReAlloc(0, 10, GMEM_MOVEABLE); ok(gbl == NULL, "global realloc allocated memory\n"); @@ -162,39 +163,39 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); mem = GlobalLock(gbl); /* #1 */ - ok(mem != NULL, "returned %p with %d (expected '!= NULL')\n", mem, GetLastError()); + ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( flags == 1, "returned 0x%04x with %d (expected '0x0001')\n", + ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); msecond = GlobalLock(gbl); /* #2 */ - ok( msecond == mem, "returned %p with %d (expected '%p')\n", + ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( flags == 2, "returned 0x%04x with %d (expected '0x0002')\n", + ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD); res = GlobalUnlock(gbl); /* #1 */ - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( flags , "returned 0x%04x with %d (expected '!= 0')\n", + ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); res = GlobalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_SUCCESS or " + "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " "MAGIC_DEAD)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( !flags , "returned 0x%04x with %d (expected '0')\n", + ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ @@ -203,7 +204,7 @@ static void test_heap(void) /* NT: ERROR_NOT_LOCKED, 9x: untouched */ ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " + "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); GlobalFree(gbl); @@ -211,35 +212,35 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); SetLastError(MAGIC_DEAD); hsecond = GlobalFree(LongToHandle(0xdeadbeef)); /* bogus handle */ ok( (hsecond == LongToHandle(0xdeadbeef)) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), LongToHandle(0xdeadbeef)); SetLastError(MAGIC_DEAD); hsecond = GlobalFree(LongToHandle(0xdeadbee0)); /* bogus pointer */ ok( (hsecond == LongToHandle(0xdeadbee0)) && ((GetLastError() == ERROR_INVALID_HANDLE) || broken(GetLastError() == ERROR_NOACCESS) /* wvista+ */), - "returned %p with 0x%08x (expected %p with ERROR_NOACCESS)\n", + "returned %p with 0x%08lx (expected %p with ERROR_NOACCESS)\n", hsecond, GetLastError(), LongToHandle(0xdeadbee0)); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with " + "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); size = GlobalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %ld with 0x%08x (expected '0' with ERROR_INVALID_HANDLE)\n", + "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); SetLastError(MAGIC_DEAD); mem = GlobalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected NULL with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", mem, GetLastError()); /* documented on MSDN: GlobalUnlock() return FALSE on failure. @@ -249,7 +250,7 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); res = GlobalUnlock(gbl); ok(GetLastError() == ERROR_INVALID_HANDLE, - "returned %d with %d (expected ERROR_INVALID_HANDLE)\n", + "returned %ld with %ld (expected ERROR_INVALID_HANDLE)\n", res, GetLastError()); gbl = GlobalAlloc(GMEM_DDESHARE, 100); @@ -267,7 +268,7 @@ static void test_heap(void) if (mem == gbl) ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } /* GMEM_FIXED block expands in place only without flags */ @@ -276,7 +277,7 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = GlobalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); GlobalFree(gbl); } @@ -286,9 +287,9 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = GlobalReAlloc(gbl, size + init_size, GMEM_MOVEABLE); ok(hsecond != NULL, - "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); mem = GlobalLock(hsecond); - ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + ok(mem == hsecond, "got %p (expected %p) @%Id\n", mem, hsecond, size); GlobalFree(hsecond); } @@ -297,12 +298,12 @@ static void test_heap(void) res = GlobalUnlock(gbl); ok(res == 1 || broken(res == 0), /* win9x */ - "Expected 1 or 0, got %d\n", res); + "Expected 1 or 0, got %ld\n", res); res = GlobalUnlock(gbl); ok(res == 1 || broken(res == 0), /* win9x */ - "Expected 1 or 0, got %d\n", res); + "Expected 1 or 0, got %ld\n", res); GlobalFree(gbl); @@ -312,8 +313,8 @@ static void test_heap(void) res = GlobalUnlock(gbl); ok(res == 1 || broken(res == 0), /* win9x */ - "Expected 1 or 0, got %d\n", res); - ok(GetLastError() == 0xdeadbeef, "got %d\n", GetLastError()); + "Expected 1 or 0, got %ld\n", res); + ok(GetLastError() == 0xdeadbeef, "got %ld\n", GetLastError()); GlobalFree(gbl); @@ -322,16 +323,16 @@ static void test_heap(void) { SetLastError(MAGIC_DEAD); size = GlobalSize((HGLOBAL)0xc042); - ok(size == 0, "Expected 0, got %ld\n", size); + ok(size == 0, "Expected 0, got %Id\n", size); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } gbl = GlobalAlloc( GMEM_FIXED, 0 ); SetLastError(0xdeadbeef); size = GlobalSize( gbl ); - ok( size == 1, "wrong size %lu\n", size ); + ok( size == 1, "wrong size %Iu\n", size ); GlobalFree( gbl ); /* ####################################### */ @@ -342,16 +343,16 @@ static void test_heap(void) gbl = LocalReAlloc(gbl, 10, LMEM_MOVEABLE); ok(gbl != NULL, "Can't realloc local memory\n"); size = LocalSize(gbl); - ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld\n", size); + ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%Id\n", size); gbl = LocalReAlloc(gbl, 0, LMEM_MOVEABLE); ok(gbl != NULL, "LocalReAlloc should not fail on size 0\n"); size = LocalSize(gbl); - ok(size == 0, "Memory not resized to size 0, instead size=%ld\n", size); + ok(size == 0, "Memory not resized to size 0, instead size=%Id\n", size); ok(LocalFree(gbl) == NULL, "Memory not freed\n"); size = LocalSize(gbl); - ok(size == 0, "Memory should have been freed, size=%ld\n", size); + ok(size == 0, "Memory should have been freed, size=%Id\n", size); gbl = LocalReAlloc(0, 10, LMEM_MOVEABLE); ok(gbl == NULL, "local realloc allocated memory\n"); @@ -360,39 +361,39 @@ static void test_heap(void) gbl = LocalAlloc(LMEM_MOVEABLE, 256); SetLastError(MAGIC_DEAD); mem = LocalLock(gbl); /* #1 */ - ok(mem != NULL, "returned %p with %d (expected '!= NULL')\n", mem, GetLastError()); + ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( flags == 1, "returned 0x%04x with %d (expected '0x0001')\n", + ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); msecond = LocalLock(gbl); /* #2 */ - ok( msecond == mem, "returned %p with %d (expected '%p')\n", + ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( flags == 2, "returned 0x%04x with %d (expected '0x0002')\n", + ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD); res = LocalUnlock(gbl); /* #1 */ - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( flags , "returned 0x%04x with %d (expected '!= 0')\n", + ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); res = LocalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_SUCCESS or " + "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " "MAGIC_DEAD)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( !flags , "returned 0x%04x with %d (expected '0')\n", + ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ @@ -401,7 +402,7 @@ static void test_heap(void) /* NT: ERROR_NOT_LOCKED, 9x: untouched */ ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " + "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); LocalFree(gbl); @@ -409,30 +410,30 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned 0x%04x with 0x%08x (expected LMEM_INVALID_HANDLE with " + "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); size = LocalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %ld with 0x%08x (expected '0' with ERROR_INVALID_HANDLE)\n", + "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); SetLastError(MAGIC_DEAD); mem = LocalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected NULL with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", mem, GetLastError()); /* This Test works the same on all Systems (GlobalUnlock() is different) */ SetLastError(MAGIC_DEAD); res = LocalUnlock(gbl); ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %d with %d (expected '0' with ERROR_INVALID_HANDLE)\n", + "returned %ld with %ld (expected '0' with ERROR_INVALID_HANDLE)\n", res, GetLastError()); /* LMEM_FIXED block expands in place only without flags */ @@ -441,7 +442,7 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = LocalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); LocalFree(gbl); } @@ -451,9 +452,9 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = LocalReAlloc(gbl, size + init_size, LMEM_MOVEABLE); ok(hsecond != NULL, - "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); mem = LocalLock(hsecond); - ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + ok(mem == hsecond, "got %p (expected %p) @%Id\n", mem, hsecond, size); LocalFree(hsecond); } @@ -461,16 +462,16 @@ static void test_heap(void) gbl = LocalAlloc(LMEM_FIXED, 100); SetLastError(0xdeadbeef); res = LocalUnlock(gbl); - ok(res == 0, "Expected 0, got %d\n", res); + ok(res == 0, "Expected 0, got %ld\n", res); ok(GetLastError() == ERROR_NOT_LOCKED || - broken(GetLastError() == 0xdeadbeef) /* win9x */, "got %d\n", GetLastError()); + broken(GetLastError() == 0xdeadbeef) /* win9x */, "got %ld\n", GetLastError()); LocalFree(gbl); gbl = LocalAlloc( LMEM_FIXED, 0 ); SetLastError(0xdeadbeef); size = LocalSize( gbl ); ok( !size || broken(size == 1), /* vistau64 */ - "wrong size %lu\n", size ); + "wrong size %Iu\n", size ); LocalFree( gbl ); /* trying to lock empty memory should give an error */ @@ -481,7 +482,7 @@ static void test_heap(void) /* NT: ERROR_DISCARDED, 9x: untouched */ ok( (mem == NULL) && ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)), - "returned %p with 0x%x/%d (expected 'NULL' with: ERROR_DISCARDED or " + "returned %p with 0x%lx/%ld (expected 'NULL' with: ERROR_DISCARDED or " "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); GlobalFree(gbl); @@ -495,8 +496,8 @@ static void test_heap(void) size = GlobalSize(gbl); size2 = GlobalSize(mem); - ok(size == 0x123, "got %lu\n", size); - ok(size2 == 0x123, "got %lu\n", size2); + ok(size == 0x123, "got %Iu\n", size); + ok(size2 == 0x123, "got %Iu\n", size2); GlobalFree(gbl); @@ -508,12 +509,12 @@ static void test_heap(void) ok(gbl == mem, "got %p, %p.\n", gbl, mem); size = GlobalSize(gbl); - ok(size == 0x123, "got %lu\n", size); + ok(size == 0x123, "got %Iu\n", size); GlobalFree(gbl); size = GlobalSize((void *)0xdeadbee0); - ok(size == 0, "got %lu\n", size); + ok(size == 0, "got %Iu\n", size); } @@ -646,7 +647,7 @@ static void test_GlobalAlloc(void) /* Check that a 'zeroing' alloc works */ mem2=GlobalAlloc(GMEM_ZEROINIT,memchunk); - ok(mem2!=NULL,"GlobalAlloc failed: error=%d\n",GetLastError()); + ok(mem2!=NULL,"GlobalAlloc failed: error=%ld\n",GetLastError()); if(mem2) { ok(GlobalSize(mem2)>=memchunk,"GlobalAlloc should return a big enough memory block\n"); mem2ptr=GlobalLock(mem2); @@ -720,18 +721,18 @@ static void test_LocalAlloc(void) /* Check that a normal alloc works */ mem1=LocalAlloc(0,memchunk); - ok(mem1!=NULL,"LocalAlloc failed: error=%d\n",GetLastError()); + ok(mem1!=NULL,"LocalAlloc failed: error=%ld\n",GetLastError()); if(mem1) { ok(LocalSize(mem1)>=memchunk, "LocalAlloc should return a big enough memory block\n"); } /* Check that a 'zeroing' and lock alloc works */ mem2=LocalAlloc(LMEM_ZEROINIT|LMEM_MOVEABLE,memchunk); - ok(mem2!=NULL,"LocalAlloc failed: error=%d\n",GetLastError()); + ok(mem2!=NULL,"LocalAlloc failed: error=%ld\n",GetLastError()); if(mem2) { ok(LocalSize(mem2)>=memchunk,"LocalAlloc should return a big enough memory block\n"); mem2ptr=LocalLock(mem2); - ok(mem2ptr!=NULL,"LocalLock: error=%d\n",GetLastError()); + ok(mem2ptr!=NULL,"LocalLock: error=%ld\n",GetLastError()); if(mem2ptr) { error=FALSE; for(i=0;i<memchunk;i++) { @@ -743,7 +744,7 @@ static void test_LocalAlloc(void) SetLastError(0); error=LocalUnlock(mem2); ok(!error && GetLastError()==NO_ERROR, - "LocalUnlock Failed: rc=%d err=%d\n",error,GetLastError()); + "LocalUnlock Failed: rc=%d err=%ld\n",error,GetLastError()); } } mem2a=LocalFree(mem2); @@ -751,11 +752,11 @@ static void test_LocalAlloc(void) /* Reallocate mem2 as moveable memory */ mem2=LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT,memchunk); - ok(mem2!=NULL, "LocalAlloc failed to create moveable memory, error=%d\n",GetLastError()); + ok(mem2!=NULL, "LocalAlloc failed to create moveable memory, error=%ld\n",GetLastError()); /* Check that ReAllocing memory works as expected */ mem2a=LocalReAlloc(mem2,2*memchunk,LMEM_MOVEABLE | LMEM_ZEROINIT); - ok(mem2a!=NULL,"LocalReAlloc failed, error=%d\n",GetLastError()); + ok(mem2a!=NULL,"LocalReAlloc failed, error=%ld\n",GetLastError()); if(mem2a) { ok(LocalSize(mem2a)>=2*memchunk,"LocalReAlloc failed\n"); mem2ptr=LocalLock(mem2a); @@ -830,7 +831,7 @@ static void test_obsolete_flags(void) ok( resultflags == test_global_flags[i].globalflags || broken(resultflags == (test_global_flags[i].globalflags & ~GMEM_DDESHARE)), /* win9x */ - "%u: expected 0x%08x, but returned 0x%08x with %d\n", + "%u: expected 0x%08x, but returned 0x%08x with %ld\n", i, test_global_flags[i].globalflags, resultflags, GetLastError() ); GlobalFree(gbl); @@ -869,8 +870,8 @@ static void test_HeapQueryInformation(void) NULL, 0, &size); ok(!ret, "HeapQueryInformation should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); - ok(size == sizeof(ULONG), "expected 4, got %lu\n", size); + "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError()); + ok(size == sizeof(ULONG), "expected 4, got %Iu\n", size); SetLastError(0xdeadbeef); ret = pHeapQueryInformation(GetProcessHeap(), @@ -878,15 +879,15 @@ static void test_HeapQueryInformation(void) NULL, 0, NULL); ok(!ret, "HeapQueryInformation should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError()); info = 0xdeadbeaf; SetLastError(0xdeadbeef); ret = pHeapQueryInformation(GetProcessHeap(), HeapCompatibilityInformation, &info, sizeof(info) + 1, NULL); - ok(ret, "HeapQueryInformation error %u\n", GetLastError()); - ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %u\n", info); + ok(ret, "HeapQueryInformation error %lu\n", GetLastError()); + ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %lu\n", info); } static void test_heap_checks( DWORD flags ) @@ -896,7 +897,7 @@ static void test_heap_checks( DWORD flags ) SIZE_T i, size, large_size = 3000 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ - trace( "testing heap flags %08x\n", flags ); + trace( "testing heap flags %08lx\n", flags ); p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); @@ -905,7 +906,7 @@ static void test_heap_checks( DWORD flags ) ok( ret, "HeapValidate failed\n" ); size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == 17, "Wrong size %lu\n", size ); + ok( size == 17, "Wrong size %Iu\n", size ); ok( p[14] == 0, "wrong data %x\n", p[14] ); ok( p[15] == 0, "wrong data %x\n", p[15] ); @@ -952,7 +953,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_VALIDATE) { size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == ~(SIZE_T)0 || broken(size == ~0u), "Wrong size %lu\n", size ); + ok( size == ~(SIZE_T)0 || broken(size == ~0u), "Wrong size %Iu\n", size ); p2 = HeapReAlloc( GetProcessHeap(), 0, p, 14 ); ok( p2 == NULL, "HeapReAlloc succeeded\n" ); @@ -964,7 +965,7 @@ static void test_heap_checks( DWORD flags ) p[17] = old; size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == 17, "Wrong size %lu\n", size ); + ok( size == 17, "Wrong size %Iu\n", size ); p2 = HeapReAlloc( GetProcessHeap(), 0, p, 14 ); ok( p2 != NULL, "HeapReAlloc failed\n" ); @@ -1010,7 +1011,7 @@ static void test_heap_checks( DWORD flags ) ok( ret, "HeapValidate failed\n" ); size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == large_size, "Wrong size %lu\n", size ); + ok( size == large_size, "Wrong size %Iu\n", size ); ok( p[large_size - 2] == 0, "wrong data %x\n", p[large_size - 2] ); ok( p[large_size - 1] == 0, "wrong data %x\n", p[large_size - 1] ); @@ -1031,7 +1032,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_VALIDATE) { size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == ~(SIZE_T)0, "Wrong size %lu\n", size ); + ok( size == ~(SIZE_T)0, "Wrong size %Iu\n", size ); p2 = HeapReAlloc( GetProcessHeap(), 0, p, large_size - 3 ); ok( p2 == NULL, "HeapReAlloc succeeded\n" ); @@ -1053,7 +1054,7 @@ static void test_heap_checks( DWORD flags ) { p = HeapAlloc( GetProcessHeap(), 0, size ); for (i = 0; i < 32; i++) if (p[size + i] != 0xab) break; - ok( i >= 8, "only %lu tail bytes for size %lu\n", i, size ); + ok( i >= 8, "only %Iu tail bytes for size %Iu\n", i, size ); HeapFree( GetProcessHeap(), 0, p ); } } @@ -1083,7 +1084,7 @@ static void test_debug_heap( const char *argv0, DWORD flags ) skip("Not authorized to change the image file execution options\n"); return; } - ok( !err, "failed to create '%s' error %u\n", keyname, err ); + ok( !err, "failed to create '%s' error %lu\n", keyname, err ); if (err) return; if (flags == 0xdeadbeef) /* magic value for unsetting it */ @@ -1094,9 +1095,9 @@ static void test_debug_heap( const char *argv0, DWORD flags ) memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); - sprintf( buffer, "%s heap.c 0x%x", argv0, flags ); + sprintf( buffer, "%s heap.c 0x%lx", argv0, flags ); ret = CreateProcessA( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); - ok( ret, "failed to create child process error %u\n", GetLastError() ); + ok( ret, "failed to create child process error %lu\n", GetLastError() ); if (ret) { wait_child_process( info.hProcess ); @@ -1157,13 +1158,13 @@ static void test_child_heap( const char *arg ) } ok( pRtlGetNtGlobalFlags() == expected, - "%s: got global flags %08x expected %08x\n", arg, pRtlGetNtGlobalFlags(), expected ); + "%s: got global flags %08lx expected %08lx\n", arg, pRtlGetNtGlobalFlags(), expected ); expect_heap = heap_flags_from_global_flag( expected ); if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee) /* vista layout */ { - ok( (heap->flags & ~HEAP_GROWABLE) == 0, "%s: got heap flags %08x\n", arg, heap->flags ); + ok( (heap->flags & ~HEAP_GROWABLE) == 0, "%s: got heap flags %08lx\n", arg, heap->flags ); } else if (heap->pattern == 0xeeeeeeee && heap->flags == 0xeeeeeeee) { @@ -1172,9 +1173,9 @@ static void test_child_heap( const char *arg ) else { ok( heap->flags == (expect_heap | HEAP_GROWABLE), - "%s: got heap flags %08x expected %08x\n", arg, heap->flags, expect_heap ); + "%s: got heap flags %08lx expected %08lx\n", arg, heap->flags, expect_heap ); ok( heap->force_flags == (expect_heap & ~0x18000080), - "%s: got heap force flags %08x expected %08x\n", arg, heap->force_flags, expect_heap ); + "%s: got heap force flags %08lx expected %08lx\n", arg, heap->force_flags, expect_heap ); expect_heap = heap->flags; } @@ -1199,11 +1200,11 @@ static void test_GetPhysicallyInstalledSystemMemory(void) ret = pGetPhysicallyInstalledSystemMemory(NULL); ok(!ret, "GetPhysicallyInstalledSystemMemory should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); total_memory = 0; ret = pGetPhysicallyInstalledSystemMemory(&total_memory); - ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed (%u)\n", GetLastError()); + ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed (%lu)\n", GetLastError()); ok(total_memory != 0, "expected total_memory != 0\n"); memstatus.dwLength = sizeof(memstatus);

8 35

[PATCH 10/10] win32u: Move GetClientRect implementation from user32.
by Jacek Caban March 9, 2022

March 9, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 2 +- dlls/win32u/window.c | 8 ++++++++ include/ntuser.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-)

2 1

[PATCH 09/10] win32u: Move GetWindowInfo implementation from user32.
by Jacek Caban March 9, 2022

March 9, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 21 ++------------------- dlls/win32u/input.c | 8 ++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 20 ++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 32 insertions(+), 19 deletions(-)

2 1

[PATCH 07/10] win32u: Move GetDpiForWindow from user32.
by Jacek Caban March 9, 2022

March 9, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/sysparams.c | 9 +++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 36 ++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 48 insertions(+), 29 deletions(-)

2 1

[PATCH 06/10] win32u: Move GetWindowDpiAwarenessContext from user32.
by Jacek Caban March 9, 2022

March 9, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 25 +------------------------ dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 33 ++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 2 +- include/ntuser.h | 3 ++- 5 files changed, 37 insertions(+), 28 deletions(-)

2 1

[PATCH 05/10] win32u: Move IsWindowUnicode implementation from user32.
by Jacek Caban March 9, 2022

March 9, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 23 +---------------------- dlls/win32u/window.c | 29 +++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 31 insertions(+), 22 deletions(-)

2 1

[PATCH 03/10] win32u: Move load_driver implementation from user32.
by Jacek Caban March 9, 2022

March 9, 2022

2 1