[PATCH 27/28] dlls/setupapi: enable compilation with long types

Eric Pouech eric.pouech at gmail.com
Thu Feb 17 00:13:03 CST 2022


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

---
 dlls/setupapi/Makefile.in   |    2 -
 dlls/setupapi/devinst.c     |  160 ++++++++++++++++++++++---------------------
 dlls/setupapi/dialog.c      |    6 +-
 dlls/setupapi/dirid.c       |    4 +
 dlls/setupapi/diskspace.c   |    2 -
 dlls/setupapi/fakedll.c     |   16 ++--
 dlls/setupapi/install.c     |   18 ++---
 dlls/setupapi/misc.c        |   16 ++--
 dlls/setupapi/parser.c      |   10 +--
 dlls/setupapi/query.c       |   24 +++---
 dlls/setupapi/queue.c       |   32 ++++-----
 dlls/setupapi/setupcab.c    |    4 +
 dlls/setupapi/stringtable.c |   14 ++--
 dlls/setupapi/stubs.c       |  100 +++++++++++++--------------
 14 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index f37ec8402cb..d1b647cd5e5 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SETUPAPI_
+EXTRADEFS = -D_SETUPAPI_
 MODULE    = setupapi.dll
 IMPORTLIB = setupapi
 IMPORTS   = uuid version advapi32 rpcrt4 kernelbase
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index ecc0b58ca5c..77fa26726cc 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -273,7 +273,7 @@ static struct device *get_devnode_device(DEVINST devnode)
     if (devnode < devnode_table_size)
         return devnode_table[devnode];
 
-    WARN("device node %u not found\n", devnode);
+    WARN("device node %lu not found\n", devnode);
     return NULL;
 }
 
@@ -553,7 +553,7 @@ static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key)
     if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0,
             KEY_CREATE_SUB_KEY, NULL, &class_key, NULL)))
     {
-        ERR("Failed to open driver class root key, error %u.\n", l);
+        ERR("Failed to open driver class root key, error %lu.\n", l);
         return l;
     }
 
@@ -564,7 +564,7 @@ static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key)
             RegCloseKey(class_key);
             return l;
         }
-        TRACE("Failed to open driver key, error %u.\n", l);
+        TRACE("Failed to open driver key, error %lu.\n", l);
     }
 
     RegCloseKey(class_key);
@@ -587,7 +587,7 @@ static LONG create_driver_key(struct device *device, HKEY *key)
     if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0,
             KEY_CREATE_SUB_KEY, NULL, &class_key, NULL)))
     {
-        ERR("Failed to open driver class root key, error %u.\n", l);
+        ERR("Failed to open driver class root key, error %lu.\n", l);
         return l;
     }
 
@@ -608,7 +608,7 @@ static LONG create_driver_key(struct device *device, HKEY *key)
         }
         RegCloseKey(*key);
     }
-    ERR("Failed to create driver key, error %u.\n", l);
+    ERR("Failed to create driver key, error %lu.\n", l);
     RegCloseKey(class_key);
     return l;
 }
@@ -704,7 +704,7 @@ static void remove_all_device_ifaces(struct device *device)
 
     if ((ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, DeviceClasses, 0, KEY_READ, &classes_key)))
     {
-        WARN("Failed to open classes key, error %u.\n", ret);
+        WARN("Failed to open classes key, error %lu.\n", ret);
         return;
     }
 
@@ -717,13 +717,13 @@ static void remove_all_device_ifaces(struct device *device)
         len = ARRAY_SIZE(class_name);
         if ((ret = RegEnumKeyExW(classes_key, i, class_name, &len, NULL, NULL, NULL, NULL)))
         {
-            if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate classes, error %u.\n", ret);
+            if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate classes, error %lu.\n", ret);
             break;
         }
 
         if ((ret = RegOpenKeyExW(classes_key, class_name, 0, KEY_READ, &class_key)))
         {
-            ERR("Failed to open class %s, error %u.\n", debugstr_w(class_name), ret);
+            ERR("Failed to open class %s, error %lu.\n", debugstr_w(class_name), ret);
             continue;
         }
 
@@ -735,20 +735,20 @@ static void remove_all_device_ifaces(struct device *device)
             len = ARRAY_SIZE(iface_name);
             if ((ret = RegEnumKeyExW(class_key, j, iface_name, &len, NULL, NULL, NULL, NULL)))
             {
-                if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate interfaces, error %u.\n", ret);
+                if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate interfaces, error %lu.\n", ret);
                 break;
             }
 
             if ((ret = RegOpenKeyExW(class_key, iface_name, 0, KEY_ALL_ACCESS, &iface_key)))
             {
-                ERR("Failed to open interface %s, error %u.\n", debugstr_w(iface_name), ret);
+                ERR("Failed to open interface %s, error %lu.\n", debugstr_w(iface_name), ret);
                 continue;
             }
 
             len = sizeof(device_name);
             if ((ret = RegQueryValueExW(iface_key, L"DeviceInstance", NULL, NULL, (BYTE *)device_name, &len)))
             {
-                ERR("Failed to query device instance, error %u.\n", ret);
+                ERR("Failed to query device instance, error %lu.\n", ret);
                 RegCloseKey(iface_key);
                 continue;
             }
@@ -756,9 +756,9 @@ static void remove_all_device_ifaces(struct device *device)
             if (!wcsicmp(device_name, device->instanceId))
             {
                 if ((ret = RegDeleteTreeW(iface_key, NULL)))
-                    ERR("Failed to delete interface %s subkeys, error %u.\n", debugstr_w(iface_name), ret);
+                    ERR("Failed to delete interface %s subkeys, error %lu.\n", debugstr_w(iface_name), ret);
                 if ((ret = RegDeleteKeyW(iface_key, L"")))
-                    ERR("Failed to delete interface %s, error %u.\n", debugstr_w(iface_name), ret);
+                    ERR("Failed to delete interface %s, error %lu.\n", debugstr_w(iface_name), ret);
             }
 
             RegCloseKey(iface_key);
@@ -1030,7 +1030,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExW(
 			       NULL,
 			       NULL,
 			       NULL);
-	TRACE("RegEnumKeyExW() returns %d\n", lError);
+	TRACE("RegEnumKeyExW() returns %ld\n", lError);
 	if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA)
 	{
 	    TRACE("Key name: %p\n", szKeyName);
@@ -1230,7 +1230,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW(
 			       NULL,
 			       NULL,
 			       NULL);
-	TRACE("RegEnumKeyExW() returns %d\n", lError);
+	TRACE("RegEnumKeyExW() returns %ld\n", lError);
 	if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA)
 	{
 	    TRACE("Key name: %p\n", szKeyName);
@@ -1527,7 +1527,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyA(
     PWSTR InfSectionNameW = NULL;
     HKEY key;
 
-    TRACE("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope,
+    TRACE("%p %p %ld %ld %ld %p %s\n", DeviceInfoSet, DeviceInfoData, Scope,
             HwProfile, KeyType, InfHandle, debugstr_a(InfSectionName));
 
     if (InfHandle)
@@ -1559,7 +1559,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da
     HKEY key = INVALID_HANDLE_VALUE;
     LONG l;
 
-    TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, inf_handle %p, inf_section %s.\n",
+    TRACE("devinfo %p, device_data %p, scope %ld, profile %ld, type %ld, inf_handle %p, inf_section %s.\n",
             devinfo, device_data, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName));
 
     if (!(device = get_device(devinfo, device_data)))
@@ -1581,7 +1581,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da
         return INVALID_HANDLE_VALUE;
     }
     if (Scope != DICS_FLAG_GLOBAL)
-        FIXME("unimplemented for scope %d\n", Scope);
+        FIXME("unimplemented for scope %ld\n", Scope);
     switch (KeyType)
     {
         case DIREG_DEV:
@@ -1592,7 +1592,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da
             l = create_driver_key(device, &key);
             break;
         default:
-            FIXME("Unhandled type %#x.\n", KeyType);
+            FIXME("Unhandled type %#lx.\n", KeyType);
             l = ERROR_CALL_NOT_IMPLEMENTED;
     }
     if (InfHandle)
@@ -1649,7 +1649,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const
     struct device *device;
     LONG l;
 
-    TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n",
+    TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#lx, device_data %p.\n",
             devinfo, debugstr_w(name), debugstr_guid(class), debugstr_w(description),
             parent, flags, device_data);
 
@@ -1756,7 +1756,7 @@ BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_
 {
     struct device *device;
 
-    TRACE("devinfo %p, data %p, flags %#x, compare_proc %p, context %p, duplicate_data %p.\n",
+    TRACE("devinfo %p, data %p, flags %#lx, compare_proc %p, context %p, duplicate_data %p.\n",
             devinfo, device_data, flags, compare_proc, context, duplicate_data);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -1801,7 +1801,7 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
     {
         SERVICE_STATUS status;
         if (!ControlService(service, SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES, &status))
-            ERR("Failed to control service %s, error %u.\n", debugstr_w(service_name), GetLastError());
+            ERR("Failed to control service %s, error %lu.\n", debugstr_w(service_name), GetLastError());
         CloseServiceHandle(service);
     }
     CloseServiceHandle(manager);
@@ -1873,7 +1873,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD inde
     struct device *device;
     DWORD i = 0;
 
-    TRACE("devinfo %p, index %d, device_data %p\n", devinfo, index, device_data);
+    TRACE("devinfo %p, index %ld, device_data %p\n", devinfo, index, device_data);
 
     if (!(set = get_device_set(devinfo)))
         return FALSE;
@@ -1911,7 +1911,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO devinfo, SP_DEVINFO_DATA *devic
 {
     WCHAR idW[MAX_DEVICE_ID_LEN];
 
-    TRACE("devinfo %p, device_data %p, id %p, size %d, needed %p.\n",
+    TRACE("devinfo %p, device_data %p, id %p, size %ld, needed %p.\n",
             devinfo, device_data, id, size, needed);
 
     if (!SetupDiGetDeviceInstanceIdW(devinfo, device_data, idW, ARRAY_SIZE(idW), NULL))
@@ -1935,7 +1935,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic
 {
     struct device *device;
 
-    TRACE("devinfo %p, device_data %p, DeviceInstanceId %p, DeviceInstanceIdSize %d, RequiredSize %p.\n",
+    TRACE("devinfo %p, device_data %p, DeviceInstanceId %p, DeviceInstanceIdSize %ld, RequiredSize %p.\n",
             devinfo, device_data, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -2010,7 +2010,7 @@ BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF hinf, const WCHAR *section,
     DWORD full_len;
     LONG line_count = -1;
 
-    TRACE("hinf %p, section %s, altplatform %p, ext %p, size %d, needed %p, extptr %p, reserved %p.\n",
+    TRACE("hinf %p, section %s, altplatform %p, ext %p, size %ld, needed %p, extptr %p, reserved %p.\n",
             hinf, debugstr_w(section), altplatform, section_ext, size, needed, extptr, reserved);
 
     if (altplatform)
@@ -2127,7 +2127,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA(
                                      Reserved);
     if (hKey == INVALID_HANDLE_VALUE)
     {
-	WARN("SetupDiOpenClassRegKeyExA() failed (Error %u)\n", GetLastError());
+	WARN("SetupDiOpenClassRegKeyExA() failed (Error %lu)\n", GetLastError());
 	return FALSE;
     }
 
@@ -2161,7 +2161,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW(
                                      Reserved);
     if (hKey == INVALID_HANDLE_VALUE)
     {
-	WARN("SetupDiOpenClassRegKeyExW() failed (Error %u)\n", GetLastError());
+	WARN("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError());
 	return FALSE;
     }
 
@@ -2371,7 +2371,7 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet,
     HKEY interfacesKey = SetupDiOpenClassRegKeyExW(guid, KEY_READ,
             DIOCR_INTERFACE, NULL, NULL);
 
-    TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(guid),
+    TRACE("%p, %s, %s, %08lx\n", DeviceInfoSet, debugstr_guid(guid),
             debugstr_w(enumstr), flags);
 
     if (interfacesKey != INVALID_HANDLE_VALUE)
@@ -2520,7 +2520,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
     HKEY enumKey;
     LONG l;
 
-    TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(class),
+    TRACE("%p, %s, %s, %08lx\n", DeviceInfoSet, debugstr_guid(class),
             debugstr_w(enumstr), flags);
 
     l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL,
@@ -2603,7 +2603,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p
     static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PROFILE;
     HDEVINFO set;
 
-    TRACE("%s %s %p 0x%08x %p %s %p\n", debugstr_guid(class),
+    TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class),
             debugstr_w(enumstr), parent, flags, deviceset, debugstr_w(machine),
             reserved);
 
@@ -2616,7 +2616,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p
         class = NULL;
 
     if (flags & unsupportedFlags)
-        WARN("unsupported flags %08x\n", flags & unsupportedFlags);
+        WARN("unsupported flags %08lx\n", flags & unsupportedFlags);
     if (deviceset)
         set = deviceset;
     else
@@ -2696,7 +2696,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceA(
     BOOL ret;
     LPWSTR ReferenceStringW = NULL;
 
-    TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData,
+    TRACE("%p %p %s %s %08lx %p\n", DeviceInfoSet, DeviceInfoData,
             debugstr_guid(InterfaceClassGuid), debugstr_a(ReferenceString),
             CreationFlags, DeviceInterfaceData);
 
@@ -2724,7 +2724,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO devinfo, SP_DEVINFO_DATA *dev
     struct device *device;
     struct device_iface *iface;
 
-    TRACE("devinfo %p, device_data %p, class %s, refstr %s, flags %#x, iface_data %p.\n",
+    TRACE("devinfo %p, device_data %p, class %s, refstr %s, flags %#lx, iface_data %p.\n",
             devinfo, device_data, debugstr_guid(class), debugstr_w(refstr), flags, iface_data);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -2766,7 +2766,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(
     HKEY key;
     PWSTR InfSectionNameW = NULL;
 
-    TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved,
+    TRACE("%p %p %ld %08lx %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved,
             samDesired, InfHandle, InfSectionName);
     if (InfHandle)
     {
@@ -2802,7 +2802,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo,
     HKEY params_key;
     LONG ret;
 
-    TRACE("devinfo %p, iface_data %p, reserved %d, access %#x, hinf %p, section %s.\n",
+    TRACE("devinfo %p, iface_data %p, reserved %ld, access %#lx, hinf %p, section %s.\n",
             devinfo, iface_data, reserved, access, hinf, debugstr_w(section));
 
     if (!(iface = get_device_iface(devinfo, iface_data)))
@@ -2833,7 +2833,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo,
     struct device_iface *iface;
     LONG ret;
 
-    TRACE("devinfo %p, iface_data %p, reserved %d.\n", devinfo, iface_data, reserved);
+    TRACE("devinfo %p, iface_data %p, reserved %ld.\n", devinfo, iface_data, reserved);
 
     if (!(iface = get_device_iface(devinfo, iface_data)))
         return FALSE;
@@ -2880,7 +2880,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO devinfo,
     struct device_iface *iface;
     DWORD i = 0;
 
-    TRACE("devinfo %p, device_data %p, class %s, index %u, iface_data %p.\n",
+    TRACE("devinfo %p, device_data %p, class %s, index %lu, iface_data %p.\n",
             devinfo, device_data, debugstr_guid(class), index, iface_data);
 
     if (!iface_data || iface_data->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA))
@@ -2980,7 +2980,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA
     DWORD bytesNeeded = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]);
     BOOL ret = FALSE;
 
-    TRACE("devinfo %p, iface_data %p, detail_data %p, size %d, needed %p, device_data %p.\n",
+    TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, needed %p, device_data %p.\n",
             devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize,
             RequiredSize, device_data);
 
@@ -3040,7 +3040,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA
         + sizeof(WCHAR); /* include NULL terminator */
     BOOL ret = FALSE;
 
-    TRACE("devinfo %p, iface_data %p, detail_data %p, size %d, needed %p, device_data %p.\n",
+    TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, needed %p, device_data %p.\n",
             devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize,
             RequiredSize, device_data);
 
@@ -3094,7 +3094,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO devinfo,
     BOOL ret = FALSE;
     struct device *device;
 
-    TRACE("devinfo %p, device_data %p, property %d, type %p, buffer %p, size %d, required %p\n",
+    TRACE("devinfo %p, device_data %p, property %ld, type %p, buffer %p, size %ld, required %p\n",
             devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -3136,7 +3136,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO devinfo,
     BOOL ret = FALSE;
     struct device *device;
 
-    TRACE("devinfo %p, device_data %p, prop %d, type %p, buffer %p, size %d, required %p\n",
+    TRACE("devinfo %p, device_data %p, prop %ld, type %p, buffer %p, size %ld, required %p\n",
             devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -3177,7 +3177,7 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO devinfo, SP_DEVINFO_DATA
     BOOL ret = FALSE;
     struct device *device;
 
-    TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n",
+    TRACE("devinfo %p, device_data %p, prop %ld, buffer %p, size %ld.\n",
             devinfo, device_data, Property, PropertyBuffer, PropertyBufferSize);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -3204,7 +3204,7 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO devinfo,
 {
     struct device *device;
 
-    TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n",
+    TRACE("devinfo %p, device_data %p, prop %ld, buffer %p, size %ld.\n",
             devinfo, device_data, prop, buffer, size);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -3544,7 +3544,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO devinfo, PCSTR instance_id, HWND hwn
 {
     WCHAR instance_idW[MAX_DEVICE_ID_LEN];
 
-    TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data);
+    TRACE("%p %s %p 0x%08lx %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data);
 
     if (!instance_id || strlen(instance_id) >= MAX_DEVICE_ID_LEN)
     {
@@ -3572,7 +3572,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hw
     DWORD size;
     DWORD error = ERROR_NO_SUCH_DEVINST;
 
-    TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data);
+    TRACE("%p %s %p 0x%08lx %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data);
 
     if (!(set = get_device_set(devinfo)))
         return FALSE;
@@ -3587,7 +3587,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hw
         FIXME("hwnd_parent unsupported\n");
 
     if (flags)
-        FIXME("flags unsupported: 0x%08x\n", flags);
+        FIXME("flags unsupported: 0x%08lx\n", flags);
 
     RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &enumKey, NULL);
     /* Instance needs to be already existent in registry, if not, report ERROR_NO_SUCH_DEVINST */
@@ -3641,7 +3641,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceW(
        DWORD OpenFlags,
        PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
 {
-    FIXME("%p %s %08x %p\n",
+    FIXME("%p %s %08lx %p\n",
         DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData);
     return FALSE;
 }
@@ -3655,7 +3655,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA(
        DWORD OpenFlags,
        PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
 {
-    FIXME("%p %s %08x %p\n", DeviceInfoSet,
+    FIXME("%p %s %08lx %p\n", DeviceInfoSet,
         debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData);
     return FALSE;
 }
@@ -3670,7 +3670,7 @@ HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO devinfo, PSP_DEVICE_INTERF
     LSTATUS lr;
     HKEY key;
 
-    TRACE("devinfo %p, iface_data %p, reserved %d, access %#x.\n", devinfo, iface_data, reserved, access);
+    TRACE("devinfo %p, iface_data %p, reserved %ld, access %#lx.\n", devinfo, iface_data, reserved, access);
 
     if (!(iface = get_device_iface(devinfo, iface_data)))
         return INVALID_HANDLE_VALUE;
@@ -3694,7 +3694,7 @@ BOOL WINAPI SetupDiSetClassInstallParamsA(
        PSP_CLASSINSTALL_HEADER ClassInstallParams,
        DWORD ClassInstallParamsSize)
 {
-    FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData,
+    FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData,
           ClassInstallParams->InstallFunction, ClassInstallParamsSize);
     return FALSE;
 }
@@ -3708,7 +3708,7 @@ BOOL WINAPI SetupDiSetClassInstallParamsW(
        PSP_CLASSINSTALL_HEADER ClassInstallParams,
        DWORD ClassInstallParamsSize)
 {
-    FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData,
+    FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData,
           ClassInstallParams->InstallFunction, ClassInstallParamsSize);
     return FALSE;
 }
@@ -3743,12 +3743,12 @@ static BOOL call_coinstallers(WCHAR *list, DI_FUNCTION function, HDEVINFO devinf
                 memset(&coinst_ctx, 0, sizeof(coinst_ctx));
                 TRACE("Calling co-installer %p.\n", coinst_proc);
                 ret = coinst_proc(function, devinfo, device_data, &coinst_ctx);
-                TRACE("Co-installer %p returned %#x.\n", coinst_proc, ret);
+                TRACE("Co-installer %p returned %#lx.\n", coinst_proc, ret);
                 if (ret == ERROR_DI_POSTPROCESSING_REQUIRED)
                     FIXME("Co-installer postprocessing not implemented.\n");
                 else if (ret)
                 {
-                    ERR("Co-installer returned error %#x.\n", ret);
+                    ERR("Co-installer returned error %#lx.\n", ret);
                     FreeLibrary(module);
                     SetLastError(ret);
                     return FALSE;
@@ -3841,7 +3841,7 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP
                     {
                         TRACE("Calling class installer %p.\n", classinst_proc);
                         ret = classinst_proc(function, devinfo, device_data);
-                        TRACE("Class installer %p returned %#x.\n", classinst_proc, ret);
+                        TRACE("Class installer %p returned %#lx.\n", classinst_proc, ret);
                     }
                     FreeLibrary(module);
                 }
@@ -3997,7 +3997,7 @@ BOOL WINAPI SetupDiSetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_
     WCHAR property_hkey_path[44];
     LSTATUS ls;
 
-    TRACE("%p %p %p %#x %p %d %#x\n", devinfo, device_data, key, type, buffer, size, flags);
+    TRACE("%p %p %p %#lx %p %ld %#lx\n", devinfo, device_data, key, type, buffer, size, flags);
 
     if (!(device = get_device(devinfo, device_data)))
         return FALSE;
@@ -4076,7 +4076,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data,
     HKEY key = INVALID_HANDLE_VALUE;
     LONG l;
 
-    TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, access %#x.\n",
+    TRACE("devinfo %p, device_data %p, scope %ld, profile %ld, type %ld, access %#lx.\n",
             devinfo, device_data, Scope, HwProfile, KeyType, samDesired);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -4099,7 +4099,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data,
         return INVALID_HANDLE_VALUE;
     }
     if (Scope != DICS_FLAG_GLOBAL)
-        FIXME("unimplemented for scope %d\n", Scope);
+        FIXME("unimplemented for scope %ld\n", Scope);
     switch (KeyType)
     {
         case DIREG_DEV:
@@ -4109,7 +4109,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data,
             l = open_driver_key(device, samDesired, &key);
             break;
         default:
-            FIXME("Unhandled type %#x.\n", KeyType);
+            FIXME("Unhandled type %#lx.\n", KeyType);
             l = ERROR_CALL_NOT_IMPLEMENTED;
     }
     SetLastError(l == ERROR_FILE_NOT_FOUND ? ERROR_KEY_DOES_NOT_EXIST : l);
@@ -4125,7 +4125,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
     struct device *device;
     LONG l;
 
-    TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d.\n",
+    TRACE("devinfo %p, device_data %p, scope %ld, profile %ld, type %ld.\n",
             devinfo, device_data, Scope, HwProfile, KeyType);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -4148,7 +4148,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
         return FALSE;
     }
     if (Scope != DICS_FLAG_GLOBAL)
-        FIXME("unimplemented for scope %d\n", Scope);
+        FIXME("unimplemented for scope %ld\n", Scope);
     switch (KeyType)
     {
         case DIREG_DRV:
@@ -4162,7 +4162,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
             l = RegDeleteKeyW(device->key, DeviceParameters);
             break;
         default:
-            FIXME("Unhandled type %#x.\n", KeyType);
+            FIXME("Unhandled type %#lx.\n", KeyType);
             l = ERROR_CALL_NOT_IMPLEMENTED;
     }
     SetLastError(l);
@@ -4176,7 +4176,7 @@ CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST devnode, char *buffer, ULONG len, ULO
 {
     struct device *device = get_devnode_device(devnode);
 
-    TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags);
+    TRACE("%lu, %p, %lu, %#lx\n", devnode, buffer, len, flags);
 
     if (!device)
         return CR_NO_SUCH_DEVINST;
@@ -4193,7 +4193,7 @@ CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST devnode, WCHAR *buffer, ULONG len, UL
 {
     struct device *device = get_devnode_device(devnode);
 
-    TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags);
+    TRACE("%lu, %p, %lu, %#lx\n", devnode, buffer, len, flags);
 
     if (!device)
         return CR_NO_SUCH_DEVINST;
@@ -4210,7 +4210,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size(ULONG *len, DEVINST devnode, ULONG flags)
 {
     struct device *device = get_devnode_device(devnode);
 
-    TRACE("%p, %u, %#x\n", len, devnode, flags);
+    TRACE("%p, %lu, %#lx\n", len, devnode, flags);
 
     if (!device)
         return CR_NO_SUCH_DEVINST;
@@ -4386,7 +4386,7 @@ static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop
     default:
         *prop_type = DEVPROP_TYPE_EMPTY;
         value_size = 0;
-        FIXME("Unhandled error %#x\n", ls);
+        FIXME("Unhandled error %#lx\n", ls);
         break;
     }
 
@@ -4406,7 +4406,7 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_
     struct device *device;
     LSTATUS ls;
 
-    TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size,
+    TRACE("%p, %p, %p, %p, %p, %ld, %p, %#lx\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size,
           required_size, flags);
 
     if (!(device = get_device(devinfo, device_data)))
@@ -4427,7 +4427,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *
     struct device *device = get_devnode_device(devnode);
     LSTATUS ls;
 
-    TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size,
+    TRACE("%lu, %p, %p, %p, %p, %#lx, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size,
           flags, machine);
 
     if (machine)
@@ -4517,13 +4517,13 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO devinfo, SP_DEVINFO_DATA *de
 
             if (!(iface = SETUPDI_CreateDeviceInterface(device, &iface_guid, refstr)))
             {
-                ERR("Failed to create device interface, error %#x.\n", GetLastError());
+                ERR("Failed to create device interface, error %#lx.\n", GetLastError());
                 continue;
             }
 
             if ((l = create_iface_key(iface, KEY_ALL_ACCESS, &iface_key)))
             {
-                ERR("Failed to create interface key, error %u.\n", l);
+                ERR("Failed to create interface key, error %lu.\n", l);
                 continue;
             }
 
@@ -4708,7 +4708,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa
                 SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL);
                 SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL);
 
-                TRACE("Found compatible driver: rank %#x manufacturer %s, desc %s.\n",
+                TRACE("Found compatible driver: rank %#lx manufacturer %s, desc %s.\n",
                         driver.rank, debugstr_w(driver.manufacturer), debugstr_w(driver.description));
 
                 driver_count++;
@@ -4731,11 +4731,11 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device
 {
     struct device *device;
 
-    TRACE("devinfo %p, device_data %p, type %#x.\n", devinfo, device_data, type);
+    TRACE("devinfo %p, device_data %p, type %#lx.\n", devinfo, device_data, type);
 
     if (type != SPDIT_COMPATDRIVER)
     {
-        FIXME("Unhandled type %#x.\n", type);
+        FIXME("Unhandled type %#lx.\n", type);
         SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
         return FALSE;
     }
@@ -4832,12 +4832,12 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
 {
     struct device *device;
 
-    TRACE("devinfo %p, device_data %p, type %#x, index %u, driver_data %p.\n",
+    TRACE("devinfo %p, device_data %p, type %#lx, index %lu, driver_data %p.\n",
             devinfo, device_data, type, index, driver_data);
 
     if (type != SPDIT_COMPATDRIVER)
     {
-        FIXME("Unhandled type %#x.\n", type);
+        FIXME("Unhandled type %#lx.\n", type);
         SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
         return FALSE;
     }
@@ -4898,7 +4898,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device
         best = device->drivers + i;
     }
 
-    TRACE("selected driver: rank %#x manufacturer %s, desc %s.\n",
+    TRACE("selected driver: rank %#lx manufacturer %s, desc %s.\n",
             best->rank, debugstr_w(best->manufacturer), debugstr_w(best->description));
 
     device->selected_driver = best;
@@ -4953,7 +4953,7 @@ BOOL WINAPI SetupDiGetDriverInfoDetailW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic
     HANDLE file;
     HINF hinf;
 
-    TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %u, ret_size %p.\n",
+    TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %lu, ret_size %p.\n",
             devinfo, device_data, driver_data, detail_data, size, ret_size);
 
     if ((detail_data || size) && size < sizeof(SP_DRVINFO_DETAIL_DATA_W))
@@ -5026,7 +5026,7 @@ BOOL WINAPI SetupDiGetDriverInfoDetailA(HDEVINFO devinfo, SP_DEVINFO_DATA *devic
     HANDLE file;
     HINF hinf;
 
-    TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %u, ret_size %p.\n",
+    TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %lu, ret_size %p.\n",
             devinfo, device_data, driver_data, detail_data, size, ret_size);
 
     if ((detail_data || size) && size < sizeof(SP_DRVINFO_DETAIL_DATA_A))
@@ -5261,12 +5261,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
 
             if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING)
             {
-                ERR("Failed to start service %s for device %s, error %u.\n",
+                ERR("Failed to start service %s for device %s, error %lu.\n",
                         debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError());
             }
             if (!ControlService(service, SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES, &status))
             {
-                ERR("Failed to control service %s for device %s, error %u.\n",
+                ERR("Failed to control service %s for device %s, error %lu.\n",
                         debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError());
             }
             CloseServiceHandle(service);
diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c
index 494525f11a7..5a0eadcb760 100644
--- a/dlls/setupapi/dialog.c
+++ b/dlls/setupapi/dialog.c
@@ -101,7 +101,7 @@ static void promptdisk_ok(HWND hwnd, struct promptdisk_params *params)
     if(params->PathRequiredSize)
     {
         *params->PathRequiredSize = requiredSize;
-        TRACE("returning PathRequiredSize=%d\n",*params->PathRequiredSize);
+        TRACE("returning PathRequiredSize=%ld\n",*params->PathRequiredSize);
     }
     if(!params->PathBuffer)
     {
@@ -187,7 +187,7 @@ UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskNa
     WCHAR *FileSoughtW, *TagFileW, PathBufferW[MAX_PATH];
     UINT ret, length;
 
-    TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_a(DialogTitle),
+    TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_a(DialogTitle),
           debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought),
           debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize,
           PathRequiredSize);
@@ -231,7 +231,7 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk
     struct promptdisk_params params;
     UINT ret;
 
-    TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_w(DialogTitle),
+    TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_w(DialogTitle),
           debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought),
           debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize,
           PathRequiredSize);
diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c
index b28e8b9dffd..a044652773f 100644
--- a/dlls/setupapi/dirid.c
+++ b/dlls/setupapi/dirid.c
@@ -180,7 +180,7 @@ static const WCHAR *create_printer_dirid( DWORD dirid )
         return create_system_dirid( DIRID_COLOR );
     case 66004:  /* asp files directory */
     default:
-        FIXME( "unsupported dirid %d\n", dirid );
+        FIXME( "unsupported dirid %ld\n", dirid );
         return get_unknown_dirid();
     }
     len = (lstrlenW(buffer) + 1) * sizeof(WCHAR);
@@ -195,7 +195,7 @@ static const WCHAR *get_csidl_dir( DWORD csidl )
 
     if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE ))
     {
-        FIXME( "CSIDL %x not found\n", csidl );
+        FIXME( "CSIDL %lx not found\n", csidl );
         return get_unknown_dirid();
     }
     len = (lstrlenW(buffer) + 1) * sizeof(WCHAR);
diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c
index f5e79d5327c..f7f6a22ce2d 100644
--- a/dlls/setupapi/diskspace.c
+++ b/dlls/setupapi/diskspace.c
@@ -53,7 +53,7 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT
     WCHAR *ptr;
     LPDISKSPACELIST list=NULL;
 
-    TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags);
+    TRACE("(%p, %lu, 0x%08x)\n", Reserved1, Reserved2, Flags);
 
     if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK)
     {
diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c
index a4b8df4dfb4..075e12f5629 100644
--- a/dlls/setupapi/fakedll.c
+++ b/dlls/setupapi/fakedll.c
@@ -395,7 +395,7 @@ static void create_directories( const WCHAR *name )
     {
         *p = 0;
         if (!CreateDirectoryW(path, NULL))
-            TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError());
+            TRACE("Couldn't create directory %s - error: %ld\n", wine_dbgstr_w(path), GetLastError());
         *p = '\\';
         p = wcschr(p+1, '\\');
     }
@@ -507,7 +507,7 @@ static HANDLE create_dest_file( const WCHAR *name, BOOL delete )
 
         h = CreateFileW( name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL );
         if (h == INVALID_HANDLE_VALUE)
-            ERR( "failed to create %s (error=%u)\n", debugstr_w(name), GetLastError() );
+            ERR( "failed to create %s (error=%lu)\n", debugstr_w(name), GetLastError() );
     }
     return h;
 }
@@ -697,7 +697,7 @@ static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const x
     {
         TRACE( "creating %s\n", debugstr_w(path) );
         ret = (WriteFile( handle, data, len, &written, NULL ) && written == len);
-        if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(path), GetLastError() );
+        if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(path), GetLastError() );
         CloseHandle( handle );
         if (!ret) DeleteFileW( path );
     }
@@ -868,7 +868,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size,
 
         if (!registrar)
         {
-            ERR( "failed to create IRegistrar: %x\n", hr );
+            ERR( "failed to create IRegistrar: %lx\n", hr );
             return;
         }
     }
@@ -879,7 +879,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size,
     GetEnvironmentVariableW( L"SystemRoot", buffer, ARRAY_SIZE(buffer) );
     IRegistrar_AddReplacement( registrar, L"SystemRoot", buffer );
     EnumResourceNamesW( module, L"WINE_REGISTRY", register_resource, (LONG_PTR)&hr );
-    if (FAILED(hr)) ERR( "failed to register %s: %x\n", debugstr_w(name), hr );
+    if (FAILED(hr)) ERR( "failed to register %s: %lx\n", debugstr_w(name), hr );
 }
 
 /* copy a fake dll file to the dest directory */
@@ -914,7 +914,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, BOOL delete, struct list
             TRACE( "%s -> %s\n", debugstr_w(file), debugstr_w(dest) );
 
             ret = (WriteFile( h, data, size, &written, NULL ) && written == size);
-            if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() );
+            if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(dest), GetLastError() );
             CloseHandle( h );
             if (ret) register_fake_dll( dest, data, size, delay_copy );
             else DeleteFileW( dest );
@@ -948,7 +948,7 @@ static void delay_copy_files( struct list *delay_copy )
         if (h && h != INVALID_HANDLE_VALUE)
         {
             ret = (WriteFile( h, data, size, &written, NULL ) && written == size);
-            if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(copy->dest), GetLastError() );
+            if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(copy->dest), GetLastError() );
             CloseHandle( h );
             if (!ret) DeleteFileW( copy->dest );
         }
@@ -1070,7 +1070,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source )
 
         ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size);
         if (ret) register_fake_dll( name, buffer, size, &delay_copy );
-        else ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() );
+        else ERR( "failed to write to %s (error=%lu)\n", debugstr_w(name), GetLastError() );
     }
     else
     {
diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 3a72c5f527d..532ac6c36a6 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -394,7 +394,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
         if (type == REG_DWORD)
         {
             DWORD dw = str ? wcstoul( str, NULL, 0 ) : 0;
-            TRACE( "setting dword %s to %x\n", debugstr_w(value), dw );
+            TRACE( "setting dword %s to %lx\n", debugstr_w(value), dw );
             RegSetValueExW( hkey, value, 0, type, (BYTE *)&dw, sizeof(dw) );
         }
         else
@@ -414,7 +414,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
         if (size)
         {
             if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE;
-            TRACE( "setting binary data %s len %d\n", debugstr_w(value), size );
+            TRACE( "setting binary data %s len %ld\n", debugstr_w(value), size );
             SetupGetBinaryField( context, 5, data, size, NULL );
         }
         RegSetValueExW( hkey, value, 0, type, data, size );
@@ -601,7 +601,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path,
 
         if (FAILED(res))
         {
-            WARN( "calling %s in %s returned error %x\n", entry_point, debugstr_w(path), res );
+            WARN( "calling %s in %s returned error %lx\n", entry_point, debugstr_w(path), res );
             status.FailureCode = SPREG_REGSVR;
             status.Win32Error = res;
             goto done;
@@ -625,7 +625,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path,
 
         if (FAILED(res))
         {
-            WARN( "calling DllInstall in %s returned error %x\n", debugstr_w(path), res );
+            WARN( "calling DllInstall in %s returned error %lx\n", debugstr_w(path), res );
             status.FailureCode = SPREG_REGSVR;
             status.Win32Error = res;
             goto done;
@@ -968,7 +968,7 @@ static BOOL iterate_section_fields( HINF hinf, PCWSTR section, PCWSTR key,
                 goto done;
             if (!callback( hinf, buffer, arg ))
             {
-                WARN("callback failed for %s %s err %d\n",
+                WARN("callback failed for %s %s err %ld\n",
                      debugstr_w(section), debugstr_w(buffer), GetLastError() );
                 goto done;
             }
@@ -1331,7 +1331,7 @@ static BOOL add_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, const WCHA
     /* FIXME: Dependencies field */
     /* FIXME: Security field */
 
-    TRACE( "service %s display %s type %x start %x error %x binary %s order %s startname %s flags %x\n",
+    TRACE( "service %s display %s type %x start %x error %x binary %s order %s startname %s flags %lx\n",
            debugstr_w(name), debugstr_w(display_name), service_type, start_type, error_control,
            debugstr_w(binary_path), debugstr_w(load_order), debugstr_w(start_name), flags );
 
@@ -1406,7 +1406,7 @@ static BOOL add_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, const WCHA
     CloseServiceHandle( service );
 
 done:
-    if (!service) WARN( "failed err %u\n", GetLastError() );
+    if (!service) WARN( "failed err %lu\n", GetLastError() );
     HeapFree( GetProcessHeap(), 0, binary_path );
     HeapFree( GetProcessHeap(), 0, display_name );
     HeapFree( GetProcessHeap(), 0, start_name );
@@ -1430,7 +1430,7 @@ static BOOL del_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, DWORD flag
     if (!(service = OpenServiceW( scm, name, SERVICE_STOP | DELETE )))
     {
         if (GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) return TRUE;
-        WARN( "cannot open %s err %u\n", debugstr_w(name), GetLastError() );
+        WARN( "cannot open %s err %lu\n", debugstr_w(name), GetLastError() );
         return FALSE;
     }
     if (flags & SPSVCINST_STOPSERVICE) ControlService( service, SERVICE_CONTROL_STOP, &status );
@@ -1558,7 +1558,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer,
     if (style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 |
                    INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE ))
     {
-        FIXME( "unknown inf_style(s) 0x%x\n",
+        FIXME( "unknown inf_style(s) 0x%lx\n",
                style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 |
                          INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE ));
         if( outsize ) *outsize = 1;
diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index 4d3ced2e4ae..f9d34b5353d 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -811,7 +811,7 @@ DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout )
 
     if (!warned)
     {
-        FIXME("%d\n", dwTimeout);
+        FIXME("%ld\n", dwTimeout);
         warned = TRUE;
     }
     return WAIT_OBJECT_0;
@@ -844,7 +844,7 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location,
     LPWSTR destW = NULL, sourceW = NULL, locationW = NULL;
     DWORD size;
 
-    TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_a(source), debugstr_a(location),
+    TRACE("%s, %s, %ld, %ld, %p, %ld, %p, %p\n", debugstr_a(source), debugstr_a(location),
           media_type, style, dest, buffer_size, required_size, component);
 
     if (dest && !(destW = MyMalloc( buffer_size * sizeof(WCHAR) ))) return FALSE;
@@ -972,7 +972,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location,
     DWORD size;
     HINF hinf;
 
-    TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_w(source), debugstr_w(location),
+    TRACE("%s, %s, %ld, %ld, %p, %ld, %p, %p\n", debugstr_w(source), debugstr_w(location),
           media_type, style, dest, buffer_size, required_size, filepart);
 
     if (!source)
@@ -1113,7 +1113,7 @@ BOOL WINAPI SetupUninstallOEMInfA( PCSTR inf_file, DWORD flags, PVOID reserved )
     BOOL ret;
     WCHAR *inf_fileW = NULL;
 
-    TRACE("%s, 0x%08x, %p\n", debugstr_a(inf_file), flags, reserved);
+    TRACE("%s, 0x%08lx, %p\n", debugstr_a(inf_file), flags, reserved);
 
     if (inf_file && !(inf_fileW = strdupAtoW( inf_file ))) return FALSE;
     ret = SetupUninstallOEMInfW( inf_fileW, flags, reserved );
@@ -1129,7 +1129,7 @@ BOOL WINAPI SetupUninstallOEMInfW( PCWSTR inf_file, DWORD flags, PVOID reserved
     static const WCHAR infW[] = {'\\','i','n','f','\\',0};
     WCHAR target[MAX_PATH];
 
-    TRACE("%s, 0x%08x, %p\n", debugstr_w(inf_file), flags, reserved);
+    TRACE("%s, 0x%08lx, %p\n", debugstr_w(inf_file), flags, reserved);
 
     if (!inf_file)
     {
@@ -1313,7 +1313,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExA( PCSTR source, PSTR name, DWORD len,
     DWORD nb_chars = 0;
     LPSTR nameA;
 
-    TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_a(source), name, len, required,
+    TRACE("%s, %p, %ld, %p, %p, %p, %p\n", debugstr_a(source), name, len, required,
           source_size, target_size, type);
 
     if (!source || !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE;
@@ -1373,7 +1373,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExW( PCWSTR source, PWSTR name, DWORD len
     BOOL ret = FALSE;
     DWORD source_len;
 
-    TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_w(source), name, len, required,
+    TRACE("%s, %p, %ld, %p, %p, %p, %p\n", debugstr_w(source), name, len, required,
           source_size, target_size, type);
 
     if (!source) return FALSE;
@@ -1498,7 +1498,7 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target )
     if ((error = LZCopy( src, dst )) >= 0) ret = ERROR_SUCCESS;
     else
     {
-        WARN("failed to decompress file %d\n", error);
+        WARN("failed to decompress file %ld\n", error);
         ret = ERROR_INVALID_DATA;
     }
 
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index c81a712ad84..5c3fad6e8e6 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -1341,7 +1341,7 @@ LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section )
         if (ret == -1) ret = 0;
         ret += file->sections[section_index]->nb_lines;
     }
-    TRACE( "(%p,%s) returning %d\n", hinf, debugstr_w(section), ret );
+    TRACE( "(%p,%s) returning %ld\n", hinf, debugstr_w(section), ret );
     SetLastError( (ret == -1) ? ERROR_SECTION_NOT_FOUND : 0 );
     return ret;
 }
@@ -1384,7 +1384,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON
             context->Section    = section_index;
             context->Line       = index;
             SetLastError( 0 );
-            TRACE( "(%p,%s): returning %d/%d\n",
+            TRACE( "(%p,%s): returning %d/%ld\n",
                    hinf, debugstr_w(section), section_index, index );
             return TRUE;
         }
@@ -1728,7 +1728,7 @@ BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer,
         }
         PARSER_string_substA( file, field->text, buffer, size );
 
-        TRACE( "context %p/%p/%d/%d index %d returning %s\n",
+        TRACE( "context %p/%p/%d/%d index %ld returning %s\n",
                context->Inf, context->CurrentInf, context->Section, context->Line,
                index, debugstr_a(buffer) );
     }
@@ -1759,7 +1759,7 @@ BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer
         }
         PARSER_string_substW( file, field->text, buffer, size );
 
-        TRACE( "context %p/%p/%d/%d index %d returning %s\n",
+        TRACE( "context %p/%p/%d/%d index %ld returning %s\n",
                context->Inf, context->CurrentInf, context->Section, context->Line,
                index, debugstr_w(buffer) );
     }
@@ -1858,7 +1858,7 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer,
         }
         buffer[i - index] = value;
     }
-    TRACE( "%p/%p/%d/%d index %d\n",
+    TRACE( "%p/%p/%d/%d index %ld\n",
            context->Inf, context->CurrentInf, context->Section, context->Line, index );
     return TRUE;
 }
diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c
index 828d8a1145a..b25bd883cc6 100644
--- a/dlls/setupapi/query.c
+++ b/dlls/setupapi/query.c
@@ -168,7 +168,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
     BOOL ret;
     DWORD infSize;
 
-    TRACE("(%p, %d, %p, %d, %p)\n", InfSpec, SearchControl, ReturnBuffer,
+    TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer,
            ReturnBufferSize, RequiredSize);
 
     if (!InfSpec)
@@ -195,7 +195,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
             inf = search_for_inf(InfSpec, SearchControl);
             break;
         case INFINFO_INF_PATH_LIST_SEARCH:
-            FIXME("Unhandled search control: %d\n", SearchControl);
+            FIXME("Unhandled search control: %ld\n", SearchControl);
 
             if (RequiredSize)
                 *RequiredSize = 0;
@@ -289,7 +289,7 @@ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation,
     DWORD len;
     LPWSTR ptr;
 
-    TRACE("(%p, %u, %p, %d, %p) Stub!\n", InfInformation, InfIndex,
+    TRACE("(%p, %u, %p, %ld, %p) Stub!\n", InfInformation, InfIndex,
           ReturnBuffer, ReturnBufferSize, RequiredSize);
 
     if (!InfInformation)
@@ -333,7 +333,7 @@ BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR f
     DWORD required;
     INT size;
 
-    TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_a(filename), source_id,
+    TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(filename), source_id,
           buffer, buffer_size, required_size);
 
     if (filename && *filename && !(filenameW = strdupAtoW( filename )))
@@ -410,7 +410,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR
     INFCONTEXT ctx;
     WCHAR *end, *source_id_str;
 
-    TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_w(filename), source_id,
+    TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id,
           buffer, buffer_size, required_size);
 
     if (!context) context = &ctx;
@@ -454,7 +454,7 @@ BOOL WINAPI SetupGetSourceInfoA( HINF hinf, UINT source_id, UINT info,
     DWORD required;
     INT size;
 
-    TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size,
+    TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size,
           required_size);
 
     if (!SetupGetSourceInfoW( hinf, source_id, info, NULL, 0, &required ))
@@ -498,7 +498,7 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info,
     static const WCHAR fmt[] = {'%','d',0};
     DWORD index;
 
-    TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size,
+    TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size,
           required_size);
 
     swprintf( source_id_str, ARRAY_SIZE(source_id_str), fmt, source_id );
@@ -545,7 +545,7 @@ BOOL WINAPI SetupGetTargetPathA( HINF hinf, PINFCONTEXT context, PCSTR section,
     DWORD required;
     INT size;
 
-    TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_a(section), buffer,
+    TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(section), buffer,
           buffer_size, required_size);
 
     if (section && !(sectionW = strdupAtoW( section )))
@@ -598,7 +598,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section,
     unsigned int size;
     BOOL ret = FALSE;
 
-    TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer,
+    TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(section), buffer,
           buffer_size, required_size);
 
     if (context) ret = SetupFindFirstLineW( hinf, destination_dirs, NULL, context );
@@ -646,7 +646,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationA(
 
     if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo))
     {
-        WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize);
+        WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize);
         SetLastError( ERROR_INVALID_USER_BUFFER );
         return FALSE;
     }
@@ -684,7 +684,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW(
 
     if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo))
     {
-        WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize);
+        WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize);
         SetLastError(ERROR_INVALID_USER_BUFFER);
         return FALSE;
     }
@@ -726,7 +726,7 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW(
     PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize,
     PDWORD RequiredSize)
 {
-    FIXME("stub: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize);
+    FIXME("stub: %s %p %s %p %lu %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize);
 
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index 1773a4df3d7..f6c83d30e1d 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -792,7 +792,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf,
     BOOL ret = FALSE;
     DWORD len;
 
-    TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#x.\n",
+    TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#lx.\n",
             queue, debugstr_w(src_root), hinf, hlist, debugstr_w(section), style);
 
     if (!src_root)
@@ -1068,7 +1068,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
     BOOL rc = FALSE;
     BOOL docopy = TRUE;
 
-    TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style);
+    TRACE("copy %s to %s style 0x%lx\n",debugstr_w(source),debugstr_w(target),style);
 
     /* before copy processing */
     if (style & SP_COPY_REPLACEONLY)
@@ -1126,7 +1126,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
                 {
                     FILEPATHS_W filepaths;
 
-                    TRACE("Versions: Source %i.%i target %i.%i\n",
+                    TRACE("Versions: Source %li.%li target %li.%li\n",
                       SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS,
                       TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS);
 
@@ -1179,7 +1179,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
     if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE |
                  SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP))
     {
-        ERR("Unsupported style(s) 0x%x\n",style);
+        ERR("Unsupported style(s) 0x%lx\n",style);
     }
 
     if (docopy)
@@ -1201,7 +1201,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
                     DeleteFileW(temp_file);
             }
         }
-        if (!rc) WARN( "failed to copy, err %u\n", GetLastError() );
+        if (!rc) WARN( "failed to copy, err %lu\n", GetLastError() );
     }
     else
         SetLastError(ERROR_SUCCESS);
@@ -1226,7 +1226,7 @@ BOOL WINAPI SetupInstallFileExA( HINF hinf, PINFCONTEXT inf_context, PCSTR sourc
     struct callback_WtoA_context ctx;
     UNICODE_STRING sourceW, rootW, destW;
 
-    TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root),
+    TRACE("%p %p %s %s %s %lx %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root),
           debugstr_a(dest), style, handler, context, in_use);
 
     sourceW.Buffer = rootW.Buffer = destW.Buffer = NULL;
@@ -1277,7 +1277,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour
     WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH];
     DWORD len;
 
-    TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
+    TRACE("%p %p %s %s %s %lx %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
           debugstr_w(dest), style, handler, context, in_use);
 
     if (in_use) FIXME("no file in use support\n");
@@ -1598,7 +1598,7 @@ BOOL WINAPI SetupScanFileQueueA( HSPFILEQ handle, DWORD flags, HWND window,
 {
     struct callback_WtoA_context ctx;
 
-    TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result);
+    TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result);
 
     ctx.orig_context = context;
     ctx.orig_handler = handler;
@@ -1619,7 +1619,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window,
     UINT notification = 0;
     BOOL ret = FALSE;
 
-    TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result);
+    TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result);
 
     if (!queue->copy_queue.count) return TRUE;
 
@@ -1628,7 +1628,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window,
 
     if (flags & ~(SPQ_SCAN_USE_CALLBACK | SPQ_SCAN_USE_CALLBACKEX))
     {
-        FIXME("flags %x not fully implemented\n", flags);
+        FIXME("flags %lx not fully implemented\n", flags);
     }
 
     paths.Source = paths.Target = NULL;
@@ -1780,10 +1780,10 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
         TRACE( "end queue\n" );
         return 0;
     case SPFILENOTIFY_STARTSUBQUEUE:
-        TRACE( "start subqueue %ld count %ld\n", param1, param2 );
+        TRACE( "start subqueue %Id count %Id\n", param1, param2 );
         return TRUE;
     case SPFILENOTIFY_ENDSUBQUEUE:
-        TRACE( "end subqueue %ld\n", param1 );
+        TRACE( "end subqueue %Id\n", param1 );
         return 0;
     case SPFILENOTIFY_STARTDELETE:
         TRACE( "start delete %s\n", debugstr_a(paths->Target) );
@@ -1823,7 +1823,7 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
         return FILEOP_DOIT;
     }
     default:
-        FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
+        FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 );
         break;
     }
     return 0;
@@ -1848,10 +1848,10 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
         TRACE( "end queue\n" );
         return 0;
     case SPFILENOTIFY_STARTSUBQUEUE:
-        TRACE( "start subqueue %ld count %ld\n", param1, param2 );
+        TRACE( "start subqueue %Id count %Id\n", param1, param2 );
         return TRUE;
     case SPFILENOTIFY_ENDSUBQUEUE:
-        TRACE( "end subqueue %ld\n", param1 );
+        TRACE( "end subqueue %Id\n", param1 );
         return 0;
     case SPFILENOTIFY_STARTDELETE:
         TRACE( "start delete %s\n", debugstr_w(paths->Target) );
@@ -1892,7 +1892,7 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
         return FILEOP_DOIT;
     }
     default:
-        FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
+        FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 );
         break;
     }
     return 0;
diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index d4d475c98cb..59f5f06635e 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -180,7 +180,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
   case fdintPARTIAL_FILE:
     return 0;
   case fdintCOPY_FILE:
-    TRACE("Copy file %s, length %d, date %#x, time %#x, attributes %#x.\n",
+    TRACE("Copy file %s, length %ld, date %#x, time %#x, attributes %#x.\n",
             debugstr_a(pfdin->psz1), pfdin->cb, pfdin->date, pfdin->time, pfdin->attribs);
     fici.NameInCabinet = pfdin->psz1;
     fici.FileSize = pfdin->cb;
@@ -261,7 +261,7 @@ BOOL WINAPI SetupIterateCabinetA(const char *file, DWORD reserved,
     HFDI hfdi;
     BOOL ret;
 
-    TRACE("file %s, reserved %#x, callback %p, context %p.\n",
+    TRACE("file %s, reserved %#lx, callback %p, context %p.\n",
             debugstr_a(file), reserved, callback, context);
 
     if (!file)
diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c
index f1ce69ce5dc..15fa6db1fa2 100644
--- a/dlls/setupapi/stringtable.c
+++ b/dlls/setupapi/stringtable.c
@@ -132,7 +132,7 @@ HSTRING_TABLE WINAPI StringTableInitializeEx(ULONG max_extra_size, DWORD reserve
 {
     struct stringtable *table;
 
-    TRACE("(%d %x)\n", max_extra_size, reserved);
+    TRACE("(%ld %lx)\n", max_extra_size, reserved);
 
     table = MyMalloc(sizeof(*table));
     if (!table) return NULL;
@@ -255,7 +255,7 @@ BOOL WINAPI StringTableGetExtraData(HSTRING_TABLE hTable, ULONG id, void *extra,
     struct stringtable *table = (struct stringtable*)hTable;
     char *extraptr;
 
-    TRACE("%p %u %p %u\n", table, id, extra, extra_size);
+    TRACE("%p %lu %p %lu\n", table, id, extra, extra_size);
 
     if (!table)
         return FALSE;
@@ -300,7 +300,7 @@ DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE hTable, LPWSTR string, DWOR
     DWORD offset;
     int cmp;
 
-    TRACE("%p->%p %s %x %p, %x\n", table, table->data, debugstr_w(string), flags, extra, extra_size);
+    TRACE("%p->%p %s %lx %p, %lx\n", table, table->data, debugstr_w(string), flags, extra, extra_size);
 
     if (!table)
         return -1;
@@ -385,7 +385,7 @@ DWORD WINAPI StringTableAddStringEx(HSTRING_TABLE hTable, LPWSTR string,
     WCHAR *ptrW;
     int len;
 
-    TRACE("%p %s %x %p, %u\n", hTable, debugstr_w(string), flags, extra, extra_size);
+    TRACE("%p %s %lx %p, %lu\n", hTable, debugstr_w(string), flags, extra, extra_size);
 
     if (!table)
         return -1;
@@ -476,7 +476,7 @@ BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE hTable, DWORD id, void *extra,
     struct stringtable *table = (struct stringtable*)hTable;
     char *extraptr;
 
-    TRACE("%p %d %p %u\n", hTable, id, extra, extra_size);
+    TRACE("%p %ld %p %lu\n", hTable, id, extra, extra_size);
 
     if (!table)
         return FALSE;
@@ -515,7 +515,7 @@ LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE hTable, ULONG id)
     struct stringtable *table = (struct stringtable*)hTable;
     static WCHAR empty[] = {0};
 
-    TRACE("%p %d\n", table, id);
+    TRACE("%p %ld\n", table, id);
 
     if (!table)
         return NULL;
@@ -548,7 +548,7 @@ BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE hTable, ULONG id, LPWSTR buf
     WCHAR *ptrW;
     int len;
 
-    TRACE("%p %x %p %p\n", table, id, buff, buflen);
+    TRACE("%p %lx %p %p\n", table, id, buff, buflen);
 
     if (!table) {
         *buflen = 0;
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index 7eb0666f651..af058b8eac8 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -55,7 +55,7 @@ CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR name, PHMACHINE machine)
  */
 CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, DEVINST dnParent, ULONG ulFlags)
 {
-  FIXME("(%p %s 0x%08x 0x%08x) stub\n", pdnDevInst, pDeviceID, dnParent, ulFlags);
+  FIXME("(%p %s 0x%08lx 0x%08lx) stub\n", pdnDevInst, pDeviceID, dnParent, ulFlags);
   return CR_SUCCESS;
 }
 
@@ -64,7 +64,7 @@ CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID,
  */
 CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, DEVINST dnParent, ULONG ulFlags)
 {
-  FIXME("(%p %s 0x%08x 0x%08x) stub\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags);
+  FIXME("(%p %s 0x%08lx 0x%08lx) stub\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags);
   return CR_SUCCESS;
 }
 
@@ -85,7 +85,7 @@ CONFIGRET WINAPI CM_Open_DevNode_Key(
     DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition,
     PHKEY phkDevice, ULONG ulFlags)
 {
-    FIXME("0x%08x 0x%08x 0x%08x 0x%08x %p 0x%08x : stub\n", dnDevInst, access, ulHardwareProfile,
+    FIXME("0x%08lx 0x%08lx 0x%08lx 0x%08lx %p 0x%08lx : stub\n", dnDevInst, access, ulHardwareProfile,
           disposition, phkDevice, ulFlags);
     return CR_SUCCESS;
 }
@@ -96,7 +96,7 @@ CONFIGRET WINAPI CM_Open_DevNode_Key(
 CONFIGRET WINAPI CM_Get_Child(
     PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)
 {
-    FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, dnDevInst, ulFlags);
+    FIXME("%p 0x%08lx 0x%08lx: stub\n", pdnDevInst, dnDevInst, ulFlags);
     return CR_SUCCESS;
 }
 
@@ -106,7 +106,7 @@ CONFIGRET WINAPI CM_Get_Child(
 CONFIGRET WINAPI CM_Get_Child_Ex(
     PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
 {
-    FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
+    FIXME("%p 0x%08lx 0x%08lx %p: stub\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
     return CR_SUCCESS;
 }
 
@@ -116,7 +116,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex(
 DWORD WINAPI CM_Get_Device_ID_ExA(
     DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine)
 {
-    FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine);
+    FIXME("0x%08lx %p 0x%08lx 0x%08lx %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine);
     return CR_SUCCESS;
 }
 
@@ -126,7 +126,7 @@ DWORD WINAPI CM_Get_Device_ID_ExA(
 DWORD WINAPI CM_Get_Device_ID_ExW(
     DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine)
 {
-    FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine);
+    FIXME("0x%08lx %p 0x%08lx 0x%08lx %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine);
     return CR_SUCCESS;
 }
 
@@ -136,7 +136,7 @@ DWORD WINAPI CM_Get_Device_ID_ExW(
 CONFIGRET WINAPI CM_Get_Device_ID_ListA(
     PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags )
 {
-    FIXME("%s %p %d 0x%08x: stub\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags);
+    FIXME("%s %p %ld 0x%08lx: stub\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags);
 
     if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0;
     return CR_SUCCESS;
@@ -148,7 +148,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA(
 CONFIGRET WINAPI CM_Get_Device_ID_ListW(
     PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags )
 {
-    FIXME("%s %p %d 0x%08x: stub\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags);
+    FIXME("%s %p %ld 0x%08lx: stub\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags);
 
     if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0;
     return CR_SUCCESS;
@@ -159,7 +159,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListW(
  */
 CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG  pulLen, PCSTR  pszFilter, ULONG  ulFlags )
 {
-    FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_a(pszFilter), ulFlags);
+    FIXME("%p %s 0x%08lx: stub\n", pulLen, debugstr_a(pszFilter), ulFlags);
 
     return CR_SUCCESS;
 }
@@ -169,7 +169,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG  pulLen, PCSTR  pszFilter,
  */
 CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG  pulLen, PCWSTR  pszFilter, ULONG  ulFlags )
 {
-    FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_w(pszFilter), ulFlags);
+    FIXME("%p %s 0x%08lx: stub\n", pulLen, debugstr_w(pszFilter), ulFlags);
 
     return CR_SUCCESS;
 }
@@ -179,7 +179,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG  pulLen, PCWSTR  pszFilter,
  */
 DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)
 {
-    FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags);
+    FIXME("%p 0x%08lx 0x%08lx stub\n", pdnDevInst, dnDevInst, ulFlags);
     if(pdnDevInst)
         *pdnDevInst = 0;
     return CR_NO_SUCH_DEVNODE;
@@ -190,7 +190,7 @@ DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags
  */
 HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags)
 {
-    FIXME("Stub %s, 0x%x\n",debugstr_w(LogFileName),Flags);
+    FIXME("Stub %s, 0x%lx\n",debugstr_w(LogFileName),Flags);
     return INVALID_HANDLE_VALUE;
 }
 
@@ -199,7 +199,7 @@ HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags)
  */
 HSPFILELOG WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags)
 {
-    FIXME("Stub %s, 0x%x\n",debugstr_a(LogFileName),Flags);
+    FIXME("Stub %s, 0x%lx\n",debugstr_a(LogFileName),Flags);
     return INVALID_HANDLE_VALUE;
 }
 
@@ -217,7 +217,7 @@ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)
  */
 BOOL WINAPI RegistryDelnode(DWORD x, DWORD y)
 {
-    FIXME("%08x %08x: stub\n", x, y);
+    FIXME("%08lx %08lx: stub\n", x, y);
     return FALSE;
 }
 
@@ -235,7 +235,7 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only )
  */
 BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buffer, DWORD return_buffer_size, PDWORD required_size)
 {
-    FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size);
+    FIXME("%p, %p, %ld, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size);
     return FALSE;
 }
 
@@ -244,7 +244,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buf
  */
 BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_buffer, DWORD return_buffer_size, PDWORD required_size)
 {
-    FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size);
+    FIXME("%p, %p, %ld, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size);
     return FALSE;
 }
 
@@ -253,7 +253,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_bu
  */
 BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source)
 {
-    FIXME("0x%08x %s: stub\n", flags, debugstr_a(source));
+    FIXME("0x%08lx %s: stub\n", flags, debugstr_a(source));
     return TRUE;
 }
 
@@ -262,7 +262,7 @@ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source)
  */
 BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source)
 {
-    FIXME("0x%08x %s: stub\n", flags, debugstr_w(source));
+    FIXME("0x%08lx %s: stub\n", flags, debugstr_w(source));
     return TRUE;
 }
 
@@ -271,7 +271,7 @@ BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source)
  */
 BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)
 {
-    FIXME("0x%08x %p %d: stub\n", flags, list, count);
+    FIXME("0x%08lx %p %d: stub\n", flags, list, count);
     return FALSE;
 }
 
@@ -280,7 +280,7 @@ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)
  */
 BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count)
 {
-    FIXME("0x%08x %p %d: stub\n", flags, list, count);
+    FIXME("0x%08lx %p %d: stub\n", flags, list, count);
     return FALSE;
 }
 
@@ -316,7 +316,7 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData
  */
 CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)
 {
-    FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags);
+    FIXME("%p %s 0x%08lx: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags);
 
     return CR_FAILURE;
 }
@@ -326,7 +326,7 @@ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID,
  */
 CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags)
 {
-    FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags);
+    FIXME("%p %s 0x%08lx: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags);
 
     return CR_FAILURE;
 }
@@ -336,7 +336,7 @@ CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID,
  */
 CONFIGRET WINAPI CM_Locate_DevNode_ExA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine)
 {
-    FIXME("%p %s 0x%08x %p: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags, hMachine);
+    FIXME("%p %s 0x%08lx %p: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags, hMachine);
 
     return CR_FAILURE;
 }
@@ -346,7 +346,7 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceI
  */
 CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine)
 {
-    FIXME("%p %s 0x%08x %p: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine);
+    FIXME("%p %s 0x%08lx %p: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine);
 
     return CR_FAILURE;
 }
@@ -357,7 +357,7 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceI
 CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(PULONG len, LPGUID class, DEVINSTID_A id,
                                                     ULONG flags)
 {
-    FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_a(id), flags);
+    FIXME("%p %p %s 0x%08lx: stub\n", len, class, debugstr_a(id), flags);
     return CR_FAILURE;
 }
 
@@ -367,7 +367,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(PULONG len, LPGUID class, DE
 CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(PULONG len, LPGUID class, DEVINSTID_W id,
                                                     ULONG flags)
 {
-    FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_w(id), flags);
+    FIXME("%p %p %s 0x%08lx: stub\n", len, class, debugstr_w(id), flags);
     return CR_FAILURE;
 }
 
@@ -377,7 +377,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(PULONG len, LPGUID class, DE
 CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class, DEVINSTID_A id,
                                                        ULONG flags, HMACHINE machine)
 {
-    FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_a(id), flags, machine);
+    FIXME("%p %p %s 0x%08lx %p: stub\n", len, class, debugstr_a(id), flags, machine);
     return CR_FAILURE;
 }
 
@@ -387,7 +387,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class,
 CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, DEVINSTID_W id,
                                                        ULONG flags, HMACHINE machine)
 {
-    FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_w(id), flags, machine);
+    FIXME("%p %p %s 0x%08lx %p: stub\n", len, class, debugstr_w(id), flags, machine);
     return CR_FAILURE;
 }
 
@@ -397,7 +397,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class,
 CONFIGRET WINAPI CM_Get_Device_Interface_AliasA(const char *interface, GUID *class,
                                                 char *name, ULONG *len, ULONG flags)
 {
-    FIXME("%s %p %p %p 0x%08x: stub\n", debugstr_a(interface), class, name, len, flags);
+    FIXME("%s %p %p %p 0x%08lx: stub\n", debugstr_a(interface), class, name, len, flags);
     return CR_FAILURE;
 }
 
@@ -407,7 +407,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_AliasA(const char *interface, GUID *cla
 CONFIGRET WINAPI CM_Get_Device_Interface_AliasW(const WCHAR *interface, GUID *class,
                                                 WCHAR *name, ULONG *len, ULONG flags)
 {
-    FIXME("%s %p %p %p 0x%08x: stub\n", debugstr_w(interface), class, name, len, flags);
+    FIXME("%s %p %p %p 0x%08lx: stub\n", debugstr_w(interface), class, name, len, flags);
     return CR_FAILURE;
 }
 
@@ -417,7 +417,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_AliasW(const WCHAR *interface, GUID *cl
 CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExA(DEVINST dev, ULONG prop, PULONG regdatatype,
     PVOID buf, PULONG len, ULONG flags, HMACHINE machine)
 {
-    FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine);
+    FIXME("0x%08lx %lu %p %p %p 0x%08lx %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine);
     return CR_FAILURE;
 }
 
@@ -427,7 +427,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExA(DEVINST dev, ULONG prop, P
 CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, PULONG regdatatype,
     PVOID buf, PULONG len, ULONG flags, HMACHINE machine)
 {
-    FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine);
+    FIXME("0x%08lx %lu %p %p %p 0x%08lx %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine);
     return CR_FAILURE;
 }
 
@@ -455,7 +455,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO
 CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev,
                                        ULONG flags)
 {
-    FIXME("%p %p 0x%08x 0x%08x: stub\n", status, problem, dev, flags);
+    FIXME("%p %p 0x%08lx 0x%08lx: stub\n", status, problem, dev, flags);
     return CR_FAILURE;
 }
 
@@ -465,7 +465,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST de
 CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST dev,
                                           ULONG flags, HMACHINE machine)
 {
-    FIXME("%p %p 0x%08x 0x%08x %p: stub\n", status, problem, dev, flags, machine);
+    FIXME("%p %p 0x%08lx 0x%08lx %p: stub\n", status, problem, dev, flags, machine);
     return CR_FAILURE;
 }
 
@@ -474,7 +474,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST
  */
 CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)
 {
-    FIXME("%u %p 0x%08x: stub\n", index, class, flags);
+    FIXME("%lu %p 0x%08lx: stub\n", index, class, flags);
     return CR_NO_SUCH_VALUE;
 }
 
@@ -484,7 +484,7 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)
 CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULONG regdatatype,
                                                  PVOID buf, ULONG len, ULONG flags, HMACHINE machine)
 {
-    FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine);
+    FIXME("%p %lu %p %p %lu 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine);
     return CR_FAILURE;
 }
 
@@ -494,7 +494,7 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULON
 CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULONG regdatatype,
                                                  PVOID buf, ULONG len, ULONG flags, HMACHINE machine)
 {
-    FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine);
+    FIXME("%p %lu %p %p %lu 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine);
     return CR_FAILURE;
 }
 
@@ -504,7 +504,7 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON
 CONFIGRET WINAPI CM_Get_Sibling(
     PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags)
 {
-    FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, DevInst, ulFlags);
+    FIXME("%p 0x%08lx 0x%08lx: stub\n", pdnDevInst, DevInst, ulFlags);
     return CR_FAILURE;
 }
 
@@ -514,19 +514,19 @@ CONFIGRET WINAPI CM_Get_Sibling(
 CONFIGRET WINAPI CM_Get_Sibling_Ex(
     PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine)
 {
-    FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, DevInst, ulFlags, hMachine);
+    FIXME("%p 0x%08lx 0x%08lx %p: stub\n", pdnDevInst, DevInst, ulFlags, hMachine);
     return CR_FAILURE;
 }
 
 CONFIGRET WINAPI CM_Reenumerate_DevNode(DEVINST dnDevInst, ULONG ulFlags)
 {
-    FIXME("0x%08x 0x%08x: stub\n", dnDevInst, ulFlags);
+    FIXME("0x%08lx 0x%08lx: stub\n", dnDevInst, ulFlags);
     return CR_FAILURE;
 }
 
 CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMACHINE machine)
 {
-    FIXME("0x%08x 0x%08x %p: stub\n", dnDevInst, ulFlags, machine);
+    FIXME("0x%08lx 0x%08lx %p: stub\n", dnDevInst, ulFlags, machine);
     return CR_FAILURE;
 }
 
@@ -536,7 +536,7 @@ CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMA
 CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, LPCVOID buf, ULONG len,
                                                  ULONG flags, HMACHINE machine)
 {
-    FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine);
+    FIXME("%p %lu %p %lu 0x%08lx %p: stub\n", class, prop, buf, len, flags, machine);
     return CR_FAILURE;
 }
 
@@ -546,7 +546,7 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, LPCVO
 CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, LPCVOID buf, ULONG len,
                                                  ULONG flags, HMACHINE machine)
 {
-    FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine);
+    FIXME("%p %lu %p %lu 0x%08lx %p: stub\n", class, prop, buf, len, flags, machine);
     return CR_FAILURE;
 }
 
@@ -564,7 +564,7 @@ BOOL WINAPI SetupLogFileW(
     PCWSTR OtherInfo,
     DWORD Flags )
 {
-    FIXME("(%p, %s, '%s', '%s', %d, %s, %s, %s, %d): stub\n", FileLogHandle,
+    FIXME("(%p, %s, '%s', '%s', %ld, %s, %s, %s, %ld): stub\n", FileLogHandle,
         debugstr_w(LogSectionName), debugstr_w(SourceFileName),
         debugstr_w(TargetFileName), Checksum, debugstr_w(DiskTagfile),
         debugstr_w(DiskDescription), debugstr_w(OtherInfo), Flags);
@@ -587,7 +587,7 @@ BOOL WINAPI SetupLogFileA(
     PCSTR OtherInfo,
     DWORD Flags )
 {
-    FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle,
+    FIXME("(%p, %p, '%s', '%s', %ld, %p, %p, %p, %ld): stub\n", FileLogHandle,
         LogSectionName, SourceFileName, TargetFileName, Checksum, DiskTagfile,
         DiskDescription, OtherInfo, Flags);
 
@@ -601,7 +601,7 @@ BOOL WINAPI SetupLogFileA(
 
 BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType)
 {
-    FIXME("%p %p %d\n", DeviceInfoSet, DeviceInfoData, DriverType);
+    FIXME("%p %p %ld\n", DeviceInfoSet, DeviceInfoData, DriverType);
 
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
@@ -612,7 +612,7 @@ BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DAT
  */
 INT WINAPI SetupDiDrawMiniIcon(HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags)
 {
-    FIXME("(%p, %s, %d, %x) stub\n", hdc, wine_dbgstr_rect(&rc), MiniIconIndex, Flags);
+    FIXME("(%p, %s, %d, %lx) stub\n", hdc, wine_dbgstr_rect(&rc), MiniIconIndex, Flags);
 
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return 0;
@@ -655,7 +655,7 @@ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVI
  */
 CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags)
 {
-    FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags);
+    FIXME("(0x%08lx, %p, %p, %lu, 0x%08lx) stub\n", dev, type, name, length, flags);
     return CR_SUCCESS;
 }
 
@@ -664,6 +664,6 @@ CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPST
  */
 CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags)
 {
-    FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags);
+    FIXME("(0x%08lx, %p, %p, %lu, 0x%08lx) stub\n", dev, type, name, length, flags);
     return CR_SUCCESS;
 }




More information about the wine-devel mailing list