From d81afa52ec121c999922683a3292aa10a72c50a0 Mon Sep 17 00:00:00 2001
From: Piotr Caban <piotr@codeweavers.com>
Date: Fri, 11 Feb 2022 23:41:50 +0100
Subject: [PATCH] msvcrt/tests: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/msvcrt/tests/Makefile.in |  1 -
 dlls/msvcrt/tests/data.c      | 10 ++++-----
 dlls/msvcrt/tests/file.c      | 42 +++++++++++++++++------------------
 dlls/msvcrt/tests/locale.c    |  6 ++---
 dlls/msvcrt/tests/misc.c      | 22 +++++++++---------
 dlls/msvcrt/tests/string.c    | 26 +++++++++++-----------
 dlls/msvcrt/tests/time.c      | 14 ++++++------
 7 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in
index 4e29f2e85fe..1db6da2a0ad 100644
--- a/dlls/msvcrt/tests/Makefile.in
+++ b/dlls/msvcrt/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = msvcrt.dll
 IMPORTS   = advapi32
 
diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c
index 52742ba4994..a0de94fd352 100644
--- a/dlls/msvcrt/tests/data.c
+++ b/dlls/msvcrt/tests/data.c
@@ -91,12 +91,12 @@ static void test_initvar( HMODULE hmsvcrt )
     winminor = *pp_winminor;
     winmajor = *pp_winmajor;
     GetVersionExA( &osvi);
-    ok( winminor == osvi.dwMinorVersion, "Wrong value for _winminor %02x expected %02x\n",
+    ok( winminor == osvi.dwMinorVersion, "Wrong value for _winminor %02x expected %02lx\n",
             winminor, osvi.dwMinorVersion);
-    ok( winmajor == osvi.dwMajorVersion, "Wrong value for _winmajor %02x expected %02x\n",
+    ok( winmajor == osvi.dwMajorVersion, "Wrong value for _winmajor %02x expected %02lx\n",
             winmajor, osvi.dwMajorVersion);
     ok( winver == ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion),
-            "Wrong value for _winver %02x expected %02x\n",
+            "Wrong value for _winver %02x expected %02lx\n",
             winver, ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion));
     if( !pp_osver || !pp_osplatform ) {
         win_skip("_osver variables are not available\n");
@@ -107,10 +107,10 @@ static void test_initvar( HMODULE hmsvcrt )
     ok( osver == (osvi.dwBuildNumber & 0xffff) ||
             ((osvi.dwBuildNumber >> 24) == osvi.dwMajorVersion &&
                  ((osvi.dwBuildNumber >> 16) & 0xff) == osvi.dwMinorVersion), /* 95/98/ME */
-            "Wrong value for _osver %04x expected %04x\n",
+            "Wrong value for _osver %04x expected %04lx\n",
             osver, osvi.dwBuildNumber);
     ok(osplatform == osvi.dwPlatformId,
-            "Wrong value for _osplatform %x expected %x\n",
+            "Wrong value for _osplatform %x expected %lx\n",
             osplatform, osvi.dwPlatformId);
 }
 
diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c
index ceb2165891f..bc26f90643e 100644
--- a/dlls/msvcrt/tests/file.c
+++ b/dlls/msvcrt/tests/file.c
@@ -263,7 +263,7 @@ static void test_readmode( BOOL ascii_mode )
     ok(fgets(buffer,2*BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE);
     l = ftell(file);
     pl = 2*BUFSIZ-2;
-    ok(l == pl,"padding line ftell got %d should be %d in %s\n", l, pl, IOMODE);
+    ok(l == pl,"padding line ftell got %ld should be %d in %s\n", l, pl, IOMODE);
     ok(lstrlenA(buffer) == pl+ao,"padding line fgets got size %d should be %d in %s\n",
      lstrlenA(buffer), pl+ao, IOMODE);
     for (fp=0; fp<strlen(outbuffer); fp++)
@@ -271,23 +271,23 @@ static void test_readmode( BOOL ascii_mode )
     fp++;
     ok(fgets(buffer,256,file) !=0,"line 1 fgets failed unexpected in %s\n", IOMODE);
     l = ftell(file);
-    ok(l == pl+fp,"line 1 ftell got %d should be %d in %s\n", l, pl+fp, IOMODE);
+    ok(l == pl+fp,"line 1 ftell got %ld should be %d in %s\n", l, pl+fp, IOMODE);
     ok(lstrlenA(buffer) == fp+ao,"line 1 fgets got size %d should be %d in %s\n",
      lstrlenA(buffer), fp+ao, IOMODE);
     /* test a seek back across the buffer boundary */
     l = pl;
     ok(fseek(file,l,SEEK_SET)==0,"seek failure in %s\n", IOMODE);
     l = ftell(file);
-    ok(l == pl,"ftell after seek got %d should be %d in %s\n", l, pl, IOMODE);
+    ok(l == pl,"ftell after seek got %ld should be %d in %s\n", l, pl, IOMODE);
     ok(fgets(buffer,256,file) !=0,"second read of line 1 fgets failed unexpected in %s\n", IOMODE);
     l = ftell(file);
-    ok(l == pl+fp,"second read of line 1 ftell got %d should be %d in %s\n", l, pl+fp, IOMODE);
+    ok(l == pl+fp,"second read of line 1 ftell got %ld should be %d in %s\n", l, pl+fp, IOMODE);
     ok(lstrlenA(buffer) == fp+ao,"second read of line 1 fgets got size %d should be %d in %s\n",
      lstrlenA(buffer), fp+ao, IOMODE);
     ok(fgets(buffer,256,file) !=0,"line 2 fgets failed unexpected in %s\n", IOMODE);
     fp += 2;
     l = ftell(file);
-    ok(l == pl+fp,"line 2 ftell got %d should be %d in %s\n", l, pl+fp, IOMODE);
+    ok(l == pl+fp,"line 2 ftell got %ld should be %d in %s\n", l, pl+fp, IOMODE);
     ok(lstrlenA(buffer) == 2+ao,"line 2 fgets got size %d should be %d in %s\n",
      lstrlenA(buffer), 2+ao, IOMODE);
     
@@ -299,7 +299,7 @@ static void test_readmode( BOOL ascii_mode )
     i=fread(buffer,1,BUFSIZ+strlen(outbuffer),file);
     ok(i==BUFSIZ+j,"fread failed, expected %d got %d in %s\n", BUFSIZ+j, i, IOMODE);
     l = ftell(file);
-    ok(l == pl+j-(ao*4)-5,"ftell after fread got %d should be %d in %s\n", l, pl+j-(ao*4)-5, IOMODE);
+    ok(l == pl+j-(ao*4)-5,"ftell after fread got %ld should be %d in %s\n", l, pl+j-(ao*4)-5, IOMODE);
     for (m=0; m<3; m++)
         ok(buffer[m]==padbuffer[m+(BUFSIZ-4)%strlen(padbuffer)],"expected %c got %c\n", padbuffer[m], buffer[m]);
     m+=BUFSIZ+2+ao;
@@ -781,10 +781,10 @@ static void test_fgetwc( void )
   tempfh = fopen(tempf,"rt"); /* open in TEXT mode */
   fgetws(wtextW,LLEN,tempfh);
   l=ftell(tempfh);
-  ok(l==BUFSIZ-2, "ftell expected %d got %d\n", BUFSIZ-2, l);
+  ok(l==BUFSIZ-2, "ftell expected %d got %ld\n", BUFSIZ-2, l);
   fgetws(wtextW,LLEN,tempfh);
   l=ftell(tempfh);
-  ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %d\n", BUFSIZ-2+lstrlenA(mytext), l);
+  ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", BUFSIZ-2+lstrlenA(mytext), l);
   mytextW = AtoW (mytext);
   aptr = mytextW;
   wptr = wtextW;
@@ -817,25 +817,25 @@ static void test_fgetwc( void )
   fgetws(wtextW,j,tempfh);
   l=ftell(tempfh);
   j=(j-1)*sizeof(WCHAR);
-  ok(l==j, "ftell expected %d got %d\n", j, l);
+  ok(l==j, "ftell expected %d got %ld\n", j, l);
   i=fgetc(tempfh);
   ok(i=='a', "fgetc expected %d got %d\n", 0x61, i);
   l=ftell(tempfh);
   j++;
-  ok(l==j, "ftell expected %d got %d\n", j, l);
+  ok(l==j, "ftell expected %d got %ld\n", j, l);
   fgetws(wtextW,3,tempfh);
   ok(wtextW[0]=='\r',"expected carriage return got %04hx\n", wtextW[0]);
   ok(wtextW[1]=='\n',"expected newline got %04hx\n", wtextW[1]);
   l=ftell(tempfh);
   j += 4;
-  ok(l==j, "ftell expected %d got %d\n", j, l);
+  ok(l==j, "ftell expected %d got %ld\n", j, l);
   for(i=0; i<strlen(mytext); i++)
     wtextW[i] = 0;
   /* the first time we get the string, it should be entirely within the local buffer */
   fgetws(wtextW,LLEN,tempfh);
   l=ftell(tempfh);
   j += (strlen(mytext)-1)*sizeof(WCHAR);
-  ok(l==j, "ftell expected %d got %d\n", j, l);
+  ok(l==j, "ftell expected %d got %ld\n", j, l);
   diff_found = FALSE;
   aptr = mytextW;
   wptr = wtextW;
@@ -1162,7 +1162,7 @@ static void test_ctrlz( void )
   ok(i==j, "returned string length expected %d got %d\n", j, i);
   j+=4; /* ftell should indicate the true end of file */
   l=ftell(tempfh);
-  ok(l==j, "ftell expected %d got %d\n", j, l);
+  ok(l==j, "ftell expected %d got %ld\n", j, l);
   ok(feof(tempfh), "did not get EOF\n");
   fclose(tempfh);
   
@@ -1172,7 +1172,7 @@ static void test_ctrlz( void )
   j=strlen(mytext)+3; /* should get through newline */
   ok(i==j, "returned string length expected %d got %d\n", j, i);
   l=ftell(tempfh);
-  ok(l==j, "ftell expected %d got %d\n", j, l);
+  ok(l==j, "ftell expected %d got %ld\n", j, l);
   ok(fgets(buffer,256,tempfh) != 0,"fgets failed unexpected\n");
   i=strlen(buffer);
   ok(i==1, "returned string length expected %d got %d\n", 1, i);
@@ -1598,7 +1598,7 @@ static void test_file_inherit( const char* selfname )
     arg_v[3] = buffer; sprintf(buffer, "%d", fd);
     arg_v[4] = 0;
     ret = _spawnvp(_P_WAIT, selfname, arg_v);
-    ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno);
+    ok(ret == 0, "_spawnvp returned %Id, errno %d\n", ret, errno);
     ok(tell(fd) == 8, "bad position %lu expecting 8\n", tell(fd));
     lseek(fd, 0, SEEK_SET);
     ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n");
@@ -1612,7 +1612,7 @@ static void test_file_inherit( const char* selfname )
     arg_v[3] = buffer; sprintf(buffer, "%d", fd);
     arg_v[4] = 0;
     ret = _spawnvp(_P_WAIT, selfname, arg_v);
-    ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno);
+    ok(ret == 0, "_spawnvp returned %Id, errno %d\n", ret, errno);
     ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd));
     ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer);
     close (fd);
@@ -1802,7 +1802,7 @@ static void test_invalid_stdin( const char* selfname )
     }
 
     ret = RegOpenCurrentUser(KEY_READ, &key);
-    ok(!ret, "RegOpenCurrentUser failed: %x\n", ret);
+    ok(!ret, "RegOpenCurrentUser failed: %lx\n", ret);
 
     sa.nLength = sizeof(sa);
     sa.lpSecurityDescriptor = NULL;
@@ -1821,7 +1821,7 @@ static void test_invalid_stdin( const char* selfname )
     wait_child_process(proc.hProcess);
 
     ret = RegCloseKey(key);
-    ok(!ret, "RegCloseKey failed: %x\n", ret);
+    ok(!ret, "RegCloseKey failed: %lx\n", ret);
 }
 
 static void test_tmpnam( void )
@@ -1865,14 +1865,14 @@ static void test_chsize( void )
     ok( _chsize( fd, sizeof(temptext) / 2 ) == 0, "_chsize() failed\n" );
 
     pos = _lseek( fd, 0, SEEK_CUR );
-    ok( cur == pos, "File pointer changed from: %d to: %d\n", cur, pos );
+    ok( cur == pos, "File pointer changed from: %ld to: %ld\n", cur, pos );
     ok( _filelength( fd ) == sizeof(temptext) / 2, "Wrong file size\n" );
 
     /* enlarge the file */
     ok( _chsize( fd, sizeof(temptext) * 2 ) == 0, "_chsize() failed\n" ); 
 
     pos = _lseek( fd, 0, SEEK_CUR );
-    ok( cur == pos, "File pointer changed from: %d to: %d\n", cur, pos );
+    ok( cur == pos, "File pointer changed from: %ld to: %ld\n", cur, pos );
     ok( _filelength( fd ) == sizeof(temptext) * 2, "Wrong file size\n" );
 
     _close( fd );
@@ -2481,7 +2481,7 @@ static void test_stdin(void)
             "GetStdHandle(STD_INPUT_HANDLE) != _get_osfhandle(STDIN_FILENO)\n");
 
     r = SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE);
-    ok(r == TRUE, "SetStdHandle returned %x, expected TRUE\n", r);
+    ok(r == TRUE, "SetStdHandle returned %lx, expected TRUE\n", r);
     h = GetStdHandle(STD_INPUT_HANDLE);
     ok(h == INVALID_HANDLE_VALUE, "h = %p\n", h);
 
diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c
index 030d65de3cb..f77e8f93abb 100644
--- a/dlls/msvcrt/tests/locale.c
+++ b/dlls/msvcrt/tests/locale.c
@@ -729,13 +729,13 @@ static void test__Gettnames(void)
     {
         size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT),
                               time_data[i], buf, sizeof(buf));
-        ok(size, "GetLocaleInfo failed: %x\n", GetLastError());
+        ok(size, "GetLocaleInfo failed: %lx\n", GetLastError());
         ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf);
     }
 
     ok(ret->wstr[0] != NULL, "ret->wstr[0] = NULL\n");
     ok(ret->str[42] + strlen(ret->str[42])+1 != (char*)ret->wstr[0],
-            "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n",
+            "ret->str[42] = %p len = %Id, ret->wstr[0] = %p\n",
             ret->str[42], strlen(ret->str[42]), ret->wstr[0]);
     free(ret);
 
@@ -747,7 +747,7 @@ static void test__Gettnames(void)
     {
         size = GetLocaleInfoA(MAKELCID(LANG_GERMAN, SORT_DEFAULT),
                               time_data[i], buf, sizeof(buf));
-        ok(size, "GetLocaleInfo failed: %x\n", GetLastError());
+        ok(size, "GetLocaleInfo failed: %lx\n", GetLastError());
         ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf);
     }
     free(ret);
diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c
index 06555e209b7..7b54b3aeb88 100644
--- a/dlls/msvcrt/tests/misc.c
+++ b/dlls/msvcrt/tests/misc.c
@@ -546,7 +546,7 @@ static int eq_nan(UINT64 ai, double b)
 static int eq_nanf(DWORD ai, float b)
 {
     DWORD bi = *(DWORD*)&b;
-    ok(ai == bi, "comparing %08x and %08x\n", ai, bi);
+    ok(ai == bi, "comparing %08lx and %08lx\n", ai, bi);
     return ai == bi;
 }
 
@@ -623,38 +623,38 @@ static void test_thread_handle_close(void)
     ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno);
     WaitForSingleObject(hThread, INFINITE);
     ret = CloseHandle(hThread);
-    ok(!ret, "ret = %d\n", ret);
+    ok(!ret, "ret = %ld\n", ret);
 
     hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)1);
     ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno);
     WaitForSingleObject(hThread, INFINITE);
     ret = CloseHandle(hThread);
-    ok(!ret, "ret = %d\n", ret);
+    ok(!ret, "ret = %ld\n", ret);
 
     hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)2);
     ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno);
     Sleep(150);
     ret = WaitForSingleObject(hThread, INFINITE);
-    ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "ret = %ld\n", ret);
     ret = CloseHandle(hThread);
-    ok(ret, "ret = %d\n", ret);
+    ok(ret, "ret = %ld\n", ret);
 
     hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)3);
     ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno);
     Sleep(150);
     ret = WaitForSingleObject(hThread, INFINITE);
-    ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "ret = %ld\n", ret);
     ret = CloseHandle(hThread);
-    ok(ret, "ret = %d\n", ret);
+    ok(ret, "ret = %ld\n", ret);
 
     /* _beginthreadex: handle is not closed on _endthread */
     hThread = (HANDLE)_beginthreadex(NULL,0, test_thread_func_ex, NULL, 0, NULL);
     ok(hThread != NULL, "_beginthreadex failed (%d)\n", errno);
     Sleep(150);
     ret = WaitForSingleObject(hThread, INFINITE);
-    ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "ret = %ld\n", ret);
     ret = CloseHandle(hThread);
-    ok(ret, "ret = %d\n", ret);
+    ok(ret, "ret = %ld\n", ret);
 }
 
 static void test_thread_suspended(void)
@@ -665,9 +665,9 @@ static void test_thread_suspended(void)
     hThread = (HANDLE)_beginthreadex(NULL, 0, test_thread_func_ex, NULL, CREATE_SUSPENDED, NULL);
     ok(hThread != NULL, "_beginthreadex failed (%d)\n", errno);
     ret = ResumeThread(hThread);
-    ok(ret == 1, "suspend count = %d\n", ret);
+    ok(ret == 1, "suspend count = %ld\n", ret);
     ret = WaitForSingleObject(hThread, 200);
-    ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "ret = %ld\n", ret);
 }
 
 static int __cdecl _lfind_s_comp(void *ctx, const void *l, const void *r)
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index be0356f4c7e..9835a8b265d 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -1707,58 +1707,58 @@ static void test_strtol(void)
     /* errno is modified on W2K8+ */
     errno = EBADF;
     l = strtol("-1234", &e, 0);
-    ok(l==-1234, "wrong value %d\n", l);
+    ok(l==-1234, "wrong value %ld\n", l);
     ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
     errno = EBADF;
     ul = strtoul("1234", &e, 0);
-    ok(ul==1234, "wrong value %u\n", ul);
+    ok(ul==1234, "wrong value %lu\n", ul);
     ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
 
     errno = EBADF;
     l = strtol("2147483647L", &e, 0);
-    ok(l==2147483647, "wrong value %d\n", l);
+    ok(l==2147483647, "wrong value %ld\n", l);
     ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
     errno = EBADF;
     l = strtol("-2147483648L", &e, 0);
-    ok(l==-2147483647L - 1, "wrong value %d\n", l);
+    ok(l==-2147483647L - 1, "wrong value %ld\n", l);
     ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
     errno = EBADF;
     ul = strtoul("4294967295UL", &e, 0);
-    ok(ul==4294967295ul, "wrong value %u\n", ul);
+    ok(ul==4294967295ul, "wrong value %lu\n", ul);
     ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
 
     errno = 0;
     l = strtol("9223372036854775807L", &e, 0);
-    ok(l==2147483647, "wrong value %d\n", l);
+    ok(l==2147483647, "wrong value %ld\n", l);
     ok(errno == ERANGE, "wrong errno %d\n", errno);
     errno = 0;
     ul = strtoul("9223372036854775807L", &e, 0);
-    ok(ul==4294967295ul, "wrong value %u\n", ul);
+    ok(ul==4294967295ul, "wrong value %lu\n", ul);
     ok(errno == ERANGE, "wrong errno %d\n", errno);
 
     errno = 0;
     ul = strtoul("-2", NULL, 0);
-    ok(ul == -2, "wrong value %u\n", ul);
+    ok(ul == -2, "wrong value %lu\n", ul);
     ok(errno == 0, "wrong errno %d\n", errno);
 
     errno = 0;
     ul = strtoul("-4294967294", NULL, 0);
-    ok(ul == 2, "wrong value %u\n", ul);
+    ok(ul == 2, "wrong value %lu\n", ul);
     ok(errno == 0, "wrong errno %d\n", errno);
 
     errno = 0;
     ul = strtoul("-4294967295", NULL, 0);
-    ok(ul==1, "wrong value %u\n", ul);
+    ok(ul==1, "wrong value %lu\n", ul);
     ok(errno == 0, "wrong errno %d\n", errno);
 
     errno = 0;
     ul = strtoul("-4294967296", NULL, 0);
-    ok(ul == 1, "wrong value %u\n", ul);
+    ok(ul == 1, "wrong value %lu\n", ul);
     ok(errno == ERANGE, "wrong errno %d\n", errno);
 
     errno = 0;
     l = strtol(neg, &e, 0);
-    ok(l == 0, "wrong value %d\n", l);
+    ok(l == 0, "wrong value %ld\n", l);
     ok(errno == 0, "wrong errno %d\n", errno);
     ok(e == neg, "e = %p, neg = %p\n", e, neg);
 }
@@ -2349,7 +2349,7 @@ static void test__wcstombs_s_l(void)
         memset(out, 0xcc, sizeof(out));
         err = p_wcstombs_s_l(&ret, tests[i].str ? out : NULL, tests[i].len,
                              tests[i].wstr, tests[i].wlen, locale);
-        ok(ret == tests[i].ret, "%d: expected ret %d, got %d for '%s' in locale %s\n", i, tests[i].ret, ret,
+        ok(ret == tests[i].ret, "%d: expected ret %Id, got %Id for '%s' in locale %s\n", i, tests[i].ret, ret,
             wine_dbgstr_w(tests[i].wstr), tests[i].locale);
         ok(err == tests[i].err, "%d: expected err %d, got %d for '%s' in locale %s\n", i, tests[i].err, err,
             wine_dbgstr_w(tests[i].wstr), tests[i].locale);
diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index 19f5c5a81d5..d4e0ac40239 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -224,7 +224,7 @@ static void test_mktime(void)
 
     ok (res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n");
     WideCharToMultiByte( CP_ACP, 0, tzinfo.StandardName, -1, buffer, sizeof(buffer), NULL, NULL );
-    trace( "bias %d std %d dst %d zone %s\n",
+    trace( "bias %ld std %ld dst %ld zone %s\n",
            tzinfo.Bias, tzinfo.StandardBias, tzinfo.DaylightBias, buffer );
     /* Bias may be positive or negative, to use offset of one day */
     my_tm = *localtime(&ref);  /* retrieve current dst flag */
@@ -244,14 +244,14 @@ static void test_mktime(void)
     sav_tm = my_tm;
 
     local_time = mktime(&my_tm);
-    ok(local_time == ref, "mktime returned %u, expected %u\n",
+    ok(local_time == ref, "mktime returned %lu, expected %lu\n",
        (DWORD)local_time, (DWORD)ref);
     /* now test some unnormalized struct tm's */
     my_tm = sav_tm;
     my_tm.tm_sec += 60;
     my_tm.tm_min -= 1;
     local_time = mktime(&my_tm);
-    ok(local_time == ref, "Unnormalized mktime returned %u, expected %u\n",
+    ok(local_time == ref, "Unnormalized mktime returned %lu, expected %lu\n",
         (DWORD)local_time, (DWORD)ref);
     ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon &&
         my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour &&
@@ -265,7 +265,7 @@ static void test_mktime(void)
     my_tm.tm_min -= 60;
     my_tm.tm_hour += 1;
     local_time = mktime(&my_tm);
-    ok(local_time == ref, "Unnormalized mktime returned %u, expected %u\n",
+    ok(local_time == ref, "Unnormalized mktime returned %lu, expected %lu\n",
        (DWORD)local_time, (DWORD)ref);
     ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon &&
         my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour &&
@@ -279,7 +279,7 @@ static void test_mktime(void)
     my_tm.tm_mon -= 12;
     my_tm.tm_year += 1;
     local_time = mktime(&my_tm);
-    ok(local_time == ref, "Unnormalized mktime returned %u, expected %u\n",
+    ok(local_time == ref, "Unnormalized mktime returned %lu, expected %lu\n",
        (DWORD)local_time, (DWORD)ref);
     ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon &&
         my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour &&
@@ -293,7 +293,7 @@ static void test_mktime(void)
     my_tm.tm_mon += 12;
     my_tm.tm_year -= 1;
     local_time = mktime(&my_tm);
-    ok(local_time == ref, "Unnormalized mktime returned %u, expected %u\n",
+    ok(local_time == ref, "Unnormalized mktime returned %lu, expected %lu\n",
        (DWORD)local_time, (DWORD)ref);
     ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon &&
         my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour &&
@@ -315,7 +315,7 @@ static void test_mktime(void)
     _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):""));
     putenv("TZ=GMT");
     nulltime = mktime(&my_tm);
-    ok(nulltime == ref,"mktime returned 0x%08x\n",(DWORD)nulltime);
+    ok(nulltime == ref,"mktime returned 0x%08lx\n",(DWORD)nulltime);
     putenv(TZ_env);
 }