Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 12:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix some error codes

Browse source 
- Add stubs for SetupDiGetClassImageList, SetupDiGetClassImageListExA/W, SetupDiDestroyClassImageList

svn path=/trunk/; revision=19386
This commit is contained in:
Hervé Poussineau 2005-11-20 20:19:05 +00:00
parent 840ca0f27e
commit 2b72127451
3 changed files with 54 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/lib/setupapi/devinst.c
View file

@ -2774,7 +2774,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW(
else else
{ {
ERR("Invalid Flags parameter!\n"); ERR("Invalid Flags parameter!\n");
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_FLAGS);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
@ -3805,7 +3805,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(
else if (CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS)) else if (CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS))
{ {
TRACE("Unknown flags: 0x%08lx\n", CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS)); TRACE("Unknown flags: 0x%08lx\n", CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS));
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_FLAGS);
} }
else else
{ {
@ -4706,7 +4706,7 @@ SetupDiOpenDeviceInfoW(
else if (OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS)) else if (OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS))
{ {
TRACE("Unknown flags: 0x%08lx\n", OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS)); TRACE("Unknown flags: 0x%08lx\n", OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS));
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_FLAGS);
} }
else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA))
SetLastError(ERROR_INVALID_USER_BUFFER); SetLastError(ERROR_INVALID_USER_BUFFER);
@ -4755,6 +4755,8 @@ SetupDiOpenDeviceInfoW(
RegCloseKey(hEnumKey); RegCloseKey(hEnumKey);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
if (rc == ERROR_FILE_NOT_FOUND)
rc = ERROR_NO_SUCH_DEVINST;
SetLastError(rc); SetLastError(rc);
return FALSE; return FALSE;
} }

8
reactos/lib/setupapi/setupapi.spec
View file

@ -291,7 +291,7 @@
@ stub SetupDiDeleteDevRegKey @ stub SetupDiDeleteDevRegKey
@ stdcall SetupDiDeleteDeviceInfo(long ptr) @ stdcall SetupDiDeleteDeviceInfo(long ptr)
@ stub SetupDiDeleteDeviceInterfaceData @ stub SetupDiDeleteDeviceInterfaceData
@ stub SetupDiDestroyClassImageList @ stdcall SetupDiDestroyClassImageList(ptr)
@ stdcall SetupDiDestroyDeviceInfoList(long) @ stdcall SetupDiDestroyDeviceInfoList(long)
@ stdcall SetupDiDestroyDriverInfoList(long ptr long) @ stdcall SetupDiDestroyDriverInfoList(long ptr long)
@ stub SetupDiDrawMiniIcon @ stub SetupDiDrawMiniIcon
@ -313,9 +313,9 @@
@ stdcall SetupDiGetClassDevsExW(ptr wstr ptr long ptr wstr ptr) @ stdcall SetupDiGetClassDevsExW(ptr wstr ptr long ptr wstr ptr)
@ stdcall SetupDiGetClassDevsW(ptr ptr long long) @ stdcall SetupDiGetClassDevsW(ptr ptr long long)
@ stub SetupDiGetClassImageIndex @ stub SetupDiGetClassImageIndex
@ stub SetupDiGetClassImageList @ stdcall SetupDiGetClassImageList(ptr)
@ stub SetupDiGetClassImageListExA @ stdcall SetupDiGetClassImageListExA(ptr str ptr)
@ stub SetupDiGetClassImageListExW @ stdcall SetupDiGetClassImageListExW(ptr wstr ptr)
@ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsA
@ stub SetupDiGetClassInstallParamsW @ stub SetupDiGetClassInstallParamsW
@ stub SetupDiGetDeviceInfoListClass @ stub SetupDiGetDeviceInfoListClass

45
reactos/lib/setupapi/stubs.c
View file

@ -175,3 +175,48 @@ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)
FIXME ("Stub %p\n",FileLogHandle); FIXME ("Stub %p\n",FileLogHandle);
return TRUE; return TRUE;
} }
/***********************************************************************
* SetupDiGetClassImageList(SETUPAPI.@)
*/
BOOL WINAPI SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData)
{
FIXME ("Stub %p\n", ClassImageListData);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
/***********************************************************************
* SetupDiGetClassImageListExA(SETUPAPI.@)
*/
BOOL WINAPI SetupDiGetClassImageListExA(PSP_CLASSIMAGELIST_DATA ClassImageListData,
PCSTR MachineName, PVOID Reserved)
{
FIXME ("Stub %p %s %p\n", ClassImageListData, debugstr_a(MachineName), Reserved);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
/***********************************************************************
* SetupDiGetClassImageListExW(SETUPAPI.@)
*/
BOOL WINAPI SetupDiGetClassImageListExW(PSP_CLASSIMAGELIST_DATA ClassImageListData,
PCWSTR MachineName, PVOID Reserved)
{
FIXME ("Stub %p %s %p\n", ClassImageListData, debugstr_w(MachineName), Reserved);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
/***********************************************************************
* SetupDiDestroyClassImageList(SETUPAPI.@)
*/
BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData)
{
FIXME ("Stub %p\n", ClassImageListData);
return TRUE;
}