From b8549aef08361cf404c6e69d3d3c8b05218f55a6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 21 Oct 2017 14:10:14 +0100 Subject: [PATCH] [MMDEVAPI_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/mmdevapi/CMakeLists.txt | 2 ++ modules/rostests/winetests/mmdevapi/render.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/mmdevapi/CMakeLists.txt b/modules/rostests/winetests/mmdevapi/CMakeLists.txt index 569915d16f0..12652fd61a1 100644 --- a/modules/rostests/winetests/mmdevapi/CMakeLists.txt +++ b/modules/rostests/winetests/mmdevapi/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) diff --git a/modules/rostests/winetests/mmdevapi/render.c b/modules/rostests/winetests/mmdevapi/render.c index c7fb7c1d15f..040ec7f5875 100644 --- a/modules/rostests/winetests/mmdevapi/render.c +++ b/modules/rostests/winetests/mmdevapi/render.c @@ -335,8 +335,8 @@ static void test_audioclient(void) (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* (!) win10 */, - "Latency < default period, delta %dus (%x%08x vs %x%08x)\n", - (LONG)((t2-t1)/10), (DWORD)(t2 >> 32), (DWORD)t2, (DWORD)(t1 >> 32), (DWORD)t1); + "Latency < default period, delta %dus (%s vs %s)\n", + (LONG)((t2-t1)/10), wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t1)); /* Native appears to add the engine period to the HW latency in shared mode */ if(t2 == 0) win10 = TRUE;