setupapi: Remove some superfluous casts.

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index f134da18aa103354ebf641f2ab7c5dcbb98eed03..1dbec9a6e32fcec9296a56f5ee07d45269e060ce 100644 (file)
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -561,8 +561,8 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set,
             devInst->data.DevInst = devInfo->devId;
             devInst->data.Reserved = (ULONG_PTR)devInfo;
             SETUPDI_GuidToString(guid, classGuidStr);
-            SetupDiSetDeviceRegistryPropertyW((HDEVINFO)set,
-                &devInst->data, SPDRP_CLASSGUID, (const BYTE *)classGuidStr,
+            SetupDiSetDeviceRegistryPropertyW(set, &devInst->data,
+                SPDRP_CLASSGUID, (const BYTE *)classGuidStr,
                 lstrlenW(classGuidStr) * sizeof(WCHAR));
             if (dev) *dev = &devInst->data;
             ret = TRUE;
@@ -1190,7 +1190,7 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid,
     list->cDevices = 0;
     list_init(&list->devices);
 
-    return (HDEVINFO)list;
+    return list;
 }
 
 /***********************************************************************

diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c
index 9da4e9da0af1d1b42fa068e2d58714131bff622a..e22133c827afe5f253d75fbd41de8e68f94624db 100644 (file)
--- a/dlls/setupapi/diskspace.c
+++ b/dlls/setupapi/diskspace.c
@@ -82,7 +82,7 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT
         }
        ptr += lstrlenW(ptr) + 1;
     }
-    return  (HANDLE)list;
+    return list;
 }
 
 

diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index 7109be9e731a3b41dae6492388c5d76015fda619..44a03497aafd1c0b9b4780b9e1301cd23c2b3631 100644 (file)
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -727,7 +727,7 @@ DWORD WINAPI TakeOwnershipOfFile(LPCWSTR lpFileName)
         goto fail;
     }
 
-    pOwner = (PTOKEN_OWNER)MyMalloc(dwSize);
+    pOwner = MyMalloc(dwSize);
     if (pOwner == NULL)
     {
         CloseHandle(hToken);

diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index c2bd84cd668f95cd9fedd06a7a82fb8958ca6dd0..656fb7898eceb4e19dc4fcfc221d588b8315f413 100644 (file)
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -1158,7 +1158,7 @@ HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR class, DWORD style, UINT *err
     TRACE( "%s -> %p\n", debugstr_w(path), file );
     file->filename = path;
     SetLastError( 0 );
-    return (HINF)file;
+    return file;
 }
 
 

diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 37c3acda84dc02ca25877c16d26cdedb12fb9e1b..ada602745ec2700895ac35d4a01e9d3eaf16209e 100644 (file)
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -1091,7 +1091,7 @@ static void testRegisterAndGetDetail(void)
          "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\";
         PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL;
 
-        detail = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)HeapAlloc(GetProcessHeap(), 0, dwSize);
+        detail = HeapAlloc(GetProcessHeap(), 0, dwSize);
         if (detail)
         {
             detail->cbSize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char);