Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation due to revision 16425.

Browse source 
I forgot a parameter in SetupDiGetClassDevsExA/W ...

svn path=/trunk/; revision=16427
This commit is contained in:
Hervé Poussineau 2005-07-05 14:00:33 +00:00
parent 9b619507af
commit 7afd05c217
3 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/include/wine/setupapi.h
View file

@ -741,8 +741,8 @@ BOOL WINAPI SetupDiGetClassDescriptionExW(const GUID*, PWSTR, DWORD, PDWORD,
HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID *,LPCSTR,HWND,DWORD); HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID *,LPCSTR,HWND,DWORD);
HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID *,LPCWSTR,HWND,DWORD); HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID *,LPCWSTR,HWND,DWORD);
#define SetupDiGetClassDevs WINELIB_NAME_AW(SetupDiGetClassDevs) #define SetupDiGetClassDevs WINELIB_NAME_AW(SetupDiGetClassDevs)
HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID *,LPCSTR,HWND,DWORD,LPCSTR,PVOID); HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID *,LPCSTR,HWND,DWORD,HDEVINFO,LPCSTR,PVOID);
HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID *,LPCWSTR,HWND,DWORD,LPCWSTR,PVOID); HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID *,LPCWSTR,HWND,DWORD,HDEVINFO,LPCWSTR,PVOID);
#define SetupDiGetClassDevsEx WINELIB_NAME_AW(SetupDiGetClassDevsEx) #define SetupDiGetClassDevsEx WINELIB_NAME_AW(SetupDiGetClassDevsEx)
BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A,
DWORD, PDWORD, PSP_DEVINFO_DATA); DWORD, PDWORD, PSP_DEVINFO_DATA);

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

@ -990,7 +990,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(
DWORD flags) DWORD flags)
{ {
return SetupDiGetClassDevsExA(class, enumstr, parent, return SetupDiGetClassDevsExA(class, enumstr, parent,
flags, NULL, NULL); flags, NULL, NULL, NULL);
} }
/*********************************************************************** /***********************************************************************
@ -1003,7 +1003,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(
DWORD flags) DWORD flags)
{ {
return SetupDiGetClassDevsExW(class, enumstr, parent, return SetupDiGetClassDevsExW(class, enumstr, parent,
flags, NULL, NULL); flags, NULL, NULL, NULL);
} }
/*********************************************************************** /***********************************************************************
@ -1014,6 +1014,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(
LPCSTR enumstr, LPCSTR enumstr,
HWND parent, HWND parent,
DWORD flags, DWORD flags,
HDEVINFO deviceset,
LPCSTR machine, LPCSTR machine,
PVOID reserved) PVOID reserved)
{ {
@ -1043,7 +1044,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(
} }
MultiByteToWideChar(CP_ACP, 0, machine, -1, machineW, len); MultiByteToWideChar(CP_ACP, 0, machine, -1, machineW, len);
} }
ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags, machineW, reserved); ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags, deviceset, machineW, reserved);
end: end:
HeapFree(GetProcessHeap(), 0, enumstrW); HeapFree(GetProcessHeap(), 0, enumstrW);
@ -1195,18 +1196,21 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(
LPCWSTR enumstr, LPCWSTR enumstr,
HWND parent, HWND parent,
DWORD flags, DWORD flags,
HDEVINFO deviceset,
LPCWSTR machine, LPCWSTR machine,
PVOID reserved) PVOID reserved)
{ {
HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;
TRACE("%s %s %p 0x%08lx\n", debugstr_guid(class), debugstr_w(enumstr), TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr),
parent, flags); parent, flags, deviceset, debugstr_w(machine), reserved);
if (flags & DIGCF_PRESENT) if (flags & DIGCF_PRESENT)
FIXME(": flag DIGCF_PRESENT ignored\n"); FIXME(": flag DIGCF_PRESENT ignored\n");
if (flags & DIGCF_PROFILE) if (flags & DIGCF_PROFILE)
FIXME(": flag DIGCF_PROFILE ignored\n"); FIXME(": flag DIGCF_PROFILE ignored\n");
if (deviceset)
FIXME(": deviceset ignored\n");
if (enumstr) if (enumstr)
FIXME(": unimplemented for enumerator strings (%s)\n", FIXME(": unimplemented for enumerator strings (%s)\n",

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

@ -68,29 +68,6 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_LIST_D
return FALSE; return FALSE;
} }
/***********************************************************************
* (SETUPAPI.@)
*
* NO WINAPI in description given
*/
HDEVINFO WINAPI SetupDiGetClassDevsExA(const GUID *class, PCSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, PCSTR machine, PVOID reserved)
{
FIXME("filter %s machine %s\n",debugstr_a(filter),debugstr_a(machine));
return FALSE;
}
/***********************************************************************
* (SETUPAPI.@)
*
* NO WINAPI in description given
*/
HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, PCWSTR machine, PVOID reserved)
{
FIXME("\n");
return FALSE;
}
/*********************************************************************** /***********************************************************************
* SetupCopyOEMInfA (SETUPAPI.@) * SetupCopyOEMInfA (SETUPAPI.@)
*/ */