- merge audio headers

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

diff --git a/base/setup/usetup/inffile.h b/base/setup/usetup/inffile.h
index 52b002d..4a5b8d9 100644 (file)
--- a/base/setup/usetup/inffile.h
+++ b/base/setup/usetup/inffile.h
@@ -36,10 +36,10 @@
 
 #define SetupCloseInfFile InfpCloseInfFile
 #define SetupFindFirstLineW InfpFindFirstLineW
-#define SetupFindNextLine InfpFindNextLine
-#define SetupGetBinaryField InfpGetBinaryField
-#define SetupGetFieldCount InfpGetFieldCount
-#define SetupGetIntField InfpGetIntField
+#define SetupFindNextLine InfFindNextLine
+#define SetupGetBinaryField InfGetBinaryField
+#define SetupGetFieldCount InfGetFieldCount
+#define SetupGetIntField InfGetIntField
 #define SetupGetMultiSzFieldW InfpGetMultiSzFieldW
 #define SetupGetStringFieldW InfpGetStringFieldW
 #define SetupOpenInfFileW InfpOpenInfFileW
@@ -66,29 +66,6 @@ InfpFindFirstLineW(
        IN PCWSTR Key,
        IN OUT PINFCONTEXT Context);
 
-BOOL WINAPI
-InfpFindNextLine(
-       IN PINFCONTEXT ContextIn,
-       OUT PINFCONTEXT ContextOut);
-
-BOOL WINAPI
-InfpGetBinaryField(
-       IN PINFCONTEXT Context,
-       IN ULONG FieldIndex,
-       IN OUT BYTE* ReturnBuffer,
-       IN ULONG ReturnBufferSize,
-       OUT PULONG RequiredSize);
-
-DWORD WINAPI
-InfpGetFieldCount(
-       IN PINFCONTEXT Context);
-
-BOOL WINAPI
-InfpGetIntField(
-       IN PINFCONTEXT Context,
-       IN DWORD FieldIndex,
-       OUT PINT IntegerValue);
-
 BOOL WINAPI
 InfpGetMultiSzFieldW(
        IN PINFCONTEXT Context,
@@ -110,6 +87,7 @@ InfpOpenInfFileW(
        IN PCWSTR FileName,
        IN PCWSTR InfClass,
        IN DWORD InfStyle,
+       IN LCID LocaleId,
        OUT PUINT ErrorLine);
 
 #endif /* __REACTOS__ */
@@ -132,6 +110,7 @@ INF_OpenBufferedFileA(
        IN ULONG FileSize,
        IN PCSTR InfClass,
        IN DWORD InfStyle,
+       IN LCID LocaleId,
        OUT PUINT ErrorLine);
 
 VOID INF_SetHeap(