Skip to content

W
wine-cw
Commit dec4332a authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

cabinet/tests: Win64 printf format warning fixes.

parent 47f822ee
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
dlls/cabinet/tests/Makefile.in
View file @ dec4332a
...@@ -4,7 +4,6 @@ SRCDIR = @srcdir@ ...@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
TESTDLL = cabinet.dll TESTDLL = cabinet.dll
IMPORTS = cabinet user32 kernel32 IMPORTS = cabinet user32 kernel32
EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \ CTESTS = \
extract.c extract.c
......
dlls/cabinet/tests/extract.c
View file @ dec4332a
...@@ -342,7 +342,7 @@ static void test_Extract(void) ...@@ -342,7 +342,7 @@ static void test_Extract(void)
lstrcpyA(extractDest.directory, "dest"); lstrcpyA(extractDest.directory, "dest");
extractDest.flags = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; extractDest.flags = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES;
res = pExtract(&extractDest, "extract.cab"); 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\\a.txt"), "Expected dest\\a.txt to exist\n");
ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.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"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n");
...@@ -354,7 +354,7 @@ static void test_Extract(void) ...@@ -354,7 +354,7 @@ static void test_Extract(void)
lstrcpyA(extractDest.directory, "dest"); lstrcpyA(extractDest.directory, "dest");
extractDest.flags = EXTRACT_FILLFILELIST; extractDest.flags = EXTRACT_FILLFILELIST;
res = pExtract(&extractDest, "extract.cab"); 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\\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\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n");
ok(extractDest.filecount == 4, "Expected 4 files, got %ld\n", extractDest.filecount); ok(extractDest.filecount == 4, "Expected 4 files, got %ld\n", extractDest.filecount);
...@@ -364,7 +364,7 @@ static void test_Extract(void) ...@@ -364,7 +364,7 @@ static void test_Extract(void)
/* try extract files operation once file list is filled */ /* try extract files operation once file list is filled */
extractDest.flags = EXTRACT_EXTRACTFILES; extractDest.flags = EXTRACT_EXTRACTFILES;
res = pExtract(&extractDest, "extract.cab"); 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\\a.txt"), "Expected dest\\a.txt to exist\n");
ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.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"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n");
...@@ -374,7 +374,7 @@ static void test_Extract(void) ...@@ -374,7 +374,7 @@ static void test_Extract(void)
/* Extract does not extract files if the dest dir does not exist */ /* Extract does not extract files if the dest dir does not exist */
res = pExtract(&extractDest, "extract.cab"); 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\\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\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n");
...@@ -389,7 +389,7 @@ static void test_Extract(void) ...@@ -389,7 +389,7 @@ static void test_Extract(void)
extractDest.filterlist = NULL; extractDest.filterlist = NULL;
CreateDirectoryA("dest", NULL); CreateDirectoryA("dest", NULL);
res = pExtract(&extractDest, "extract.cab"); 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\\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\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n");
ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n");
...@@ -405,7 +405,7 @@ static void test_Extract(void) ...@@ -405,7 +405,7 @@ static void test_Extract(void)
extractDest.flags = 1; extractDest.flags = 1;
extractDest.filelist = NULL; extractDest.filelist = NULL;
res = pExtract(&extractDest, "extract.cab"); 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\\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\\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"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n");
...@@ -420,7 +420,7 @@ static void test_Extract(void) ...@@ -420,7 +420,7 @@ static void test_Extract(void)
extractDest.flags = 0; extractDest.flags = 0;
res = pExtract(&extractDest, "extract.cab"); 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\\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\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n");
ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.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) ...@@ -436,7 +436,7 @@ static void test_Extract(void)
extractDest.flags = 0; extractDest.flags = 0;
extractDest.filterlist = extractDest.filelist; extractDest.filterlist = extractDest.filelist;
res = pExtract(&extractDest, "extract.cab"); 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\\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\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n");
ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment