Module: wine Branch: master Commit: dec4332a1e21934aacf768c34536387cdeb668b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec4332a1e21934aacf768c345...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Oct 5 22:07:06 2006 +0200
cabinet/tests: Win64 printf format warning fixes.
---
dlls/cabinet/tests/Makefile.in | 1 - dlls/cabinet/tests/extract.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in index 6ab6bca..7a4f69c 100644 --- a/dlls/cabinet/tests/Makefile.in +++ b/dlls/cabinet/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = cabinet.dll IMPORTS = cabinet user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \ extract.c diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 8352f1b..a0139e5 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -342,7 +342,7 @@ static void test_Extract(void) lstrcpyA(extractDest.directory, "dest"); extractDest.flags = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\a.txt"), "Expected dest\a.txt to exist\n"); ok(DeleteFileA("dest\b.txt"), "Expected dest\b.txt to exist\n"); ok(DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to exist\n"); @@ -354,7 +354,7 @@ static void test_Extract(void) lstrcpyA(extractDest.directory, "dest"); extractDest.flags = EXTRACT_FILLFILELIST; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\a.txt"), "Expected dest\a.txt to not exist\n"); ok(!DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to not exist\n"); ok(extractDest.filecount == 4, "Expected 4 files, got %ld\n", extractDest.filecount); @@ -364,7 +364,7 @@ static void test_Extract(void) /* try extract files operation once file list is filled */ extractDest.flags = EXTRACT_EXTRACTFILES; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\a.txt"), "Expected dest\a.txt to exist\n"); ok(DeleteFileA("dest\b.txt"), "Expected dest\b.txt to exist\n"); ok(DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to exist\n"); @@ -374,7 +374,7 @@ static void test_Extract(void)
/* Extract does not extract files if the dest dir does not exist */ res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\a.txt"), "Expected dest\a.txt to not exist\n"); ok(!DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to not exist\n");
@@ -389,7 +389,7 @@ static void test_Extract(void) extractDest.filterlist = NULL; CreateDirectoryA("dest", NULL); res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\a.txt"), "Expected dest\a.txt to exist\n"); ok(DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to exist\n"); ok(!DeleteFileA("dest\b.txt"), "Expected dest\b.txt to not exist\n"); @@ -405,7 +405,7 @@ static void test_Extract(void) extractDest.flags = 1; extractDest.filelist = NULL; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\a.txt"), "Expected dest\a.txt to not exist\n"); ok(!DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to not exist\n"); ok(!DeleteFileA("dest\b.txt"), "Expected dest\b.txt to not exist\n"); @@ -420,7 +420,7 @@ static void test_Extract(void)
extractDest.flags = 0; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\a.txt"), "Expected dest\a.txt to exist\n"); ok(!DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to exist\n"); ok(!DeleteFileA("dest\b.txt"), "Expected dest\b.txt to exist\n"); @@ -436,7 +436,7 @@ static void test_Extract(void) extractDest.flags = 0; extractDest.filterlist = extractDest.filelist; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\a.txt"), "Expected dest\a.txt to exist\n"); ok(DeleteFileA("dest\testdir\c.txt"), "Expected dest\testdir\c.txt to exist\n"); ok(DeleteFileA("dest\b.txt"), "Expected dest\b.txt to exist\n");