MSVC porting fixes.
This commit is contained in:
Steven Edwards
Alexandre Julliard
parent
49c6a8d73d
commit
6518b5ca27
|
|
@ -1312,7 +1312,7 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE
|
|||
/***********************************************************************
|
||||
* SetupFindNextLine (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupFindNextLine( const INFCONTEXT *context_in, INFCONTEXT *context_out )
|
||||
BOOL WINAPI SetupFindNextLine( PINFCONTEXT context_in, PINFCONTEXT context_out )
|
||||
{
|
||||
struct inf_file *file = context_in->CurrentInf;
|
||||
struct section *section;
|
||||
|
|
@ -1353,8 +1353,8 @@ BOOL WINAPI SetupFindNextLine( const INFCONTEXT *context_in, INFCONTEXT *context
|
|||
/***********************************************************************
|
||||
* SetupFindNextMatchLineA (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupFindNextMatchLineA( const INFCONTEXT *context_in, PCSTR key,
|
||||
INFCONTEXT *context_out )
|
||||
BOOL WINAPI SetupFindNextMatchLineA( PINFCONTEXT context_in, PCSTR key,
|
||||
PINFCONTEXT context_out )
|
||||
{
|
||||
UNICODE_STRING keyW;
|
||||
BOOL ret = FALSE;
|
||||
|
|
@ -1375,8 +1375,8 @@ BOOL WINAPI SetupFindNextMatchLineA( const INFCONTEXT *context_in, PCSTR key,
|
|||
/***********************************************************************
|
||||
* SetupFindNextMatchLineW (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupFindNextMatchLineW( const INFCONTEXT *context_in, PCWSTR key,
|
||||
INFCONTEXT *context_out )
|
||||
BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key,
|
||||
PINFCONTEXT context_out )
|
||||
{
|
||||
struct inf_file *file = context_in->CurrentInf;
|
||||
struct section *section;
|
||||
|
|
@ -1437,8 +1437,8 @@ BOOL WINAPI SetupFindNextMatchLineW( const INFCONTEXT *context_in, PCWSTR key,
|
|||
/***********************************************************************
|
||||
* SetupGetLineTextW (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetLineTextW( const INFCONTEXT *context, HINF hinf, PCWSTR section_name,
|
||||
PCWSTR key_name, PWSTR buffer, DWORD size, DWORD *required )
|
||||
BOOL WINAPI SetupGetLineTextW( PINFCONTEXT context, HINF hinf, PCWSTR section_name,
|
||||
PCWSTR key_name, PWSTR buffer, DWORD size, PDWORD required )
|
||||
{
|
||||
struct inf_file *file;
|
||||
struct line *line;
|
||||
|
|
@ -1488,8 +1488,8 @@ BOOL WINAPI SetupGetLineTextW( const INFCONTEXT *context, HINF hinf, PCWSTR sect
|
|||
/***********************************************************************
|
||||
* SetupGetLineTextA (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetLineTextA( const INFCONTEXT *context, HINF hinf, PCSTR section_name,
|
||||
PCSTR key_name, PSTR buffer, DWORD size, DWORD *required )
|
||||
BOOL WINAPI SetupGetLineTextA( PINFCONTEXT context, HINF hinf, PCSTR section_name,
|
||||
PCSTR key_name, PSTR buffer, DWORD size, PDWORD required )
|
||||
{
|
||||
struct inf_file *file;
|
||||
struct line *line;
|
||||
|
|
@ -1539,7 +1539,7 @@ BOOL WINAPI SetupGetLineTextA( const INFCONTEXT *context, HINF hinf, PCSTR secti
|
|||
/***********************************************************************
|
||||
* SetupGetFieldCount (SETUPAPI.@)
|
||||
*/
|
||||
DWORD WINAPI SetupGetFieldCount( const INFCONTEXT *context )
|
||||
DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context )
|
||||
{
|
||||
struct inf_file *file = context->CurrentInf;
|
||||
struct line *line = get_line( file, context->Section, context->Line );
|
||||
|
|
@ -1552,8 +1552,8 @@ DWORD WINAPI SetupGetFieldCount( const INFCONTEXT *context )
|
|||
/***********************************************************************
|
||||
* SetupGetStringFieldA (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetStringFieldA( const INFCONTEXT *context, DWORD index, PSTR buffer,
|
||||
DWORD size, DWORD *required )
|
||||
BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer,
|
||||
DWORD size, PDWORD required )
|
||||
{
|
||||
struct inf_file *file = context->CurrentInf;
|
||||
struct field *field = get_field( file, context->Section, context->Line, index );
|
||||
|
|
@ -1583,8 +1583,8 @@ BOOL WINAPI SetupGetStringFieldA( const INFCONTEXT *context, DWORD index, PSTR b
|
|||
/***********************************************************************
|
||||
* SetupGetStringFieldW (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetStringFieldW( const INFCONTEXT *context, DWORD index, PWSTR buffer,
|
||||
DWORD size, DWORD *required )
|
||||
BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer,
|
||||
DWORD size, PDWORD required )
|
||||
{
|
||||
struct inf_file *file = context->CurrentInf;
|
||||
struct field *field = get_field( file, context->Section, context->Line, index );
|
||||
|
|
@ -1614,7 +1614,7 @@ BOOL WINAPI SetupGetStringFieldW( const INFCONTEXT *context, DWORD index, PWSTR
|
|||
/***********************************************************************
|
||||
* SetupGetIntField (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetIntField( const INFCONTEXT *context, DWORD index, INT *result )
|
||||
BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result )
|
||||
{
|
||||
char localbuff[20];
|
||||
char *end, *buffer = localbuff;
|
||||
|
|
@ -1645,8 +1645,8 @@ BOOL WINAPI SetupGetIntField( const INFCONTEXT *context, DWORD index, INT *resul
|
|||
/***********************************************************************
|
||||
* SetupGetBinaryField (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetBinaryField( const INFCONTEXT *context, DWORD index, BYTE *buffer,
|
||||
DWORD size, DWORD *required )
|
||||
BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer,
|
||||
DWORD size, LPDWORD required )
|
||||
{
|
||||
struct inf_file *file = context->CurrentInf;
|
||||
struct line *line = get_line( file, context->Section, context->Line );
|
||||
|
|
@ -1702,8 +1702,8 @@ BOOL WINAPI SetupGetBinaryField( const INFCONTEXT *context, DWORD index, BYTE *b
|
|||
/***********************************************************************
|
||||
* SetupGetMultiSzFieldA (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetMultiSzFieldA( const INFCONTEXT *context, DWORD index, PSTR buffer,
|
||||
DWORD size, DWORD *required )
|
||||
BOOL WINAPI SetupGetMultiSzFieldA( PINFCONTEXT context, DWORD index, PSTR buffer,
|
||||
DWORD size, LPDWORD required )
|
||||
{
|
||||
struct inf_file *file = context->CurrentInf;
|
||||
struct line *line = get_line( file, context->Section, context->Line );
|
||||
|
|
@ -1751,8 +1751,8 @@ BOOL WINAPI SetupGetMultiSzFieldA( const INFCONTEXT *context, DWORD index, PSTR
|
|||
/***********************************************************************
|
||||
* SetupGetMultiSzFieldW (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupGetMultiSzFieldW( const INFCONTEXT *context, DWORD index, PWSTR buffer,
|
||||
DWORD size, DWORD *required )
|
||||
BOOL WINAPI SetupGetMultiSzFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer,
|
||||
DWORD size, LPDWORD required )
|
||||
{
|
||||
struct inf_file *file = context->CurrentInf;
|
||||
struct line *line = get_line( file, context->Section, context->Line );
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 )
|
|||
*
|
||||
* WINAPI in description not given
|
||||
*/
|
||||
HKEY WINAPI SetupDiOpenClassRegKeyExW(LPGUID class, DWORD access, DWORD flags, LPCWSTR machine, PVOID reserved)
|
||||
HKEY WINAPI SetupDiOpenClassRegKeyExW(const GUID* class, REGSAM access, DWORD flags, PCWSTR machine, PVOID reserved)
|
||||
{
|
||||
FIXME("\n");
|
||||
return INVALID_HANDLE_VALUE;
|
||||
|
|
@ -64,7 +64,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW(LPGUID class, DWORD access, DWORD flags, L
|
|||
/***********************************************************************
|
||||
* SetupDiGetClassDescriptionExW (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupDiGetClassDescriptionExW (GUID* class, LPCWSTR desc, DWORD size, PDWORD required, LPCWSTR machine, PVOID reserved)
|
||||
BOOL WINAPI SetupDiGetClassDescriptionExW (const GUID* class, PWSTR desc, DWORD size, PDWORD required, PCWSTR machine, PVOID reserved)
|
||||
{
|
||||
FIXME("\n");
|
||||
return FALSE;
|
||||
|
|
@ -73,7 +73,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW (GUID* class, LPCWSTR desc, DWORD size
|
|||
/***********************************************************************
|
||||
* SetupDiClassNameFromGuidExW (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupDiClassNameFromGuidExW (GUID* class, LPCWSTR desc, DWORD size, PDWORD required, LPCWSTR machine, PVOID reserved)
|
||||
BOOL WINAPI SetupDiClassNameFromGuidExW (const GUID* class, PWSTR desc, DWORD size, PDWORD required, PCWSTR machine, PVOID reserved)
|
||||
{
|
||||
FIXME("\n");
|
||||
return FALSE;
|
||||
|
|
@ -89,9 +89,9 @@ BOOL WINAPI SetupDiBuildClassInfoListExW(DWORD flags, LPGUID list, DWORD size, P
|
|||
}
|
||||
|
||||
/***********************************************************************
|
||||
* SetupDiGetDeviceInfoListDetailW (SETUPAPI.@)
|
||||
* SetupDiGetDeviceInfoListDetailA (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupDiGetDeviceInfoListDetailA(HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data )
|
||||
BOOL WINAPI SetupDiGetDeviceInfoListDetailA(HDEVINFO devinfo, PSP_DEVINFO_LIST_DETAIL_DATA_A devinfo_data )
|
||||
{
|
||||
FIXME("\n");
|
||||
return FALSE;
|
||||
|
|
@ -100,7 +100,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailA(HDEVINFO devinfo, PSP_DEVINFO_DATA d
|
|||
/***********************************************************************
|
||||
* SetupDiGetDeviceInfoListDetailW (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data )
|
||||
BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_LIST_DETAIL_DATA_W devinfo_data )
|
||||
{
|
||||
FIXME("\n");
|
||||
return FALSE;
|
||||
|
|
@ -109,7 +109,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_DATA d
|
|||
/***********************************************************************
|
||||
* SetupDiCreateDeviceInfoListA (SETUPAPI.@)
|
||||
*/
|
||||
HDEVINFO WINAPI SetupDiCreateDeviceInfoList(LPGUID class, HWND parend)
|
||||
HDEVINFO WINAPI SetupDiCreateDeviceInfoList(const GUID *class, HWND parend)
|
||||
{
|
||||
FIXME("\n");
|
||||
return FALSE;
|
||||
|
|
@ -118,7 +118,7 @@ HDEVINFO WINAPI SetupDiCreateDeviceInfoList(LPGUID class, HWND parend)
|
|||
/***********************************************************************
|
||||
* SetupDiCreateDeviceInfoListExW (SETUPAPI.@)
|
||||
*/
|
||||
HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(LPGUID class, HWND parend, LPCWSTR machine, PVOID reserved)
|
||||
HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(const GUID *class, HWND parend , PCWSTR machine, PVOID reserved)
|
||||
{
|
||||
FIXME("\n");
|
||||
return FALSE;
|
||||
|
|
@ -129,7 +129,7 @@ HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(LPGUID class, HWND parend, LPCWST
|
|||
*
|
||||
* NO WINAPI in description given
|
||||
*/
|
||||
HDEVINFO WINAPI SetupDiGetClassDevsExA(LPGUID class, LPCSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, LPCSTR machine, PVOID reserved)
|
||||
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;
|
||||
|
|
@ -140,7 +140,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(LPGUID class, LPCSTR filter, HWND parent,
|
|||
*
|
||||
* NO WINAPI in description given
|
||||
*/
|
||||
HDEVINFO WINAPI SetupDiGetClassDevsExW(LPGUID class, LPCWSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, LPCWSTR machine, PVOID reserved)
|
||||
HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, PCWSTR machine, PVOID reserved)
|
||||
{
|
||||
FIXME("\n");
|
||||
return FALSE;
|
||||
|
|
@ -179,10 +179,10 @@ DWORD WINAPI CM_Disconnect_Machine(DWORD handle)
|
|||
/***********************************************************************
|
||||
* SetupCopyOEMInfA (SETUPAPI.@)
|
||||
*/
|
||||
BOOL WINAPI SetupCopyOEMInfA(LPCSTR sourceinffile, LPCSTR sourcemedialoc,
|
||||
DWORD mediatype, DWORD copystyle, LPSTR destinfname,
|
||||
BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc,
|
||||
DWORD mediatype, DWORD copystyle, PSTR destinfname,
|
||||
DWORD destnamesize, PDWORD required,
|
||||
LPSTR destinfnamecomponent)
|
||||
PSTR *destinfnamecomponent)
|
||||
{
|
||||
FIXME("stub: source %s location %s ...\n",sourceinffile, sourcemedialoc);
|
||||
return FALSE;
|
||||
|
|
|
|||
|
|
@ -160,6 +160,23 @@ typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_W
|
|||
DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DEVICE_INTERFACE_DETAIL_DATA)
|
||||
DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA)
|
||||
|
||||
typedef struct _SP_DEVINFO_LIST_DETAIL_DATA_A {
|
||||
DWORD cbSize;
|
||||
GUID ClassGuid;
|
||||
HANDLE RemoteMachineHandle;
|
||||
CHAR RemoteMachineName[SP_MAX_MACHINENAME_LENGTH];
|
||||
} SP_DEVINFO_LIST_DETAIL_DATA_A, *PSP_DEVINFO_LIST_DETAIL_DATA_A;
|
||||
|
||||
typedef struct _SP_DEVINFO_LIST_DETAIL_DATA_W {
|
||||
DWORD cbSize;
|
||||
GUID ClassGuid;
|
||||
HANDLE RemoteMachineHandle;
|
||||
WCHAR RemoteMachineName[SP_MAX_MACHINENAME_LENGTH];
|
||||
} SP_DEVINFO_LIST_DETAIL_DATA_W, *PSP_DEVINFO_LIST_DETAIL_DATA_W;
|
||||
|
||||
DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DEVINFO_LIST_DETAIL_DATA)
|
||||
DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DEVINFO_LIST_DETAIL_DATA)
|
||||
|
||||
typedef struct _FILE_IN_CABINET_INFO_A {
|
||||
LPCSTR NameInCabinet;
|
||||
DWORD FileSize;
|
||||
|
|
@ -517,21 +534,21 @@ LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section );
|
|||
BOOL WINAPI SetupFindFirstLineA( HINF hinf, PCSTR section, PCSTR key, INFCONTEXT *context );
|
||||
BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTEXT *context );
|
||||
#define SetupFindFirstLine WINELIB_NAME_AW(SetupFindFirstLine)
|
||||
BOOL WINAPI SetupFindNextLine( const INFCONTEXT *, INFCONTEXT * );
|
||||
BOOL WINAPI SetupFindNextMatchLineA( const INFCONTEXT *, PCSTR, INFCONTEXT * );
|
||||
BOOL WINAPI SetupFindNextMatchLineW( const INFCONTEXT *, PCWSTR, INFCONTEXT * );
|
||||
BOOL WINAPI SetupFindNextLine( PINFCONTEXT context_in, PINFCONTEXT context_out );
|
||||
BOOL WINAPI SetupFindNextMatchLineA( PINFCONTEXT context_in, PCSTR key, PINFCONTEXT context_out );
|
||||
BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out );
|
||||
#define SetupFindNextMatchLine WINELIB_NAME_AW(SetupFindNextMatchLine)
|
||||
BOOL WINAPI SetupGetLineTextA( const INFCONTEXT *, HINF, PCSTR, PCSTR, PSTR, DWORD, DWORD * );
|
||||
BOOL WINAPI SetupGetLineTextW( const INFCONTEXT *, HINF, PCWSTR, PCWSTR, PWSTR, DWORD, DWORD * );
|
||||
BOOL WINAPI SetupGetLineTextA( PINFCONTEXT context, HINF hinf, PCSTR section_name,PCSTR key_name, PSTR buffer, DWORD size, PDWORD required );
|
||||
BOOL WINAPI SetupGetLineTextW( PINFCONTEXT context, HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR buffer, DWORD size, PDWORD required );
|
||||
#define SetupGetLineText WINELIB_NAME_AW(SetupGetLineText)
|
||||
DWORD WINAPI SetupGetFieldCount( const INFCONTEXT * );
|
||||
BOOL WINAPI SetupGetIntField( const INFCONTEXT *, DWORD, INT * );
|
||||
BOOL WINAPI SetupGetStringFieldA( const INFCONTEXT *, DWORD, PSTR, DWORD, DWORD * );
|
||||
BOOL WINAPI SetupGetStringFieldW( const INFCONTEXT *, DWORD, PWSTR, DWORD, DWORD * );
|
||||
DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context );
|
||||
BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result );
|
||||
BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, PDWORD required );
|
||||
BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, PDWORD required );
|
||||
#define SetupGetStringField WINELIB_NAME_AW(SetupGetStringField)
|
||||
BOOL WINAPI SetupGetBinaryField( const INFCONTEXT *, DWORD, BYTE *, DWORD, DWORD * );
|
||||
BOOL WINAPI SetupGetMultiSzFieldA( const INFCONTEXT *, DWORD, PSTR, DWORD, DWORD * );
|
||||
BOOL WINAPI SetupGetMultiSzFieldW( const INFCONTEXT *, DWORD, PWSTR, DWORD, DWORD * );
|
||||
BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, DWORD size, LPDWORD required );
|
||||
BOOL WINAPI SetupGetMultiSzFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, LPDWORD required );
|
||||
BOOL WINAPI SetupGetMultiSzFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, LPDWORD required );
|
||||
#define SetupGetMultiSzField WINELIB_NAME_AW(SetupGetMultiSzField)
|
||||
BOOL WINAPI SetupSetDirectoryIdA( HINF, DWORD, PCSTR );
|
||||
BOOL WINAPI SetupSetDirectoryIdW( HINF, DWORD, PCWSTR );
|
||||
|
|
|
|||
Loading…
Reference in New Issue