Sync with trunk r63270.

[reactos.git] / base / setup / usetup / inffile.h

diff --git a/base/setup/usetup/inffile.h b/base/setup/usetup/inffile.h
index 4a5b8d9..83133f9 100644 (file)
--- a/base/setup/usetup/inffile.h
+++ b/base/setup/usetup/inffile.h
@@ -34,14 +34,9 @@
 
 #include <infcommon.h>
 
-#define SetupCloseInfFile InfpCloseInfFile
 #define SetupFindFirstLineW InfpFindFirstLineW
-#define SetupFindNextLine InfFindNextLine
-#define SetupGetBinaryField InfGetBinaryField
 #define SetupGetFieldCount InfGetFieldCount
 #define SetupGetIntField InfGetIntField
-#define SetupGetMultiSzFieldW InfpGetMultiSzFieldW
-#define SetupGetStringFieldW InfpGetStringFieldW
 #define SetupOpenInfFileW InfpOpenInfFileW
 
 #define INF_STYLE_WIN4 0x00000002
@@ -50,70 +45,49 @@
  * Delete it once we don't use inflib anymore */
 typedef struct _INFCONTEXT
 {
-       PVOID Inf;
-       PVOID Section;
-       PVOID Line;
+    PVOID Inf;
+    PVOID Section;
+    PVOID Line;
 } INFCONTEXT;
 
-VOID WINAPI
-InfpCloseInfFile(
-       IN HINF InfHandle);
-
-BOOL WINAPI
+BOOL
+WINAPI
 InfpFindFirstLineW(
-       IN HINF InfHandle,
-       IN PCWSTR Section,
-       IN PCWSTR Key,
-       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);
+    IN HINF InfHandle,
+    IN PCWSTR Section,
+    IN PCWSTR Key,
+    IN OUT PINFCONTEXT Context);
 
-HINF WINAPI
+HINF
+WINAPI
 InfpOpenInfFileW(
-       IN PCWSTR FileName,
-       IN PCWSTR InfClass,
-       IN DWORD InfStyle,
-       IN LCID LocaleId,
-       OUT PUINT ErrorLine);
+    IN PCWSTR FileName,
+    IN PCWSTR InfClass,
+    IN DWORD InfStyle,
+    IN LCID LocaleId,
+    OUT PUINT ErrorLine);
 
 #endif /* __REACTOS__ */
 
 BOOLEAN
 INF_GetData(
-       IN PINFCONTEXT Context,
-       OUT PWCHAR *Key,
-       OUT PWCHAR *Data);
+    IN PINFCONTEXT Context,
+    OUT PWCHAR *Key,
+    OUT PWCHAR *Data);
 
 BOOLEAN
 INF_GetDataField(
-       IN PINFCONTEXT Context,
-       IN ULONG FieldIndex,
-       OUT PWCHAR *Data);
+    IN PINFCONTEXT Context,
+    IN ULONG FieldIndex,
+    OUT PWCHAR *Data);
 
 HINF WINAPI
 INF_OpenBufferedFileA(
-       IN PSTR FileBuffer,
-       IN ULONG FileSize,
-       IN PCSTR InfClass,
-       IN DWORD InfStyle,
-       IN LCID LocaleId,
-       OUT PUINT ErrorLine);
-
-VOID INF_SetHeap(
-       IN PVOID Heap);
+    IN PSTR FileBuffer,
+    IN ULONG FileSize,
+    IN PCSTR InfClass,
+    IN DWORD InfStyle,
+    IN LCID LocaleId,
+    OUT PUINT ErrorLine);
 
 /* EOF */