[PATCH 3/5] setupapi: Fix compiler warnings when converting between pointers and integers on 64-bit systems

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 dlls/setupapi/devinst.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 4a852da18b..ad43852ad3 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -468,7 +468,7 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set,
     if (devInfo)
     {
         devInfo->set = set;
-        devInfo->devId = (DWORD)devInst;
+        devInfo->devId = (DWORD)(DWORD_PTR)devInst;
 
         devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0,
                 (lstrlenW(instanceId) + 1) * sizeof(WCHAR));
@@ -525,7 +525,7 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo)
         SETUPDI_FreeInterfaceInstances(iface);
         HeapFree(GetProcessHeap(), 0, iface);
     }
-    GlobalFree((HANDLE)devInfo->devId);
+    GlobalFree((HANDLE)(DWORD_PTR)devInfo->devId);
 }
 
 /* Adds a device with GUID guid and identifier devInst to set.  Allocates a
@@ -3092,7 +3092,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(
     struct DeviceInfoSet *set = DeviceInfoSet;
     struct DeviceInfo *devInfo;
 
-    TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData,
+    TRACE("%04x %p %d %p %p %d %p\n", (DWORD)(DWORD_PTR)DeviceInfoSet, DeviceInfoData,
         Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize,
         RequiredSize);
 
@@ -3155,7 +3155,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(
     struct DeviceInfoSet *set = DeviceInfoSet;
     struct DeviceInfo *devInfo;
 
-    TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData,
+    TRACE("%04x %p %d %p %p %d %p\n", (DWORD)(DWORD_PTR)DeviceInfoSet, DeviceInfoData,
         Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize,
         RequiredSize);
 
@@ -3982,7 +3982,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(
 CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST dnDevInst, PSTR Buffer,
                                    ULONG  BufferLen, ULONG  ulFlags)
 {
-    struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst);
+    struct DeviceInfo *devInfo = GlobalLock((HANDLE)(DWORD_PTR)dnDevInst);
 
     TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags);
 
@@ -4000,7 +4000,7 @@ CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST dnDevInst, PSTR Buffer,
 CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST dnDevInst, LPWSTR Buffer,
                                    ULONG  BufferLen, ULONG  ulFlags)
 {
-    struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst);
+    struct DeviceInfo *devInfo = GlobalLock((HANDLE)(DWORD_PTR)dnDevInst);
 
     TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags);
 
@@ -4012,7 +4012,7 @@ CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST dnDevInst, LPWSTR Buffer,
 
     lstrcpynW(Buffer, devInfo->instanceId, BufferLen);
     TRACE("Returning %s\n", debugstr_w(Buffer));
-    GlobalUnlock((HANDLE)dnDevInst);
+    GlobalUnlock((HANDLE)(DWORD_PTR)dnDevInst);
     return CR_SUCCESS;
 }
 
@@ -4024,7 +4024,7 @@ CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST dnDevInst, LPWSTR Buffer,
 CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG  pulLen, DEVINST dnDevInst,
                                         ULONG  ulFlags)
 {
-    struct DeviceInfo *ppdevInfo = GlobalLock((HANDLE)dnDevInst);
+    struct DeviceInfo *ppdevInfo = GlobalLock((HANDLE)(DWORD_PTR)dnDevInst);
 
     TRACE("%x->%p, %p, %u\n", dnDevInst, ppdevInfo, pulLen, ulFlags);
 
@@ -4035,7 +4035,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG  pulLen, DEVINST dnDevInst,
     }
 
     *pulLen = lstrlenW(ppdevInfo->instanceId);
-    GlobalUnlock((HANDLE)dnDevInst);
+    GlobalUnlock((HANDLE)(DWORD_PTR)dnDevInst);
     return CR_SUCCESS;
 }
 
-- 
2.13.2