- 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 7aa1e1c..4a5b8d9 100644 (file)
--- a/base/setup/usetup/inffile.h
+++ b/base/setup/usetup/inffile.h
@@ -12,9 +12,9 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /*
  * COPYRIGHT:       See COPYING in the top level directory
@@ -24,8 +24,7 @@
  * PROGRAMMER:      Hervé Poussineau
  */
 
-#ifndef __INFFILE_H__
-#define __INFFILE_H__
+#pragma once
 
 #ifndef __REACTOS__
 
@@ -37,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
@@ -67,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,
@@ -111,6 +87,7 @@ InfpOpenInfFileW(
        IN PCWSTR FileName,
        IN PCWSTR InfClass,
        IN DWORD InfStyle,
+       IN LCID LocaleId,
        OUT PUINT ErrorLine);
 
 #endif /* __REACTOS__ */
@@ -133,11 +110,10 @@ INF_OpenBufferedFileA(
        IN ULONG FileSize,
        IN PCSTR InfClass,
        IN DWORD InfStyle,
+       IN LCID LocaleId,
        OUT PUINT ErrorLine);
 
 VOID INF_SetHeap(
        IN PVOID Heap);
 
-#endif /* __INFFILE_H__*/
-
 /* EOF */