[ros-diffs] [reactos] 01/01: [QMGR_WINETEST] Sync with Wine Staging 2.16. CORE-13762

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=684625e49fdc5edb8a881…

commit 684625e49fdc5edb8a8818205d903d3109813660
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Oct 21 13:33:33 2017 +0100

    [QMGR_WINETEST] Sync with Wine Staging 2.16. CORE-13762
---
 modules/rostests/winetests/qmgr/CMakeLists.txt | 2 ++
 modules/rostests/winetests/qmgr/file.c         | 8 ++++----
 modules/rostests/winetests/qmgr/job.c          | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/rostests/winetests/qmgr/CMakeLists.txt
b/modules/rostests/winetests/qmgr/CMakeLists.txt
index f2d2aa7ef4..a3681e9fac 100644
--- a/modules/rostests/winetests/qmgr/CMakeLists.txt
+++ b/modules/rostests/winetests/qmgr/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG)
+
 list(APPEND SOURCE
     enum_files.c
     enum_jobs.c
diff --git a/modules/rostests/winetests/qmgr/file.c
b/modules/rostests/winetests/qmgr/file.c
index 61d77225d1..3cee4bdc8c 100644
--- a/modules/rostests/winetests/qmgr/file.c
+++ b/modules/rostests/winetests/qmgr/file.c
@@ -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");
 }
 
diff --git a/modules/rostests/winetests/qmgr/job.c
b/modules/rostests/winetests/qmgr/job.c
index 012ae1cf4b..3ed3425a5d 100644
--- a/modules/rostests/winetests/qmgr/job.c
+++ b/modules/rostests/winetests/qmgr/job.c
@@ -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);
 }