Merge from Wine:

James Hawkins <truiken@gmail.com>
- Add stubs for SetupOpenLog, SetupCloseLog, and SetupLogError
- Implement pSetupGetField, with tests.

svn path=/trunk/; revision=24162
This commit is contained in:
Hervé Poussineau 2006-09-17 10:34:51 +00:00
parent f07b34a9d0
commit b6919c977d
3 changed files with 47 additions and 3 deletions

View file

@ -1982,6 +1982,22 @@ BOOL WINAPI SetupGetMultiSzFieldW( PINFCONTEXT context, DWORD index, PWSTR buffe
return TRUE;
}
/***********************************************************************
* pSetupGetField (SETUPAPI.@)
*/
LPCWSTR WINAPI pSetupGetField( PINFCONTEXT context, DWORD index )
{
struct inf_file *file = context->CurrentInf;
struct field *field = get_field( file, context->Section, context->Line, index );
if (!field)
{
SetLastError( ERROR_INVALID_PARAMETER );
return NULL;
}
return field->text;
}
/***********************************************************************
* SetupGetInfFileListW (SETUPAPI.@)
*/

View file

@ -248,7 +248,7 @@
@ stub SetupCancelTemporarySourceList
@ stdcall SetupCloseFileQueue(ptr)
@ stdcall SetupCloseInfFile(long)
@ stub SetupCloseLog
@ stdcall SetupCloseLog()
@ stdcall SetupCommitFileQueueA(long long ptr ptr)
@ stdcall SetupCommitFileQueueW(long long ptr ptr)
@ stdcall SetupCopyErrorA(long str str str str str long long str long ptr)
@ -446,7 +446,7 @@
@ stdcall SetupIterateCabinetA(str long ptr ptr)
@ stdcall SetupIterateCabinetW(wstr long ptr ptr)
@ stub SetupLogErrorA
@ stub SetupLogErrorW
@ stdcall SetupLogErrorW(wstr long)
@ stub SetupLogFileA
@ stub SetupLogFileW
@ stdcall SetupOpenAppendInfFileA(str long ptr)
@ -454,6 +454,7 @@
@ stdcall SetupOpenFileQueue()
@ stdcall SetupOpenInfFileA(str str long ptr)
@ stdcall SetupOpenInfFileW(wstr wstr long ptr)
@ stdcall SetupOpenLog(long)
@ stdcall SetupOpenMasterInf()
@ stub SetupPromptForDiskA
@ stub SetupPromptForDiskW
@ -543,7 +544,7 @@
@ stub pSetupAppendStringToMultiSz
@ stub pSetupDestroyRunOnceNodeList
@ stub pSetupDirectoryIdToPath
@ stub pSetupGetField
@ stdcall pSetupGetField(ptr long)
@ stub pSetupGetGlobalFlags
@ stub pSetupGetOsLoaderDriveAndPath
@ stub pSetupGetQueueFlags

View file

@ -129,6 +129,33 @@ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)
}
/***********************************************************************
* SetupCloseLog(SETUPAPI.@)
*/
void WINAPI SetupCloseLog()
{
FIXME("() stub\n");
}
/***********************************************************************
* SetupLogErrorW(SETUPAPI.@)
*/
BOOL WINAPI SetupLogErrorW(PCWSTR MessageString, LogSeverity Severity)
{
FIXME("(%s, %ld) stub\n", debugstr_w(MessageString), Severity);
return TRUE;
}
/***********************************************************************
* SetupOpenLog(SETUPAPI.@)
*/
BOOL WINAPI SetupOpenLog(BOOL Reserved)
{
FIXME("(%d) stub\n", Reserved);
return TRUE;
}
/***********************************************************************
* SetupDiDestroyClassImageList(SETUPAPI.@)
*/