From 44e65a0facb84c14c63447837187a2aea2791b8c Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Sun, 8 Oct 2006 00:48:51 +0200
Subject: [PATCH] quartz/tests: Win64 printf format warning fixes.

---
 dlls/quartz/tests/Makefile.in    |  1 -
 dlls/quartz/tests/filtergraph.c  | 18 +++++++++---------
 dlls/quartz/tests/memallocator.c | 12 ++++++------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in
index 42851f5b17d..2c8bdc1f078 100644
--- a/dlls/quartz/tests/Makefile.in
+++ b/dlls/quartz/tests/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 TESTDLL   = quartz.dll
 IMPORTS   = ole32 user32 gdi32 kernel32
 EXTRALIBS = -lstrmiids
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 CTESTS = \
 	filtergraph.c \
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 3c80e13c1d9..fe26bafc689 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -42,7 +42,7 @@ static void renderfile(void)
     HRESULT hr;
 
     hr = IGraphBuilder_RenderFile(pgraph, file, NULL);
-    ok(hr==S_OK, "RenderFile returned: %lx\n", hr);
+    ok(hr==S_OK, "RenderFile returned: %x\n", hr);
 }
 
 static void rungraph(void)
@@ -53,28 +53,28 @@ static void rungraph(void)
     HANDLE hEvent;
 
     hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (LPVOID*)&pmc);
-    ok(hr==S_OK, "Cannot get IMediaControl interface returned: %lx\n", hr);
+    ok(hr==S_OK, "Cannot get IMediaControl interface returned: %x\n", hr);
 
     hr = IMediaControl_Run(pmc);
-    ok(hr==S_FALSE, "Cannot run the graph returned: %lx\n", hr);
+    ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr);
 
     hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaEvent, (LPVOID*)&pme);
-    ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %lx\n", hr);
+    ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %x\n", hr);
 
     hr = IMediaEvent_GetEventHandle(pme, (OAEVENT*)&hEvent);
-    ok(hr==S_OK, "Cannot get event handle returned: %lx\n", hr);
+    ok(hr==S_OK, "Cannot get event handle returned: %x\n", hr);
 
     /* WaitForSingleObject(hEvent, INFINITE); */
     Sleep(20000);
 
     hr = IMediaControl_Release(pme);
-    ok(hr==2, "Releasing mediaevent returned: %lx\n", hr);
+    ok(hr==2, "Releasing mediaevent returned: %x\n", hr);
 
     hr = IMediaControl_Stop(pmc);
-    ok(hr==S_OK, "Cannot stop the graph returned: %lx\n", hr);
+    ok(hr==S_OK, "Cannot stop the graph returned: %x\n", hr);
     
     hr = IMediaControl_Release(pmc);
-    ok(hr==1, "Releasing mediacontrol returned: %lx\n", hr);
+    ok(hr==1, "Releasing mediacontrol returned: %x\n", hr);
 }
 
 static void releasefiltergraph(void)
@@ -82,7 +82,7 @@ static void releasefiltergraph(void)
     HRESULT hr;
 
     hr = IGraphBuilder_Release(pgraph);
-    ok(hr==0, "Releasing filtergraph returned: %lx\n", hr);
+    ok(hr==0, "Releasing filtergraph returned: %x\n", hr);
 }
 
 START_TEST(filtergraph)
diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c
index 0914d272b2c..0a01db92b38 100644
--- a/dlls/quartz/tests/memallocator.c
+++ b/dlls/quartz/tests/memallocator.c
@@ -33,7 +33,7 @@ static void CommitDecommitTest(void)
     HRESULT hr;
 
     hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAllocator);
-    ok(hr==S_OK, "Unable to create memory allocator %lx\n", hr);
+    ok(hr==S_OK, "Unable to create memory allocator %x\n", hr);
 
     if (hr == S_OK)
     {
@@ -46,17 +46,17 @@ static void CommitDecommitTest(void)
 	RequestedProps.cbPrefix = 0;
 
 	hr = IMemAllocator_SetProperties(pMemAllocator, &RequestedProps, &ActualProps);
-	ok(hr==S_OK, "SetProperties returned: %lx\n", hr);
+	ok(hr==S_OK, "SetProperties returned: %x\n", hr);
 
 	hr = IMemAllocator_Commit(pMemAllocator);
-	ok(hr==S_OK, "Commit returned: %lx\n", hr);
+	ok(hr==S_OK, "Commit returned: %x\n", hr);
 	hr = IMemAllocator_Commit(pMemAllocator);
-	ok(hr==S_OK, "Commit returned: %lx\n", hr);
+	ok(hr==S_OK, "Commit returned: %x\n", hr);
 
 	hr = IMemAllocator_Decommit(pMemAllocator);
-	ok(hr==S_OK, "Decommit returned: %lx\n", hr);
+	ok(hr==S_OK, "Decommit returned: %x\n", hr);
 	hr = IMemAllocator_Decommit(pMemAllocator);
-	ok(hr==S_OK, "Cecommit returned: %lx\n", hr);
+	ok(hr==S_OK, "Cecommit returned: %x\n", hr);
 
 	IMemAllocator_Release(pMemAllocator);
     }