Synchronize with trunk revision 59636 (just before Alex's CreateProcess revamp).

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

diff --git a/base/setup/usetup/inffile.c b/base/setup/usetup/inffile.c
index 7b0d2a9..e2ea1b4 100644 (file)
--- a/base/setup/usetup/inffile.c
+++ b/base/setup/usetup/inffile.c
@@ -28,10 +28,6 @@
 
 #include "usetup.h"
 
-#ifdef __REACTOS__
-#include <infros.h>
-#endif
-
 #define NDEBUG
 #include <debug.h>
 
@@ -39,13 +35,6 @@
 
 #ifdef __REACTOS__
 
-VOID WINAPI
-InfpCloseInfFile(
-       IN HINF InfHandle)
-{
-       InfCloseFile(InfHandle);
-}
-
 BOOL WINAPI
 InfpFindFirstLineW(
        IN HINF InfHandle,
@@ -65,28 +54,6 @@ InfpFindFirstLineW(
        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
 InfpOpenInfFileW(
        IN PCWSTR FileName,
@@ -104,7 +71,7 @@ InfpOpenInfFileW(
        Status = InfOpenFile(
                &hInf,
                &FileNameU,
-               LocaleId,
+               LANGIDFROMLCID(LocaleId),
                &ErrorLineUL);
        *ErrorLine = (UINT)ErrorLineUL;
        if (!NT_SUCCESS(Status))
@@ -226,7 +193,7 @@ INF_OpenBufferedFileA(
                &hInf,
                FileBuffer,
                FileSize,
-               LocaleId,
+               LANGIDFROMLCID(LocaleId),
                &ErrorLineUL);
        *ErrorLine = (UINT)ErrorLineUL;
        if (!NT_SUCCESS(Status))
@@ -238,12 +205,4 @@ INF_OpenBufferedFileA(
 #endif /* !__REACTOS__ */
 }
 
-VOID INF_SetHeap(
-       IN PVOID Heap)
-{
-#ifdef __REACTOS__
-       InfSetHeap(Heap);
-#endif
-}
-
 /* EOF */