ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Avoid using CONST.

This commit is contained in:
Michael Stefaniuc 2013-09-23 00:37:16 +02:00 committed by Alexandre Julliard
parent 9fefae61da
commit 09524be583
2 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dlls/setupapi/devinst.c
View File

@ -1310,14 +1310,9 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(
/*********************************************************************** /***********************************************************************
* SetupDiCreateDeviceInfoA (SETUPAPI.@) * SetupDiCreateDeviceInfoA (SETUPAPI.@)
*/ */
BOOL WINAPI SetupDiCreateDeviceInfoA( BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceName,
HDEVINFO DeviceInfoSet, const GUID *ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags,
PCSTR DeviceName, PSP_DEVINFO_DATA DeviceInfoData)
CONST GUID *ClassGuid,
PCSTR DeviceDescription,
HWND hwndParent,
DWORD CreationFlags,
PSP_DEVINFO_DATA DeviceInfoData)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
LPWSTR DeviceNameW = NULL; LPWSTR DeviceNameW = NULL;
@ -1373,14 +1368,9 @@ static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName)
/*********************************************************************** /***********************************************************************
* SetupDiCreateDeviceInfoW (SETUPAPI.@) * SetupDiCreateDeviceInfoW (SETUPAPI.@)
*/ */
BOOL WINAPI SetupDiCreateDeviceInfoW( BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceName,
HDEVINFO DeviceInfoSet, const GUID *ClassGuid, PCWSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags,
PCWSTR DeviceName, PSP_DEVINFO_DATA DeviceInfoData)
CONST GUID *ClassGuid,
PCWSTR DeviceDescription,
HWND hwndParent,
DWORD CreationFlags,
PSP_DEVINFO_DATA DeviceInfoData)
{ {
struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfoSet *set = DeviceInfoSet;
BOOL ret = FALSE, allocatedInstanceId = FALSE; BOOL ret = FALSE, allocatedInstanceId = FALSE;
@ -1922,11 +1912,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW(
/*********************************************************************** /***********************************************************************
* SetupDiGetClassDevsA (SETUPAPI.@) * SetupDiGetClassDevsA (SETUPAPI.@)
*/ */
HDEVINFO WINAPI SetupDiGetClassDevsA( HDEVINFO WINAPI SetupDiGetClassDevsA(const GUID *class, LPCSTR enumstr, HWND parent, DWORD flags)
CONST GUID *class,
LPCSTR enumstr,
HWND parent,
DWORD flags)
{ {
HDEVINFO ret; HDEVINFO ret;
LPWSTR enumstrW = NULL; LPWSTR enumstrW = NULL;
@ -2328,11 +2314,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
/*********************************************************************** /***********************************************************************
* SetupDiGetClassDevsW (SETUPAPI.@) * SetupDiGetClassDevsW (SETUPAPI.@)
*/ */
HDEVINFO WINAPI SetupDiGetClassDevsW( HDEVINFO WINAPI SetupDiGetClassDevsW(const GUID *class, LPCWSTR enumstr, HWND parent, DWORD flags)
CONST GUID *class,
LPCWSTR enumstr,
HWND parent,
DWORD flags)
{ {
return SetupDiGetClassDevsExW(class, enumstr, parent, flags, NULL, NULL, return SetupDiGetClassDevsExW(class, enumstr, parent, flags, NULL, NULL,
NULL); NULL);
@ -2341,14 +2323,8 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(
/*********************************************************************** /***********************************************************************
* SetupDiGetClassDevsExW (SETUPAPI.@) * SetupDiGetClassDevsExW (SETUPAPI.@)
*/ */
HDEVINFO WINAPI SetupDiGetClassDevsExW( HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND parent, DWORD flags,
CONST GUID *class, HDEVINFO deviceset, PCWSTR machine, void *reserved)
PCWSTR enumstr,
HWND parent,
DWORD flags,
HDEVINFO deviceset,
PCWSTR machine,
PVOID reserved)
{ {
static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PRESENT | static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PRESENT |
DIGCF_PROFILE; DIGCF_PROFILE;
@ -2790,12 +2766,9 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(
* Success: non-zero value. * Success: non-zero value.
* Failure: FALSE. Call GetLastError() for more info. * Failure: FALSE. Call GetLastError() for more info.
*/ */
BOOL WINAPI SetupDiEnumDeviceInterfaces( BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData,
HDEVINFO DeviceInfoSet, const GUID *InterfaceClassGuid, DWORD MemberIndex,
PSP_DEVINFO_DATA DeviceInfoData, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
CONST GUID * InterfaceClassGuid,
DWORD MemberIndex,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
{ {
struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfoSet *set = DeviceInfoSet;
BOOL ret = FALSE; BOOL ret = FALSE;

4
dlls/setupapi/tests/devinst.c
View File

@ -52,8 +52,8 @@ static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DAT
static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA);
static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA);
static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA);
static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(CONST GUID *, LPCSTR, HWND, DWORD); static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(const GUID *, LPCSTR, HWND, DWORD);
static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(CONST GUID *, LPCWSTR, HWND, DWORD); static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(const GUID *, LPCWSTR, HWND, DWORD);
static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD);
static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD);
static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD);