From 16e15913d9458b6ab072c555c87ff74f82753034 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Tue, 3 Oct 2006 23:38:46 +0200
Subject: [PATCH] dinput8: Win64 printf format warning fixes.

---
 dlls/dinput8/Makefile.in    | 1 -
 dlls/dinput8/dinput8_main.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index f7216602dae..f7e049b08b9 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = dinput8.dll
 IMPORTLIB = libdinput8.$(IMPLIBEXT)
 IMPORTS   = dinput ole32 advapi32 kernel32
 EXTRALIBS = -luuid -ldxguid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	dinput8_main.c
diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c
index f06e2a4bfa1..5b0e6348b7d 100644
--- a/dlls/dinput8/dinput8_main.c
+++ b/dlls/dinput8/dinput8_main.c
@@ -53,7 +53,7 @@ static void UnlockModule(void)
 HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) {
     HRESULT hr;
 
-    TRACE("hInst (%p), dwVersion: %ld, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);
+    TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);
 
     /* The specified version needs to be dinput8 (0x800) or higher */
     if(dwVersion < 0x800)
@@ -66,7 +66,7 @@ HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid,
     
     hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI);
     if(FAILED(hr)) {
-        ERR("CoCreateInstance failed with hr = %ld; Try running wineprefixcreate to fix it.\n", hr);
+        ERR("CoCreateInstance failed with hr = %d; Try running wineprefixcreate to fix it.\n", hr);
         return DIERR_INVALIDPARAM;
     }