Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 09:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

****** ROS-specific code sync too

Browse source 
[WINESYNC] setupapi: Remove superfluous pointer casts.

wine commit id ffae0123ac46ba6dfac74d7c84422073fd53b580 by Michael Stefaniuc <mstefani@redhat.de>

SYNC NOTE: Applied to ReactOS-specific code.

Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
This commit is contained in:
winesync 2024-01-03 18:47:21 +01:00 committed by Hermès Bélusca-Maïto
parent 7c3bfe4dad
commit e58a7ca526
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
5 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/setupapi/devclass.c
View file

@ -936,7 +936,7 @@ SETUP_PropertyAddPropertyAdvancedHandler(
PSP_ADDPROPERTYPAGE_DATA *CurrentAddPropertyPageData;
if (!DeviceInfoData)
{
struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *list = DeviceInfoSet;
CurrentAddPropertyPageData = &list->ClassInstallParams.AddPropertyPageData;
}
else

37
dll/win32/setupapi/devinst.c
View file

@ -1400,7 +1400,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(
HINF InfHandle,
PCWSTR InfSectionName)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
struct DeviceInfo *deviceInfo;
HKEY key = INVALID_HANDLE_VALUE;
DWORD rc;
@ -1574,7 +1574,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(
DWORD CreationFlags,
PSP_DEVINFO_DATA DeviceInfoData)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
struct DeviceInfo *deviceInfo = NULL;
BOOL ret = FALSE;
CONFIGRET cr;
@ -1714,7 +1714,7 @@ BOOL WINAPI SetupDiRegisterDeviceInfo(
PVOID CompareContext,
PSP_DEVINFO_DATA DupDeviceInfoData)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
WCHAR DevInstId[MAX_DEVICE_ID_LEN];
DEVINST ParentDevInst;
CONFIGRET cr;
@ -1798,7 +1798,7 @@ BOOL WINAPI SetupDiEnumDeviceInfo(
}
if (devinfo && devinfo != INVALID_HANDLE_VALUE)
{
struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo;
struct DeviceInfoSet *list = devinfo;
if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC)
{
if (info->cbSize != sizeof(SP_DEVINFO_DATA))
@ -1907,7 +1907,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW(
DWORD DeviceInstanceIdSize,
PDWORD RequiredSize)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
struct DeviceInfo *devInfo;
TRACE("%s(%p %p %p %d %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, DeviceInstanceId,
@ -2326,7 +2326,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(
/* Create the deviceset if not set */
if (deviceset)
{
list = (struct DeviceInfoSet *)deviceset;
list = deviceset;
if (list->magic != SETUP_DEVICE_INFO_SET_MAGIC)
{
SetLastError(ERROR_INVALID_HANDLE);
@ -2341,7 +2341,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(
NULL, machine, NULL);
if (hDeviceInfo == INVALID_HANDLE_VALUE)
goto cleanup;
list = (struct DeviceInfoSet *)hDeviceInfo;
list = hDeviceInfo;
}
if (flags & DIGCF_PROFILE)
@ -2420,7 +2420,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailA(
HDEVINFO DeviceInfoSet,
PSP_DEVINFO_LIST_DETAIL_DATA_A DevInfoData )
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DevInfoData);
@ -2461,7 +2461,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailW(
HDEVINFO DeviceInfoSet,
PSP_DEVINFO_LIST_DETAIL_DATA_W DevInfoData )
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DevInfoData);
@ -2535,7 +2535,8 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW(
DWORD CreationFlags,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
TRACE("%s(%p %p %s %s %08x %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData,
debugstr_guid(InterfaceClassGuid), debugstr_w(ReferenceString),
CreationFlags, DeviceInterfaceData);
@ -2620,7 +2621,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(
LONG rc;
WCHAR bracedGuidString[39];
struct DeviceInterface *DevItf;
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
TRACE("%s(%p %p %d %08x %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInterfaceData, Reserved,
samDesired, InfHandle, InfSectionName);
@ -2726,7 +2727,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
DWORD Reserved)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
BOOL ret = FALSE;
TRACE("%s(%p %p %d)\n", __FUNCTION__, DeviceInfoSet, DeviceInterfaceData, Reserved);
@ -2780,7 +2781,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(
DWORD MemberIndex,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
BOOL ret = FALSE;
TRACE("%s(%p, %p, %s, %d, %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData,
@ -2889,7 +2890,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo)
TRACE("%s(%p)\n", __FUNCTION__, devinfo);
if (devinfo && devinfo != INVALID_HANDLE_VALUE)
{
struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo;
struct DeviceInfoSet *list = devinfo;
if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC)
{
@ -2914,7 +2915,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
PDWORD RequiredSize,
PSP_DEVINFO_DATA DeviceInfoData)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailDataW = NULL;
DWORD sizeW = 0, bytesNeeded;
BOOL ret = FALSE;
@ -3008,7 +3009,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
PDWORD RequiredSize,
PSP_DEVINFO_DATA DeviceInfoData)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
BOOL ret = FALSE;
TRACE("%s(%p, %p, %p, %d, %p, %p)\n", __FUNCTION__, DeviceInfoSet,
@ -3220,7 +3221,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(
DWORD PropertyBufferSize,
PDWORD RequiredSize)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
struct DeviceInfo *devInfo;
CONFIGRET cr;
LONG lError = ERROR_SUCCESS;
@ -3354,7 +3355,7 @@ BOOL WINAPI IntSetupDiSetDeviceRegistryPropertyAW(
BOOL isAnsi)
{
BOOL ret = FALSE;
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfoSet *set = DeviceInfoSet;
struct DeviceInfo *deviceInfo;
TRACE("%s(%p %p %d %p %d)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Property,

2
dll/win32/setupapi/diskspace.c
View file

@ -244,7 +244,7 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace,
*/
BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace)
{
LPDISKSPACELIST list = (LPDISKSPACELIST)DiskSpace;
LPDISKSPACELIST list = DiskSpace;
HeapFree(GetProcessHeap(),0,list);
return TRUE;
}

4
dll/win32/setupapi/queue.c
View file

@ -1666,7 +1666,7 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
UINT_PTR param1, UINT_PTR param2 )
{
FILEPATHS_A *paths = (FILEPATHS_A *)param1;
struct default_callback_context *ctx = (struct default_callback_context *)context;
struct default_callback_context *ctx = context;
switch(notification)
{
@ -1730,7 +1730,7 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
UINT_PTR param1, UINT_PTR param2 )
{
FILEPATHS_W *paths = (FILEPATHS_W *)param1;
struct default_callback_context *ctx = (struct default_callback_context *)context;
struct default_callback_context *ctx = context;
switch(notification)
{

2
sdk/tools/winesync/setupapi.cfg
View file

@ -5,4 +5,4 @@ files:
dlls/setupapi/misc.c: dll/win32/setupapi/misc.c
dlls/setupapi/stubs.c: dll/win32/setupapi/stubs.c
tags:
wine: 4efd105fb3d5c19a43d57abe7bde1b6b0b736b2d
wine: ffae0123ac46ba6dfac74d7c84422073fd53b580