kernel32/tests: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Mon Oct 9 18:06:48 CDT 2006
---
dlls/kernel32/tests/Makefile.in | 1
dlls/kernel32/tests/alloc.c | 14 +-
dlls/kernel32/tests/atom.c | 20 +--
dlls/kernel32/tests/change.c | 68 +++++-----
dlls/kernel32/tests/codepage.c | 20 +--
dlls/kernel32/tests/comm.c | 180 +++++++++++++------------
dlls/kernel32/tests/console.c | 16 +-
dlls/kernel32/tests/directory.c | 70 +++++-----
dlls/kernel32/tests/drive.c | 36 +++--
dlls/kernel32/tests/environ.c | 56 ++++----
dlls/kernel32/tests/file.c | 272 +++++++++++++++++++-------------------
dlls/kernel32/tests/format_msg.c | 58 ++++----
dlls/kernel32/tests/heap.c | 58 ++++----
dlls/kernel32/tests/locale.c | 108 ++++++++-------
dlls/kernel32/tests/module.c | 20 +--
dlls/kernel32/tests/path.c | 64 ++++-----
dlls/kernel32/tests/pipe.c | 58 ++++----
dlls/kernel32/tests/process.c | 14 +-
dlls/kernel32/tests/sync.c | 10 +
dlls/kernel32/tests/thread.c | 46 +++---
dlls/kernel32/tests/time.c | 18 +--
dlls/kernel32/tests/toolhelp.c | 14 +-
dlls/kernel32/tests/version.c | 40 +++---
dlls/kernel32/tests/virtual.c | 52 ++++---
24 files changed, 656 insertions(+), 657 deletions(-)
diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in
index 1366200..fe3bc4a 100644
--- a/dlls/kernel32/tests/Makefile.in
+++ b/dlls/kernel32/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = kernel32.dll
IMPORTS = kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \
alloc.c \
diff --git a/dlls/kernel32/tests/alloc.c b/dlls/kernel32/tests/alloc.c
index 49cf99a..c46fa8d 100644
--- a/dlls/kernel32/tests/alloc.c
+++ b/dlls/kernel32/tests/alloc.c
@@ -188,7 +188,7 @@ static void test_Global(void)
/* Check that a 'zeroing' alloc works */
mem2=GlobalAlloc(GMEM_ZEROINIT,memchunk);
- ok(mem2!=NULL,"GlobalAlloc failed: error=%ld\n",GetLastError());
+ ok(mem2!=NULL,"GlobalAlloc failed: error=%d\n",GetLastError());
if(mem2) {
ok(GlobalSize(mem2)>=memchunk,"GlobalAlloc should return a big enough memory block\n");
mem2ptr=GlobalLock(mem2);
@@ -272,18 +272,18 @@ static void test_Local(void)
/* Check that a normal alloc works */
mem1=LocalAlloc(0,memchunk);
- ok(mem1!=NULL,"LocalAlloc failed: error=%ld\n",GetLastError());
+ ok(mem1!=NULL,"LocalAlloc failed: error=%d\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=%ld\n",GetLastError());
+ ok(mem2!=NULL,"LocalAlloc failed: error=%d\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=%ld\n",GetLastError());
+ ok(mem2ptr!=NULL,"LocalLock: error=%d\n",GetLastError());
if(mem2ptr) {
error=0;
for(i=0;i<memchunk;i++) {
@@ -295,7 +295,7 @@ static void test_Local(void)
SetLastError(0);
error=LocalUnlock(mem2);
ok(error==0 && GetLastError()==NO_ERROR,
- "LocalUnlock Failed: rc=%d err=%ld\n",error,GetLastError());
+ "LocalUnlock Failed: rc=%d err=%d\n",error,GetLastError());
}
}
mem2a=LocalFree(mem2);
@@ -303,11 +303,11 @@ static void test_Local(void)
/* Reallocate mem2 as moveable memory */
mem2=LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT,memchunk);
- ok(mem2!=NULL, "LocalAlloc failed to create moveable memory, error=%ld\n",GetLastError());
+ ok(mem2!=NULL, "LocalAlloc failed to create moveable memory, error=%d\n",GetLastError());
/* Check that ReAllocing memory works as expected */
mem2a=LocalReAlloc(mem2,2*memchunk,LMEM_MOVEABLE | LMEM_ZEROINIT);
- ok(mem2a!=NULL,"LocalReAlloc failed, error=%ld\n",GetLastError());
+ ok(mem2a!=NULL,"LocalReAlloc failed, error=%d\n",GetLastError());
if(mem2a) {
ok(LocalSize(mem2a)>=2*memchunk,"LocalReAlloc failed\n");
mem2ptr=LocalLock(mem2a);
diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c
index 1f4cbb3..87b7afd 100644
--- a/dlls/kernel32/tests/atom.c
+++ b/dlls/kernel32/tests/atom.c
@@ -211,12 +211,12 @@ static void test_get_atom_name(void)
{
ok(GetLastError() == (i ? ERROR_MORE_DATA : ERROR_INVALID_PARAMETER) ||
GetLastError() == 0xdeadbeef, /* the Win 9x way */
- "wrong error conditions %lu for %u\n", GetLastError(), i);
+ "wrong error conditions %u for %u\n", GetLastError(), i);
}
else /* the Win 9x way */
{
ok(GetLastError() == 0xdeadbeef,
- "wrong error conditions %lu for %u\n", GetLastError(), i);
+ "wrong error conditions %u for %u\n", GetLastError(), i);
}
}
@@ -251,11 +251,11 @@ static void test_get_atom_name(void)
len = GlobalGetAtomNameA(atom, out, 10);
if (!len) /* the NT way */
{
- ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%lu instead of %u)\n", GetLastError(), ERROR_MORE_DATA);
+ ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%u instead of %u)\n", GetLastError(), ERROR_MORE_DATA);
}
else /* the Win9x way */
{
- ok(GetLastError() == 0xdeadbeef, "wrong error code (%lu instead of %u)\n", GetLastError(), 0xdeadbeef);
+ ok(GetLastError() == 0xdeadbeef, "wrong error code (%u instead of %u)\n", GetLastError(), 0xdeadbeef);
}
for (i = 0; i < 9; i++)
{
@@ -292,7 +292,7 @@ static void test_get_atom_name(void)
{
/* len == 0 with ERROR_MORE_DATA is on NT3.51 */
ok(len == 1 || (len == 0 && GetLastError() == ERROR_MORE_DATA),
- "0x%04x: got %u with %ld (excepted '1' or '0' with " \
+ "0x%04x: got %u with %d (excepted '1' or '0' with " \
"ERROR_MORE_DATA)\n", i, len, GetLastError());
ok(outW[1] == DOUBLE('.'), "buffer overwrite\n");
}
@@ -499,12 +499,12 @@ static void test_local_get_atom_name(voi
ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER ||
GetLastError() == ERROR_MORE_DATA ||
GetLastError() == 0xdeadbeef, /* the Win 9x way */
- "wrong error conditions %lu for %u\n", GetLastError(), i);
+ "wrong error conditions %u for %u\n", GetLastError(), i);
else
ok(GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_MORE_DATA ||
GetLastError() == 0xdeadbeef, /* the Win 9x way */
- "wrong error conditions %lu for %u\n", GetLastError(), i);
+ "wrong error conditions %u for %u\n", GetLastError(), i);
}
/* test string limits & overflow */
do_initA(in, "abcdefghij", 255);
@@ -534,7 +534,7 @@ static void test_local_get_atom_name(voi
ok(GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_MORE_DATA ||
GetLastError() == 0xdeadbeef, /* the Win 9x way */
- "wrong error code (%lu)\n", GetLastError());
+ "wrong error code (%u)\n", GetLastError());
if (unicode_OS)
{
@@ -561,7 +561,7 @@ static void test_local_get_atom_name(voi
/* ERROR_MORE_DATA is on nt3.51 sp5 */
ok(GetLastError() == ERROR_MORE_DATA ||
GetLastError() == (i ? ERROR_INSUFFICIENT_BUFFER : ERROR_INVALID_PARAMETER),
- "wrong error conditions %lu for %u\n", GetLastError(), i);
+ "wrong error conditions %u for %u\n", GetLastError(), i);
}
do_initW(inW, "abcdefghij", 255);
atom = AddAtomW(inW);
@@ -589,7 +589,7 @@ static void test_local_get_atom_name(voi
/* ERROR_MORE_DATA is on nt3.51 sp5 */
ok(GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_MORE_DATA,
- "wrong error code (%lu)\n", GetLastError());
+ "wrong error code (%u)\n", GetLastError());
}
}
diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c
index d374e3c..04bbbc4 100644
--- a/dlls/kernel32/tests/change.c
+++ b/dlls/kernel32/tests/change.c
@@ -49,7 +49,7 @@ static DWORD CALLBACK NotificationThread
}
ret = FindCloseChangeNotification(change);
- ok( ret, "FindCloseChangeNotification error: %ld\n",
+ ok( ret, "FindCloseChangeNotification error: %d\n",
GetLastError());
ExitThread((DWORD)ret);
@@ -61,11 +61,11 @@ static HANDLE StartNotificationThread(LP
DWORD threadId;
change = FindFirstChangeNotificationA(path, subtree, flags);
- ok(change != INVALID_HANDLE_VALUE, "FindFirstChangeNotification error: %ld\n", GetLastError());
+ ok(change != INVALID_HANDLE_VALUE, "FindFirstChangeNotification error: %d\n", GetLastError());
thread = CreateThread(NULL, 0, NotificationThread, (LPVOID)change,
0, &threadId);
- ok(thread != INVALID_HANDLE_VALUE, "CreateThread error: %ld\n", GetLastError());
+ ok(thread != INVALID_HANDLE_VALUE, "CreateThread error: %d\n", GetLastError());
return thread;
}
@@ -75,7 +75,7 @@ static DWORD FinishNotificationThread(HA
DWORD status, exitcode;
status = WaitForSingleObject(thread, 5000);
- ok(status == WAIT_OBJECT_0, "WaitForSingleObject status %ld error %ld\n", status, GetLastError());
+ ok(status == WAIT_OBJECT_0, "WaitForSingleObject status %d error %d\n", status, GetLastError());
ok(GetExitCodeThread(thread, &exitcode), "Could not retrieve thread exit code\n");
@@ -97,45 +97,45 @@ static void test_FindFirstChangeNotifica
change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
ok(change == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND,
- "FindFirstChangeNotification error: %ld\n", GetLastError());
+ "FindFirstChangeNotification error: %d\n", GetLastError());
if (0) /* This documents win2k behavior. It crashes on win98. */
{
change = FindFirstChangeNotificationA(NULL, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
ok(change == NULL && GetLastError() == ERROR_PATH_NOT_FOUND,
- "FindFirstChangeNotification error: %ld\n", GetLastError());
+ "FindFirstChangeNotification error: %d\n", GetLastError());
}
ret = FindNextChangeNotification(NULL);
- ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindNextChangeNotification error: %ld\n",
+ ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindNextChangeNotification error: %d\n",
GetLastError());
ret = FindCloseChangeNotification(NULL);
- ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindCloseChangeNotification error: %ld\n",
+ ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindCloseChangeNotification error: %d\n",
GetLastError());
ret = GetTempPathA(MAX_PATH, workdir);
- ok(ret, "GetTempPathA error: %ld\n", GetLastError());
+ ok(ret, "GetTempPathA error: %d\n", GetLastError());
lstrcatA(workdir, "testFileChangeNotification");
ret = CreateDirectoryA(workdir, NULL);
- ok(ret, "CreateDirectoryA error: %ld\n", GetLastError());
+ ok(ret, "CreateDirectoryA error: %d\n", GetLastError());
ret = GetTempFileNameA(workdir, prefix, 0, filename1);
- ok(ret, "GetTempFileNameA error: %ld\n", GetLastError());
+ ok(ret, "GetTempFileNameA error: %d\n", GetLastError());
file = CreateFileA(filename1, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, 0);
- ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError());
ret = CloseHandle(file);
- ok( ret, "CloseHandle error: %ld\n", GetLastError());
+ ok( ret, "CloseHandle error: %d\n", GetLastError());
/* Try to register notification for a file. win98 and win2k behave differently here */
change = FindFirstChangeNotificationA(filename1, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
ok(change == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_DIRECTORY ||
GetLastError() == ERROR_FILE_NOT_FOUND),
- "FindFirstChangeNotification error: %ld\n", GetLastError());
+ "FindFirstChangeNotification error: %d\n", GetLastError());
lstrcpyA(dirname1, filename1);
lstrcatA(dirname1, "dir");
@@ -144,18 +144,18 @@ static void test_FindFirstChangeNotifica
lstrcatA(dirname2, "new");
ret = CreateDirectoryA(dirname1, NULL);
- ok(ret, "CreateDirectoryA error: %ld\n", GetLastError());
+ ok(ret, "CreateDirectoryA error: %d\n", GetLastError());
/* What if we move the directory we registered notification for? */
thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME);
ret = MoveFileA(dirname1, dirname2);
- ok(ret, "MoveFileA error: %ld\n", GetLastError());
+ ok(ret, "MoveFileA error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* What if we remove the directory we registered notification for? */
thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME);
ret = RemoveDirectoryA(dirname2);
- ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError());
+ ok(ret, "RemoveDirectoryA error: %d\n", GetLastError());
/* win98 and win2k behave differently here */
ret = FinishNotificationThread(thread);
@@ -166,19 +166,19 @@ static void test_FindFirstChangeNotifica
/* Create a directory */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME);
ret = CreateDirectoryA(dirname1, NULL);
- ok(ret, "CreateDirectoryA error: %ld\n", GetLastError());
+ ok(ret, "CreateDirectoryA error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* Rename a directory */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME);
ret = MoveFileA(dirname1, dirname2);
- ok(ret, "MoveFileA error: %ld\n", GetLastError());
+ ok(ret, "MoveFileA error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* Delete a directory */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME);
ret = RemoveDirectoryA(dirname2);
- ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError());
+ ok(ret, "RemoveDirectoryA error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
lstrcpyA(filename2, filename1);
@@ -187,63 +187,63 @@ static void test_FindFirstChangeNotifica
/* Rename a file */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
ret = MoveFileA(filename1, filename2);
- ok(ret, "MoveFileA error: %ld\n", GetLastError());
+ ok(ret, "MoveFileA error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* Delete a file */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
ret = DeleteFileA(filename2);
- ok(ret, "DeleteFileA error: %ld\n", GetLastError());
+ ok(ret, "DeleteFileA error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* Create a file */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
file = CreateFileA(filename2, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, 0);
- ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError());
ret = CloseHandle(file);
- ok( ret, "CloseHandle error: %ld\n", GetLastError());
+ ok( ret, "CloseHandle error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
attributes = GetFileAttributesA(filename2);
- ok(attributes != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA error: %ld\n", GetLastError());
+ ok(attributes != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA error: %d\n", GetLastError());
attributes &= FILE_ATTRIBUTE_READONLY;
/* Change file attributes */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_ATTRIBUTES);
ret = SetFileAttributesA(filename2, attributes);
- ok(ret, "SetFileAttributesA error: %ld\n", GetLastError());
+ ok(ret, "SetFileAttributesA error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* Change last write time by writing to a file */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_LAST_WRITE);
file = CreateFileA(filename2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, 0);
- ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError());
ret = WriteFile(file, buffer, sizeof(buffer), &count, NULL);
- ok(ret && count == sizeof(buffer), "WriteFile error: %ld\n", GetLastError());
+ ok(ret && count == sizeof(buffer), "WriteFile error: %d\n", GetLastError());
ret = CloseHandle(file);
- ok( ret, "CloseHandle error: %ld\n", GetLastError());
+ ok( ret, "CloseHandle error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* Change file size by truncating a file */
thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_SIZE);
file = CreateFileA(filename2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, 0);
- ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError());
ret = WriteFile(file, buffer, sizeof(buffer) / 2, &count, NULL);
- ok(ret && count == sizeof(buffer) / 2, "WriteFileA error: %ld\n", GetLastError());
+ ok(ret && count == sizeof(buffer) / 2, "WriteFileA error: %d\n", GetLastError());
ret = CloseHandle(file);
- ok( ret, "CloseHandle error: %ld\n", GetLastError());
+ ok( ret, "CloseHandle error: %d\n", GetLastError());
ok(FinishNotificationThread(thread), "Missed notification\n");
/* clean up */
ret = DeleteFileA(filename2);
- ok(ret, "DeleteFileA error: %ld\n", GetLastError());
+ ok(ret, "DeleteFileA error: %d\n", GetLastError());
ret = RemoveDirectoryA(workdir);
- ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError());
+ ok(ret, "RemoveDirectoryA error: %d\n", GetLastError());
}
/* this test concentrates more on the wait behaviour of the handle */
diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c
index db9ee16..d65aa59 100644
--- a/dlls/kernel32/tests/codepage.c
+++ b/dlls/kernel32/tests/codepage.c
@@ -36,7 +36,7 @@ static void test_destination_buffer(void
SetLastError(0xdeadbeef);
needed = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL);
- ok( (needed > 0), "returned %d with 0x%lx/%ld (expected '> 0')\n",
+ ok( (needed > 0), "returned %d with 0x%x/%d (expected '> 0')\n",
needed, GetLastError(), GetLastError());
maxsize = needed*2;
@@ -48,14 +48,14 @@ static void test_destination_buffer(void
buffer[maxsize] = '\0';
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed+1, NULL, NULL);
- ok( (len > 0), "returned %d with 0x%lx/%ld and '%s' (expected '> 0')\n",
+ ok( (len > 0), "returned %d with 0x%x/%d and '%s' (expected '> 0')\n",
len, GetLastError(), GetLastError(), buffer);
memset(buffer, 'x', maxsize);
buffer[maxsize] = '\0';
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed, NULL, NULL);
- ok( (len > 0), "returned %d with 0x%lx/%ld and '%s' (expected '> 0')\n",
+ ok( (len > 0), "returned %d with 0x%x/%d and '%s' (expected '> 0')\n",
len, GetLastError(), GetLastError(), buffer);
memset(buffer, 'x', maxsize);
@@ -63,7 +63,7 @@ static void test_destination_buffer(void
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed-1, NULL, NULL);
ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER),
- "returned %d with 0x%lx/%ld and '%s' (expected '0' with " \
+ "returned %d with 0x%x/%d and '%s' (expected '0' with " \
"ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer);
memset(buffer, 'x', maxsize);
@@ -71,18 +71,18 @@ static void test_destination_buffer(void
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 1, NULL, NULL);
ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER),
- "returned %d with 0x%lx/%ld and '%s' (expected '0' with " \
+ "returned %d with 0x%x/%d and '%s' (expected '0' with " \
"ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer);
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 0, NULL, NULL);
- ok( (len > 0), "returned %d with 0x%lx/%ld (expected '> 0')\n",
+ ok( (len > 0), "returned %d with 0x%x/%d (expected '> 0')\n",
len, GetLastError(), GetLastError());
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, needed, NULL, NULL);
ok( !len && (GetLastError() == ERROR_INVALID_PARAMETER),
- "returned %d with 0x%lx/%ld (expected '0' with " \
+ "returned %d with 0x%x/%d (expected '0' with " \
"ERROR_INVALID_PARAMETER)\n", len, GetLastError(), GetLastError());
HeapFree(GetProcessHeap(), 0, buffer);
@@ -99,7 +99,7 @@ static void test_null_source(void)
len = WideCharToMultiByte(CP_ACP, 0, NULL, 0, NULL, 0, NULL, NULL);
GLE = GetLastError();
ok(!len && GLE == ERROR_INVALID_PARAMETER,
- "WideCharToMultiByte returned %d with GLE=%ld (expected 0 with ERROR_INVALID_PARAMETER)\n",
+ "WideCharToMultiByte returned %d with GLE=%d (expected 0 with ERROR_INVALID_PARAMETER)\n",
len, GLE);
}
@@ -124,13 +124,13 @@ static void test_negative_source_length(
memset(buf,'x',sizeof(buf));
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -2002, buf, 10, NULL, NULL);
ok(len == 7 && !lstrcmpA(buf, "foobar") && GetLastError() == 0xdeadbeef,
- "WideCharToMultiByte(-2002): len=%d error=%ld\n",len,GetLastError());
+ "WideCharToMultiByte(-2002): len=%d error=%d\n",len,GetLastError());
SetLastError( 0xdeadbeef );
memset(bufW,'x',sizeof(bufW));
len = MultiByteToWideChar(CP_ACP, 0, "foobar", -2002, bufW, 10);
ok(len == 7 && !mylstrcmpW(bufW, foobarW) && GetLastError() == 0xdeadbeef,
- "MultiByteToWideChar(-2002): len=%d error=%ld\n",len,GetLastError());
+ "MultiByteToWideChar(-2002): len=%d error=%d\n",len,GetLastError());
}
static void test_overlapped_buffers(void)
diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c
index 3fac9c2..b87de56 100644
--- a/dlls/kernel32/tests/comm.c
+++ b/dlls/kernel32/tests/comm.c
@@ -433,7 +433,7 @@ static void check_result(const char *fun
DWORD LastError = GetLastError();
DWORD CorrectError = (ptest->result ? 0xdeadbeef : ERROR_INVALID_PARAMETER);
- ok(LastError == CorrectError, "%s(\"%s\"), 0x%02x: GetLastError() returned 0x%08lx, should be 0x%08lx\n", function, ptest->string, initial_value, LastError, CorrectError);
+ ok(LastError == CorrectError, "%s(\"%s\"), 0x%02x: GetLastError() returned 0x%08x, should be 0x%08x\n", function, ptest->string, initial_value, LastError, CorrectError);
ok(result == ptest->result, "%s(\"%s\"), 0x%02x: return value should be %s\n", function, ptest->string, initial_value, ptest->result ? "TRUE" : "FALSE");
}
@@ -444,7 +444,7 @@ static void check_dcb(const char *functi
{
/* DCBlength is a special case since Win 9x sets it but NT does not.
We will accept either as correct. */
- check_dcb_member2(DCBlength, (DWORD)sizeof(DCB), "%lu");
+ check_dcb_member2(DCBlength, (DWORD)sizeof(DCB), "%u");
/* For old style control strings Win 9x does not set the next five members, NT does. */
if(ptest->old_style && ptest->result)
@@ -488,7 +488,7 @@ static void check_dcb(const char *functi
}
/* Check the result of the DCB members. */
- check_dcb_member(BaudRate, "%lu");
+ check_dcb_member(BaudRate, "%u");
check_dcb_member(fBinary, "%u");
check_dcb_member(fParity, "%u");
check_dcb_member(fTXContinueOnXoff, "%u");
@@ -510,7 +510,7 @@ static void check_dcb(const char *functi
check_dcb_member(wReserved1, "%u");
}
-#define check_timeouts_member(a) ok(ptimeouts1->a == ptimeouts2->a, "%s(\"%s\"), 0x%02x: "#a" is %lu, should be %lu\n", function, ptest->string, initial_value, ptimeouts1->a, ptimeouts2->a);
+#define check_timeouts_member(a) ok(ptimeouts1->a == ptimeouts2->a, "%s(\"%s\"), 0x%02x: "#a" is %u, should be %u\n", function, ptest->string, initial_value, ptimeouts1->a, ptimeouts2->a);
static void check_timeouts(const char *function, TEST *ptest, int initial_value, COMMTIMEOUTS *ptimeouts1, COMMTIMEOUTS *ptimeouts2)
{
@@ -680,9 +680,9 @@ static HANDLE test_OpenComm(BOOL doOverl
if (hcom != INVALID_HANDLE_VALUE)
{
ok(ClearCommError(hcom,&errors,&comstat), "Unexpected errors on open\n");
- ok(comstat.cbInQue == 0, "Unexpected %ld chars in InQueue\n",comstat.cbInQue);
- ok(comstat.cbOutQue == 0, "Still pending %ld charcters in OutQueue\n", comstat.cbOutQue);
- ok(errors == 0, "Unexpected errors 0x%08lx\n", errors);
+ ok(comstat.cbInQue == 0, "Unexpected %d chars in InQueue\n",comstat.cbInQue);
+ ok(comstat.cbOutQue == 0, "Still pending %d charcters in OutQueue\n", comstat.cbOutQue);
+ ok(errors == 0, "Unexpected errors 0x%08x\n", errors);
}
return hcom;
}
@@ -692,7 +692,7 @@ static void test_GetModemStatus(HANDLE h
DWORD ModemStat;
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- trace("GetCommModemStatus returned 0x%08lx->%s%s%s%s\n", ModemStat,
+ trace("GetCommModemStatus returned 0x%08x->%s%s%s%s\n", ModemStat,
(ModemStat &MS_RLSD_ON)?"MS_RLSD_ON ":"",
(ModemStat &MS_RING_ON)?"MS_RING_ON ":"",
(ModemStat &MS_DSR_ON)?"MS_DSR_ON ":"",
@@ -727,10 +727,10 @@ static void test_ReadTimeOut(HANDLE hcom
LastError = GetLastError();
after = GetTickCount();
ok( res == TRUE, "A timed-out read should return TRUE\n");
- ok( LastError == 0xdeadbeef, "err=%ld\n", LastError);
+ ok( LastError == 0xdeadbeef, "err=%d\n", LastError);
timediff = after - before;
ok( timediff > TIMEOUT>>2 && timediff < TIMEOUT *2,
- "Unexpected TimeOut %ld, expected %d\n", timediff, TIMEOUT);
+ "Unexpected TimeOut %d, expected %d\n", timediff, TIMEOUT);
}
static void test_waittxempty(HANDLE hcom)
@@ -765,9 +765,9 @@ static void test_waittxempty(HANDLE hcom
after = GetTickCount();
ok(res_write == TRUE, "WriteFile failed\n");
ok(written == sizeof(tbuf),
- "WriteFile: Unexpected write_size %ld\n", written);
+ "WriteFile: Unexpected write_size %d\n", written);
- trace("WriteFile succeeded, took %ld ms to write %ld Bytes at %ld Baud\n",
+ trace("WriteFile succeeded, took %d ms to write %d Bytes at %d Baud\n",
after - before, written, baud);
before = GetTickCount();
@@ -776,12 +776,12 @@ static void test_waittxempty(HANDLE hcom
ok(res == TRUE, "WaitCommEvent failed\n");
ok((evtmask & EV_TXEMPTY),
- "WaitCommEvent: Unexpected EvtMask 0x%08lx, expected 0x%08x\n",
+ "WaitCommEvent: Unexpected EvtMask 0x%08x, expected 0x%08x\n",
evtmask, EV_TXEMPTY);
timediff = after - before;
- trace("WaitCommEvent for EV_TXEMPTY took %ld ms\n", timediff);
+ trace("WaitCommEvent for EV_TXEMPTY took %d ms\n", timediff);
/* 050604: This shows a difference between XP (tested with mingw compiled crosstest):
XP returns Writefile only after everything went out of the Serial port,
while wine returns immedate.
@@ -798,9 +798,9 @@ static void test_ClearCommErrors(HANDLE
COMSTAT lpStat;
ok(ClearCommError(hcom, &errors, &lpStat), "ClearCommError failed\n");
- ok(lpStat.cbInQue == 0, "Unexpected %ld chars in InQueue\n", lpStat.cbInQue);
- ok(lpStat.cbOutQue == 0, "Unexpected %ld chars in OutQueue\n", lpStat.cbOutQue);
- ok(errors == 0, "ClearCommErrors: Unexpected error 0x%08lx\n", errors);
+ ok(lpStat.cbInQue == 0, "Unexpected %d chars in InQueue\n", lpStat.cbInQue);
+ ok(lpStat.cbOutQue == 0, "Unexpected %d chars in OutQueue\n", lpStat.cbOutQue);
+ ok(errors == 0, "ClearCommErrors: Unexpected error 0x%08x\n", errors);
trace("test_ClearCommErrors done\n");
}
@@ -813,7 +813,7 @@ static void test_non_pending_errors(HAND
dcb.ByteSize = 255; /* likely bogus */
ok(!SetCommState(hcom, &dcb), "SetCommState should have failed\n");
ok(ClearCommError(hcom, &err, NULL), "ClearCommError should succeed\n");
- ok(!(err & CE_MODE), "ClearCommError shouldn't set CE_MODE byte in this case (%lx)\n", err);
+ ok(!(err & CE_MODE), "ClearCommError shouldn't set CE_MODE byte in this case (%x)\n", err);
}
/**/
@@ -845,20 +845,20 @@ static void test_LoopbackRead(HANDLE hco
before = GetTickCount();
ok(WriteFile(hcom,tbuf,sizeof(tbuf),&written, NULL), "WriteFile failed\n");
after = GetTickCount();
- ok(written == sizeof(tbuf),"WriteFile %ld bytes written\n", written);
+ ok(written == sizeof(tbuf),"WriteFile %d bytes written\n", written);
diff = after -before;
/* make sure all bytes are written, so Readfile will succeed in one call*/
ok(WaitCommEvent(hcom, &evtmask, NULL), "WaitCommEvent failed\n");
before = GetTickCount();
ok(evtmask == EV_TXEMPTY,
- "WaitCommEvent: Unexpected EvtMask 0x%08lx, expected 0x%08x\n",
+ "WaitCommEvent: Unexpected EvtMask 0x%08x, expected 0x%08x\n",
evtmask, EV_TXEMPTY);
- trace("Write %ld ms WaitCommEvent EV_TXEMPTY %ld ms\n", diff, before- after);
+ trace("Write %d ms WaitCommEvent EV_TXEMPTY %d ms\n", diff, before- after);
read=0;
ok(ReadFile(hcom, rbuf, sizeof(rbuf), &read, NULL), "Readfile failed\n");
- ok(read == sizeof(tbuf),"ReadFile read %ld bytes, expected \"%s\"\n", read,rbuf);
+ ok(read == sizeof(tbuf),"ReadFile read %d bytes, expected \"%s\"\n", read,rbuf);
/* Now do the same withe a slower Baud rate.
As we request more characters then written, we will hit the timeout
@@ -875,22 +875,22 @@ static void test_LoopbackRead(HANDLE hco
ok(SetCommMask(hcom, EV_RXCHAR), "SetCommMask failed\n");
ok(WriteFile(hcom,tbuf,sizeof(tbuf),&written, NULL), "WriteFile failed\n");
- ok(written == sizeof(tbuf),"WriteFile %ld bytes written\n", written);
+ ok(written == sizeof(tbuf),"WriteFile %d bytes written\n", written);
trace("WaitCommEventEV_RXCHAR\n");
ok(WaitCommEvent(hcom, &evtmask, NULL), "WaitCommEvent failed\n");
- ok(evtmask == EV_RXCHAR, "WaitCommEvent: Unexpected EvtMask 0x%08lx, expected 0x%08x\n",
+ ok(evtmask == EV_RXCHAR, "WaitCommEvent: Unexpected EvtMask 0x%08x, expected 0x%08x\n",
evtmask, EV_RXCHAR);
before = GetTickCount();
res = ReadFile(hcom, rbuf, sizeof(rbuf), &read, NULL);
after = GetTickCount();
ok(res, "Readfile failed\n");
- ok(read == sizeof(tbuf),"ReadFile read %ld bytes\n", read);
+ ok(read == sizeof(tbuf),"ReadFile read %d bytes\n", read);
diff = after - before;
- trace("Readfile for %ld chars took %ld ms\n", read, diff);
+ trace("Readfile for %d chars took %d ms\n", read, diff);
ok( (diff > TIMEOUT - TIMEDELTA) && (diff < TIMEOUT + TIMEDELTA),
- "Timedout Wait took %ld ms, expected around %d\n", diff, TIMEOUT);
+ "Timedout Wait took %d ms, expected around %d\n", diff, TIMEOUT);
/* now do a plain read with slow speed
* This will result in several low level reads and a timeout to happen
@@ -911,8 +911,8 @@ static void test_LoopbackRead(HANDLE hco
}
while ((read < sizeof(tbuf)) && (i <10));
after = GetTickCount();
- ok( read == sizeof(tbuf),"ReadFile read %ld bytes\n", read);
- trace("Plain Read for %ld char at %d baud took %ld ms\n", read, SLOWBAUD, after-before);
+ ok( read == sizeof(tbuf),"ReadFile read %d bytes\n", read);
+ trace("Plain Read for %d char at %d baud took %d ms\n", read, SLOWBAUD, after-before);
}
static void test_LoopbackCtsRts(HANDLE hcom)
@@ -933,11 +933,11 @@ static void test_LoopbackCtsRts(HANDLE h
{
ok(EscapeCommFunction(hcom, CLRRTS), "EscapeCommFunction failed to clear RTS\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok ((ModemStat & MS_CTS_ON) == 0, "CTS didn't react: 0x%04lx, expected 0x%04lx\n",
+ ok ((ModemStat & MS_CTS_ON) == 0, "CTS didn't react: 0x%04x, expected 0x%04x\n",
ModemStat, (defaultStat & ~MS_CTS_ON));
ok(EscapeCommFunction(hcom, SETRTS), "EscapeCommFunction failed to clear RTS\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore CTS: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore CTS: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
else
@@ -945,11 +945,11 @@ static void test_LoopbackCtsRts(HANDLE h
ok(EscapeCommFunction(hcom, SETRTS), "EscapeCommFunction failed to set RTS\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
ok ((ModemStat & MS_CTS_ON) == MS_CTS_ON,
- "CTS didn't react: 0x%04lx, expected 0x%04lx\n",
+ "CTS didn't react: 0x%04x, expected 0x%04x\n",
ModemStat, (defaultStat | MS_CTS_ON));
ok(EscapeCommFunction(hcom, CLRRTS), "EscapeCommFunction failed to clear RTS\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore CTS: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore CTS: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
}
@@ -972,11 +972,11 @@ static void test_LoopbackDtrDcd(HANDLE h
{
ok(EscapeCommFunction(hcom, CLRDTR), "EscapeCommFunction failed to clear DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok ((ModemStat & MS_RLSD_ON) == 0, "RLSD didn't react: 0x%04lx, expected 0x%04lx\n",
+ ok ((ModemStat & MS_RLSD_ON) == 0, "RLSD didn't react: 0x%04x, expected 0x%04x\n",
ModemStat, (defaultStat & ~MS_RLSD_ON));
ok(EscapeCommFunction(hcom, SETDTR), "EscapeCommFunction failed to set DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore RLSD: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore RLSD: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
else
@@ -984,11 +984,11 @@ static void test_LoopbackDtrDcd(HANDLE h
ok(EscapeCommFunction(hcom, SETDTR), "EscapeCommFunction failed to set DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
ok ((ModemStat & MS_RLSD_ON) == MS_RLSD_ON,
- "RLSD didn't react: 0x%04lx, expected 0x%04lx\n",
+ "RLSD didn't react: 0x%04x, expected 0x%04x\n",
ModemStat, (defaultStat | MS_RLSD_ON));
ok(EscapeCommFunction(hcom, CLRDTR), "EscapeCommFunction failed to clear DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore RLSD: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore RLSD: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
}
@@ -1011,11 +1011,11 @@ static void test_LoopbackDtrDsr(HANDLE h
{
ok(EscapeCommFunction(hcom, CLRDTR), "EscapeCommFunction failed to clear DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok ((ModemStat & MS_DSR_ON) == 0, "CTS didn't react: 0x%04lx, expected 0x%04lx\n",
+ ok ((ModemStat & MS_DSR_ON) == 0, "CTS didn't react: 0x%04x, expected 0x%04x\n",
ModemStat, (defaultStat & ~MS_DSR_ON));
ok(EscapeCommFunction(hcom, SETDTR), "EscapeCommFunction failed to clear DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore DSR: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore DSR: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
else
@@ -1023,11 +1023,11 @@ static void test_LoopbackDtrDsr(HANDLE h
ok(EscapeCommFunction(hcom, SETDTR), "EscapeCommFunction failed to set DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
ok ((ModemStat & MS_DSR_ON) == MS_DSR_ON,
- "CTS didn't react: 0x%04lx,expected 0x%04lx\n",
+ "CTS didn't react: 0x%04x,expected 0x%04x\n",
ModemStat, (defaultStat | MS_DSR_ON));
ok(EscapeCommFunction(hcom, CLRDTR), "EscapeCommFunction failed to clear DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore DSR: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore DSR: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
}
@@ -1050,11 +1050,11 @@ static void test_LoopbackDtrRing(HANDLE
{
ok(EscapeCommFunction(hcom, CLRDTR), "EscapeCommFunction failed to clear DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok ((ModemStat & MS_RING_ON) == 0, "RING didn't react: 0x%04lx, expected 0x%04lx\n",
+ ok ((ModemStat & MS_RING_ON) == 0, "RING didn't react: 0x%04x, expected 0x%04x\n",
ModemStat, (defaultStat & ~MS_RING_ON));
ok(EscapeCommFunction(hcom, SETDTR), "EscapeCommFunction failed to set DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore RING: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore RING: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
else
@@ -1062,11 +1062,11 @@ static void test_LoopbackDtrRing(HANDLE
ok(EscapeCommFunction(hcom, SETDTR), "EscapeCommFunction failed to set DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
ok ((ModemStat & MS_RING_ON) == MS_RING_ON,
- "RING didn't react: 0x%04lx,expected 0x%04lx\n",
+ "RING didn't react: 0x%04x,expected 0x%04x\n",
ModemStat, (defaultStat | MS_RING_ON));
ok(EscapeCommFunction(hcom, CLRDTR), "EscapeCommFunction failed to clear DTR\n");
ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n");
- ok (ModemStat == defaultStat, "Failed to restore RING: 0x%04lx, expected 0x%04lx\n",
+ ok (ModemStat == defaultStat, "Failed to restore RING: 0x%04x, expected 0x%04x\n",
ModemStat, defaultStat);
}
}
@@ -1092,7 +1092,7 @@ static void test_WaitRx(HANDLE hcom)
overlapped.hEvent = hComPortEvent;
ok((hComWriteEvent = CreateEvent( NULL, TRUE, FALSE, NULL )) !=0,
- "CreateEvent res 0x%08lx\n",
+ "CreateEvent res 0x%08x\n",
GetLastError());
ZeroMemory( &overlapped_w, sizeof(overlapped_w));
overlapped_w.hEvent = hComWriteEvent;
@@ -1101,47 +1101,47 @@ static void test_WaitRx(HANDLE hcom)
{success_wait = WaitCommEvent(hcom, &evtmask, &overlapped);}
err_wait = GetLastError();
after = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx\n", success_wait, err_wait, evtmask);
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x\n", success_wait, err_wait, evtmask);
ok(success_wait || err_wait == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n");
trace("overlapped WriteCommEvent returned.\n");
success_write= WriteFile(hcom, "X", 1, &written, &overlapped_w);
err_write = GetLastError();
ok(success_write || err_write == ERROR_IO_PENDING,
- "overlapped WriteFile failed, err 0x%08lx\n",
+ "overlapped WriteFile failed, err 0x%08x\n",
err_write);
if (!success_write && (err_write == ERROR_IO_PENDING)) {
success_write = WaitForSingleObjectEx(hComWriteEvent, TIMEOUT, TRUE);
err_write = GetLastError();
- ok(success_write == WAIT_OBJECT_0, "WaitForSingleObjectEx, res 0x%08lx, err 0x%08lx\n",
+ ok(success_write == WAIT_OBJECT_0, "WaitForSingleObjectEx, res 0x%08x, err 0x%08x\n",
success_write, err_write);
}
Sleep(TIMEOUT >>1);
success_write = GetOverlappedResult(hcom, &overlapped_w, &written, FALSE);
err_write = GetLastError();
- trace("Write after Wait res 0x%08lx err 0x%08lx\n",success_write, err_write);
- ok(success_write && written ==1, "Write after Wait res 0x%08lx err 0x%08lx\n",
+ trace("Write after Wait res 0x%08x err 0x%08x\n",success_write, err_write);
+ ok(success_write && written ==1, "Write after Wait res 0x%08x err 0x%08x\n",
success_write, err_write);
if (!success_wait && (err_wait == ERROR_IO_PENDING)) {
success_wait = WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE);
err_wait = GetLastError();
- ok(success_wait == WAIT_OBJECT_0, "wait hComPortEvent, res 0x%08lx, err 0x%08lx\n",
+ ok(success_wait == WAIT_OBJECT_0, "wait hComPortEvent, res 0x%08x, err 0x%08x\n",
success_wait, err_wait);
}
success_wait = GetOverlappedResult(hcom, &overlapped, &written, FALSE);
err_wait = GetLastError();
after1 = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx diff1 %ld, diff2 %ld\n",
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x diff1 %d, diff2 %d\n",
success_wait, err_wait, evtmask, after-before, after1-before);
- ok(evtmask & EV_RXCHAR, "Detect EV_RXCHAR: 0x%08lx, expected 0x%08x\n",
+ ok(evtmask & EV_RXCHAR, "Detect EV_RXCHAR: 0x%08x, expected 0x%08x\n",
evtmask, EV_RXCHAR);
diff = after1 - before;
ok ((diff > (TIMEOUT>>1) -TIMEDELTA) && (diff < (TIMEOUT>>1) + TIMEDELTA),
- "Unexpected time %ld, expected around %d\n", diff, TIMEOUT>>1);
+ "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1);
}
@@ -1157,14 +1157,14 @@ static DWORD CALLBACK toggle_ctlLine(LPV
HANDLE hComPortEvent = (HANDLE) args[3];
DWORD success, err;
- trace("toggle_ctlLine timeout %ld clt 0x%08lx handle 0x%08lx\n",
+ trace("toggle_ctlLine timeout %d clt 0x%08x handle 0x%08x\n",
args[0], args[1], args[2]);
Sleep(timeout);
- ok(EscapeCommFunction(hcom, ctl),"EscapeCommFunction 0x%08lx failed\n", ctl);
+ ok(EscapeCommFunction(hcom, ctl),"EscapeCommFunction 0x%08x failed\n", ctl);
trace("toggle_ctline done\n");
success = WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE);
err = GetLastError();
- trace("toggle_ctline WaitForSingleObjectEx res 0x%08lx err 0x%08lx\n",
+ trace("toggle_ctline WaitForSingleObjectEx res 0x%08x err 0x%08x\n",
success, err);
return 0;
}
@@ -1199,7 +1199,7 @@ static void test_WaitCts(HANDLE hcom)
args[1] = SETRTS;
args[2]=(DWORD) hcom;
- trace("test_WaitCts timeout %ld clt 0x%08lx handle 0x%08lx\n",args[0], args[1], args[2]);
+ trace("test_WaitCts timeout %d clt 0x%08x handle 0x%08x\n",args[0], args[1], args[2]);
ok(SetCommMask(hcom, EV_CTS), "SetCommMask failed\n");
hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
@@ -1218,7 +1218,7 @@ static void test_WaitCts(HANDLE hcom)
err = GetLastError();
after = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx\n", success, err, evtmask);
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x\n", success, err, evtmask);
ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n");
trace("overlapped WriteCommEvent returned.\n");
if (!success && (err == ERROR_IO_PENDING))
@@ -1227,10 +1227,10 @@ static void test_WaitCts(HANDLE hcom)
success = GetOverlappedResult(hcom, &overlapped, &written, FALSE);
err = GetLastError();
after1 = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx diff1 %ld, diff2 %ld\n",
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x diff1 %d, diff2 %d\n",
success, err, evtmask, after-before, after1-before);
- ok(evtmask & EV_CTS, "Failed to detect EV_CTS: 0x%08lx, expected 0x%08x\n",
+ ok(evtmask & EV_CTS, "Failed to detect EV_CTS: 0x%08x, expected 0x%08x\n",
evtmask, EV_CTS);
ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n");
if(defaultStat & MS_CTS_ON)
@@ -1240,7 +1240,7 @@ static void test_WaitCts(HANDLE hcom)
diff = after1 - before;
ok ((diff > (TIMEOUT>>1) -TIMEDELTA) && (diff < (TIMEOUT>>1) + TIMEDELTA),
- "Unexpected time %ld, expected around %d\n", diff, TIMEOUT>>1);
+ "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1);
/*restore RTS Settings*/
if(defaultStat & MS_CTS_ON)
@@ -1258,7 +1258,7 @@ static DWORD CALLBACK reset_CommMask(LPV
DWORD timeout = args[0];
HANDLE hcom = (HANDLE) args[1];
- trace(" Changing CommMask on the fly for handle %p after timeout %ld\n",
+ trace(" Changing CommMask on the fly for handle %p after timeout %d\n",
hcom, timeout);
Sleep(timeout);
ok(SetCommMask(hcom, 0),"SetCommMask %p failed\n", hcom);
@@ -1288,7 +1288,7 @@ static void test_AbortWaitCts(HANDLE hc
args[0]= TIMEOUT >>1;
args[1]=(DWORD) hcom;
- trace("test_AbortWaitCts timeout %ld handle 0x%08lx\n",args[0], args[1]);
+ trace("test_AbortWaitCts timeout %d handle 0x%08x\n",args[0], args[1]);
ok(SetCommMask(hcom, EV_CTS), "SetCommMask failed\n");
hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
@@ -1306,7 +1306,7 @@ static void test_AbortWaitCts(HANDLE hc
err = GetLastError();
after = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx\n", success, err, evtmask);
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x\n", success, err, evtmask);
ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n");
trace("overlapped WriteCommEvent returned.\n");
if (!success && (err == ERROR_IO_PENDING))
@@ -1315,15 +1315,15 @@ static void test_AbortWaitCts(HANDLE hc
success = GetOverlappedResult(hcom, &overlapped, &written, FALSE);
err = GetLastError();
after1 = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx diff1 %ld, diff2 %ld\n",
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x diff1 %d, diff2 %d\n",
success, err, evtmask, after-before, after1-before);
- ok(evtmask == 0, "Incorect EventMask 0x%08lx returned on Wait aborted bu SetCommMask, expected 0x%08x\n",
+ ok(evtmask == 0, "Incorect EventMask 0x%08x returned on Wait aborted bu SetCommMask, expected 0x%08x\n",
evtmask, 0);
ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n");
diff = after1 - before;
ok ((diff > (TIMEOUT>>1) -TIMEDELTA) && (diff < (TIMEOUT>>1) + TIMEDELTA),
- "Unexpected time %ld, expected around %d\n", diff, TIMEOUT>>1);
+ "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1);
}
@@ -1354,7 +1354,7 @@ static void test_WaitDsr(HANDLE hcom)
args[1] = SETDTR;
args[2]=(DWORD) hcom;
- trace("test_WaitDsr timeout %ld clt 0x%08lx handle 0x%08lx\n",args[0], args[1], args[2]);
+ trace("test_WaitDsr timeout %d clt 0x%08x handle 0x%08x\n",args[0], args[1], args[2]);
ok(SetCommMask(hcom, EV_DSR), "SetCommMask failed\n");
hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
@@ -1369,7 +1369,7 @@ static void test_WaitDsr(HANDLE hcom)
err = GetLastError();
after = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx\n", success, err, evtmask);
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x\n", success, err, evtmask);
ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n");
trace("overlapped WriteCommEvent returned.\n");
if (!success && (err == ERROR_IO_PENDING))
@@ -1378,10 +1378,10 @@ static void test_WaitDsr(HANDLE hcom)
success = GetOverlappedResult(hcom, &overlapped, &written, FALSE);
err = GetLastError();
after1 = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx diff1 %ld, diff2 %ld\n",
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x diff1 %d, diff2 %d\n",
success, err, evtmask, after-before, after1-before);
- ok(evtmask & EV_DSR, "Failed to detect EV_DSR: 0x%08lx, expected 0x%08x\n",
+ ok(evtmask & EV_DSR, "Failed to detect EV_DSR: 0x%08x, expected 0x%08x\n",
evtmask, EV_DSR);
ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n");
if(defaultStat & MS_DSR_ON)
@@ -1391,7 +1391,7 @@ static void test_WaitDsr(HANDLE hcom)
diff = after1 - before;
ok ((diff > (TIMEOUT>>1) -TIMEDELTA) && (diff < (TIMEOUT>>1) + TIMEDELTA),
- "Unexpected time %ld, expected around %d\n", diff, TIMEOUT>>1);
+ "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1);
/*restore RTS Settings*/
if(defaultStat & MS_DSR_ON)
@@ -1427,7 +1427,7 @@ static void test_WaitRing(HANDLE hcom)
args[1] = SETDTR;
args[2]=(DWORD) hcom;
- trace("test_WaitRing timeout %ld clt 0x%08lx handle 0x%08lx\n",args[0], args[1], args[2]);
+ trace("test_WaitRing timeout %d clt 0x%08x handle 0x%08x\n",args[0], args[1], args[2]);
ok(SetCommMask(hcom, EV_RING), "SetCommMask failed\n");
hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
@@ -1442,7 +1442,7 @@ static void test_WaitRing(HANDLE hcom)
err = GetLastError();
after = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx\n", success, err, evtmask);
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x\n", success, err, evtmask);
ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n");
trace("overlapped WriteCommEvent returned.\n");
if (!success && (err == ERROR_IO_PENDING))
@@ -1451,10 +1451,10 @@ static void test_WaitRing(HANDLE hcom)
success = GetOverlappedResult(hcom, &overlapped, &written, FALSE);
err = GetLastError();
after1 = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx diff1 %ld, diff2 %ld\n",
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x diff1 %d, diff2 %d\n",
success, err, evtmask, after-before, after1-before);
- ok(evtmask & EV_RING, "Failed to detect EV_RING: 0x%08lx, expected 0x%08x\n",
+ ok(evtmask & EV_RING, "Failed to detect EV_RING: 0x%08x, expected 0x%08x\n",
evtmask, EV_CTS);
ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n");
if(defaultStat & MS_RING_ON)
@@ -1464,7 +1464,7 @@ static void test_WaitRing(HANDLE hcom)
diff = after1 - before;
ok ((diff > (TIMEOUT>>1) -TIMEDELTA) && (diff < (TIMEOUT>>1) + TIMEDELTA),
- "Unexpected time %ld, expected around %d\n", diff, TIMEOUT>>1);
+ "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1);
/*restore RTS Settings*/
if(defaultStat & MS_RING_ON)
@@ -1499,7 +1499,7 @@ static void test_WaitDcd(HANDLE hcom)
args[1] = SETDTR;
args[2]=(DWORD) hcom;
- trace("test_WaitDcd timeout %ld clt 0x%08lx handle 0x%08lx\n",args[0], args[1], args[2]);
+ trace("test_WaitDcd timeout %d clt 0x%08x handle 0x%08x\n",args[0], args[1], args[2]);
ok(SetCommMask(hcom, EV_RLSD), "SetCommMask failed\n");
hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
@@ -1514,7 +1514,7 @@ static void test_WaitDcd(HANDLE hcom)
err = GetLastError();
after = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx\n", success, err, evtmask);
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x\n", success, err, evtmask);
ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n");
trace("overlapped WriteCommEvent returned.\n");
if (!success && (err == ERROR_IO_PENDING))
@@ -1523,10 +1523,10 @@ static void test_WaitDcd(HANDLE hcom)
success = GetOverlappedResult(hcom, &overlapped, &written, FALSE);
err = GetLastError();
after1 = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx diff1 %ld, diff2 %ld\n",
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x diff1 %d, diff2 %d\n",
success, err, evtmask, after-before, after1-before);
- ok(evtmask & EV_RLSD, "Failed to detect EV_RLSD: 0x%08lx, expected 0x%08x\n",
+ ok(evtmask & EV_RLSD, "Failed to detect EV_RLSD: 0x%08x, expected 0x%08x\n",
evtmask, EV_CTS);
ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n");
if(defaultStat & MS_RLSD_ON)
@@ -1536,7 +1536,7 @@ static void test_WaitDcd(HANDLE hcom)
diff = after1 - before;
ok ((diff > (TIMEOUT>>1) -TIMEDELTA) && (diff < (TIMEOUT>>1) + TIMEDELTA),
- "Unexpected time %ld, expected around %d\n", diff, TIMEOUT>>1);
+ "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1);
/*restore RTS Settings*/
if(defaultStat & MS_RLSD_ON)
@@ -1554,7 +1554,7 @@ static DWORD CALLBACK set_CommBreak(LPVO
DWORD timeout = args[0];
HANDLE hcom = (HANDLE) args[1];
- trace("SetCommBreak for handle %p after timeout %ld\n",
+ trace("SetCommBreak for handle %p after timeout %d\n",
hcom, timeout);
Sleep(timeout);
ok(SetCommBreak(hcom),"SetCommBreak %p failed\n", hcom);
@@ -1594,26 +1594,26 @@ static void test_WaitBreak(HANDLE hcom)
err = GetLastError();
after = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx\n", success, err, evtmask);
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x\n", success, err, evtmask);
ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n");
trace("overlapped WriteCommEvent returned.\n");
if (!success && (err == ERROR_IO_PENDING))
ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0,
- "wait hComPortEvent res 0x%08lx\n", GetLastError());
+ "wait hComPortEvent res 0x%08x\n", GetLastError());
success = GetOverlappedResult(hcom, &overlapped, &written, FALSE);
err = GetLastError();
after1 = GetTickCount();
- trace("Success 0x%08lx err 0x%08lx evtmask 0x%08lx diff1 %ld, diff2 %ld\n",
+ trace("Success 0x%08x err 0x%08x evtmask 0x%08x diff1 %d, diff2 %d\n",
success, err, evtmask, after-before, after1-before);
- ok(evtmask & EV_BREAK, "Failed to detect EV_BREAK: 0x%08lx, expected 0x%08x\n",
+ ok(evtmask & EV_BREAK, "Failed to detect EV_BREAK: 0x%08x, expected 0x%08x\n",
evtmask, EV_BREAK);
ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n");
diff = after1 - before;
ok ((diff > (TIMEOUT>>1) -TIMEDELTA) && (diff < (TIMEOUT>>1) + TIMEDELTA),
- "Unexpected time %ld, expected around %d\n", diff, TIMEOUT>>1);
+ "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1);
ok(ClearCommBreak(hcom), "ClearCommBreak failed\n");
}
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index b9e0778..3bcb872 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -74,7 +74,7 @@ static void testCursor(HANDLE hCon, COOR
c.X = c.Y = 0;
ok(SetConsoleCursorPosition(0, c) == 0, "No handle\n");
- ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting %u got %lu\n",
+ ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting %u got %u\n",
ERROR_INVALID_HANDLE, GetLastError());
c.X = c.Y = 0;
@@ -89,25 +89,25 @@ static void testCursor(HANDLE hCon, COOR
c.X = sbSize.X;
c.Y = sbSize.Y - 1;
ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n",
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %u\n",
ERROR_INVALID_PARAMETER, GetLastError());
c.X = sbSize.X - 1;
c.Y = sbSize.Y;
ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n",
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %u\n",
ERROR_INVALID_PARAMETER, GetLastError());
c.X = -1;
c.Y = 0;
ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n",
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %u\n",
ERROR_INVALID_PARAMETER, GetLastError());
c.X = 0;
c.Y = -1;
ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n",
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %u\n",
ERROR_INVALID_PARAMETER, GetLastError());
}
@@ -150,7 +150,7 @@ static void testWriteNotWrappedNotProces
ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n");
ret = WriteConsole(hCon, mytest, mylen, &len, NULL);
- ok(ret != 0 && len == mylen, "Couldn't write, ret = %d, len = %ld\n", ret, len);
+ ok(ret != 0 && len == mylen, "Couldn't write, ret = %d, len = %d\n", ret, len);
c.Y = 0;
for (p = mylen - 3; p < mylen; p++)
{
@@ -524,7 +524,7 @@ static BOOL WINAPI mch(DWORD event)
static void testCtrlHandler(void)
{
ok(!SetConsoleCtrlHandler(mch, FALSE), "Shouldn't succeed\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %lu\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %u\n", GetLastError());
ok(SetConsoleCtrlHandler(mch, TRUE), "Couldn't set handler\n");
/* wine requires the event for the test, as we cannot insure, so far, that event
* are processed synchronously in GenerateConsoleCtrlEvent()
@@ -549,7 +549,7 @@ #endif
CloseHandle(mch_event);
ok(SetConsoleCtrlHandler(mch, FALSE), "Couldn't remove handler\n");
ok(!SetConsoleCtrlHandler(mch, FALSE), "Shouldn't succeed\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %lu\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %u\n", GetLastError());
}
START_TEST(console)
diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c
index 402d26e..47e7701 100644
--- a/dlls/kernel32/tests/directory.c
+++ b/dlls/kernel32/tests/directory.c
@@ -156,12 +156,12 @@ static void test_CreateDirectoryA(void)
ret = CreateDirectoryA(NULL, NULL);
ok(ret == FALSE && (GetLastError() == ERROR_PATH_NOT_FOUND ||
GetLastError() == ERROR_INVALID_PARAMETER),
- "CreateDirectoryA(NULL): ret=%d err=%ld\n", ret, GetLastError());
+ "CreateDirectoryA(NULL): ret=%d err=%d\n", ret, GetLastError());
ret = CreateDirectoryA("", NULL);
ok(ret == FALSE && (GetLastError() == ERROR_BAD_PATHNAME ||
GetLastError() == ERROR_PATH_NOT_FOUND),
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
ret = GetSystemDirectoryA(tmpdir, MAX_PATH);
ok(ret < MAX_PATH, "System directory should fit into MAX_PATH\n");
@@ -171,53 +171,53 @@ static void test_CreateDirectoryA(void)
ret = CreateDirectoryA(".", NULL);
ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS,
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
ret = CreateDirectoryA("..", NULL);
ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS,
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
GetTempPathA(MAX_PATH, tmpdir);
tmpdir[3] = 0; /* truncate the path */
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && (GetLastError() == ERROR_ALREADY_EXISTS ||
GetLastError() == ERROR_ACCESS_DENIED),
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == TRUE, "CreateDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ ok(ret == TRUE, "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS,
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
lstrcatA(tmpdir, "?");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
GetLastError() == ERROR_PATH_NOT_FOUND),
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
RemoveDirectoryA(tmpdir);
tmpdir[lstrlenA(tmpdir) - 1] = '*';
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
GetLastError() == ERROR_PATH_NOT_FOUND),
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
RemoveDirectoryA(tmpdir);
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me/Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND,
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
RemoveDirectoryA(tmpdir);
/* Test behavior with a trailing dot.
@@ -227,21 +227,21 @@ static void test_CreateDirectoryA(void)
lstrcatA(tmpdir, "Please Remove Me.");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE,
- "CreateDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
lstrcatA(tmpdir, "/Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE,
- "CreateDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me");
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
/* Test behavior with two trailing dots.
* The directory should be created without the trailing dots.
@@ -250,25 +250,25 @@ static void test_CreateDirectoryA(void)
lstrcatA(tmpdir, "Please Remove Me..");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE,
- "CreateDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
lstrcatA(tmpdir, "/Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE || /* On Win98 */
(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND), /* On NT! */
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
if (ret == TRUE)
{
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
}
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me");
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
/* Test behavior with a trailing space.
* The directory should be created without the trailing space.
@@ -277,25 +277,25 @@ static void test_CreateDirectoryA(void)
lstrcatA(tmpdir, "Please Remove Me ");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE,
- "CreateDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
lstrcatA(tmpdir, "/Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE || /* On Win98 */
(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND), /* On NT! */
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
if (ret == TRUE)
{
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
}
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me");
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
/* Test behavior with a trailing space.
* The directory should be created without the trailing spaces.
@@ -304,25 +304,25 @@ static void test_CreateDirectoryA(void)
lstrcatA(tmpdir, "Please Remove Me ");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE,
- "CreateDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
lstrcatA(tmpdir, "/Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == TRUE || /* On Win98 */
(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND), /* On NT! */
- "CreateDirectoryA(%s): ret=%d err=%ld\n", tmpdir, ret, GetLastError());
+ "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
if (ret == TRUE)
{
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
}
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me");
ret = RemoveDirectoryA(tmpdir);
ok(ret == TRUE,
- "RemoveDirectoryA(%s) failed err=%ld\n", tmpdir, GetLastError());
+ "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
}
static void test_CreateDirectoryW(void)
@@ -375,14 +375,14 @@ static void test_CreateDirectoryW(void)
lstrcatW(tmpdir, questionW);
ret = CreateDirectoryW(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryW with ? wildcard name should fail with error 183, ret=%s error=%ld\n",
+ "CreateDirectoryW with ? wildcard name should fail with error 183, ret=%s error=%d\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryW(tmpdir);
tmpdir[lstrlenW(tmpdir) - 1] = '*';
ret = CreateDirectoryW(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld\n",
+ "CreateDirectoryW with * wildcard name should fail with error 183, ret=%s error=%d\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryW(tmpdir);
@@ -413,14 +413,14 @@ static void test_RemoveDirectoryA(void)
ret = RemoveDirectoryA(tmpdir);
ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
GetLastError() == ERROR_PATH_NOT_FOUND),
- "RemoveDirectoryA with ? wildcard name should fail, ret=%s error=%ld\n",
+ "RemoveDirectoryA with ? wildcard name should fail, ret=%s error=%d\n",
ret ? " True" : "False", GetLastError());
tmpdir[lstrlenA(tmpdir) - 1] = '*';
ret = RemoveDirectoryA(tmpdir);
ok(ret == FALSE && (GetLastError() == ERROR_INVALID_NAME ||
GetLastError() == ERROR_PATH_NOT_FOUND),
- "RemoveDirectoryA with * wildcard name should fail, ret=%s error=%ld\n",
+ "RemoveDirectoryA with * wildcard name should fail, ret=%s error=%d\n",
ret ? " True" : "False", GetLastError());
}
@@ -445,13 +445,13 @@ static void test_RemoveDirectoryW(void)
lstrcatW(tmpdir, questionW);
ret = RemoveDirectoryW(tmpdir);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryW with wildcard should fail with error 183, ret=%s error=%ld\n",
+ "RemoveDirectoryW with wildcard should fail with error 183, ret=%s error=%d\n",
ret ? " True" : "False", GetLastError());
tmpdir[lstrlenW(tmpdir) - 1] = '*';
ret = RemoveDirectoryW(tmpdir);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld\n",
+ "RemoveDirectoryW with * wildcard name should fail with error 183, ret=%s error=%d\n",
ret ? " True" : "False", GetLastError());
}
@@ -459,9 +459,9 @@ static void test_SetCurrentDirectoryA(vo
{
SetLastError(0);
ok( !SetCurrentDirectoryA( "\\some_dummy_dir" ), "SetCurrentDirectoryA succeeded\n" );
- ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %ld\n", GetLastError() );
+ ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %d\n", GetLastError() );
ok( !SetCurrentDirectoryA( "\\some_dummy\\subdir" ), "SetCurrentDirectoryA succeeded\n" );
- ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %ld\n", GetLastError() );
+ ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() );
}
START_TEST(directory)
diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c
index a6c0b7f..52afc93 100644
--- a/dlls/kernel32/tests/drive.c
+++ b/dlls/kernel32/tests/drive.c
@@ -34,7 +34,7 @@ static void test_GetDriveTypeA(void)
UINT type;
logical_drives = GetLogicalDrives();
- ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError());
+ ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError());
for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++)
{
@@ -57,7 +57,7 @@ static void test_GetDriveTypeW(void)
UINT type;
logical_drives = GetLogicalDrives();
- ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError());
+ ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError());
for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++)
{
@@ -86,21 +86,21 @@ static void test_GetDiskFreeSpaceA(void)
DWORD logical_drives;
ret = GetDiskFreeSpaceA(NULL, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
- ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError());
+ ok(ret, "GetDiskFreeSpaceA error %d\n", GetLastError());
ret = GetDiskFreeSpaceA("", §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
ok(!ret && (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_INVALID_NAME),
- "GetDiskFreeSpaceA(\"\"): ret=%d GetLastError=%ld\n",
+ "GetDiskFreeSpaceA(\"\"): ret=%d GetLastError=%d\n",
ret, GetLastError());
ret = GetDiskFreeSpaceA("\\", §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
- ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError());
+ ok(ret, "GetDiskFreeSpaceA error %d\n", GetLastError());
ret = GetDiskFreeSpaceA("/", §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
- ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError());
+ ok(ret, "GetDiskFreeSpaceA error %d\n", GetLastError());
logical_drives = GetLogicalDrives();
- ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError());
+ ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError());
for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++)
{
@@ -113,18 +113,18 @@ static void test_GetDiskFreeSpaceA(void)
ret = GetDiskFreeSpaceA(drive, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
if (!(logical_drives & 1))
ok(!ret && (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_INVALID_DRIVE),
- "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%ld\n",
+ "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n",
drive, ret, GetLastError());
else
{
ok(ret ||
(!ret && (GetLastError() == ERROR_NOT_READY || GetLastError() == ERROR_INVALID_DRIVE)),
- "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%ld\n",
+ "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n",
drive, ret, GetLastError());
if( GetVersion() & 0x80000000)
/* win3.0 thru winME */
ok( total_clusters <= 65535,
- "total clusters is %ld > 65535\n", total_clusters);
+ "total clusters is %d > 65535\n", total_clusters);
else if (pGetDiskFreeSpaceExA) {
/* NT, 2k, XP : GetDiskFreeSpace shoud be accurate */
ULARGE_INTEGER totEx, tot, d;
@@ -133,7 +133,7 @@ static void test_GetDiskFreeSpaceA(void)
tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters;
ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL);
ok( ret || (!ret && ERROR_NOT_READY == GetLastError()),
- "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%ld\n", drive, GetLastError());
+ "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError());
ok( bytes_per_sector == 0 || /* empty cd rom drive */
totEx.QuadPart <= tot.QuadPart,
"GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive);
@@ -160,21 +160,21 @@ static void test_GetDiskFreeSpaceW(void)
/* Must be Win9x which doesn't support the Unicode functions */
return;
}
- ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError());
+ ok(ret, "GetDiskFreeSpaceW error %d\n", GetLastError());
ret = GetDiskFreeSpaceW(empty_pathW, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND,
- "GetDiskFreeSpaceW(\"\"): ret=%d GetLastError=%ld\n",
+ "GetDiskFreeSpaceW(\"\"): ret=%d GetLastError=%d\n",
ret, GetLastError());
ret = GetDiskFreeSpaceW(root_pathW, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
- ok(ret, "GetDiskFreeSpaceW(\"\") error %ld\n", GetLastError());
+ ok(ret, "GetDiskFreeSpaceW(\"\") error %d\n", GetLastError());
ret = GetDiskFreeSpaceW(unix_style_root_pathW, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
- ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError());
+ ok(ret, "GetDiskFreeSpaceW error %d\n", GetLastError());
logical_drives = GetLogicalDrives();
- ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError());
+ ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError());
for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++)
{
@@ -185,11 +185,11 @@ static void test_GetDiskFreeSpaceW(void)
ret = GetDiskFreeSpaceW(drive, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);
if (!(logical_drives & 1))
ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND,
- "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%ld\n",
+ "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n",
drive[0], ret, GetLastError());
else
ok(ret || GetLastError() == ERROR_NOT_READY,
- "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%ld\n",
+ "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n",
drive[0], ret, GetLastError());
}
logical_drives >>= 1;
diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c
index c9b8cd9..85007cd 100644
--- a/dlls/kernel32/tests/environ.c
+++ b/dlls/kernel32/tests/environ.c
@@ -36,31 +36,31 @@ static void test_GetSetEnvironmentVariab
ret = SetEnvironmentVariableA(name, value);
ok(ret == TRUE,
- "unexpected error in SetEnvironmentVariableA, GetLastError=%ld\n",
+ "unexpected error in SetEnvironmentVariableA, GetLastError=%d\n",
GetLastError());
/* Try to retrieve the environment variable we just set */
ret_size = GetEnvironmentVariableA(name, NULL, 0);
ok(ret_size == strlen(value) + 1,
- "should return length with terminating 0 ret_size=%ld\n", ret_size);
+ "should return length with terminating 0 ret_size=%d\n", ret_size);
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value));
ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n");
ok(ret_size == strlen(value) + 1,
- "should return length with terminating 0 ret_size=%ld\n", ret_size);
+ "should return length with terminating 0 ret_size=%d\n", ret_size);
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer\n");
ok(ret_size == strlen(value),
- "should return length without terminating 0 ret_size=%ld\n", ret_size);
+ "should return length without terminating 0 ret_size=%d\n", ret_size);
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name_cased, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer\n");
ok(ret_size == strlen(value),
- "should return length without terminating 0 ret_size=%ld\n", ret_size);
+ "should return length without terminating 0 ret_size=%d\n", ret_size);
/* Remove that environment variable */
ret = SetEnvironmentVariableA(name_cased, NULL);
@@ -70,24 +70,24 @@ static void test_GetSetEnvironmentVariab
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n");
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
/* Check behavior of SetEnvironmentVariableA(name, "") */
ret = SetEnvironmentVariableA(name, value);
ok(ret == TRUE,
- "unexpected error in SetEnvironmentVariableA, GetLastError=%ld\n",
+ "unexpected error in SetEnvironmentVariableA, GetLastError=%d\n",
GetLastError());
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name_cased, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer\n");
ok(ret_size == strlen(value),
- "should return length without terminating 0 ret_size=%ld\n", ret_size);
+ "should return length without terminating 0 ret_size=%d\n", ret_size);
ret = SetEnvironmentVariableA(name_cased, "");
ok(ret == TRUE,
- "should not fail with empty value but GetLastError=%ld\n", GetLastError());
+ "should not fail with empty value but GetLastError=%d\n", GetLastError());
lstrcpyA(buf, "foo");
SetLastError(0);
@@ -95,23 +95,23 @@ static void test_GetSetEnvironmentVariab
ok(ret_size == 0 &&
((GetLastError() == 0 && lstrcmpA(buf, "") == 0) ||
(GetLastError() == ERROR_ENVVAR_NOT_FOUND)),
- "%s should be set to \"\" (NT) or removed (Win9x) but ret_size=%ld GetLastError=%ld and buf=%s\n",
+ "%s should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d and buf=%s\n",
name, ret_size, GetLastError(), buf);
/* Test the limits */
ret_size = GetEnvironmentVariableA(NULL, NULL, 0);
ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND),
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
ret_size = GetEnvironmentVariableA(NULL, buf, lstrlenA(value) + 1);
ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND),
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
ret_size = GetEnvironmentVariableA("", buf, lstrlenA(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
}
@@ -133,13 +133,13 @@ static void test_GetSetEnvironmentVariab
return;
}
ok(ret == TRUE,
- "unexpected error in SetEnvironmentVariableW, GetLastError=%ld\n",
+ "unexpected error in SetEnvironmentVariableW, GetLastError=%d\n",
GetLastError());
/* Try to retrieve the environment variable we just set */
ret_size = GetEnvironmentVariableW(name, NULL, 0);
ok(ret_size == lstrlenW(value) + 1,
- "should return length with terminating 0 ret_size=%ld\n",
+ "should return length with terminating 0 ret_size=%d\n",
ret_size);
lstrcpyW(buf, fooW);
@@ -147,19 +147,19 @@ static void test_GetSetEnvironmentVariab
ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n");
ok(ret_size == lstrlenW(value) + 1,
- "should return length with terminating 0 ret_size=%ld\n", ret_size);
+ "should return length with terminating 0 ret_size=%d\n", ret_size);
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(lstrcmpW(buf, value) == 0, "should touch the buffer\n");
ok(ret_size == lstrlenW(value),
- "should return length without terminating 0 ret_size=%ld\n", ret_size);
+ "should return length without terminating 0 ret_size=%d\n", ret_size);
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name_cased, buf, lstrlenW(value) + 1);
ok(lstrcmpW(buf, value) == 0, "should touch the buffer\n");
ok(ret_size == lstrlenW(value),
- "should return length without terminating 0 ret_size=%ld\n", ret_size);
+ "should return length without terminating 0 ret_size=%d\n", ret_size);
/* Remove that environment variable */
ret = SetEnvironmentVariableW(name_cased, NULL);
@@ -169,45 +169,45 @@ static void test_GetSetEnvironmentVariab
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n");
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
/* Check behavior of SetEnvironmentVariableW(name, "") */
ret = SetEnvironmentVariableW(name, value);
ok(ret == TRUE,
- "unexpected error in SetEnvironmentVariableW, GetLastError=%ld\n",
+ "unexpected error in SetEnvironmentVariableW, GetLastError=%d\n",
GetLastError());
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(lstrcmpW(buf, value) == 0, "should touch the buffer\n");
ok(ret_size == lstrlenW(value),
- "should return length without terminating 0 ret_size=%ld\n", ret_size);
+ "should return length without terminating 0 ret_size=%d\n", ret_size);
ret = SetEnvironmentVariableW(name_cased, empty_strW);
- ok(ret == TRUE, "should not fail with empty value but GetLastError=%ld\n", GetLastError());
+ ok(ret == TRUE, "should not fail with empty value but GetLastError=%d\n", GetLastError());
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string\n");
/* Test the limits */
ret_size = GetEnvironmentVariableW(NULL, NULL, 0);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
- "should not find variable but ret_size=%ld GetLastError=%ld\n",
+ "should not find variable but ret_size=%d GetLastError=%d\n",
ret_size, GetLastError());
ret = SetEnvironmentVariableW(NULL, NULL);
ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND),
- "should fail with NULL, NULL but ret=%d and GetLastError=%ld\n",
+ "should fail with NULL, NULL but ret=%d and GetLastError=%d\n",
ret, GetLastError());
}
@@ -219,14 +219,14 @@ static void test_ExpandEnvironmentString
/* test a large destination size */
strcpy(buf, "12345");
ret_size = ExpandEnvironmentStringsA(buf, buf2, sizeof(buf2));
- ok(!strcmp(buf, buf2), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %ld\n", buf, buf2, ret_size);
+ ok(!strcmp(buf, buf2), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf2, ret_size);
ret_size1 = GetWindowsDirectoryA(buf1,256);
ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n");
ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf));
if (ERROR_ENVVAR_NOT_FOUND == GetLastError())
return;
- ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %ld\n", buf, buf1, ret_size);
+ ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf1, ret_size);
}
START_TEST(environ)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 29602b2..72464a3 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -65,7 +65,7 @@ static void test__hread( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -75,7 +75,7 @@ static void test__hread( void )
filehandle = _lopen( filename, OF_READ );
- ok( HFILE_ERROR != filehandle, "couldn't open file \"%s\" again (err=%ld)\n", filename, GetLastError( ) );
+ ok( HFILE_ERROR != filehandle, "couldn't open file \"%s\" again (err=%d)\n", filename, GetLastError( ) );
bytes_read = _hread( filehandle, buffer, 2 * strlen( sillytext ) );
@@ -94,7 +94,7 @@ static void test__hread( void )
ok( HFILE_ERROR != _lclose( filehandle ), "_lclose complains\n" );
ret = DeleteFileA( filename );
- ok( ret != 0, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError( ) );
}
@@ -114,7 +114,7 @@ static void test__hwrite( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -179,7 +179,7 @@ static void test__hwrite( void )
ok( HFILE_ERROR != _lclose( filehandle ), "_lclose complains\n" );
ret = DeleteFileA( filename );
- ok( ret != 0, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError( ) );
}
@@ -191,7 +191,7 @@ static void test__lclose( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -200,7 +200,7 @@ static void test__lclose( void )
ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" );
ret = DeleteFileA( filename );
- ok( ret != 0, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError( ) );
}
@@ -217,7 +217,7 @@ static void test__lcreat( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -232,10 +232,10 @@ static void test__lcreat( void )
ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should be able to find file\n" );
ret = DeleteFileA(filename);
- ok( ret != 0, "DeleteFile failed (%ld)\n", GetLastError());
+ ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError());
filehandle = _lcreat( filename, 1 ); /* readonly */
- ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%ld)\n", filename, GetLastError( ) );
+ ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError( ) );
ok( HFILE_ERROR != _hwrite( filehandle, sillytext, strlen( sillytext ) ), "_hwrite shouldn't be able to write never the less\n" );
@@ -250,7 +250,7 @@ static void test__lcreat( void )
ok( DeleteFileA( filename ) != 0, "now it should be possible to delete the file!\n" );
filehandle = _lcreat( filename, 2 );
- ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%ld)\n", filename, GetLastError( ) );
+ ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError( ) );
ok( HFILE_ERROR != _hwrite( filehandle, sillytext, strlen( sillytext ) ), "_hwrite complains\n" );
@@ -263,10 +263,10 @@ static void test__lcreat( void )
ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should STILL be able to find file\n" );
ret = DeleteFileA( filename );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
filehandle = _lcreat( filename, 4 ); /* SYSTEM file */
- ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%ld)\n", filename, GetLastError( ) );
+ ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError( ) );
ok( HFILE_ERROR != _hwrite( filehandle, sillytext, strlen( sillytext ) ), "_hwrite complains\n" );
@@ -279,7 +279,7 @@ static void test__lcreat( void )
ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should STILL be able to find file\n" );
ret = DeleteFileA( filename );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
filehandle=_lcreat (slashname, 0); /* illegal name */
if (HFILE_ERROR==filehandle) {
@@ -292,16 +292,16 @@ static void test__lcreat( void )
if (INVALID_HANDLE_VALUE!=find)
{
ret = FindClose (find);
- ok (0 != ret, "FindClose complains (%ld)\n", GetLastError ());
+ ok (0 != ret, "FindClose complains (%d)\n", GetLastError ());
slashname[strlen(slashname)-1]=0;
ok (!strcmp (slashname, search_results.cFileName),
"found unexpected name \"%s\"\n", search_results.cFileName);
ok (FILE_ATTRIBUTE_ARCHIVE==search_results.dwFileAttributes,
- "attributes of file \"%s\" are 0x%04lx\n", search_results.cFileName,
+ "attributes of file \"%s\" are 0x%04x\n", search_results.cFileName,
search_results.dwFileAttributes);
}
ret = DeleteFileA( slashname );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
}
filehandle=_lcreat (filename, 8); /* illegal attribute */
@@ -314,15 +314,15 @@ static void test__lcreat( void )
ok (0, "file \"%s\" not found\n", filename);
else {
ret = FindClose(find);
- ok ( 0 != ret, "FindClose complains (%ld)\n", GetLastError ());
+ ok ( 0 != ret, "FindClose complains (%d)\n", GetLastError ());
ok (!strcmp (filename, search_results.cFileName),
"found unexpected name \"%s\"\n", search_results.cFileName);
ok (FILE_ATTRIBUTE_ARCHIVE==search_results.dwFileAttributes,
- "attributes of file \"%s\" are 0x%04lx\n", search_results.cFileName,
+ "attributes of file \"%s\" are 0x%04x\n", search_results.cFileName,
search_results.dwFileAttributes);
}
ret = DeleteFileA( filename );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
}
}
@@ -338,7 +338,7 @@ static void test__llseek( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -361,7 +361,7 @@ static void test__llseek( void )
ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" );
ret = DeleteFileA( filename );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
}
@@ -375,7 +375,7 @@ static void test__llopen( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -400,7 +400,7 @@ static void test__llopen( void )
ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" );
ret = DeleteFileA( filename );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
/* TODO - add tests for the SHARE modes - use two processes to pull this one off */
}
@@ -417,7 +417,7 @@ static void test__lread( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -427,7 +427,7 @@ static void test__lread( void )
filehandle = _lopen( filename, OF_READ );
- ok( HFILE_ERROR != filehandle, "couldn't open file \"%s\" again (err=%ld)\n", filename, GetLastError());
+ ok( HFILE_ERROR != filehandle, "couldn't open file \"%s\" again (err=%d)\n", filename, GetLastError());
bytes_read = _lread( filehandle, buffer, 2 * strlen( sillytext ) );
@@ -446,7 +446,7 @@ static void test__lread( void )
ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" );
ret = DeleteFileA( filename );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
}
@@ -466,7 +466,7 @@ static void test__lwrite( void )
filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
@@ -531,7 +531,7 @@ static void test__lwrite( void )
ok( HFILE_ERROR != _lclose( filehandle ), "_lclose complains\n" );
ret = DeleteFileA( filename );
- ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) );
+ ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );
}
static void test_CopyFileA(void)
@@ -546,68 +546,68 @@ static void test_CopyFileA(void)
BOOL retok;
ret = GetTempPathA(MAX_PATH, temp_path);
- ok(ret != 0, "GetTempPathA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempPathA error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = GetTempFileNameA(temp_path, prefix, 0, source);
- ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError());
/* make the source have not zero size */
hfile = CreateFileA(source, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 );
ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file\n");
retok = WriteFile(hfile, prefix, sizeof(prefix), &ret, NULL );
ok( retok && ret == sizeof(prefix),
- "WriteFile error %ld\n", GetLastError());
+ "WriteFile error %d\n", GetLastError());
ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n");
/* get the file time and change it to prove the difference */
ret = GetFileTime(hfile, NULL, NULL, &ft1);
- ok( ret, "GetFileTime error %ld\n", GetLastError());
+ ok( ret, "GetFileTime error %d\n", GetLastError());
ft1.dwLowDateTime -= 600000000; /* 60 second */
ret = SetFileTime(hfile, NULL, NULL, &ft1);
- ok( ret, "SetFileTime error %ld\n", GetLastError());
+ ok( ret, "SetFileTime error %d\n", GetLastError());
GetFileTime(hfile, NULL, NULL, &ft1); /* get the actual time back */
CloseHandle(hfile);
ret = GetTempFileNameA(temp_path, prefix, 0, dest);
- ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError());
SetLastError(0xdeadbeef);
ret = CopyFileA(source, dest, TRUE);
ok(!ret && GetLastError() == ERROR_FILE_EXISTS,
- "CopyFileA: unexpected error %ld\n", GetLastError());
+ "CopyFileA: unexpected error %d\n", GetLastError());
ret = CopyFileA(source, dest, FALSE);
- ok(ret, "CopyFileA: error %ld\n", GetLastError());
+ ok(ret, "CopyFileA: error %d\n", GetLastError());
/* make sure that destination has correct size */
hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");
ret = GetFileSize(hfile, NULL);
- ok(ret == sizeof(prefix), "destination file has wrong size %ld\n", ret);
+ ok(ret == sizeof(prefix), "destination file has wrong size %d\n", ret);
/* make sure that destination has the same filetime */
ret = GetFileTime(hfile, NULL, NULL, &ft2);
- ok( ret, "GetFileTime error %ld\n", GetLastError());
+ ok( ret, "GetFileTime error %d\n", GetLastError());
ok(CompareFileTime(&ft1, &ft2) == 0, "destination file has wrong filetime\n");
SetLastError(0xdeadbeef);
ret = CopyFileA(source, dest, FALSE);
ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION,
- "CopyFileA: ret = %ld, unexpected error %ld\n", ret, GetLastError());
+ "CopyFileA: ret = %d, unexpected error %d\n", ret, GetLastError());
/* make sure that destination still has correct size */
ret = GetFileSize(hfile, NULL);
- ok(ret == sizeof(prefix), "destination file has wrong size %ld\n", ret);
+ ok(ret == sizeof(prefix), "destination file has wrong size %d\n", ret);
retok = ReadFile(hfile, buf, sizeof(buf), &ret, NULL);
ok( retok && ret == sizeof(prefix),
- "ReadFile: error %ld\n", GetLastError());
+ "ReadFile: error %d\n", GetLastError());
ok(!memcmp(prefix, buf, sizeof(prefix)), "buffer contents mismatch\n");
CloseHandle(hfile);
ret = DeleteFileA(source);
- ok(ret, "DeleteFileA: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileA: error %d\n", GetLastError());
ret = DeleteFileA(dest);
- ok(ret, "DeleteFileA: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileA: error %d\n", GetLastError());
}
static void test_CopyFileW(void)
@@ -620,26 +620,26 @@ static void test_CopyFileW(void)
ret = GetTempPathW(MAX_PATH, temp_path);
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(ret != 0, "GetTempPathW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempPathW error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = GetTempFileNameW(temp_path, prefix, 0, source);
- ok(ret != 0, "GetTempFileNameW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError());
ret = GetTempFileNameW(temp_path, prefix, 0, dest);
- ok(ret != 0, "GetTempFileNameW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError());
ret = CopyFileW(source, dest, TRUE);
ok(!ret && GetLastError() == ERROR_FILE_EXISTS,
- "CopyFileW: unexpected error %ld\n", GetLastError());
+ "CopyFileW: unexpected error %d\n", GetLastError());
ret = CopyFileW(source, dest, FALSE);
- ok(ret, "CopyFileW: error %ld\n", GetLastError());
+ ok(ret, "CopyFileW: error %d\n", GetLastError());
ret = DeleteFileW(source);
- ok(ret, "DeleteFileW: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileW: error %d\n", GetLastError());
ret = DeleteFileW(dest);
- ok(ret, "DeleteFileW: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileW: error %d\n", GetLastError());
}
static void test_CreateFileA(void)
@@ -651,11 +651,11 @@ static void test_CreateFileA(void)
DWORD ret;
ret = GetTempPathA(MAX_PATH, temp_path);
- ok(ret != 0, "GetTempPathA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempPathA error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = GetTempFileNameA(temp_path, prefix, 0, filename);
- ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError());
hFile = CreateFileA(filename, GENERIC_READ, 0, NULL,
CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0);
@@ -663,7 +663,7 @@ static void test_CreateFileA(void)
"CREATE_NEW should fail if file exists and last error value should be ERROR_FILE_EXISTS\n");
ret = DeleteFileA(filename);
- ok(ret, "DeleteFileA: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileA: error %d\n", GetLastError());
}
static void test_CreateFileW(void)
@@ -679,11 +679,11 @@ static void test_CreateFileW(void)
ret = GetTempPathW(MAX_PATH, temp_path);
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(ret != 0, "GetTempPathW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempPathW error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = GetTempFileNameW(temp_path, prefix, 0, filename);
- ok(ret != 0, "GetTempFileNameW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError());
hFile = CreateFileW(filename, GENERIC_READ, 0, NULL,
CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0);
@@ -691,7 +691,7 @@ static void test_CreateFileW(void)
"CREATE_NEW should fail if file exists and last error value should be ERROR_FILE_EXISTS\n");
ret = DeleteFileW(filename);
- ok(ret, "DeleteFileW: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileW: error %d\n", GetLastError());
#if 0 /* this test crashes on NT4.0 */
hFile = CreateFileW(NULL, GENERIC_READ, 0, NULL,
@@ -703,13 +703,13 @@ #endif
hFile = CreateFileW(emptyW, GENERIC_READ, 0, NULL,
CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0);
ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND,
- "CreateFileW(\"\") returned ret=%p error=%ld\n",hFile,GetLastError());
+ "CreateFileW(\"\") returned ret=%p error=%d\n",hFile,GetLastError());
/* test the result of opening a nonexistent driver name */
hFile = CreateFileW(bogus, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND,
- "CreateFileW on invalid VxD name returned ret=%p error=%ld\n",hFile,GetLastError());
+ "CreateFileW on invalid VxD name returned ret=%p error=%d\n",hFile,GetLastError());
}
static void test_GetTempFileNameA(void)
@@ -722,7 +722,7 @@ static void test_GetTempFileNameA(void)
result = GetWindowsDirectory(windowsdir, sizeof(windowsdir));
ok(result < sizeof(windowsdir), "windowsdir is abnormally long!\n");
- ok(result != 0, "GetWindowsDirectory: error %ld\n", GetLastError());
+ ok(result != 0, "GetWindowsDirectory: error %d\n", GetLastError());
/* If the Windows directory is the root directory, it ends in backslash, not else. */
if (strlen(windowsdir) != 3) /* As in "C:\" or "F:\" */
@@ -735,13 +735,13 @@ static void test_GetTempFileNameA(void)
windowsdrive[2] = '\0';
result = GetTempFileNameA(windowsdrive, "abc", 1, out);
- ok(result != 0, "GetTempFileNameA: error %ld\n", GetLastError());
+ ok(result != 0, "GetTempFileNameA: error %d\n", GetLastError());
ok(((out[0] == windowsdrive[0]) && (out[1] == ':')) && (out[2] == '\\'),
"GetTempFileNameA: first three characters should be %c:\\, string was actually %s\n",
windowsdrive[0], out);
result = GetTempFileNameA(windowsdir, "abc", 2, out);
- ok(result != 0, "GetTempFileNameA: error %ld\n", GetLastError());
+ ok(result != 0, "GetTempFileNameA: error %d\n", GetLastError());
expected[0] = '\0';
strcat(expected, windowsdir);
strcat(expected, "abc2.tmp");
@@ -756,19 +756,19 @@ static void test_DeleteFileA( void )
ret = DeleteFileA(NULL);
ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_PATH_NOT_FOUND),
- "DeleteFileA(NULL) returned ret=%d error=%ld\n",ret,GetLastError());
+ "DeleteFileA(NULL) returned ret=%d error=%d\n",ret,GetLastError());
ret = DeleteFileA("");
ok(!ret && (GetLastError() == ERROR_PATH_NOT_FOUND ||
GetLastError() == ERROR_BAD_PATHNAME),
- "DeleteFileA(\"\") returned ret=%d error=%ld\n",ret,GetLastError());
+ "DeleteFileA(\"\") returned ret=%d error=%d\n",ret,GetLastError());
ret = DeleteFileA("nul");
ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND ||
GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_ACCESS_DENIED ||
GetLastError() == ERROR_INVALID_FUNCTION),
- "DeleteFileA(\"nul\") returned ret=%d error=%ld\n",ret,GetLastError());
+ "DeleteFileA(\"nul\") returned ret=%d error=%d\n",ret,GetLastError());
}
static void test_DeleteFileW( void )
@@ -780,11 +780,11 @@ static void test_DeleteFileW( void )
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND,
- "DeleteFileW(NULL) returned ret=%d error=%ld\n",ret,GetLastError());
+ "DeleteFileW(NULL) returned ret=%d error=%d\n",ret,GetLastError());
ret = DeleteFileW(emptyW);
ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND,
- "DeleteFileW(\"\") returned ret=%d error=%ld\n",ret,GetLastError());
+ "DeleteFileW(\"\") returned ret=%d error=%d\n",ret,GetLastError());
}
#define IsDotDir(x) ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0))))
@@ -797,24 +797,24 @@ static void test_MoveFileA(void)
DWORD ret;
ret = GetTempPathA(MAX_PATH, tempdir);
- ok(ret != 0, "GetTempPathA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempPathA error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = GetTempFileNameA(tempdir, prefix, 0, source);
- ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError());
ret = GetTempFileNameA(tempdir, prefix, 0, dest);
- ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError());
ret = MoveFileA(source, dest);
ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS,
- "MoveFileA: unexpected error %ld\n", GetLastError());
+ "MoveFileA: unexpected error %d\n", GetLastError());
ret = DeleteFileA(dest);
- ok(ret, "DeleteFileA: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileA: error %d\n", GetLastError());
ret = MoveFileA(source, dest);
- ok(ret, "MoveFileA: failed, error %ld\n", GetLastError());
+ ok(ret, "MoveFileA: failed, error %d\n", GetLastError());
lstrcatA(tempdir, "Remove Me");
ret = CreateDirectoryA(tempdir, NULL);
@@ -828,7 +828,7 @@ static void test_MoveFileA(void)
ok(!ret, "MoveFileA: shouldn't move to wildcard file\n");
ok(GetLastError() == ERROR_INVALID_NAME || /* NT */
GetLastError() == ERROR_FILE_NOT_FOUND, /* Win9x */
- "MoveFileA: with wildcards, unexpected error %ld\n", GetLastError());
+ "MoveFileA: with wildcards, unexpected error %d\n", GetLastError());
if (ret || (GetLastError() != ERROR_INVALID_NAME))
{
WIN32_FIND_DATAA fd;
@@ -853,11 +853,11 @@ static void test_MoveFileA(void)
}
}
ret = DeleteFileA(source);
- ok(ret, "DeleteFileA: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileA: error %d\n", GetLastError());
ret = DeleteFileA(dest);
- ok(!ret, "DeleteFileA: error %ld\n", GetLastError());
+ ok(!ret, "DeleteFileA: error %d\n", GetLastError());
ret = RemoveDirectoryA(tempdir);
- ok(ret, "DeleteDirectoryA: error %ld\n", GetLastError());
+ ok(ret, "DeleteDirectoryA: error %d\n", GetLastError());
}
static void test_MoveFileW(void)
@@ -870,23 +870,23 @@ static void test_MoveFileW(void)
ret = GetTempPathW(MAX_PATH, temp_path);
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(ret != 0, "GetTempPathW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempPathW error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = GetTempFileNameW(temp_path, prefix, 0, source);
- ok(ret != 0, "GetTempFileNameW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError());
ret = GetTempFileNameW(temp_path, prefix, 0, dest);
- ok(ret != 0, "GetTempFileNameW error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError());
ret = MoveFileW(source, dest);
ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS,
- "CopyFileW: unexpected error %ld\n", GetLastError());
+ "CopyFileW: unexpected error %d\n", GetLastError());
ret = DeleteFileW(source);
- ok(ret, "DeleteFileW: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileW: error %d\n", GetLastError());
ret = DeleteFileW(dest);
- ok(ret, "DeleteFileW: error %ld\n", GetLastError());
+ ok(ret, "DeleteFileW: error %d\n", GetLastError());
}
#define PATTERN_OFFSET 0x10
@@ -903,19 +903,19 @@ static void test_offset_in_overlapped_st
BOOL ret;
ret =GetTempPathA(MAX_PATH, temp_path);
- ok( ret, "GetTempPathA error %ld\n", GetLastError());
+ ok( ret, "GetTempPathA error %d\n", GetLastError());
ret =GetTempFileNameA(temp_path, "pfx", 0, temp_fname);
- ok( ret, "GetTempFileNameA error %ld\n", GetLastError());
+ ok( ret, "GetTempFileNameA error %d\n", GetLastError());
/*** Write File *****************************************************/
hFile = CreateFileA(temp_fname, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
- ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA error %ld\n", GetLastError());
+ ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA error %d\n", GetLastError());
for(i = 0; i < sizeof(buf); i++) buf[i] = i;
ret = WriteFile(hFile, buf, sizeof(buf), &done, NULL);
- ok( ret, "WriteFile error %ld\n", GetLastError());
- ok(done == sizeof(buf), "expected number of bytes written %lu\n", done);
+ ok( ret, "WriteFile error %d\n", GetLastError());
+ ok(done == sizeof(buf), "expected number of bytes written %u\n", done);
memset(&ov, 0, sizeof(ov));
S(U(ov)).Offset = PATTERN_OFFSET;
@@ -923,18 +923,18 @@ static void test_offset_in_overlapped_st
rc=WriteFile(hFile, pattern, sizeof(pattern), &done, &ov);
/* Win 9x does not support the overlapped I/O on files */
if (rc || GetLastError()!=ERROR_INVALID_PARAMETER) {
- ok(rc, "WriteFile error %ld\n", GetLastError());
- ok(done == sizeof(pattern), "expected number of bytes written %lu\n", done);
+ ok(rc, "WriteFile error %d\n", GetLastError());
+ ok(done == sizeof(pattern), "expected number of bytes written %u\n", done);
offset = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
- ok(offset == PATTERN_OFFSET + sizeof(pattern), "wrong file offset %ld\n", offset);
+ ok(offset == PATTERN_OFFSET + sizeof(pattern), "wrong file offset %d\n", offset);
S(U(ov)).Offset = sizeof(buf) * 2;
S(U(ov)).OffsetHigh = 0;
ret = WriteFile(hFile, pattern, sizeof(pattern), &done, &ov);
- ok( ret, "WriteFile error %ld\n", GetLastError());
- ok(done == sizeof(pattern), "expected number of bytes written %lu\n", done);
+ ok( ret, "WriteFile error %d\n", GetLastError());
+ ok(done == sizeof(pattern), "expected number of bytes written %u\n", done);
offset = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
- ok(offset == sizeof(buf) * 2 + sizeof(pattern), "wrong file offset %ld\n", offset);
+ ok(offset == sizeof(buf) * 2 + sizeof(pattern), "wrong file offset %d\n", offset);
}
CloseHandle(hFile);
@@ -942,7 +942,7 @@ static void test_offset_in_overlapped_st
/*** Read File *****************************************************/
hFile = CreateFileA(temp_fname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0);
- ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA error %ld\n", GetLastError());
+ ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA error %d\n", GetLastError());
memset(buf, 0, sizeof(buf));
memset(&ov, 0, sizeof(ov));
@@ -951,17 +951,17 @@ static void test_offset_in_overlapped_st
rc=ReadFile(hFile, buf, sizeof(pattern), &done, &ov);
/* Win 9x does not support the overlapped I/O on files */
if (rc || GetLastError()!=ERROR_INVALID_PARAMETER) {
- ok(rc, "ReadFile error %ld\n", GetLastError());
- ok(done == sizeof(pattern), "expected number of bytes read %lu\n", done);
+ ok(rc, "ReadFile error %d\n", GetLastError());
+ ok(done == sizeof(pattern), "expected number of bytes read %u\n", done);
offset = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
- ok(offset == PATTERN_OFFSET + sizeof(pattern), "wrong file offset %ld\n", offset);
+ ok(offset == PATTERN_OFFSET + sizeof(pattern), "wrong file offset %d\n", offset);
ok(!memcmp(buf, pattern, sizeof(pattern)), "pattern match failed\n");
}
CloseHandle(hFile);
ret = DeleteFileA(temp_fname);
- ok( ret, "DeleteFileA error %ld\n", GetLastError());
+ ok( ret, "DeleteFileA error %d\n", GetLastError());
}
static void test_LockFile(void)
@@ -978,7 +978,7 @@ static void test_LockFile(void)
CREATE_ALWAYS, 0, 0 );
if (handle == INVALID_HANDLE_VALUE)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
ok( WriteFile( handle, sillytext, strlen(sillytext), &written, NULL ), "write failed\n" );
@@ -1103,7 +1103,7 @@ static void test_file_sharing(void)
h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
if (h == INVALID_HANDLE_VALUE)
{
- ok(0, "couldn't create file \"%s\" (err=%ld)\n", filename, GetLastError());
+ ok(0, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError());
return;
}
CloseHandle( h );
@@ -1116,7 +1116,7 @@ static void test_file_sharing(void)
NULL, OPEN_EXISTING, 0, 0 );
if (h == INVALID_HANDLE_VALUE)
{
- ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError());
+ ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError());
return;
}
for (a2 = 0; a2 < sizeof(access_modes)/sizeof(access_modes[0]); a2++)
@@ -1134,7 +1134,7 @@ static void test_file_sharing(void)
"Windows 95 sets GetLastError() = ERROR_SHARING_VIOLATION and\n"
" Windows XP GetLastError() = 0, but now it is %d.\n"
" indexes = %d, %d, %d, %d\n"
- " modes =\n %lx/%lx/%lx/%lx\n",
+ " modes =\n %x/%x/%x/%x\n",
ret,
a1, s1, a2, s2,
access_modes[a1], sharing_modes[s1],
@@ -1144,12 +1144,12 @@ static void test_file_sharing(void)
else
{
ok( h2 == INVALID_HANDLE_VALUE,
- "open succeeded for modes %lx/%lx/%lx/%lx\n",
+ "open succeeded for modes %x/%x/%x/%x\n",
access_modes[a1], sharing_modes[s1],
access_modes[a2], sharing_modes[s2] );
if (h2 == INVALID_HANDLE_VALUE)
ok( GetLastError() == ERROR_SHARING_VIOLATION,
- "wrong error code %ld\n", GetLastError() );
+ "wrong error code %d\n", GetLastError() );
}
if (h2 != INVALID_HANDLE_VALUE) CloseHandle( h2 );
}
@@ -1160,15 +1160,15 @@ static void test_file_sharing(void)
SetLastError(0xdeadbeef);
h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, 0 );
- ok( h != INVALID_HANDLE_VALUE, "CreateFileA error %ld\n", GetLastError() );
+ ok( h != INVALID_HANDLE_VALUE, "CreateFileA error %d\n", GetLastError() );
SetLastError(0xdeadbeef);
h2 = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 );
ok( h2 == INVALID_HANDLE_VALUE, "CreateFileA should fail\n");
- ok( GetLastError() == ERROR_SHARING_VIOLATION, "wrong error code %ld\n", GetLastError() );
+ ok( GetLastError() == ERROR_SHARING_VIOLATION, "wrong error code %d\n", GetLastError() );
h2 = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 );
- ok( h2 != INVALID_HANDLE_VALUE, "CreateFileA error %ld\n", GetLastError() );
+ ok( h2 != INVALID_HANDLE_VALUE, "CreateFileA error %d\n", GetLastError() );
CloseHandle(h);
CloseHandle(h2);
@@ -1330,12 +1330,12 @@ static void test_GetFileType(void)
HANDLE h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
ok( h != INVALID_HANDLE_VALUE, "open %s failed\n", filename );
type = GetFileType(h);
- ok( type == FILE_TYPE_DISK, "expected type disk got %ld\n", type );
+ ok( type == FILE_TYPE_DISK, "expected type disk got %d\n", type );
CloseHandle( h );
h = CreateFileA( "nul", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 );
ok( h != INVALID_HANDLE_VALUE, "open nul failed\n" );
type = GetFileType(h);
- ok( type == FILE_TYPE_CHAR, "expected type char for nul got %ld\n", type );
+ ok( type == FILE_TYPE_CHAR, "expected type char for nul got %d\n", type );
CloseHandle( h );
DeleteFileA( filename );
}
@@ -1393,32 +1393,32 @@ static void test_read_write(void)
static const char prefix[] = "pfx";
ret = GetTempPathA(MAX_PATH, temp_path);
- ok(ret != 0, "GetTempPathA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempPathA error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
ret = GetTempFileNameA(temp_path, prefix, 0, filename);
- ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
+ ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError());
hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL,
CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0);
- ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %ld\n", GetLastError());
+ ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError());
SetLastError(12345678);
bytes = 12345678;
ret = WriteFile(hFile, NULL, 0, &bytes, NULL);
ok(ret && GetLastError() == 12345678,
- "ret = %ld, error %ld\n", ret, GetLastError());
- ok(!bytes, "bytes = %ld\n", bytes);
+ "ret = %d, error %d\n", ret, GetLastError());
+ ok(!bytes, "bytes = %d\n", bytes);
SetLastError(12345678);
bytes = 12345678;
ret = WriteFile(hFile, NULL, 10, &bytes, NULL);
ok((!ret && GetLastError() == ERROR_INVALID_USER_BUFFER) || /* Win2k */
(ret && GetLastError() == 12345678), /* Win9x */
- "ret = %ld, error %ld\n", ret, GetLastError());
+ "ret = %d, error %d\n", ret, GetLastError());
ok(!bytes || /* Win2k */
bytes == 10, /* Win9x */
- "bytes = %ld\n", bytes);
+ "bytes = %d\n", bytes);
/* make sure the file contains data */
WriteFile(hFile, "this is the test data", 21, &bytes, NULL);
@@ -1428,21 +1428,21 @@ static void test_read_write(void)
bytes = 12345678;
ret = ReadFile(hFile, NULL, 0, &bytes, NULL);
ok(ret && GetLastError() == 12345678,
- "ret = %ld, error %ld\n", ret, GetLastError());
- ok(!bytes, "bytes = %ld\n", bytes);
+ "ret = %d, error %d\n", ret, GetLastError());
+ ok(!bytes, "bytes = %d\n", bytes);
SetLastError(12345678);
bytes = 12345678;
ret = ReadFile(hFile, NULL, 10, &bytes, NULL);
ok(!ret && (GetLastError() == ERROR_NOACCESS || /* Win2k */
GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */
- "ret = %ld, error %ld\n", ret, GetLastError());
- ok(!bytes, "bytes = %ld\n", bytes);
+ "ret = %d, error %d\n", ret, GetLastError());
+ ok(!bytes, "bytes = %d\n", bytes);
ret = CloseHandle(hFile);
- ok( ret, "CloseHandle: error %ld\n", GetLastError());
+ ok( ret, "CloseHandle: error %d\n", GetLastError());
ret = DeleteFileA(filename);
- ok( ret, "DeleteFileA: error %ld\n", GetLastError());
+ ok( ret, "DeleteFileA: error %d\n", GetLastError());
}
static void test_OpenFile(void)
@@ -1476,9 +1476,9 @@ static void test_OpenFile(void)
SetLastError(0xfaceabee);
hFile = OpenFile(buff, &ofs, OF_EXIST);
- ok( hFile == TRUE, "%s not found : %ld\n", buff, GetLastError() );
+ ok( hFile == TRUE, "%s not found : %d\n", buff, GetLastError() );
ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
ok( ofs.cBytes == sizeof(ofs), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
ok( lstrcmpiA(ofs.szPathName, buff) == 0,
@@ -1497,8 +1497,8 @@ static void test_OpenFile(void)
SetLastError(0xfaceabee);
hFile = OpenFile(foo, &ofs, OF_EXIST);
- ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %ld\n", GetLastError());
- ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %ld\n", GetLastError() );
+ ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %d\n", GetLastError());
+ ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError() );
todo_wine
ok( ofs.cBytes == 0xA5, "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_FILE_NOT_FOUND, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
@@ -1518,9 +1518,9 @@ static void test_OpenFile(void)
SetLastError(0xfaceabee);
hFile = OpenFile(foo_too_long, &ofs, OF_EXIST);
- ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %ld\n", GetLastError());
+ ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %d\n", GetLastError());
ok( GetLastError() == ERROR_INVALID_DATA || GetLastError() == ERROR_FILENAME_EXCED_RANGE,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
todo_wine
ok( ofs.cBytes == 0xA5, "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_INVALID_DATA || ofs.nErrCode == ERROR_FILENAME_EXCED_RANGE,
@@ -1548,13 +1548,13 @@ static void test_OpenFile(void)
hFile = OpenFile(filename, &ofs, OF_CREATE);
ok( hFile != HFILE_ERROR, "OpenFile failed to create nonexistent file\n" );
ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
ret = CloseHandle((HANDLE)hFile);
ok( ret == TRUE, "CloseHandle() returns %d\n", ret );
retval = GetFileAttributesA(filename);
- ok( retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError() );
+ ok( retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %d\n", GetLastError() );
memset(&ofs, 0xA5, sizeof(ofs));
SetLastError(0xfaceabee);
@@ -1563,7 +1563,7 @@ static void test_OpenFile(void)
hFile = OpenFile(filename, &ofs, OF_READ);
ok( hFile != HFILE_ERROR, "OpenFile failed on read\n" );
ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
ok( lstrcmpiA(ofs.szPathName, buff) == 0,
@@ -1577,7 +1577,7 @@ static void test_OpenFile(void)
hFile = OpenFile(filename, &ofs, OF_WRITE);
ok( hFile != HFILE_ERROR, "OpenFile failed on write\n" );
ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
ok( lstrcmpiA(ofs.szPathName, buff) == 0,
@@ -1591,7 +1591,7 @@ static void test_OpenFile(void)
hFile = OpenFile(filename, &ofs, OF_READWRITE);
ok( hFile != HFILE_ERROR, "OpenFile failed on read/write\n" );
ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
ok( lstrcmpiA(ofs.szPathName, buff) == 0,
@@ -1605,7 +1605,7 @@ static void test_OpenFile(void)
hFile = OpenFile(filename, &ofs, OF_EXIST);
ok( hFile == 1, "OpenFile failed on finding our created file\n" );
ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
ok( lstrcmpiA(ofs.szPathName, buff) == 0,
@@ -1617,7 +1617,7 @@ static void test_OpenFile(void)
hFile = OpenFile(filename, &ofs, OF_DELETE);
ok( hFile == 1, "OpenFile failed on delete (%d)\n", hFile );
ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS,
- "GetLastError() returns %ld\n", GetLastError() );
+ "GetLastError() returns %d\n", GetLastError() );
ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes );
ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode );
ok( lstrcmpiA(ofs.szPathName, buff) == 0,
diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c
index 80fdf41..9396d45 100644
--- a/dlls/kernel32/tests/format_msg.c
+++ b/dlls/kernel32/tests/format_msg.c
@@ -48,176 +48,176 @@ static void test_message_from_string(voi
r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0,
0, out, sizeof(out)/sizeof(CHAR),NULL);
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* using the format feature */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0,
0, out, sizeof(out)/sizeof(CHAR), "test");
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* no format */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0,
0, out, sizeof(out)/sizeof(CHAR), "test");
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* two pieces */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1%2", 0,
0, out, sizeof(out)/sizeof(CHAR), "te","st");
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* three pieces */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1%3%2%1", 0,
0, out, sizeof(out)/sizeof(CHAR), "t","s","e");
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* s doesn't seem to work in format strings */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%!s!", 0,
0, out, sizeof(out)/sizeof(CHAR), "test");
ok(!strcmp("!s!", out),"failed out=[%s]\n",out);
- ok(r==3,"failed: r=%ld\n",r);
+ ok(r==3,"failed: r=%d\n",r);
/* S is unicode */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!S!", 0,
0, out, sizeof(out)/sizeof(CHAR), szwTest);
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* as characters */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!c!%2!c!%3!c!%1!c!", 0,
0, out, sizeof(out)/sizeof(CHAR), 't','e','s');
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* some numbers */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!d!%2!d!%3!d!", 0,
0, out, sizeof(out)/sizeof(CHAR), 1,2,3);
ok(!strcmp("123", out),"failed out=[%s]\n",out);
- ok(r==3,"failed: r=%ld\n",r);
+ ok(r==3,"failed: r=%d\n",r);
/* a single digit with some spacing */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4d!", 0,
0, out, sizeof(out)/sizeof(CHAR), 1);
ok(!strcmp(" 1", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* a single digit, left justified */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!-4d!", 0,
0, out, sizeof(out)/sizeof(CHAR), 1);
ok(!strcmp("1 ", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* two digit decimal number */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4d!", 0,
0, out, sizeof(out)/sizeof(CHAR), 11);
ok(!strcmp(" 11", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* a hex number */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4x!", 0,
0, out, sizeof(out)/sizeof(CHAR), 11);
ok(!strcmp(" b", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* a hex number, upper case */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4X!", 0,
0, out, sizeof(out)/sizeof(CHAR), 11);
ok(!strcmp(" B", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* a hex number, upper case, left justified */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!-4X!", 0,
0, out, sizeof(out)/sizeof(CHAR), 11);
ok(!strcmp("B ", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* a long hex number, upper case */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4X!", 0,
0, out, sizeof(out)/sizeof(CHAR), 0x1ab);
ok(!strcmp(" 1AB", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* two percent... */
r = doit(FORMAT_MESSAGE_FROM_STRING, " %%%% ", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp(" %% ", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* periods are special cases */
r = doit(FORMAT_MESSAGE_FROM_STRING, " %.%. %1!d!", 0,
0, out, sizeof(out)/sizeof(CHAR), 0x1ab);
ok(!strcmp(" .. 427", out),"failed out=[%s]\n",out);
- ok(r==7,"failed: r=%ld\n",r);
+ ok(r==7,"failed: r=%d\n",r);
/* %0 ends the line */
r = doit(FORMAT_MESSAGE_FROM_STRING, "test%0test", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("test", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* %! prints an exclaimation */
r = doit(FORMAT_MESSAGE_FROM_STRING, "yah%!%0 ", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("yah!", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* %space */
r = doit(FORMAT_MESSAGE_FROM_STRING, "% % ", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp(" ", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING, "hi\n", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("hi\r\n", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* carriage return line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING, "hi\r\n", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("hi\r\n", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* carriage return line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING, "\r", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("\r\n", out),"failed out=[%s]\n",out);
- ok(r==2,"failed: r=%ld\n",r);
+ ok(r==2,"failed: r=%d\n",r);
/* carriage return line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING, "\r\r\n", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out);
- ok(r==4,"failed: r=%ld\n",r);
+ ok(r==4,"failed: r=%d\n",r);
/* change of pace... test the low byte of dwflags */
/* line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("hi ", out) || !strcmp("hi\r\n", out),"failed out=[%s]\n",out);
- ok(r==3 || r==4,"failed: r=%ld\n",r);
+ ok(r==3 || r==4,"failed: r=%d\n",r);
/* carriage return line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\r\n", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp("hi ", out),"failed out=[%s]\n",out);
- ok(r==3,"failed: r=%ld\n",r);
+ ok(r==3,"failed: r=%d\n",r);
/* carriage return line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp(" ", out),"failed out=[%s]\n",out);
- ok(r==1,"failed: r=%ld\n",r);
+ ok(r==1,"failed: r=%d\n",r);
/* carriage return line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r\r\n", 0,
0, out, sizeof(out)/sizeof(CHAR));
ok(!strcmp(" ", out),"failed out=[%s]\n",out);
- ok(r==2,"failed: r=%ld\n",r);
+ ok(r==2,"failed: r=%d\n",r);
}
START_TEST(format_msg)
diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index 59ae0f2..4a7326d 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -87,39 +87,39 @@ START_TEST(heap)
SetLastError(MAGIC_DEAD);
mem = GlobalLock(gbl); /* #1 */
- ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError());
+ ok(mem != NULL, "returned %p with %d (expected '!= NULL')\n", mem, GetLastError());
SetLastError(MAGIC_DEAD);
flags = GlobalFlags(gbl);
- ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n",
+ ok( flags == 1, "returned 0x%04x with %d (expected '0x0001')\n",
flags, GetLastError());
SetLastError(MAGIC_DEAD);
msecond = GlobalLock(gbl); /* #2 */
- ok( msecond == mem, "returned %p with %ld (expected '%p')\n",
+ ok( msecond == mem, "returned %p with %d (expected '%p')\n",
msecond, GetLastError(), mem);
SetLastError(MAGIC_DEAD);
flags = GlobalFlags(gbl);
- ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n",
+ ok( flags == 2, "returned 0x%04x with %d (expected '0x0002')\n",
flags, GetLastError());
SetLastError(MAGIC_DEAD);
SetLastError(MAGIC_DEAD);
res = GlobalUnlock(gbl); /* #1 */
- ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError());
+ ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError());
SetLastError(MAGIC_DEAD);
flags = GlobalFlags(gbl);
- ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n",
+ ok( flags , "returned 0x%04x with %d (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 %ld with %ld (expected '0' with: ERROR_SUCCESS or " \
+ "returned %d with %d (expected '0' with: ERROR_SUCCESS or " \
"MAGIC_DEAD)\n", res, GetLastError());
SetLastError(MAGIC_DEAD);
flags = GlobalFlags(gbl);
- ok( !flags , "returned 0x%04x with %ld (expected '0')\n",
+ ok( !flags , "returned 0x%04x with %d (expected '0')\n",
flags, GetLastError());
/* Unlock an already unlocked Handle */
@@ -128,7 +128,7 @@ START_TEST(heap)
/* NT: ERROR_NOT_LOCKED, 9x: untouched */
ok( !res &&
((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)),
- "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " \
+ "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " \
"MAGIC_DEAD)\n", res, GetLastError());
GlobalFree(gbl);
@@ -136,23 +136,23 @@ START_TEST(heap)
SetLastError(MAGIC_DEAD);
hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */
ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE),
- "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n",
+ "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n",
hsecond, GetLastError(), gbl);
SetLastError(MAGIC_DEAD);
flags = GlobalFlags(gbl);
ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE),
- "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " \
+ "returned 0x%04x with 0x%08x (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%08lx (expected '0' with ERROR_INVALID_HANDLE)\n",
+ "returned %ld with 0x%08x (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%08lx (expected NULL with ERROR_INVALID_HANDLE)\n",
+ "returned %p with 0x%08x (expected NULL with ERROR_INVALID_HANDLE)\n",
mem, GetLastError());
/* documented on MSDN: GlobalUnlock() return FALSE on failure.
@@ -162,7 +162,7 @@ START_TEST(heap)
SetLastError(MAGIC_DEAD);
res = GlobalUnlock(gbl);
ok(GetLastError() == ERROR_INVALID_HANDLE,
- "returned %ld with %ld (expected ERROR_INVALID_HANDLE)\n",
+ "returned %d with %d (expected ERROR_INVALID_HANDLE)\n",
res, GetLastError());
@@ -192,39 +192,39 @@ START_TEST(heap)
gbl = LocalAlloc(LMEM_MOVEABLE, 256);
SetLastError(MAGIC_DEAD);
mem = LocalLock(gbl); /* #1 */
- ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError());
+ ok(mem != NULL, "returned %p with %d (expected '!= NULL')\n", mem, GetLastError());
SetLastError(MAGIC_DEAD);
flags = LocalFlags(gbl);
- ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n",
+ ok( flags == 1, "returned 0x%04x with %d (expected '0x0001')\n",
flags, GetLastError());
SetLastError(MAGIC_DEAD);
msecond = LocalLock(gbl); /* #2 */
- ok( msecond == mem, "returned %p with %ld (expected '%p')\n",
+ ok( msecond == mem, "returned %p with %d (expected '%p')\n",
msecond, GetLastError(), mem);
SetLastError(MAGIC_DEAD);
flags = LocalFlags(gbl);
- ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n",
+ ok( flags == 2, "returned 0x%04x with %d (expected '0x0002')\n",
flags, GetLastError());
SetLastError(MAGIC_DEAD);
SetLastError(MAGIC_DEAD);
res = LocalUnlock(gbl); /* #1 */
- ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError());
+ ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError());
SetLastError(MAGIC_DEAD);
flags = LocalFlags(gbl);
- ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n",
+ ok( flags , "returned 0x%04x with %d (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 %ld with %ld (expected '0' with: ERROR_SUCCESS or " \
+ "returned %d with %d (expected '0' with: ERROR_SUCCESS or " \
"MAGIC_DEAD)\n", res, GetLastError());
SetLastError(MAGIC_DEAD);
flags = LocalFlags(gbl);
- ok( !flags , "returned 0x%04x with %ld (expected '0')\n",
+ ok( !flags , "returned 0x%04x with %d (expected '0')\n",
flags, GetLastError());
/* Unlock an already unlocked Handle */
@@ -233,7 +233,7 @@ START_TEST(heap)
/* NT: ERROR_NOT_LOCKED, 9x: untouched */
ok( !res &&
((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)),
- "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " \
+ "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " \
"MAGIC_DEAD)\n", res, GetLastError());
LocalFree(gbl);
@@ -241,30 +241,30 @@ START_TEST(heap)
SetLastError(MAGIC_DEAD);
hsecond = LocalFree(gbl); /* invalid handle: free memory twice */
ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE),
- "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n",
+ "returned %p with 0x%08x (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%08lx (expected LMEM_INVALID_HANDLE with " \
+ "returned 0x%04x with 0x%08x (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%08lx (expected '0' with ERROR_INVALID_HANDLE)\n",
+ "returned %ld with 0x%08x (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%08lx (expected NULL with ERROR_INVALID_HANDLE)\n",
+ "returned %p with 0x%08x (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 %ld with %ld (expected '0' with ERROR_INVALID_HANDLE)\n",
+ "returned %d with %d (expected '0' with ERROR_INVALID_HANDLE)\n",
res, GetLastError());
/* trying to lock empty memory should give an error */
@@ -275,7 +275,7 @@ START_TEST(heap)
/* NT: ERROR_DISCARDED, 9x: untouched */
ok( (mem == NULL) &&
((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)),
- "returned %p with 0x%lx/%ld (expected 'NULL' with: ERROR_DISCARDED or " \
+ "returned %p with 0x%x/%d (expected 'NULL' with: ERROR_DISCARDED or " \
"MAGIC_DEAD)\n", mem, GetLastError(), GetLastError());
GlobalFree(gbl);
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 565f998..a091248 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -108,16 +108,16 @@ #define COUNTOF(x) (sizeof(x)/sizeof(x)[
#define EXPECT_LEN(len) ok(ret == (len), "Expected Len %d, got %d\n", (int)(len), ret)
#define EXPECT_INVALID ok(GetLastError() == ERROR_INVALID_PARAMETER, \
- "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError())
+ "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError())
#define EXPECT_BUFFER ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, \
- "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError())
+ "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError())
#define EXPECT_FLAGS ok(GetLastError() == ERROR_INVALID_FLAGS, \
- "Expected ERROR_INVALID_FLAGS, got %ld\n", GetLastError())
+ "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError())
#define EXPECT_INVALIDFLAGS ok(GetLastError() == ERROR_INVALID_FLAGS || \
GetLastError() == ERROR_INVALID_PARAMETER, \
- "Expected ERROR_INVALID_FLAGS, got %ld\n", GetLastError())
+ "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError())
#define EXPECT_VALID ok(GetLastError() == 0, \
- "Expected GetLastError() == 0, got %ld\n", GetLastError())
+ "Expected GetLastError() == 0, got %d\n", GetLastError())
#define STRINGSA(x,y) strcpy(input, x); strcpy(Expected, y); SetLastError(0); buffer[0] = '\0'
#define EXPECT_LENA EXPECT_LEN((int)strlen(Expected)+1)
@@ -140,7 +140,7 @@ static void test_GetLocaleInfoA(void)
LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
char buffer[BUFFER_SIZE];
- ok(lcid == 0x409, "wrong LCID calculated - %ld\n", lcid);
+ ok(lcid == 0x409, "wrong LCID calculated - %d\n", lcid);
/* HTMLKit and "Font xplorer lite" expect GetLocaleInfoA to
* partially fill the buffer even if it is too short. See bug 637.
@@ -779,12 +779,12 @@ static void test_CompareStringA(void)
SetLastError(0xdeadbeef);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0x10, "NULL", -1, "NULL", -1);
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ok(!ret, "CompareStringA must fail with invalid flag\n");
SetLastError(0xdeadbeef);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, LOCALE_USE_CP_ACP, "NULL", -1, "NULL", -1);
- ok(GetLastError() == 0xdeadbeef, "unexpected error code %ld\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "unexpected error code %d\n", GetLastError());
ok(ret == CSTR_EQUAL, "CompareStringA error: %d != CSTR_EQUAL\n", ret);
/* end of test for CompareStringA flags */
@@ -957,7 +957,7 @@ static void test_LCMapStringA(void)
ret = LCMapStringA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP | LCMAP_LOWERCASE,
lower_case, -1, buf, sizeof(buf));
ok(ret == lstrlenA(lower_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenA(lower_case) + 1);
ok(!memcmp(buf, lower_case, ret), "LCMapStringA should return %s, but not %s\n", lower_case, buf);
@@ -965,38 +965,38 @@ static void test_LCMapStringA(void)
upper_case, -1, buf, sizeof(buf));
ok(!ret, "LCMAP_LOWERCASE and LCMAP_UPPERCASE are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_HIRAGANA | LCMAP_KATAKANA,
upper_case, -1, buf, sizeof(buf));
ok(!ret, "LCMAP_HIRAGANA and LCMAP_KATAKANA are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_HALFWIDTH | LCMAP_FULLWIDTH,
upper_case, -1, buf, sizeof(buf));
ok(!ret, "LCMAP_HALFWIDTH | LCMAP_FULLWIDTH are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE,
upper_case, -1, buf, sizeof(buf));
ok(!ret, "LCMAP_TRADITIONAL_CHINESE and LCMAP_SIMPLIFIED_CHINESE are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
/* SORT_STRINGSORT must be used exclusively with LCMAP_SORTKEY */
SetLastError(0xdeadbeef);
ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE | SORT_STRINGSORT,
upper_case, -1, buf, sizeof(buf));
- ok(GetLastError() == ERROR_INVALID_FLAGS, "expected ERROR_INVALID_FLAGS, got %ld\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_FLAGS, "expected ERROR_INVALID_FLAGS, got %d\n", GetLastError());
ok(!ret, "SORT_STRINGSORT without LCMAP_SORTKEY must fail\n");
/* test LCMAP_LOWERCASE */
ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE,
upper_case, -1, buf, sizeof(buf));
ok(ret == lstrlenA(upper_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenA(upper_case) + 1);
ok(!lstrcmpA(buf, lower_case), "LCMapStringA should return %s, but not %s\n", lower_case, buf);
@@ -1004,7 +1004,7 @@ static void test_LCMapStringA(void)
ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_UPPERCASE,
lower_case, -1, buf, sizeof(buf));
ok(ret == lstrlenA(lower_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenA(lower_case) + 1);
ok(!lstrcmpA(buf, upper_case), "LCMapStringA should return %s, but not %s\n", upper_case, buf);
@@ -1024,7 +1024,7 @@ static void test_LCMapStringA(void)
else
{
ok(ret == lstrlenA(lower_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenA(lower_case) + 1);
ok(!lstrcmpA(buf, upper_case), "LCMapStringA should return %s, but not %s\n", upper_case, buf);
}
@@ -1036,7 +1036,7 @@ static void test_LCMapStringA(void)
else
{
ok(ret == lstrlenA(upper_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenA(lower_case) + 1);
ok(!lstrcmpA(buf, lower_case), "LCMapStringA should return %s, but not %s\n", lower_case, buf);
}
@@ -1047,7 +1047,7 @@ static void test_LCMapStringA(void)
buf, 10, buf, sizeof(buf));
ok(GetLastError() == ERROR_INVALID_FLAGS /* NT */ ||
GetLastError() == ERROR_INVALID_PARAMETER /* Win9x */,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ok(!ret, "src == dst without LCMAP_UPPERCASE or LCMAP_LOWERCASE must fail\n");
/* test whether '\0' is always appended */
@@ -1111,7 +1111,7 @@ static void test_LCMapStringA(void)
ret = LCMapStringA(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf));
ok(!ret, "LCMapStringA should fail with srclen = 0\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
}
static void test_LCMapStringW(void)
@@ -1133,38 +1133,38 @@ static void test_LCMapStringW(void)
}
ok(!ret, "LCMAP_LOWERCASE and LCMAP_UPPERCASE are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_HIRAGANA | LCMAP_KATAKANA,
upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR));
ok(!ret, "LCMAP_HIRAGANA and LCMAP_KATAKANA are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_HALFWIDTH | LCMAP_FULLWIDTH,
upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR));
ok(!ret, "LCMAP_HALFWIDTH | LCMAP_FULLWIDTH are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE,
upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR));
ok(!ret, "LCMAP_TRADITIONAL_CHINESE and LCMAP_SIMPLIFIED_CHINESE are mutually exclusive\n");
ok(GetLastError() == ERROR_INVALID_FLAGS,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
/* SORT_STRINGSORT must be used exclusively with LCMAP_SORTKEY */
SetLastError(0xdeadbeef);
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE | SORT_STRINGSORT,
upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR));
- ok(GetLastError() == ERROR_INVALID_FLAGS, "expected ERROR_INVALID_FLAGS, got %ld\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_FLAGS, "expected ERROR_INVALID_FLAGS, got %d\n", GetLastError());
ok(!ret, "SORT_STRINGSORT without LCMAP_SORTKEY must fail\n");
/* test LCMAP_LOWERCASE */
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE,
upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR));
ok(ret == lstrlenW(upper_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenW(upper_case) + 1);
ok(!lstrcmpW(buf, lower_case), "string compare mismatch\n");
@@ -1172,7 +1172,7 @@ static void test_LCMapStringW(void)
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_UPPERCASE,
lower_case, -1, buf, sizeof(buf)/sizeof(WCHAR));
ok(ret == lstrlenW(lower_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenW(lower_case) + 1);
ok(!lstrcmpW(buf, upper_case), "string compare mismatch\n");
@@ -1188,7 +1188,7 @@ static void test_LCMapStringW(void)
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_UPPERCASE,
buf, -1, buf, sizeof(buf)/sizeof(WCHAR));
ok(ret == lstrlenW(lower_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenW(lower_case) + 1);
ok(!lstrcmpW(buf, upper_case), "string compare mismatch\n");
@@ -1196,7 +1196,7 @@ static void test_LCMapStringW(void)
ret = LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE,
buf, -1, buf, sizeof(buf)/sizeof(WCHAR));
ok(ret == lstrlenW(upper_case) + 1,
- "ret %d, error %ld, expected value %d\n",
+ "ret %d, error %d, expected value %d\n",
ret, GetLastError(), lstrlenW(lower_case) + 1);
ok(!lstrcmpW(buf, lower_case), "string compare mismatch\n");
@@ -1206,7 +1206,7 @@ static void test_LCMapStringW(void)
buf, 10, buf, sizeof(buf));
ok(GetLastError() == ERROR_INVALID_FLAGS /* NT */ ||
GetLastError() == ERROR_INVALID_PARAMETER /* Win9x */,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
ok(!ret, "src == dst without LCMAP_UPPERCASE or LCMAP_LOWERCASE must fail\n");
/* test whether '\0' is always appended */
@@ -1270,7 +1270,7 @@ static void test_LCMapStringW(void)
ret = LCMapStringW(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf));
ok(!ret, "LCMapStringW should fail with srclen = 0\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
- "unexpected error code %ld\n", GetLastError());
+ "unexpected error code %d\n", GetLastError());
}
/* this requires collation table patch to make it MS compatible */
@@ -1774,7 +1774,7 @@ static void test_FoldStringW(void)
ret = pFoldStringW(MAP_FOLDCZONE, src, -1, dst, 256);
EXPECT_LEN(2); EXPECT_VALID;
ok(dst[0] == 'A' && dst[1] == '\0',
- "srclen=-1: Expected ret=2 [%d,%d], got ret=%d [%d,%d], err=%ld\n",
+ "srclen=-1: Expected ret=2 [%d,%d], got ret=%d [%d,%d], err=%d\n",
'A', '\0', ret, dst[0], dst[1], GetLastError());
/* If size is given, result is not NUL terminated */
@@ -1786,7 +1786,7 @@ static void test_FoldStringW(void)
ret = pFoldStringW(MAP_FOLDCZONE, src, 1, dst, 256);
EXPECT_LEN(1); EXPECT_VALID;
ok(dst[0] == 'A' && dst[1] == 'X',
- "srclen=1: Expected ret=1, [%d,%d], got ret=%d,[%d,%d], err=%ld\n",
+ "srclen=1: Expected ret=1, [%d,%d], got ret=%d,[%d,%d], err=%d\n",
'A','X', ret, dst[0], dst[1], GetLastError());
/* MAP_FOLDDIGITS */
@@ -1893,7 +1893,7 @@ static void test_FoldStringW(void)
#define LCID_OK(l) \
- ok(lcid == l, "Expected lcid = %08lx, got %08lx\n", l, lcid)
+ ok(lcid == l, "Expected lcid = %08x, got %08x\n", l, lcid)
#define MKLCID(x,y,z) MAKELCID(MAKELANGID(x, y), z)
#define LCID_RES(src, res) lcid = ConvertDefaultLocale(src); LCID_OK(res)
#define TEST_LCIDLANG(a,b) LCID_RES(MAKELCID(a,b), MAKELCID(a,b))
@@ -1935,15 +1935,15 @@ static void test_ConvertDefaultLocale(vo
static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName,
DWORD dwFlags, LONG_PTR lParam)
{
- trace("%08lx, %s, %s, %08lx, %08lx\n",
+ trace("%08x, %s, %s, %08x, %08lx\n",
lgrpid, lpszNum, lpszName, dwFlags, lParam);
ok(pIsValidLanguageGroup(lgrpid, dwFlags) == TRUE,
- "Enumerated grp %ld not valid (flags %ld)\n", lgrpid, dwFlags);
+ "Enumerated grp %d not valid (flags %d)\n", lgrpid, dwFlags);
/* If lParam is one, we are calling with flags defaulted from 0 */
ok(!lParam || (dwFlags == LGRPID_INSTALLED || dwFlags == LGRPID_SUPPORTED),
- "Expected dwFlags == LGRPID_INSTALLED || dwFlags == LGRPID_SUPPORTED, got %ld\n", dwFlags);
+ "Expected dwFlags == LGRPID_INSTALLED || dwFlags == LGRPID_SUPPORTED, got %d\n", dwFlags);
return TRUE;
}
@@ -1976,12 +1976,12 @@ static void test_EnumSystemLanguageGroup
static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum,
LONG_PTR lParam)
{
- trace("%08lx, %08lx, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam);
+ trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam);
ok(pIsValidLanguageGroup(lgrpid, LGRPID_SUPPORTED) == TRUE,
- "Enumerated grp %ld not valid\n", lgrpid);
+ "Enumerated grp %d not valid\n", lgrpid);
ok(IsValidLocale(lcid, LCID_SUPPORTED) == TRUE,
- "Enumerated grp locale %ld not valid\n", lcid);
+ "Enumerated grp locale %d not valid\n", lcid);
return TRUE;
}
@@ -2101,56 +2101,56 @@ static void test_EnumDateFormatsA(void)
trace("EnumDateFormatsA 0\n");
date_fmt_buf[0] = 0;
ret = EnumDateFormatsA(enum_datetime_procA, lcid, 0);
- ok(ret, "EnumDateFormatsA(0) error %ld\n", GetLastError());
+ ok(ret, "EnumDateFormatsA(0) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf));
- ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %ld\n", GetLastError());
+ ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
trace("EnumDateFormatsA LOCALE_USE_CP_ACP\n");
date_fmt_buf[0] = 0;
ret = EnumDateFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP);
- ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %ld\n", GetLastError());
+ ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf));
- ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %ld\n", GetLastError());
+ ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
trace("EnumDateFormatsA DATE_SHORTDATE\n");
date_fmt_buf[0] = 0;
ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_SHORTDATE);
- ok(ret, "EnumDateFormatsA(DATE_SHORTDATE) error %ld\n", GetLastError());
+ ok(ret, "EnumDateFormatsA(DATE_SHORTDATE) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf));
- ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %ld\n", GetLastError());
+ ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
trace("EnumDateFormatsA DATE_LONGDATE\n");
date_fmt_buf[0] = 0;
ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_LONGDATE);
- ok(ret, "EnumDateFormatsA(DATE_LONGDATE) error %ld\n", GetLastError());
+ ok(ret, "EnumDateFormatsA(DATE_LONGDATE) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_SLONGDATE, buf, sizeof(buf));
- ok(ret, "GetLocaleInfoA(LOCALE_SLONGDATE) error %ld\n", GetLastError());
+ ok(ret, "GetLocaleInfoA(LOCALE_SLONGDATE) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
trace("EnumDateFormatsA DATE_YEARMONTH\n");
date_fmt_buf[0] = 0;
ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_YEARMONTH);
- ok(ret, "EnumDateFormatsA(DATE_YEARMONTH) error %ld\n", GetLastError());
+ ok(ret, "EnumDateFormatsA(DATE_YEARMONTH) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_SYEARMONTH, buf, sizeof(buf));
- ok(ret, "GetLocaleInfoA(LOCALE_SYEARMONTH) error %ld\n", GetLastError());
+ ok(ret, "GetLocaleInfoA(LOCALE_SYEARMONTH) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
}
@@ -2163,23 +2163,23 @@ static void test_EnumTimeFormatsA(void)
trace("EnumTimeFormatsA 0\n");
date_fmt_buf[0] = 0;
ret = EnumTimeFormatsA(enum_datetime_procA, lcid, 0);
- ok(ret, "EnumTimeFormatsA(0) error %ld\n", GetLastError());
+ ok(ret, "EnumTimeFormatsA(0) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT, buf, sizeof(buf));
- ok(ret, "GetLocaleInfoA(LOCALE_STIMEFORMAT) error %ld\n", GetLastError());
+ ok(ret, "GetLocaleInfoA(LOCALE_STIMEFORMAT) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
trace("EnumTimeFormatsA LOCALE_USE_CP_ACP\n");
date_fmt_buf[0] = 0;
ret = EnumTimeFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP);
- ok(ret, "EnumTimeFormatsA(LOCALE_USE_CP_ACP) error %ld\n", GetLastError());
+ ok(ret, "EnumTimeFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT, buf, sizeof(buf));
- ok(ret, "GetLocaleInfoA(LOCALE_STIMEFORMAT) error %ld\n", GetLastError());
+ ok(ret, "GetLocaleInfoA(LOCALE_STIMEFORMAT) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
}
diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c
index caf2f68..326a80e 100644
--- a/dlls/kernel32/tests/module.c
+++ b/dlls/kernel32/tests/module.c
@@ -54,11 +54,11 @@ static void testGetModuleFileName(const
ok(len1W > 0, "Getting module filename for handle %p\n", hMod);
}
- ok(len1A == strlen(bufA), "Unexpected length of GetModuleFilenameA (%ld/%d)\n", len1A, lstrlenA(bufA));
+ ok(len1A == strlen(bufA), "Unexpected length of GetModuleFilenameA (%d/%d)\n", len1A, lstrlenA(bufA));
if (is_unicode_enabled)
{
- ok(len1W == lstrlenW(bufW), "Unexpected length of GetModuleFilenameW (%ld/%d)\n", len1W, lstrlenW(bufW));
+ ok(len1W == lstrlenW(bufW), "Unexpected length of GetModuleFilenameW (%d/%d)\n", len1W, lstrlenW(bufW));
ok(cmpStrAW(bufA, bufW, len1A, len1W), "Comparing GetModuleFilenameAW results\n");
}
@@ -73,12 +73,12 @@ static void testGetModuleFileName(const
len2W = GetModuleFileNameW(hMod, bufW, len1W / 2);
ok(len2W > 0, "Getting module filename for handle %p\n", hMod);
ok(cmpStrAW(bufA, bufW, len2A, len2W), "Comparing GetModuleFilenameAW results with buffer too small\n" );
- ok(len1W / 2 == len2W, "Correct length in GetModuleFilenameW with buffer too small (%ld/%ld)\n", len1W / 2, len2W);
+ ok(len1W / 2 == len2W, "Correct length in GetModuleFilenameW with buffer too small (%d/%d)\n", len1W / 2, len2W);
}
ok(len1A / 2 == len2A ||
len1A / 2 == len2A + 1, /* Win9x */
- "Correct length in GetModuleFilenameA with buffer too small (%ld/%ld)\n", len1A / 2, len2A);
+ "Correct length in GetModuleFilenameA with buffer too small (%d/%d)\n", len1A / 2, len2A);
}
static void testGetModuleFileName_Wrong(void)
@@ -109,11 +109,11 @@ static void testLoadLibraryA(void)
SetLastError(0xdeadbeef);
hModule = LoadLibraryA("kernel32.dll");
ok( hModule != NULL, "kernel32.dll should be loadable\n");
- ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %08lx\n", GetLastError());
+ ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %08x\n", GetLastError());
fp = GetProcAddress(hModule, "CreateFileA");
ok( fp != NULL, "CreateFileA should be there\n");
- ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %08lx\n", GetLastError());
+ ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %08x\n", GetLastError());
SetLastError(0xdeadbeef);
hModule1 = LoadLibraryA("kernel32 ");
@@ -121,7 +121,7 @@ static void testLoadLibraryA(void)
if (GetLastError() != ERROR_DLL_NOT_FOUND)
{
ok( hModule1 != NULL, "\"kernel32 \" should be loadable\n");
- ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %08lx\n", GetLastError());
+ ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %08x\n", GetLastError());
ok( hModule == hModule1, "Loaded wrong module\n");
FreeLibrary(hModule1);
}
@@ -137,7 +137,7 @@ static void testLoadLibraryA_Wrong(void)
hModule = LoadLibraryA("non_ex_pv.dll");
ok( !hModule, "non_ex_pv.dll should be not loadable\n");
ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND,
- "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x), got %08lx\n", GetLastError());
+ "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x), got %08x\n", GetLastError());
/* Just in case */
FreeLibrary(hModule);
@@ -151,13 +151,13 @@ static void testGetProcAddress_Wrong(voi
fp = GetProcAddress(NULL, "non_ex_call");
ok( !fp, "non_ex_call should not be found\n");
ok( GetLastError() == ERROR_PROC_NOT_FOUND || GetLastError() == ERROR_INVALID_HANDLE,
- "Expected ERROR_PROC_NOT_FOUND or ERROR_INVALID_HANDLE(win9x), got %08lx\n", GetLastError());
+ "Expected ERROR_PROC_NOT_FOUND or ERROR_INVALID_HANDLE(win9x), got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
fp = GetProcAddress((HMODULE)0xdeadbeef, "non_ex_call");
ok( !fp, "non_ex_call should not be found\n");
ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_INVALID_HANDLE,
- "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_HANDLE(win9x), got %08lx\n", GetLastError());
+ "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_HANDLE(win9x), got %08x\n", GetLastError());
}
START_TEST(module)
diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index 9e31ad7..4f4c0d7 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -240,24 +240,24 @@ static void test_FunnyChars(CHAR *curdir
ok((passfail.shortlen==0 &&
(passfail.shorterror==ERROR_FILE_NOT_FOUND || passfail.shorterror==ERROR_PATH_NOT_FOUND || !passfail.shorterror)) ||
(passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0),
- "%s: GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]\n",
+ "%s: GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n",
errstr,passfail.shortlen,passfail.shorterror,tmpstr);
} else {
ok(passfail.shortlen==0 &&
(passfail.shorterror==ERROR_INVALID_NAME || passfail.shorterror==ERROR_FILE_NOT_FOUND || !passfail.shorterror),
- "%s: GetShortPathA should have failed len=%ld, error=%ld\n",
+ "%s: GetShortPathA should have failed len=%d, error=%d\n",
errstr,passfail.shortlen,passfail.shorterror);
}
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
if(valid) {
ok(passfail.longerror==ERROR_FILE_NOT_FOUND,
- "%s: GetLongPathA returned %ld and not %d\n",
+ "%s: GetLongPathA returned %d and not %d\n",
errstr,passfail.longerror,ERROR_FILE_NOT_FOUND);
} else {
ok(passfail.longerror==ERROR_INVALID_NAME ||
passfail.longerror==ERROR_FILE_NOT_FOUND,
- "%s: GetLongPathA returned %ld and not %d or %d'\n",
+ "%s: GetLongPathA returned %d and not %d or %d'\n",
errstr, passfail.longerror,ERROR_INVALID_NAME,ERROR_FILE_NOT_FOUND);
}
}
@@ -324,7 +324,7 @@ static void test_InitPathA(CHAR *newdir,
lstrcpyA(tmpstr,"aaaaaaaa");
len1=GetTempPathA(len,tmpstr);
ok(len1==len+1,
- "GetTempPathA should return string length %ld instead of %ld\n",len+1,len1);
+ "GetTempPathA should return string length %d instead of %d\n",len+1,len1);
/* Test GetTmpFileNameA
The only test we do here is whether GetTempFileNameA passes or not.
@@ -382,11 +382,11 @@ static void test_InitPathA(CHAR *newdir,
bRes = CreateDirectoryA("c:",NULL);
ok(!bRes && (GetLastError() == ERROR_ACCESS_DENIED ||
GetLastError() == ERROR_ALREADY_EXISTS),
- "CreateDirectoryA(\"c:\" should have failed (%ld)\n", GetLastError());
+ "CreateDirectoryA(\"c:\" should have failed (%d)\n", GetLastError());
bRes = CreateDirectoryA("c:\\",NULL);
ok(!bRes && (GetLastError() == ERROR_ACCESS_DENIED ||
GetLastError() == ERROR_ALREADY_EXISTS),
- "CreateDirectoryA(\"c:\\\" should have failed (%ld)\n", GetLastError());
+ "CreateDirectoryA(\"c:\\\" should have failed (%d)\n", GetLastError());
sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,SHORTFILE);
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);
@@ -424,7 +424,7 @@ static void test_CurrentDirectoryA(CHAR
*/
lstrcpyA(tmpstr,"aaaaaaa");
len1=GetCurrentDirectoryA(len,tmpstr);
- ok(len1==len+1, "GetCurrentDirectoryA returned %ld instead of %ld\n",len1,len+1);
+ ok(len1==len+1, "GetCurrentDirectoryA returned %d instead of %d\n",len1,len+1);
ok(lstrcmpiA(tmpstr,"aaaaaaa")==0,
"GetCurrentDirectoryA should not have modified the buffer\n");
/* SetCurrentDirectoryA shouldn't care whether the string has a
@@ -512,13 +512,13 @@ static void test_PathNameA(CHAR *curdir,
rc1=(*pGetLongPathNameA)(tmpstr,NULL,0);
rc2=(*pGetLongPathNameA)(curdir,NULL,0);
ok((rc1-strlen(tmpstr))==(rc2-strlen(curdir)),
- "GetLongPathNameA: wrong return code, %ld instead of %d\n",
+ "GetLongPathNameA: wrong return code, %d instead of %d\n",
rc1, lstrlenA(tmpstr)+1);
sprintf(dir,"%c:",curDrive);
rc1=(*pGetLongPathNameA)(dir,tmpstr,sizeof(tmpstr));
ok(strcmp(dir,tmpstr)==0,
- "GetLongPathNameA: returned '%s' instead of '%s' (rc=%ld)\n",
+ "GetLongPathNameA: returned '%s' instead of '%s' (rc=%d)\n",
tmpstr,dir,rc1);
}
@@ -549,7 +549,7 @@ static void test_PathNameA(CHAR *curdir,
(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND)) ||
(passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0),
- "GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]\n",
+ "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n",
passfail.shortlen,passfail.shorterror,tmpstr);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
@@ -577,7 +577,7 @@ static void test_PathNameA(CHAR *curdir,
(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND)) ||
(passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0),
- "GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]\n",
+ "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n",
passfail.shortlen,passfail.shorterror,tmpstr);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
@@ -604,13 +604,13 @@ static void test_PathNameA(CHAR *curdir,
(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND)) ||
(passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0),
- "GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]\n",
+ "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n",
passfail.shortlen,passfail.shorterror,tmpstr);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
ok(passfail.longerror==ERROR_PATH_NOT_FOUND ||
passfail.longerror==ERROR_FILE_NOT_FOUND,
- "GetLongPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'\n",
+ "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n",
passfail.longerror);
}
/* Now try a 8.3 directory, long file name */
@@ -619,13 +619,13 @@ static void test_PathNameA(CHAR *curdir,
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND ||
!passfail.shorterror,
- "GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'\n",
+ "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n",
passfail.shorterror);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
ok(passfail.longerror==ERROR_PATH_NOT_FOUND ||
passfail.longerror==ERROR_FILE_NOT_FOUND,
- "GetLongPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'\n",
+ "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n",
passfail.longerror);
}
/* Next is a long directory, 8.3 file */
@@ -634,13 +634,13 @@ static void test_PathNameA(CHAR *curdir,
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND ||
!passfail.shorterror,
- "GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'\n",
+ "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n",
passfail.shorterror);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
ok(passfail.longerror==ERROR_PATH_NOT_FOUND ||
passfail.longerror==ERROR_FILE_NOT_FOUND,
- "GetLongPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'\n",
+ "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n",
passfail.longerror);
}
/*Lastly a long directory, long file */
@@ -649,13 +649,13 @@ static void test_PathNameA(CHAR *curdir,
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND ||
!passfail.shorterror,
- "GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'\n",
+ "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n",
passfail.shorterror);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
ok(passfail.longerror==ERROR_PATH_NOT_FOUND ||
passfail.longerror==ERROR_FILE_NOT_FOUND,
- "GetLongPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'\n",
+ "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n",
passfail.longerror);
}
/* Next try directories ending with '\\' */
@@ -672,12 +672,12 @@ static void test_PathNameA(CHAR *curdir,
(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND)) ||
(passfail.shortlen==strlen(tmpstr2) && lstrcmpiA(tmpstr1,tmpstr2)==0),
- "GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]\n",
+ "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n",
passfail.shortlen,passfail.shorterror,tmpstr);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
ok(passfail.longerror==ERROR_FILE_NOT_FOUND,
- "GetLongPathA returned %ld and not 'ERROR_FILE_NOT_FOUND'\n",
+ "GetLongPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n",
passfail.longerror);
}
sprintf(tmpstr,"%s\\",NONDIR_LONG);
@@ -686,12 +686,12 @@ static void test_PathNameA(CHAR *curdir,
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND ||
passfail.shorterror==ERROR_FILE_NOT_FOUND ||
!passfail.shorterror,
- "GetShortPathA returned %ld and not 'ERROR_FILE_NOT_FOUND'\n",
+ "GetShortPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n",
passfail.shorterror);
if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n");
ok(passfail.longerror==ERROR_FILE_NOT_FOUND,
- "GetLongPathA returned %ld and not 'ERROR_FILE_NOT_FOUND'\n",
+ "GetLongPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n",
passfail.longerror);
}
/* Test GetFullPathNameA with drive letters */
@@ -827,10 +827,10 @@ static void test_GetTempPathA(char* tmp_
* of len_with_null.
*/
len = GetTempPathA(1, buf);
- ok(len >= len_with_null, "Expected >= %lu, got %lu\n", len_with_null, len);
+ ok(len >= len_with_null, "Expected >= %u, got %u\n", len_with_null, len);
len = GetTempPathA(0, NULL);
- ok(len >= len_with_null, "Expected >= %lu, got %lu\n", len_with_null, len);
+ ok(len >= len_with_null, "Expected >= %u, got %u\n", len_with_null, len);
/* The call above gave us the buffer size that Windows thinks is needed
* so the next call should work
@@ -870,10 +870,10 @@ static void test_GetTempPathW(char* tmp_
lstrcpyW(buf, fooW);
len = GetTempPathW(1, buf);
ok(buf[0] == 0, "unicode version should truncate the buffer to zero size\n");
- ok(len >= len_with_null, "Expected >= %lu, got %lu\n", len_with_null, len);
+ ok(len >= len_with_null, "Expected >= %u, got %u\n", len_with_null, len);
len = GetTempPathW(0, NULL);
- ok(len >= len_with_null, "Expected >= %lu, got %lu\n", len_with_null, len);
+ ok(len >= len_with_null, "Expected >= %u, got %u\n", len_with_null, len);
lstrcpyW(buf, fooW);
len = GetTempPathW(len, buf);
@@ -939,14 +939,14 @@ static void test_GetLongPathNameW(void)
length = pGetLongPathNameW(NULL,NULL,0);
if(pGetLongPathNameW)
{
- ok(0==length,"GetLongPathNameW returned %ld but expected 0\n",length);
- ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %lx but expected ERROR_INVALID_PARAMETER\n",GetLastError());
+ ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length);
+ ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %x but expected ERROR_INVALID_PARAMETER\n",GetLastError());
SetLastError(0xdeadbeef);
empty[0]=0;
length = pGetLongPathNameW(empty,NULL,0);
- ok(0==length,"GetLongPathNameW returned %ld but expected 0\n",length);
- ok(GetLastError()==ERROR_PATH_NOT_FOUND,"GetLastError returned %lx but expected ERROR_PATH_NOT_FOUND\n",GetLastError());
+ ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length);
+ ok(GetLastError()==ERROR_PATH_NOT_FOUND,"GetLastError returned %x but expected ERROR_PATH_NOT_FOUND\n",GetLastError());
}
}
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index c92563b..c956e75 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -91,10 +91,10 @@ static void test_CreateNamedPipe(int pip
/* lpSecurityAttrib */ NULL);
ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n");
- ok(WaitNamedPipeA(PIPENAME, 2000), "WaitNamedPipe failed (%08lx)\n", GetLastError());
+ ok(WaitNamedPipeA(PIPENAME, 2000), "WaitNamedPipe failed (%08x)\n", GetLastError());
hFile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0);
- ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed (%08lx)\n", GetLastError());
+ ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed (%08x)\n", GetLastError());
/* don't try to do i/o if one side couldn't be opened, as it hangs */
if (hFile != INVALID_HANDLE_VALUE) {
@@ -105,20 +105,20 @@ static void test_CreateNamedPipe(int pip
ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile\n");
ok(written == sizeof(obuf), "write file len 1\n");
ok(PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL), "Peek\n");
- ok(readden == sizeof(obuf), "peek 1 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "peek 1 got %d bytes\n", readden);
ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
- ok(readden == sizeof(obuf), "read 1 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "read 1 got %d bytes\n", readden);
ok(memcmp(obuf, ibuf, written) == 0, "content 1 check\n");
memset(ibuf, 0, sizeof(ibuf));
ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n");
ok(written == sizeof(obuf2), "write file len 2\n");
ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n");
- ok(readden == sizeof(obuf2), "peek 2 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden);
ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n");
- ok(readden == sizeof(obuf2), "peek 2 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden);
ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
- ok(readden == sizeof(obuf2), "read 2 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden);
ok(memcmp(obuf2, ibuf, written) == 0, "content 2 check\n");
/* Test reading of multiple writes */
@@ -131,13 +131,13 @@ static void test_CreateNamedPipe(int pip
if (pipemode == PIPE_TYPE_BYTE) {
todo_wine {
/* should return all 23 bytes */
- ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden);
}
}
else
- ok(readden == sizeof(obuf), "peek3 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden);
if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */
- ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %ld bytes available\n", avail);
+ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail);
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 3a check\n");
if (pipemode == PIPE_TYPE_BYTE) {
@@ -147,7 +147,7 @@ static void test_CreateNamedPipe(int pip
}
}
ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
- ok(readden == sizeof(obuf) + sizeof(obuf2), "read 3 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf) + sizeof(obuf2), "read 3 got %d bytes\n", readden);
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 3a check\n");
pbuf += sizeof(obuf);
@@ -163,13 +163,13 @@ static void test_CreateNamedPipe(int pip
if (pipemode == PIPE_TYPE_BYTE) {
todo_wine {
/* should return all 23 bytes */
- ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden);
}
}
else
- ok(readden == sizeof(obuf), "peek4 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden);
if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */
- ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %ld bytes available\n", avail);
+ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail);
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 4a check\n");
if (pipemode == PIPE_TYPE_BYTE) {
@@ -180,11 +180,11 @@ static void test_CreateNamedPipe(int pip
}
ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
if (pipemode == PIPE_TYPE_BYTE) {
- ok(readden == sizeof(obuf) + sizeof(obuf2), "read 4 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf) + sizeof(obuf2), "read 4 got %d bytes\n", readden);
}
else {
todo_wine {
- ok(readden == sizeof(obuf), "read 4 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "read 4 got %d bytes\n", readden);
}
}
pbuf = ibuf;
@@ -212,14 +212,14 @@ static void test_CreateNamedPipe(int pip
ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n");
ok(written == sizeof(obuf2), "write file len 3b\n");
ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n");
- ok(readden == sizeof(obuf), "peek5 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden);
if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */
- ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %ld bytes available\n", avail);
+ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail);
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n");
ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
todo_wine {
- ok(readden == sizeof(obuf), "read 5 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "read 5 got %d bytes\n", readden);
}
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n");
@@ -228,12 +228,12 @@ static void test_CreateNamedPipe(int pip
/* the write of obuf2 from write4 should still be in the buffer */
ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6a\n");
todo_wine {
- ok(readden == sizeof(obuf2), "peek6a got %ld bytes\n", readden);
- ok(avail == sizeof(obuf2), "peek6a got %ld bytes available\n", avail);
+ ok(readden == sizeof(obuf2), "peek6a got %d bytes\n", readden);
+ ok(avail == sizeof(obuf2), "peek6a got %d bytes available\n", avail);
}
if (avail > 0) {
ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
- ok(readden == sizeof(obuf2), "read 6a got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf2), "read 6a got %d bytes\n", readden);
pbuf = ibuf;
ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "content 6a check\n");
}
@@ -243,14 +243,14 @@ static void test_CreateNamedPipe(int pip
ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n");
ok(written == sizeof(obuf2), "write file len 6b\n");
ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n");
- ok(readden == sizeof(obuf), "peek6 got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden);
if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */
- ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %ld bytes available\n", avail);
+ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail);
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n");
ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
todo_wine {
- ok(readden == sizeof(obuf), "read 6b got %ld bytes\n", readden);
+ ok(readden == sizeof(obuf), "read 6b got %d bytes\n", readden);
}
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n");
@@ -746,18 +746,18 @@ static void test_CreatePipe(void)
pipe_attr.lpSecurityDescriptor = NULL;
ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n");
ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n");
- ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %ld bytes\n", written);
+ ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written);
ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from non empty pipe failed\n");
- ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %ld bytes\n", read);
+ ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read);
/* Now write another chunk*/
ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n");
ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n");
- ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %ld bytes\n", written);
+ ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written);
/* and close the write end, read should still succeed*/
ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n");
ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from broken pipe withe with pending data failed\n");
- ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %ld bytes\n", read);
+ ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read);
/* But now we need to get informed that the pipe is closed */
ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n");
}
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 4b269b2..693e9b5 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -330,13 +330,13 @@ #endif
ok(SetConsoleCP(1252), "Setting CP\n");
ok(SetConsoleOutputCP(1252), "Setting SB CP\n");
ret = SetConsoleMode(hConIn, modeIn ^ 1);
- ok( ret, "Setting mode (%ld)\n", GetLastError());
+ ok( ret, "Setting mode (%d)\n", GetLastError());
ret = SetConsoleMode(hConOut, modeOut ^ 1);
- ok( ret, "Setting mode (%ld)\n", GetLastError());
+ ok( ret, "Setting mode (%d)\n", GetLastError());
sbi.dwCursorPosition.X ^= 1;
sbi.dwCursorPosition.Y ^= 1;
ret = SetConsoleCursorPosition(hConOut, sbi.dwCursorPosition);
- ok( ret, "Setting cursor position (%ld)\n", GetLastError());
+ ok( ret, "Setting cursor position (%d)\n", GetLastError());
}
if (option && strcmp(option, "stdhandle") == 0)
{
@@ -825,7 +825,7 @@ static void test_Directory(void)
memset(&info, 0, sizeof(info));
ok(!CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L,
NULL, "non\\existent\\directory", &startup, &info), "CreateProcess\n");
- ok(GetLastError() == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %ld\n", GetLastError());
+ ok(GetLastError() == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", GetLastError());
ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n");
}
@@ -1182,8 +1182,8 @@ static void test_Console(void)
okChildInt("Console", "InputMode", modeIn);
okChildInt("Console", "OutputMode", modeOut);
- todo_wine ok(cpInC == 1252, "Wrong console CP (expected 1252 got %ld/%ld)\n", cpInC, cpIn);
- todo_wine ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %ld/%ld)\n", cpOutC, cpOut);
+ todo_wine ok(cpInC == 1252, "Wrong console CP (expected 1252 got %d/%d)\n", cpInC, cpIn);
+ todo_wine ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut);
ok(modeInC == (modeIn ^ 1), "Wrong console mode\n");
ok(modeOutC == (modeOut ^ 1), "Wrong console-SB mode\n");
ok(sbiC.dwCursorPosition.X == (sbi.dwCursorPosition.X ^ 1), "Wrong cursor position\n");
@@ -1220,7 +1220,7 @@ static void test_Console(void)
msg_len = strlen(msg) + 1;
ok(WriteFile(hParentOut, msg, msg_len, &w, NULL), "Writing to child\n");
- ok(w == msg_len, "Should have written %u bytes, actually wrote %lu\n", msg_len, w);
+ ok(w == msg_len, "Should have written %u bytes, actually wrote %u\n", msg_len, w);
memset(buffer, 0, sizeof(buffer));
ok(ReadFile(hParentIn, buffer, sizeof(buffer), &w, NULL), "Reading from child\n");
ok(strcmp(buffer, msg) == 0, "Should have received '%s'\n", msg);
diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
index 321f5cf..de387f7 100644
--- a/dlls/kernel32/tests/sync.c
+++ b/dlls/kernel32/tests/sync.c
@@ -134,19 +134,19 @@ static void test_mutex(void)
HANDLE hOpened;
hCreated = CreateMutex(NULL, FALSE, "WineTestMutex");
- ok(hCreated != NULL, "CreateMutex failed with error %ld\n", GetLastError());
+ ok(hCreated != NULL, "CreateMutex failed with error %d\n", GetLastError());
wait_ret = WaitForSingleObject(hCreated, INFINITE);
- ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error 0x%08lx\n", wait_ret);
+ ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error 0x%08x\n", wait_ret);
/* yes, opening with just READ_CONTROL access allows us to successfully
* call ReleaseMutex */
hOpened = OpenMutex(READ_CONTROL, FALSE, "WineTestMutex");
- ok(hOpened != NULL, "OpenMutex failed with error %ld\n", GetLastError());
+ ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError());
ret = ReleaseMutex(hOpened);
- todo_wine ok(ret, "ReleaseMutex failed with error %ld\n", GetLastError());
+ todo_wine ok(ret, "ReleaseMutex failed with error %d\n", GetLastError());
ret = ReleaseMutex(hCreated);
todo_wine ok(!ret && (GetLastError() == ERROR_NOT_OWNER),
- "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %ld\n", GetLastError());
+ "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %d\n", GetLastError());
CloseHandle(hOpened);
CloseHandle(hCreated);
diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index 00951b3..127b1e7 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -246,16 +246,16 @@ static VOID test_CreateThread_basic(void
thread[0] = CreateThread(NULL,0,threadFunc2,NULL,0,NULL);
GLE = GetLastError();
if (thread[0]) { /* NT */
- ok(GLE==0xFACEaBAD, "CreateThread set last error to %ld, expected 4207848365\n", GLE);
+ ok(GLE==0xFACEaBAD, "CreateThread set last error to %d, expected 4207848365\n", GLE);
ret = WaitForSingleObject(thread[0],100);
ok(ret==WAIT_OBJECT_0, "threadFunc2 did not exit during 100 ms\n");
ret = GetExitCodeThread(thread[0],&exitCode);
- ok(ret!=0, "GetExitCodeThread returned %ld (expected nonzero)\n", ret);
- ok(exitCode==99, "threadFunc2 exited with code: %ld (expected 99)\n", exitCode);
+ ok(ret!=0, "GetExitCodeThread returned %d (expected nonzero)\n", ret);
+ ok(exitCode==99, "threadFunc2 exited with code: %d (expected 99)\n", exitCode);
ok(CloseHandle(thread[0])!=0,"Error closing thread handle\n");
}
else { /* 9x */
- ok(GLE==ERROR_INVALID_PARAMETER, "CreateThread set last error to %ld, expected 87\n", GLE);
+ ok(GLE==ERROR_INVALID_PARAMETER, "CreateThread set last error to %d, expected 87\n", GLE);
}
}
@@ -336,8 +336,8 @@ static VOID test_SuspendThread(void)
}
/* Trying to suspend a terminated thread should fail */
error=SuspendThread(thread);
- ok(error==~0U, "wrong return code: %ld\n", error);
- ok(GetLastError()==ERROR_ACCESS_DENIED || GetLastError()==ERROR_NO_MORE_ITEMS, "unexpected error code: %ld\n", GetLastError());
+ ok(error==~0U, "wrong return code: %d\n", error);
+ ok(GetLastError()==ERROR_ACCESS_DENIED || GetLastError()==ERROR_NO_MORE_ITEMS, "unexpected error code: %d\n", GetLastError());
ok(CloseHandle(thread)!=0,"CloseHandle Failed\n");
}
@@ -481,19 +481,19 @@ #endif
}
todo_wine {
- ok(rc!=0,"error=%ld\n",GetLastError());
+ ok(rc!=0,"error=%d\n",GetLastError());
rc = pSetThreadPriorityBoost(curthread,1);
- ok( rc != 0, "error=%ld\n",GetLastError());
+ ok( rc != 0, "error=%d\n",GetLastError());
rc=pGetThreadPriorityBoost(curthread,&disabled);
ok(rc!=0 && disabled==1,
- "rc=%d error=%ld disabled=%d\n",rc,GetLastError(),disabled);
+ "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled);
rc = pSetThreadPriorityBoost(curthread,0);
- ok( rc != 0, "error=%ld\n",GetLastError());
+ ok( rc != 0, "error=%d\n",GetLastError());
rc=pGetThreadPriorityBoost(curthread,&disabled);
ok(rc!=0 && disabled==0,
- "rc=%d error=%ld disabled=%d\n",rc,GetLastError(),disabled);
+ "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled);
}
}
@@ -555,7 +555,7 @@ static VOID test_GetThreadTimes(void)
static VOID test_thread_processor(void)
{
HANDLE curthread,curproc;
- DWORD processMask,systemMask;
+ DWORD_PTR processMask,systemMask;
SYSTEM_INFO sysInfo;
int error=0;
@@ -603,17 +603,17 @@ static VOID test_GetThreadExitCode(void)
HANDLE thread;
ret = GetExitCodeThread((HANDLE)0x2bad2bad,&exitCode);
- ok(ret==0, "GetExitCodeThread returned non zero value: %ld\n", ret);
+ ok(ret==0, "GetExitCodeThread returned non zero value: %d\n", ret);
GLE = GetLastError();
- ok(GLE==ERROR_INVALID_HANDLE, "GetLastError returned %ld (expected 6)\n", GLE);
+ ok(GLE==ERROR_INVALID_HANDLE, "GetLastError returned %d (expected 6)\n", GLE);
thread = CreateThread(NULL,0,threadFunc2,NULL,0,&threadid);
ret = WaitForSingleObject(thread,100);
ok(ret==WAIT_OBJECT_0, "threadFunc2 did not exit during 100 ms\n");
ret = GetExitCodeThread(thread,&exitCode);
ok(ret==exitCode || ret==1,
- "GetExitCodeThread returned %ld (expected 1 or %ld)\n", ret, exitCode);
- ok(exitCode==99, "threadFunc2 exited with code %ld (expected 99)\n", exitCode);
+ "GetExitCodeThread returned %d (expected 1 or %d)\n", ret, exitCode);
+ ok(exitCode==99, "threadFunc2 exited with code %d (expected 99)\n", exitCode);
ok(CloseHandle(thread)!=0,"Error closing thread handle\n");
}
@@ -646,7 +646,7 @@ static void test_SetThreadContext(void)
SetLastError(0xdeadbeef);
event = CreateEvent( NULL, TRUE, FALSE, NULL );
thread = CreateThread( NULL, 0, threadFunc6, (void *)2, 0, &threadid );
- ok( thread != NULL, "CreateThread failed : (%ld)\n", GetLastError() );
+ ok( thread != NULL, "CreateThread failed : (%d)\n", GetLastError() );
if (!thread)
{
trace("Thread creation failed, skipping rest of test\n");
@@ -658,7 +658,7 @@ static void test_SetThreadContext(void)
ctx.ContextFlags = CONTEXT_FULL;
SetLastError(0xdeadbeef);
- ok( GetThreadContext( thread, &ctx ), "GetThreadContext failed : (%ld)\n", GetLastError() );
+ ok( GetThreadContext( thread, &ctx ), "GetThreadContext failed : (%d)\n", GetLastError() );
/* simulate a call to set_test_val(10) */
stack = (int *)ctx.Esp;
@@ -667,11 +667,11 @@ static void test_SetThreadContext(void)
ctx.Esp -= 2 * sizeof(int *);
ctx.Eip = (DWORD)set_test_val;
SetLastError(0xdeadbeef);
- ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed : (%ld)\n", GetLastError() );
+ ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed : (%d)\n", GetLastError() );
SetLastError(0xdeadbeef);
prevcount = ResumeThread( thread );
- ok ( prevcount == 1, "Previous suspend count (%ld) instead of 1, last error : (%ld)\n",
+ ok ( prevcount == 1, "Previous suspend count (%d) instead of 1, last error : (%d)\n",
prevcount, GetLastError() );
WaitForSingleObject( thread, INFINITE );
@@ -708,14 +708,14 @@ static void test_QueueUserWorkItem(void)
for (i = 0; i < 100; i++)
{
BOOL ret = pQueueUserWorkItem(work_function, (void *)i, WT_EXECUTEDEFAULT);
- ok(ret, "QueueUserWorkItem failed with error %ld\n", GetLastError());
+ ok(ret, "QueueUserWorkItem failed with error %d\n", GetLastError());
}
wait_result = WaitForSingleObject(finish_event, 10000);
after = GetTickCount();
- trace("100 QueueUserWorkItem calls took %ldms\n", after - before);
- ok(wait_result == WAIT_OBJECT_0, "wait failed with error 0x%lx\n", wait_result);
+ trace("100 QueueUserWorkItem calls took %dms\n", after - before);
+ ok(wait_result == WAIT_OBJECT_0, "wait failed with error 0x%x\n", wait_result);
ok(times_executed == 100, "didn't execute all of the work items\n");
}
diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index ffab615..5f79856 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -85,7 +85,7 @@ static void test_conversions(void)
SETUP_ATIME(st)
ok (SystemTimeToFileTime(&st,&ft), "Conversion Failed ATIME\n");
ok( (!((ft.dwHighDateTime != ATIME_HI) || (ft.dwLowDateTime!=ATIME_LOW))),
- "Wrong time for ATIME: %08lx %08lx (correct %08x %08x)\n",
+ "Wrong time for ATIME: %08x %08x (correct %08x %08x)\n",
ft.dwLowDateTime, ft.dwHighDateTime, ATIME_LOW, ATIME_HI);
@@ -94,7 +94,7 @@ static void test_conversions(void)
ok( (!((ft.dwHighDateTime != MAYDAY_2002_HI) ||
(ft.dwLowDateTime!=MAYDAY_2002_LO))),
- "Wrong time for 2002 %08lx %08lx (correct %08x %08x)\n", ft.dwLowDateTime,
+ "Wrong time for 2002 %08x %08x (correct %08x %08x)\n", ft.dwLowDateTime,
ft.dwHighDateTime, MAYDAY_2002_LO, MAYDAY_2002_HI);
@@ -103,7 +103,7 @@ static void test_conversions(void)
ok( (!((ft.dwHighDateTime!=NEWYEAR_1980_HI) ||
(ft.dwLowDateTime!=NEWYEAR_1980_LO))) ,
- "Wrong time for 1980 %08lx %08lx (correct %08x %08x)\n", ft.dwLowDateTime,
+ "Wrong time for 1980 %08x %08x (correct %08x %08x)\n", ft.dwLowDateTime,
ft.dwHighDateTime, NEWYEAR_1980_LO,NEWYEAR_1980_HI );
ok(DosDateTimeToFileTime(DOS_DATE(1980,1,1),DOS_TIME(0,0,0),&ft),
@@ -111,7 +111,7 @@ static void test_conversions(void)
ok( (!((ft.dwHighDateTime!=NEWYEAR_1980_HI) ||
(ft.dwLowDateTime!=NEWYEAR_1980_LO))),
- "Wrong time DosDateTimeToFileTime %08lx %08lx (correct %08x %08x)\n",
+ "Wrong time DosDateTimeToFileTime %08x %08x (correct %08x %08x)\n",
ft.dwHighDateTime, ft.dwLowDateTime, NEWYEAR_1980_HI, NEWYEAR_1980_LO);
}
@@ -129,7 +129,7 @@ static void test_invalid_arg(void)
"DosDateTimeToFileTime() failed\n");
ok( (ft.dwHighDateTime==NEWYEAR_1980_HI) && (ft.dwLowDateTime==NEWYEAR_1980_LO),
- "filetime for 1/1/80 00:00:00 was %08lx %08lx\n", ft.dwHighDateTime, ft.dwLowDateTime);
+ "filetime for 1/1/80 00:00:00 was %08x %08x\n", ft.dwHighDateTime, ft.dwLowDateTime);
/* now check SystemTimeToFileTime */
memset(&ft,0,sizeof ft);
@@ -184,7 +184,7 @@ static void test_FileTimeToSystemTime(vo
ft.dwLowDateTime = 0;
ret = FileTimeToSystemTime(&ft, &st);
ok( ret,
- "FileTimeToSystemTime() failed with Error 0x%08lx\n",GetLastError());
+ "FileTimeToSystemTime() failed with Error 0x%08x\n",GetLastError());
ok(((st.wYear == 1601) && (st.wMonth == 1) && (st.wDay == 1) &&
(st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 0) &&
(st.wMilliseconds == 0)),
@@ -194,7 +194,7 @@ static void test_FileTimeToSystemTime(vo
ft.dwLowDateTime = (UINT)time;
ret = FileTimeToSystemTime(&ft, &st);
ok( ret,
- "FileTimeToSystemTime() failed with Error 0x%08lx\n",GetLastError());
+ "FileTimeToSystemTime() failed with Error 0x%08x\n",GetLastError());
ok(((st.wYear == 1970) && (st.wMonth == 1) && (st.wDay == 1) &&
(st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 1) &&
(st.wMilliseconds == 0)),
@@ -221,7 +221,7 @@ static void test_FileTimeToLocalFileTime
ft.dwLowDateTime = (UINT)time;
ret = FileTimeToLocalFileTime(&ft, &lft);
ok( ret,
- "FileTimeToLocalFileTime() failed with Error 0x%08lx\n",GetLastError());
+ "FileTimeToLocalFileTime() failed with Error 0x%08x\n",GetLastError());
FileTimeToSystemTime(&lft, &st);
ok(((st.wYear == 1970) && (st.wMonth == 1) && (st.wDay == 1) &&
(st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 1) &&
@@ -235,7 +235,7 @@ static void test_FileTimeToLocalFileTime
ok(res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n");
ret = FileTimeToLocalFileTime(&ft, &lft);
ok( ret,
- "FileTimeToLocalFileTime() failed with Error 0x%08lx\n",GetLastError());
+ "FileTimeToLocalFileTime() failed with Error 0x%08x\n",GetLastError());
FileTimeToSystemTime(&lft, &st);
ok(((st.wYear == 1970) && (st.wMonth == 1) && (st.wDay == 1) &&
(st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 1) &&
diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c
index 4b4b272..628626a 100644
--- a/dlls/kernel32/tests/toolhelp.c
+++ b/dlls/kernel32/tests/toolhelp.c
@@ -120,7 +120,7 @@ static void test_process(DWORD curr_pid,
{
if (pe.th32ProcessID == curr_pid) found++;
if (pe.th32ProcessID == sub_pcs_pid) found++;
- trace("PID=%lx %s\n", pe.th32ProcessID, pe.szExeFile);
+ trace("PID=%x %s\n", pe.th32ProcessID, pe.szExeFile);
num++;
} while (pProcess32Next( hSnapshot, &pe ));
}
@@ -134,7 +134,7 @@ static void test_process(DWORD curr_pid,
{
if (pe.th32ProcessID == curr_pid) found++;
if (pe.th32ProcessID == sub_pcs_pid) found++;
- trace("PID=%lx %s\n", pe.th32ProcessID, pe.szExeFile);
+ trace("PID=%x %s\n", pe.th32ProcessID, pe.szExeFile);
num--;
} while (pProcess32Next( hSnapshot, &pe ));
}
@@ -172,7 +172,7 @@ static void test_thread(DWORD curr_pid,
{
if (te.th32OwnerProcessID == curr_pid) curr_found++;
if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++;
- trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri);
+ trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri);
num++;
} while (pThread32Next( hSnapshot, &te ));
}
@@ -188,7 +188,7 @@ static void test_thread(DWORD curr_pid,
{
if (te.th32OwnerProcessID == curr_pid) curr_found++;
if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++;
- trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri);
+ trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri);
num--;
} while (pThread32Next( hSnapshot, &te ));
}
@@ -240,7 +240,7 @@ static void test_module(DWORD pid, const
{
do
{
- trace("PID=%lx base=%p size=%lx %s %s\n",
+ trace("PID=%x base=%p size=%x %s %s\n",
me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule);
ok(me.th32ProcessID == pid, "wrong returned process id\n");
for (i = 0; i < num_expected; i++)
@@ -259,7 +259,7 @@ static void test_module(DWORD pid, const
{
do
{
- trace("PID=%lx base=%p size=%lx %s %s\n",
+ trace("PID=%x base=%p size=%x %s %s\n",
me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule);
for (i = 0; i < num_expected; i++)
if (!lstrcmpi(expected[i], me.szModule)) found[i]++;
@@ -322,7 +322,7 @@ START_TEST(toolhelp)
startup.dwFlags = STARTF_USESHOWWINDOW;
startup.wShowWindow = SW_SHOWNORMAL;
- sprintf(buffer, "%s tests/toolhelp.c %lu %lu", selfname, (DWORD)ev1, (DWORD)ev2);
+ sprintf(buffer, "%s tests/toolhelp.c %u %u", selfname, (DWORD)ev1, (DWORD)ev2);
ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info), "CreateProcess\n");
/* wait for child to be initialized */
w = WaitForSingleObject(ev1, WAIT_TIME);
diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index c4ac6ea..4fcef79 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -53,24 +53,24 @@ START_TEST(version)
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION,
pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
ret = pVerifyVersionInfoA(&info, VER_BUILDNUMBER | VER_MAJORVERSION |
VER_MINORVERSION/* | VER_PLATFORMID | VER_SERVICEPACKMAJOR |
VER_SERVICEPACKMINOR | VER_SUITENAME | VER_PRODUCT_TYPE */,
pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
/* tests special handling of VER_SUITENAME */
ret = pVerifyVersionInfoA(&info, VER_SUITENAME,
pVerSetConditionMask(0, VER_SUITENAME, VER_AND));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
ret = pVerifyVersionInfoA(&info, VER_SUITENAME,
pVerSetConditionMask(0, VER_SUITENAME, VER_OR));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
/* test handling of version numbers */
@@ -81,59 +81,59 @@ START_TEST(version)
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL),
VER_MAJORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
info.dwMinorVersion = 0;
info.wServicePackMajor = 10;
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL),
VER_MAJORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
info.wServicePackMajor = 0;
info.wServicePackMinor = 10;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL),
VER_MAJORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.wServicePackMinor++;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.wServicePackMajor--;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.wServicePackMajor--;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.wServicePackMajor++;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.wServicePackMajor++;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.wServicePackMajor--;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_EQUAL));
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
/* test the failure hierarchy for the four version fields */
@@ -142,25 +142,25 @@ START_TEST(version)
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.dwMinorVersion++;
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
info.dwMajorVersion++;
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
GetVersionEx((OSVERSIONINFO *)&info);
@@ -168,16 +168,16 @@ START_TEST(version)
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
/* test bad dwOSVersionInfoSize */
GetVersionEx((OSVERSIONINFO *)&info);
info.dwOSVersionInfoSize = 0;
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
- ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
+ ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
}
diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index 2eac5a7..15f1508 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -36,7 +36,7 @@ static void test_VirtualAlloc(void)
ok(addr1 == NULL, "VirtualAlloc should fail on zero-sized allocation\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER /* NT */ ||
GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Win9x */
- "got %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError());
+ "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError());
addr1 = VirtualAlloc(0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS);
ok(addr1 != NULL, "VirtualAlloc failed\n");
@@ -46,21 +46,21 @@ static void test_VirtualAlloc(void)
"VirtualQuery failed\n");
ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1);
ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1);
- ok(info.AllocationProtect == PAGE_NOACCESS, "%lx != PAGE_NOACCESS\n", info.AllocationProtect);
+ ok(info.AllocationProtect == PAGE_NOACCESS, "%x != PAGE_NOACCESS\n", info.AllocationProtect);
ok(info.RegionSize == 0x10000, "%lx != 0x10000\n", info.RegionSize);
- ok(info.State == MEM_RESERVE, "%lx != MEM_RESERVE\n", info.State);
+ ok(info.State == MEM_RESERVE, "%x != MEM_RESERVE\n", info.State);
/* NT reports Protect == 0 for a not committed memory block */
ok(info.Protect == 0 /* NT */ ||
info.Protect == PAGE_NOACCESS, /* Win9x */
- "%lx != PAGE_NOACCESS\n", info.Protect);
- ok(info.Type == MEM_PRIVATE, "%lx != MEM_PRIVATE\n", info.Type);
+ "%x != PAGE_NOACCESS\n", info.Protect);
+ ok(info.Type == MEM_PRIVATE, "%x != MEM_PRIVATE\n", info.Type);
SetLastError(0xdeadbeef);
ok(!VirtualProtect(addr1, 0xFFFC, PAGE_READONLY, &old_prot),
"VirtualProtect should fail on a not committed memory\n");
ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ ||
GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */
- "got %ld, expected ERROR_INVALID_ADDRESS\n", GetLastError());
+ "got %d, expected ERROR_INVALID_ADDRESS\n", GetLastError());
addr2 = VirtualAlloc(addr1, 0x1000, MEM_COMMIT, PAGE_NOACCESS);
ok(addr1 == addr2, "VirtualAlloc failed\n");
@@ -70,12 +70,12 @@ static void test_VirtualAlloc(void)
"VirtualQuery failed\n");
ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1);
ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1);
- ok(info.AllocationProtect == PAGE_NOACCESS, "%lx != PAGE_NOACCESS\n", info.AllocationProtect);
+ ok(info.AllocationProtect == PAGE_NOACCESS, "%x != PAGE_NOACCESS\n", info.AllocationProtect);
ok(info.RegionSize == 0x1000, "%lx != 0x1000\n", info.RegionSize);
- ok(info.State == MEM_COMMIT, "%lx != MEM_COMMIT\n", info.State);
+ ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State);
/* this time NT reports PAGE_NOACCESS as well */
- ok(info.Protect == PAGE_NOACCESS, "%lx != PAGE_NOACCESS\n", info.Protect);
- ok(info.Type == MEM_PRIVATE, "%lx != MEM_PRIVATE\n", info.Type);
+ ok(info.Protect == PAGE_NOACCESS, "%x != PAGE_NOACCESS\n", info.Protect);
+ ok(info.Type == MEM_PRIVATE, "%x != MEM_PRIVATE\n", info.Type);
/* this should fail, since not the whole range is committed yet */
SetLastError(0xdeadbeef);
@@ -83,26 +83,26 @@ static void test_VirtualAlloc(void)
"VirtualProtect should fail on a not committed memory\n");
ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ ||
GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */
- "got %ld, expected ERROR_INVALID_ADDRESS\n", GetLastError());
+ "got %d, expected ERROR_INVALID_ADDRESS\n", GetLastError());
ok(VirtualProtect(addr1, 0x1000, PAGE_READONLY, &old_prot), "VirtualProtect failed\n");
ok(old_prot == PAGE_NOACCESS,
- "wrong old protection: got %04lx instead of PAGE_NOACCESS\n", old_prot);
+ "wrong old protection: got %04x instead of PAGE_NOACCESS\n", old_prot);
ok(VirtualProtect(addr1, 0x1000, PAGE_READWRITE, &old_prot), "VirtualProtect failed\n");
ok(old_prot == PAGE_READONLY,
- "wrong old protection: got %04lx instead of PAGE_READONLY\n", old_prot);
+ "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot);
ok(!VirtualFree(addr1, 0x10000, 0), "VirtualFree should fail with type 0\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
- "got %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError());
+ "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError());
ok(VirtualFree(addr1, 0x10000, MEM_DECOMMIT), "VirtualFree failed\n");
/* if the type is MEM_RELEASE, size must be 0 */
ok(!VirtualFree(addr1, 1, MEM_RELEASE), "VirtualFree should fail\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
- "got %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError());
+ "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError());
ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n");
}
@@ -130,7 +130,7 @@ static void test_MapViewOfFile(void)
/* this fails on win9x but succeeds on NT */
ptr = MapViewOfFile( mapping, FILE_MAP_COPY, 0, 0, 4096 );
if (ptr) UnmapViewOfFile( ptr );
- else ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %lx\n", GetLastError() );
+ else ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %x\n", GetLastError() );
ptr = MapViewOfFile( mapping, 0, 0, 0, 4096 );
ok( ptr != NULL, "MapViewOfFile 0 failed\n" );
@@ -153,7 +153,7 @@ static void test_MapViewOfFile(void)
/* this fails on win9x but succeeds on NT */
ptr = MapViewOfFile( mapping, FILE_MAP_COPY, 0, 0, 4096 );
if (ptr) UnmapViewOfFile( ptr );
- else ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %lx\n", GetLastError() );
+ else ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %x\n", GetLastError() );
ptr = MapViewOfFile( mapping, 0, 0, 0, 4096 );
ok( ptr != NULL, "MapViewOfFile 0 failed\n" );
@@ -162,7 +162,7 @@ static void test_MapViewOfFile(void)
ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 );
ok( !ptr, "MapViewOfFile FILE_MAP_WRITE succeeded\n" );
ok( GetLastError() == ERROR_INVALID_PARAMETER ||
- GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %lx\n", GetLastError() );
+ GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %x\n", GetLastError() );
CloseHandle( mapping );
/* copy-on-write mapping */
@@ -185,14 +185,14 @@ static void test_MapViewOfFile(void)
ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 );
ok( !ptr, "MapViewOfFile FILE_MAP_WRITE succeeded\n" );
ok( GetLastError() == ERROR_INVALID_PARAMETER ||
- GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %lx\n", GetLastError() );
+ GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %x\n", GetLastError() );
CloseHandle( mapping );
/* no access mapping */
mapping = CreateFileMappingA( file, NULL, PAGE_NOACCESS, 0, 4096, NULL );
/* fails on NT but succeeds on win9x */
- if (!mapping) ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %lx\n", GetLastError() );
+ if (!mapping) ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %x\n", GetLastError() );
else
{
ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 );
@@ -201,7 +201,7 @@ static void test_MapViewOfFile(void)
ptr = MapViewOfFile( mapping, FILE_MAP_COPY, 0, 0, 4096 );
ok( !ptr, "MapViewOfFile FILE_MAP_COPY succeeded\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %lx\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %x\n", GetLastError() );
ptr = MapViewOfFile( mapping, 0, 0, 0, 4096 );
ok( ptr != NULL, "MapViewOfFile 0 failed\n" );
@@ -209,7 +209,7 @@ static void test_MapViewOfFile(void)
ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 );
ok( !ptr, "MapViewOfFile FILE_MAP_WRITE succeeded\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %lx\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %x\n", GetLastError() );
CloseHandle( mapping );
}
@@ -224,7 +224,7 @@ static void test_MapViewOfFile(void)
mapping = CreateFileMappingA( file, NULL, PAGE_READWRITE, 0, 4096, NULL );
ok( !mapping, "CreateFileMapping PAGE_READWRITE succeeded\n" );
ok( GetLastError() == ERROR_INVALID_PARAMETER ||
- GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %lx\n", GetLastError() );
+ GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %x\n", GetLastError() );
mapping = CreateFileMappingA( file, NULL, PAGE_WRITECOPY, 0, 4096, NULL );
ok( mapping != 0, "CreateFileMapping PAGE_WRITECOPY failed\n" );
@@ -243,17 +243,17 @@ static void test_MapViewOfFile(void)
mapping = CreateFileMappingA( file, NULL, PAGE_READWRITE, 0, 4096, NULL );
ok( !mapping, "CreateFileMapping PAGE_READWRITE succeeded\n" );
ok( GetLastError() == ERROR_INVALID_PARAMETER ||
- GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %lx\n", GetLastError() );
+ GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %x\n", GetLastError() );
mapping = CreateFileMappingA( file, NULL, PAGE_WRITECOPY, 0, 4096, NULL );
ok( !mapping, "CreateFileMapping PAGE_WRITECOPY succeeded\n" );
ok( GetLastError() == ERROR_INVALID_PARAMETER ||
- GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %lx\n", GetLastError() );
+ GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %x\n", GetLastError() );
mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 4096, NULL );
ok( !mapping, "CreateFileMapping PAGE_READONLY succeeded\n" );
ok( GetLastError() == ERROR_INVALID_PARAMETER ||
- GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %lx\n", GetLastError() );
+ GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %x\n", GetLastError() );
CloseHandle( file );
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061010/6d5963a5/attachment-0001.pgp
More information about the wine-patches
mailing list