From 5baf01f96f81a4c3cba91d5fe29c08ed8ed8aac7 Mon Sep 17 00:00:00 2001 From: Samuel Serapion Date: Wed, 24 Sep 2008 04:07:16 +0000 Subject: [PATCH] Remove references to Infp Functions that collide with inflib names, call the actual functions instead of making small functions that shared the same parameters and just called into inflib anyway, with no changes whatsoever. Make InfpGetIntField's 3rd parameter an INT* svn path=/branches/ros-amd64-bringup/; revision=36443 --- reactos/base/setup/usetup/inffile.c | 40 ----------------------------- reactos/base/setup/usetup/inffile.h | 31 +++------------------- reactos/base/setup/usetup/usetup.h | 1 + reactos/lib/inflib/infget.c | 2 +- reactos/lib/inflib/infpriv.h | 2 +- reactos/lib/inflib/infros.h | 2 +- reactos/lib/inflib/infrosget.c | 2 +- 7 files changed, 9 insertions(+), 71 deletions(-) diff --git a/reactos/base/setup/usetup/inffile.c b/reactos/base/setup/usetup/inffile.c index 17d2cd25a62..173781c660a 100644 --- a/reactos/base/setup/usetup/inffile.c +++ b/reactos/base/setup/usetup/inffile.c @@ -65,46 +65,6 @@ InfpFindFirstLineW( return TRUE; } -BOOL WINAPI -InfpFindNextLine( - IN PINFCONTEXT ContextIn, - OUT PINFCONTEXT ContextOut) -{ - return InfFindNextLine(ContextIn, ContextOut); -} - -BOOL WINAPI -InfpGetBinaryField( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - IN OUT BYTE* ReturnBuffer, - IN ULONG ReturnBufferSize, - OUT PULONG RequiredSize) -{ - return InfGetBinaryField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); -} - -DWORD WINAPI -InfpGetFieldCount( - IN PINFCONTEXT Context) -{ - return (DWORD)InfGetFieldCount(Context); -} - -BOOL WINAPI -InfpGetIntField( - IN PINFCONTEXT Context, - IN DWORD FieldIndex, - OUT PINT IntegerValue) -{ - LONG IntegerValueL; - BOOL ret; - - ret = InfGetIntField(Context, FieldIndex, &IntegerValueL); - *IntegerValue = (INT)IntegerValueL; - return ret; -} - BOOL WINAPI InfpGetMultiSzFieldW( IN PINFCONTEXT Context, diff --git a/reactos/base/setup/usetup/inffile.h b/reactos/base/setup/usetup/inffile.h index 7aa1e1c2752..f17e7cbb019 100644 --- a/reactos/base/setup/usetup/inffile.h +++ b/reactos/base/setup/usetup/inffile.h @@ -37,10 +37,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 +67,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, diff --git a/reactos/base/setup/usetup/usetup.h b/reactos/base/setup/usetup/usetup.h index ce933d8a5a6..b634e06611d 100644 --- a/reactos/base/setup/usetup/usetup.h +++ b/reactos/base/setup/usetup/usetup.h @@ -54,6 +54,7 @@ /* Internal Headers */ #include "interface/consup.h" #include "partlist.h" +#include "infros.h" #include "inffile.h" #include "inicache.h" #include "progress.h" diff --git a/reactos/lib/inflib/infget.c b/reactos/lib/inflib/infget.c index ff23a2c3f7b..6e713d4d534 100644 --- a/reactos/lib/inflib/infget.c +++ b/reactos/lib/inflib/infget.c @@ -271,7 +271,7 @@ InfpGetBinaryField(PINFCONTEXT Context, INFSTATUS InfpGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue) + INT* IntegerValue) { PINFCACHELINE CacheLine; PINFCACHEFIELD CacheField; diff --git a/reactos/lib/inflib/infpriv.h b/reactos/lib/inflib/infpriv.h index 2619b1ca77a..cde48d42579 100644 --- a/reactos/lib/inflib/infpriv.h +++ b/reactos/lib/inflib/infpriv.h @@ -116,7 +116,7 @@ extern INFSTATUS InfpGetBinaryField(PINFCONTEXT Context, PULONG RequiredSize); extern INFSTATUS InfpGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue); + INT* IntegerValue); extern INFSTATUS InfpGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PTSTR ReturnBuffer, diff --git a/reactos/lib/inflib/infros.h b/reactos/lib/inflib/infros.h index e959a72a9e7..77368cbdd24 100644 --- a/reactos/lib/inflib/infros.h +++ b/reactos/lib/inflib/infros.h @@ -49,7 +49,7 @@ extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, PULONG RequiredSize); extern BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue); + PINT IntegerValue); extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PWSTR ReturnBuffer, diff --git a/reactos/lib/inflib/infrosget.c b/reactos/lib/inflib/infrosget.c index 9f3e7b06abf..ee919cb4288 100644 --- a/reactos/lib/inflib/infrosget.c +++ b/reactos/lib/inflib/infrosget.c @@ -84,7 +84,7 @@ InfGetBinaryField(PINFCONTEXT Context, BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue) + PINT IntegerValue) { return INF_SUCCESS(InfpGetIntField(Context, FieldIndex, IntegerValue)); }