olecli32: Win64 printf format warning fixes.

dlls/olecli32/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = olecli32.dll
 IMPORTLIB = libolecli32.$(IMPLIBEXT)
 IMPORTS   = ole32 gdi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	olecli_main.c

dlls/olecli32/olecli16.c

@@ -199,7 +199,7 @@ static LONG OLE_current_handle;
  */
 OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc)
 {
-    FIXME("(%ld: stub\n", hDoc);
+    FIXME("(%d: stub\n", hDoc);
     return OLE_OK;
 }
 
@@ -219,7 +219,7 @@ OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
  */
 OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
 {
-    FIXME("(%ld,%s,...): stub\n",hDoc, newName);
+    FIXME("(%d,%s,...): stub\n",hDoc, newName);
     return OLE_OK;
 }
 
@@ -228,7 +228,7 @@ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
  */
 OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
 {
-    FIXME("(%ld): stub\n",hServerDoc);
+    FIXME("(%d): stub\n",hServerDoc);
     return OLE_OK;
 }
 
@@ -237,7 +237,7 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
  */
 OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
 {
-    FIXME("(%ld): stub\n", hServerDoc);
+    FIXME("(%d): stub\n", hServerDoc);
     return OLE_OK;
 }
 
@@ -246,7 +246,7 @@ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
  */
 OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data)
 {
-    FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
+    FIXME("(%d, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
 	LOWORD(data));
     return OLE_OK;
 }
@@ -258,7 +258,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDO
                                           LPCSTR xname, SEGPTR lpoleob, UINT16 render,
                                           UINT16 clipformat )
 {
-	FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
+	FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n",
               name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob),
               LOWORD(lpoleob), render, clipformat);
 	return OLE_OK;
@@ -305,7 +305,7 @@ OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hc
                                       LPCSTR xname, SEGPTR lpoleob,
                                       UINT16 render, UINT16 clipformat )
 {
-	FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
+	FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n",
               name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob),
               LOWORD(lpoleob), render, clipformat);
 	return OLE_OK;

dlls/olecli32/olecli_main.c

@@ -199,7 +199,7 @@ static LONG OLE_current_handle;
  */
 OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc)
 {
-    FIXME("(%ld: stub\n", hDoc);
+    FIXME("(%d: stub\n", hDoc);
     return OLE_OK;
 }
 
@@ -219,7 +219,7 @@ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
  */
 OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
 {
-    FIXME("(%ld,%s,...): stub\n",hDoc, newName);
+    FIXME("(%d,%s,...): stub\n",hDoc, newName);
     return OLE_OK;
 }
 
@@ -228,7 +228,7 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
  */
 OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
 {
-    FIXME("(%ld): stub\n",hServerDoc);
+    FIXME("(%d): stub\n",hServerDoc);
     return OLE_OK;
 }
 
@@ -239,7 +239,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip(
 	LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
 	_LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat
 ) {
-	FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
+	FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n",
 	      name,olecli,hclientdoc,xname,lpoleob,render,clipformat);
 	return OLE_OK;
 }
@@ -248,7 +248,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip(
  *           OleQueryLinkFromClip	[OLECLI32.9]
  */
 OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
-	FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat);
+	FIXME("(%s,%d,%d): stub!\n",name,render,clipformat);
 	return OLE_OK;
 }
 
@@ -256,7 +256,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFO
  *           OleQueryCreateFromClip	[OLECLI32.10]
  */
 OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
-	FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat);
+	FIXME("(%s,%d,%d): stub!\n",name,render,clipformat);
 	return OLE_OK;
 }
 
@@ -296,7 +296,7 @@ OLESTATUS WINAPI OleCreateFromClip(
 	LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
 	_LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat
 ) {
-	FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
+	FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n",
 	      name,olecli,hclientdoc,xname,lpoleob,render,clipformat);
 	/* clipb type, object kreieren entsprechend etc. */
 	return OLE_OK;