mapi32/tests: Win64 printf format warning fixes.

dlls/mapi32/tests/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 TESTDLL   = mapi32.dll
 IMPORTS   = kernel32
 EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 CTESTS = \
 	imalloc.c \

dlls/mapi32/tests/imalloc.c

@@ -55,13 +55,13 @@ static void test_IMalloc(void)
     lpVoid = NULL;
     hRet = IMalloc_QueryInterface(lpMalloc, &IID_IUnknown, &lpVoid);
     ok (hRet == S_OK && lpVoid != NULL,
-        "IID_IUnknown: exepected S_OK, non-null, got 0x%08lx, %p\n",
+        "IID_IUnknown: exepected S_OK, non-null, got 0x%08x, %p\n",
         hRet, lpVoid);
 
     lpVoid = NULL;
     hRet = IMalloc_QueryInterface(lpMalloc, &IID_IMalloc, &lpVoid);
     ok (hRet == S_OK && lpVoid != NULL,
-        "IID_IIMalloc: exepected S_OK, non-null, got 0x%08lx, %p\n",
+        "IID_IIMalloc: exepected S_OK, non-null, got 0x%08x, %p\n",
         hRet, lpVoid);
 
     /* Prove that native mapi uses LocalAlloc/LocalFree */
@@ -79,10 +79,10 @@ static void test_IMalloc(void)
     LocalFree(lpMem);
  
     ulRef = IMalloc_AddRef(lpMalloc);
-    ok (ulRef == 1u, "AddRef expected 1, returned %ld\n", ulRef); 
+    ok (ulRef == 1u, "AddRef expected 1, returned %d\n", ulRef); 
     
     ulRef = IMalloc_Release(lpMalloc);
-    ok (ulRef == 1u, "AddRef expected 1, returned %ld\n", ulRef);
+    ok (ulRef == 1u, "AddRef expected 1, returned %d\n", ulRef);
 
     IMalloc_Release(lpMalloc);
 }

dlls/mapi32/tests/util.c

@@ -71,7 +71,7 @@ static void test_SwapPlong(void)
     longs[2] = 0x20000001;
     pSwapPlong(longs, 2);
     ok(longs[0] == 0x0100ffff && longs[1] == 0xffff0010 && longs[2] == 0x20000001,
-       "Expected {0x0100ffff,0xffff0010,0x20000001}, got {0x%08lx,0x%08lx,0x%08lx}\n",
+       "Expected {0x0100ffff,0xffff0010,0x20000001}, got {0x%08x,0x%08x,0x%08x}\n",
        longs[0], longs[1], longs[2]);
 }
 
@@ -131,9 +131,9 @@ static void test_UlFromSzHex(void)
         return;
 
     ok(pUlFromSzHex("fF") == 0xffu,
-       "UlFromSzHex: expected 0xff, got 0x%lx\n", pUlFromSzHex("fF"));
+       "UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF"));
 
-    ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: exected 0x0. got 0x%lx\n",
+    ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: exected 0x0. got 0x%x\n",
        pUlFromSzHex(" c"));
 }
 
@@ -153,7 +153,7 @@ static void test_CbOfEncoded(void)
         memset(buff, '\0', sizeof(buff));
         memset(buff, '?', i);
         ulRet = pCbOfEncoded(buff);
-        ok(ulRet == ulExpected, "CbOfEncoded(length %d): expected %ld, got %ld\n",
+        ok(ulRet == ulExpected, "CbOfEncoded(length %d): expected %d, got %d\n",
            i, ulExpected, ulRet);
     }
 }