Michael Stefaniuc : amstream: Win64 printf format warning fixes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 158253bffd1ccdc181eb13ac0f9786a7e05b0a5d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=158253bffd1ccdc181eb13ac0f...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Fri Oct  6 23:01:52 2006 +0200

amstream: Win64 printf format warning fixes.

---

 dlls/amstream/Makefile.in   |    1 -
 dlls/amstream/amstream.c    |   10 +++++-----
 dlls/amstream/mediastream.c |    8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in
index 41e8fa1..33f8d23 100644
--- a/dlls/amstream/Makefile.in
+++ b/dlls/amstream/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = amstream.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -lstrmiids -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	amstream.c \
diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c
index 0001f1f..449a2d2 100644
--- a/dlls/amstream/amstream.c
+++ b/dlls/amstream/amstream.c
@@ -210,7 +210,7 @@ static HRESULT WINAPI IAMMultiMediaStrea
     IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
     HRESULT hr = S_OK;
 
-    FIXME("(%p/%p)->(%lx,%lx,%p) partial stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); 
+    FIXME("(%p/%p)->(%x,%x,%p) partial stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph);
 
     if (pFilterGraph)
     {
@@ -256,7 +256,7 @@ static HRESULT WINAPI IAMMultiMediaStrea
     IMediaStream* pStream;
     IMediaStream** pNewStreams;
 
-    FIXME("(%p/%p)->(%p,%p,%lx,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream); 
+    FIXME("(%p/%p)->(%p,%p,%x,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream);
 
     hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream);
     if (SUCCEEDED(hr))
@@ -291,7 +291,7 @@ static HRESULT WINAPI IAMMultiMediaStrea
     IPin *ipin;
     PIN_DIRECTION pin_direction;
 
-    TRACE("(%p/%p)->(%s,%lx)\n", This, iface, debugstr_w(pszFileName), dwFlags);
+    TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags);
 
     ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter);
     if(ret != S_OK)
@@ -350,7 +350,7 @@ static HRESULT WINAPI IAMMultiMediaStrea
 {
     IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
 
-    FIXME("(%p/%p)->(%p,%p,%lx) stub!\n", This, iface, pCtx, pMoniker, dwFlags); 
+    FIXME("(%p/%p)->(%p,%p,%x) stub!\n", This, iface, pCtx, pMoniker, dwFlags);
 
     return E_NOTIMPL;
 }
@@ -359,7 +359,7 @@ static HRESULT WINAPI IAMMultiMediaStrea
 {
     IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
 
-    FIXME("(%p/%p)->(%lx)\n", This, iface, dwFlags);
+    FIXME("(%p/%p)->(%x)\n", This, iface, dwFlags);
 
     if(dwFlags != AMMSF_NOCLOCK)
         return E_INVALIDARG;
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
index 430755f..c2446c9 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -134,7 +134,7 @@ static HRESULT WINAPI IMediaStreamImpl_S
 {
     IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
 
-    FIXME("(%p/%p)->(%p,%lx) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags); 
+    FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags);
 
     return S_FALSE;
 }
@@ -143,7 +143,7 @@ static HRESULT WINAPI IMediaStreamImpl_A
 {
     IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
 
-    FIXME("(%p/%p)->(%lx,%p) stub!\n", This, iface, dwFlags, ppSample); 
+    FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, dwFlags, ppSample);
 
     return S_FALSE;
 }
@@ -152,7 +152,7 @@ static HRESULT WINAPI IMediaStreamImpl_C
 {
     IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
 
-    FIXME("(%p/%p)->(%p,%lx,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample); 
+    FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample);
 
     return S_FALSE;
 }
@@ -161,7 +161,7 @@ static HRESULT WINAPI IMediaStreamImpl_S
 {
     IMediaStreamImpl *This = (IMediaStreamImpl *)iface;
 
-    FIXME("(%p/%p)->(%lx) stub!\n", This, iface, dwFlags); 
+    FIXME("(%p/%p)->(%x) stub!\n", This, iface, dwFlags);
 
     return S_FALSE;
 }