[PATCH 28/28] dlls/setupx.dll16: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/setupx.dll16/Makefile.in   |    1 -
 dlls/setupx.dll16/devinst16.c   |    2 +-
 dlls/setupx.dll16/setupx_main.c |    4 ++--
 dlls/setupx.dll16/virtcopy.c    |    6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in
index 3d7de3d3dff..d7d6555baf0 100644
--- a/dlls/setupx.dll16/Makefile.in
+++ b/dlls/setupx.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = setupx.dll16
 IMPORTS   = setupapi user32 advapi32
 
diff --git a/dlls/setupx.dll16/devinst16.c b/dlls/setupx.dll16/devinst16.c
index 55f38b021eb..9775c19329f 100644
--- a/dlls/setupx.dll16/devinst16.c
+++ b/dlls/setupx.dll16/devinst16.c
@@ -104,7 +104,7 @@ RETERR16 WINAPI DiCreateDeviceInfo16(LPLPDEVICE_INFO16 lplpdi,
                                      LPCSTR lpszClassName, HWND16 hwndParent)
 {
     LPDEVICE_INFO16 lpdi;
-    FIXME("(%p %s %08x %x %s %s %x): stub\n", lplpdi,
+    FIXME("(%p %s %08lx %x %s %s %x): stub\n", lplpdi,
           debugstr_a(lpszDescription), dnDevnode, hkey,
           debugstr_a(lpszRegsubkey), debugstr_a(lpszClassName), hwndParent);
     lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16));
diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c
index 9245ead9c59..19de9480ee3 100644
--- a/dlls/setupx.dll16/setupx_main.c
+++ b/dlls/setupx.dll16/setupx_main.c
@@ -86,7 +86,7 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName,
                                 LPDWORD lpdwReserved, LPDWORD lpdwType,
                                 LPBYTE lpbData, LPDWORD lpcbData )
 {
-    FIXME("(%p,%s,%p,%p,%p,%d), semi-stub.\n",hkey,debugstr_a(lpszValueName),
+    FIXME("(%p,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName),
           lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0);
     return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType,
                                lpbData, lpcbData );
@@ -608,7 +608,7 @@ RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath)
  */
 RETERR16 WINAPI DiInstallClass16(LPCSTR lpszInfFileName, DWORD dwFlags)
 {
-    FIXME("(%s, %u), stub.\n", lpszInfFileName, dwFlags);
+    FIXME("(%s, %lu), stub.\n", lpszInfFileName, dwFlags);
     return 0;
 }
 
diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c
index d6bcab6611f..552db5a9895 100644
--- a/dlls/setupx.dll16/virtcopy.c
+++ b/dlls/setupx.dll16/virtcopy.c
@@ -408,7 +408,7 @@ LPCSTR WINAPI VcpExplain16(LPVIRTNODE lpVn, DWORD dwWhat)
 	    }
 	    break;
 	default:
-            FIXME("%d unimplemented !\n", dwWhat);
+            FIXME("%ld unimplemented !\n", dwWhat);
 	    strcpy(buffer, "Unknown error");
 	    break;
     }
@@ -517,7 +517,7 @@ RETERR16 WINAPI vcpDefCallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam,
 {
     static int count = 0;
     if (count < 10)
-        FIXME("(%p, %04x, %04lx, %08lx, %08lx) - what to do here ?\n",
+        FIXME("(%p, %04x, %04x, %08lx, %08lx) - what to do here ?\n",
 		lpvObj, uMsg, wParam, lParam, lParamRef);
     count++;
     return OK;
@@ -669,7 +669,7 @@ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam,
     RETERR16 res = VCPN_OK;
 
     if (count < 5)
-        FIXME("(%p, %04x, %04lx, %08lx, %08lx) - semi-stub\n",
+        FIXME("(%p, %04x, %04x, %08lx, %08lx) - semi-stub\n",
 		lpvObj, uMsg, wParam, lParam, lParamRef);
     count++;
     switch (uMsg)