Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
- Get rid of indirection
See issue #5190 for more details.

svn path=/trunk/; revision=50834
This commit is contained in:
Johannes Anderwald 2011-02-20 16:50:38 +00:00
parent 759dd145d1
commit f59aa17010
6 changed files with 32 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

37
reactos/base/setup/usetup/inffile.c
View file

@ -39,13 +39,6 @@
#ifdef __REACTOS__ #ifdef __REACTOS__
VOID WINAPI
InfpCloseInfFile(
IN HINF InfHandle)
{
InfCloseFile(InfHandle);
}
BOOL WINAPI BOOL WINAPI
InfpFindFirstLineW( InfpFindFirstLineW(
IN HINF InfHandle, IN HINF InfHandle,
@ -65,28 +58,6 @@ InfpFindFirstLineW(
return TRUE; return TRUE;
} }
BOOL WINAPI
InfpGetMultiSzFieldW(
IN PINFCONTEXT Context,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize)
{
return InfGetMultiSzField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
}
BOOL WINAPI
InfpGetStringFieldW(
IN PINFCONTEXT Context,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize)
{
return InfGetStringField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
}
HINF WINAPI HINF WINAPI
InfpOpenInfFileW( InfpOpenInfFileW(
IN PCWSTR FileName, IN PCWSTR FileName,
@ -238,12 +209,4 @@ INF_OpenBufferedFileA(
#endif /* !__REACTOS__ */ #endif /* !__REACTOS__ */
} }
VOID INF_SetHeap(
IN PVOID Heap)
{
#ifdef __REACTOS__
InfSetHeap(Heap);
#endif
}
/* EOF */ /* EOF */

28
reactos/base/setup/usetup/inffile.h
View file

@ -34,14 +34,9 @@
#include <infcommon.h> #include <infcommon.h>
#define SetupCloseInfFile InfpCloseInfFile
#define SetupFindFirstLineW InfpFindFirstLineW #define SetupFindFirstLineW InfpFindFirstLineW
#define SetupFindNextLine InfFindNextLine
#define SetupGetBinaryField InfGetBinaryField
#define SetupGetFieldCount InfGetFieldCount #define SetupGetFieldCount InfGetFieldCount
#define SetupGetIntField InfGetIntField #define SetupGetIntField InfGetIntField
#define SetupGetMultiSzFieldW InfpGetMultiSzFieldW
#define SetupGetStringFieldW InfpGetStringFieldW
#define SetupOpenInfFileW InfpOpenInfFileW #define SetupOpenInfFileW InfpOpenInfFileW
#define INF_STYLE_WIN4 0x00000002 #define INF_STYLE_WIN4 0x00000002
@ -55,10 +50,6 @@ typedef struct _INFCONTEXT
PVOID Line; PVOID Line;
} INFCONTEXT; } INFCONTEXT;
VOID WINAPI
InfpCloseInfFile(
IN HINF InfHandle);
BOOL WINAPI BOOL WINAPI
InfpFindFirstLineW( InfpFindFirstLineW(
IN HINF InfHandle, IN HINF InfHandle,
@ -66,22 +57,6 @@ InfpFindFirstLineW(
IN PCWSTR Key, IN PCWSTR Key,
IN OUT PINFCONTEXT Context); IN OUT PINFCONTEXT Context);
BOOL WINAPI
InfpGetMultiSzFieldW(
IN PINFCONTEXT Context,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize);
BOOL WINAPI
InfpGetStringFieldW(
IN PINFCONTEXT Context,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize);
HINF WINAPI HINF WINAPI
InfpOpenInfFileW( InfpOpenInfFileW(
IN PCWSTR FileName, IN PCWSTR FileName,
@ -113,7 +88,4 @@ INF_OpenBufferedFileA(
IN LCID LocaleId, IN LCID LocaleId,
OUT PUINT ErrorLine); OUT PUINT ErrorLine);
VOID INF_SetHeap(
IN PVOID Heap);
/* EOF */ /* EOF */

2
reactos/base/setup/usetup/interface/usetup.c
View file

@ -3978,7 +3978,7 @@ NtProcessStartup(PPEB Peb)
RtlNormalizeProcessParams(Peb->ProcessParameters); RtlNormalizeProcessParams(Peb->ProcessParameters);
ProcessHeap = Peb->ProcessHeap; ProcessHeap = Peb->ProcessHeap;
INF_SetHeap(ProcessHeap); InfSetHeap(ProcessHeap);
RunUSetup(); RunUSetup();
} }
#endif /* __REACTOS__ */ #endif /* __REACTOS__ */

2
reactos/base/setup/usetup/registry.c
View file

@ -646,7 +646,7 @@ ImportRegistryFile(PWSTR Filename,
DPRINT1("registry_callback() failed\n"); DPRINT1("registry_callback() failed\n");
} }
SetupCloseInfFile (hInf); InfCloseFile (hInf);
return TRUE; return TRUE;
} }

30
reactos/base/setup/usetup/usetup.h
View file

@ -78,6 +78,36 @@ extern UNICODE_STRING SourcePath;
extern BOOLEAN IsUnattendedSetup; extern BOOLEAN IsUnattendedSetup;
extern PWCHAR SelectedLanguageId; extern PWCHAR SelectedLanguageId;
#ifdef __REACTOS__
extern VOID InfSetHeap(PVOID Heap);
extern VOID InfCloseFile(HINF InfHandle);
extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn,
PINFCONTEXT ContextOut);
extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context,
ULONG FieldIndex,
PUCHAR ReturnBuffer,
ULONG ReturnBufferSize,
PULONG RequiredSize);
extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context,
ULONG FieldIndex,
PWSTR ReturnBuffer,
ULONG ReturnBufferSize,
PULONG RequiredSize);
extern BOOLEAN InfGetStringField(PINFCONTEXT Context,
ULONG FieldIndex,
PWSTR ReturnBuffer,
ULONG ReturnBufferSize,
PULONG RequiredSize);
#define SetupCloseInfFile InfCloseFile
#define SetupFindNextLine InfFindNextLine
#define SetupGetBinaryField InfGetBinaryField
#define SetupGetMultiSzFieldW InfGetMultiSzField
#define SetupGetStringFieldW InfGetStringField
#endif /* __REACTOS__ */
typedef enum _PAGE_NUMBER typedef enum _PAGE_NUMBER
{ {
START_PAGE, START_PAGE,

19
reactos/lib/inflib/infros.h
View file

@ -14,7 +14,6 @@ extern "C" {
#include <infcommon.h> #include <infcommon.h>
extern VOID InfSetHeap(PVOID Heap);
extern NTSTATUS InfOpenBufferedFile(PHINF InfHandle, extern NTSTATUS InfOpenBufferedFile(PHINF InfHandle,
PVOID Buffer, PVOID Buffer,
ULONG BufferSize, ULONG BufferSize,
@ -25,13 +24,10 @@ extern NTSTATUS InfOpenFile(PHINF InfHandle,
extern NTSTATUS InfWriteFile(HINF InfHandle, extern NTSTATUS InfWriteFile(HINF InfHandle,
PUNICODE_STRING FileName, PUNICODE_STRING FileName,
PUNICODE_STRING HeaderComment); PUNICODE_STRING HeaderComment);
extern VOID InfCloseFile(HINF InfHandle);
extern BOOLEAN InfFindFirstLine(HINF InfHandle, extern BOOLEAN InfFindFirstLine(HINF InfHandle,
PCWSTR Section, PCWSTR Section,
PCWSTR Key, PCWSTR Key,
PINFCONTEXT *Context); PINFCONTEXT *Context);
extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn,
PINFCONTEXT ContextOut);
extern BOOLEAN InfFindFirstMatchLine(PINFCONTEXT ContextIn, extern BOOLEAN InfFindFirstMatchLine(PINFCONTEXT ContextIn,
PCWSTR Key, PCWSTR Key,
PINFCONTEXT ContextOut); PINFCONTEXT ContextOut);
@ -41,24 +37,9 @@ extern BOOLEAN InfFindNextMatchLine(PINFCONTEXT ContextIn,
extern LONG InfGetLineCount(HINF InfHandle, extern LONG InfGetLineCount(HINF InfHandle,
PCWSTR Section); PCWSTR Section);
extern LONG InfGetFieldCount(PINFCONTEXT Context); extern LONG InfGetFieldCount(PINFCONTEXT Context);
extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context,
ULONG FieldIndex,
PUCHAR ReturnBuffer,
ULONG ReturnBufferSize,
PULONG RequiredSize);
extern BOOLEAN InfGetIntField(PINFCONTEXT Context, extern BOOLEAN InfGetIntField(PINFCONTEXT Context,
ULONG FieldIndex, ULONG FieldIndex,
PINT IntegerValue); PINT IntegerValue);
extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context,
ULONG FieldIndex,
PWSTR ReturnBuffer,
ULONG ReturnBufferSize,
PULONG RequiredSize);
extern BOOLEAN InfGetStringField(PINFCONTEXT Context,
ULONG FieldIndex,
PWSTR ReturnBuffer,
ULONG ReturnBufferSize,
PULONG RequiredSize);
extern BOOLEAN InfGetData(PINFCONTEXT Context, extern BOOLEAN InfGetData(PINFCONTEXT Context,
PWCHAR *Key, PWCHAR *Key,
PWCHAR *Data); PWCHAR *Data);