[QMGR_WINETEST] Sync with Wine Staging 2.16. CORE-13762
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Oct 2017 12:33:33 +0000 (13:33 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Oct 2017 12:33:33 +0000 (13:33 +0100)
modules/rostests/winetests/qmgr/CMakeLists.txt
modules/rostests/winetests/qmgr/file.c
modules/rostests/winetests/qmgr/job.c

index f2d2aa7..a3681e9 100644 (file)
@@ -1,4 +1,6 @@
 
+add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG)
+
 list(APPEND SOURCE
     enum_files.c
     enum_jobs.c
index 61d7722..3cee4bd 100644 (file)
@@ -185,10 +185,10 @@ static void test_GetProgress_PreTransfer(void)
 
     hres = IBackgroundCopyFile_GetProgress(test_file, &progress);
     ok(hres == S_OK, "GetProgress failed: %08x\n", hres);
-    ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %x%08x\n",
-       (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal);
-    ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %x%08x\n",
-       (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred);
+    ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %s\n",
+       wine_dbgstr_longlong(progress.BytesTotal));
+    ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %s\n",
+       wine_dbgstr_longlong(progress.BytesTransferred));
     ok(progress.Completed == FALSE, "Got incorrect completion status\n");
 }
 
index 012ae1c..3ed3425 100644 (file)
@@ -266,10 +266,10 @@ static void test_GetProgress_preTransfer(void)
     hres = IBackgroundCopyJob_GetProgress(test_job, &progress);
     ok(hres == S_OK, "GetProgress failed: 0x%08x\n", hres);
 
-    ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %x%08x\n",
-       (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal);
-    ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %x%08x\n",
-       (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred);
+    ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %s\n",
+       wine_dbgstr_longlong(progress.BytesTotal));
+    ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %s\n",
+       wine_dbgstr_longlong(progress.BytesTransferred));
     ok(progress.FilesTotal == 0, "Incorrect FilesTotal: %u\n", progress.FilesTotal);
     ok(progress.FilesTransferred == 0, "Incorrect FilesTransferred %u\n", progress.FilesTransferred);
 }