From b4c6e46926f23c4d8ec8989e7c2c4a1901a3df62 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Sun, 8 Oct 2006 00:49:45 +0200
Subject: [PATCH] olesvr32: Win64 printf format warning fixes.

---
 dlls/olesvr32/Makefile.in   |  1 -
 dlls/olesvr32/olesvr_main.c | 30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in
index 5ea89a5bca9..3a234dde04e 100644
--- a/dlls/olesvr32/Makefile.in
+++ b/dlls/olesvr32/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = olesvr32.dll
 IMPORTLIB = libolesvr32.$(IMPLIBEXT)
 IMPORTS   = kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	olesvr_main.c
diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c
index 06a32df2d7e..3d22cb754a6 100644
--- a/dlls/olesvr32/olesvr_main.c
+++ b/dlls/olesvr32/olesvr_main.c
@@ -150,7 +150,7 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct,
  */
 OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
 {
-    FIXME("(%ld): stub\n",hServer);
+    FIXME("(%d): stub\n",hServer);
     return OLE_OK;
 }
 
@@ -159,7 +159,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
  */
 OLESTATUS WINAPI OleBlockServer(LHSERVER hServer)
 {
-    FIXME("(%ld): stub\n",hServer);
+    FIXME("(%d): stub\n",hServer);
     return OLE_OK;
 }
 
@@ -168,7 +168,7 @@ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer)
  */
 OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
 {
-    FIXME("(%ld): stub\n",hServer);
+    FIXME("(%d): stub\n",hServer);
     /* no more blocked messages :) */
     *block=FALSE;
     return OLE_OK;
@@ -179,7 +179,7 @@ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
  */
 OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block)
 {
-    FIXME("(%ld): stub\n",hServer);
+    FIXME("(%d): stub\n",hServer);
     /* no more blocked messages :) */
     *block=FALSE;
     return OLE_OK;
@@ -192,7 +192,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
                                          LPOLESERVERDOC document,
                                          LHSERVERDOC *hRet)
 {
-    FIXME("(%ld,%s): stub\n",hServer, docname);
+    FIXME("(%d,%s): stub\n",hServer, docname);
     *hRet=++OLE_current_handle;
     return OLE_OK;
 }
@@ -202,7 +202,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
  */
 OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
 {
-    FIXME("%ld  - stub\n",hServerDoc);
+    FIXME("%d  - stub\n",hServerDoc);
     return OLE_OK;
 }
 
@@ -211,7 +211,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
  */
 OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc)
 {
-    FIXME("(%ld): stub\n",hServerDoc);
+    FIXME("(%d): stub\n",hServerDoc);
     return OLE_OK;
 }
 
@@ -220,7 +220,7 @@ OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc)
  */
 OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer)
 {
-    FIXME("%ld - stub\n",hServer);
+    FIXME("%d - stub\n",hServer);
     return OLE_OK;
 }
 
@@ -240,7 +240,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname,
                                          LPOLESERVERDOC document,
                                          LHSERVERDOC *hRet)
 {
-    FIXME("(%ld,%s): stub\n", hServer, docname);
+    FIXME("(%d,%s): stub\n", hServer, docname);
     *hRet=++OLE_current_handle;
     return OLE_OK;
 }
@@ -251,7 +251,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname,
  */
 OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName)
 {
-    FIXME("(%ld,%s): stub.\n", hDoc, newName);
+    FIXME("(%d,%s): stub.\n", hDoc, newName);
     return OLE_OK;
 }
 
@@ -261,7 +261,7 @@ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName)
  */
 OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName)
 {
-    FIXME("(%ld,%s): stub.\n",hDoc, newName);
+    FIXME("(%d,%s): stub.\n",hDoc, newName);
     return OLE_OK;
 }
 
@@ -271,7 +271,7 @@ OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName)
  */
 OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc)
 {
-    FIXME("(%ld): stub.\n", hDoc);
+    FIXME("(%d): stub.\n", hDoc);
     return OLE_OK;
 }
 
@@ -281,7 +281,7 @@ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc)
  */
 OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc)
 {
-    FIXME("(%ld): stub.\n", hDoc);
+    FIXME("(%d): stub.\n", hDoc);
     return OLE_OK;
 }
 
@@ -291,7 +291,7 @@ OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc)
  */
 OLESTATUS WINAPI OleSavedServerDoc16(LHSERVERDOC hDoc)
 {
-    FIXME("(%ld): stub.\n", hDoc);
+    FIXME("(%d): stub.\n", hDoc);
     return OLE_OK;
 }
 
@@ -301,6 +301,6 @@ OLESTATUS WINAPI OleSavedServerDoc16(LHSERVERDOC hDoc)
  */
 OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc)
 {
-    FIXME("(%ld): stub.\n", hDoc);
+    FIXME("(%d): stub.\n", hDoc);
     return OLE_OK;
 }