25 Jul
2010
25 Jul
'10
1:46 p.m.
Author: tkreuzer
Date: Sun Jul 25 13:46:54 2010
New Revision: 48251
URL: http://svn.reactos.org/svn/reactos?rev=48251&view=rev
Log:
[USETUP] / [INFLIB]
Merge r36443 from amd64 branch:
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* (Samuel Serapion)
Modified:
trunk/reactos/ (props changed)
trunk/reactos/base/setup/usetup/inffile.c
trunk/reactos/base/setup/usetup/inffile.h
trunk/reactos/base/setup/usetup/usetup.h
trunk/reactos/lib/inflib/infget.c
trunk/reactos/lib/inflib/infpriv.h
trunk/reactos/lib/inflib/infros.h
trunk/reactos/lib/inflib/infrosget.c
trunk/reactos/lib/newinflib/infget.c
trunk/reactos/lib/newinflib/infhostget.c
trunk/reactos/lib/newinflib/infpriv.h
trunk/reactos/lib/newinflib/infros.h
trunk/reactos/lib/newinflib/infrosget.c
Propchange: trunk/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 25 13:46:54 2010
@@ -1,4 +1,4 @@
/branches/header-work:45691-47721
/branches/reactos-yarotows:46372,46848,46966,47800,48026,48064
/branches/ros-amd64-bringup:36852
-/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
+/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
Modified: trunk/reactos/base/setup/usetup/inffile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.…
==============================================================================
--- trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -66,46 +66,6 @@
}
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,
IN ULONG FieldIndex,
Modified: trunk/reactos/base/setup/usetup/inffile.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.…
==============================================================================
--- trunk/reactos/base/setup/usetup/inffile.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/inffile.h [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -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
@@ -65,29 +65,6 @@
IN PCWSTR Section,
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(
Modified: trunk/reactos/base/setup/usetup/usetup.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h…
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -50,6 +50,7 @@
/* Internal Headers */
#include "interface/consup.h"
#include "partlist.h"
+#include "infros.h"
#include "inffile.h"
#include "inicache.h"
#include "progress.h"
Modified: trunk/reactos/lib/inflib/infget.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infget.c?rev=48…
==============================================================================
--- trunk/reactos/lib/inflib/infget.c [iso-8859-1] (original)
+++ trunk/reactos/lib/inflib/infget.c [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -271,7 +271,7 @@
INFSTATUS
InfpGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue)
+ INT* IntegerValue)
{
PINFCACHELINE CacheLine;
PINFCACHEFIELD CacheField;
Modified: trunk/reactos/lib/inflib/infpriv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infpriv.h?rev=4…
==============================================================================
--- trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] (original)
+++ trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -115,7 +115,7 @@
PULONG RequiredSize);
extern INFSTATUS InfpGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue);
+ INT* IntegerValue);
extern INFSTATUS InfpGetMultiSzField(PINFCONTEXT Context,
ULONG FieldIndex,
PTSTR ReturnBuffer,
Modified: trunk/reactos/lib/inflib/infros.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infros.h?rev=48…
==============================================================================
--- trunk/reactos/lib/inflib/infros.h [iso-8859-1] (original)
+++ trunk/reactos/lib/inflib/infros.h [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -48,7 +48,7 @@
PULONG RequiredSize);
extern BOOLEAN InfGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue);
+ PINT IntegerValue);
extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context,
ULONG FieldIndex,
PWSTR ReturnBuffer,
Modified: trunk/reactos/lib/inflib/infrosget.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infrosget.c?rev…
==============================================================================
--- trunk/reactos/lib/inflib/infrosget.c [iso-8859-1] (original)
+++ trunk/reactos/lib/inflib/infrosget.c [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -84,7 +84,7 @@
BOOLEAN
InfGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue)
+ PINT IntegerValue)
{
return INF_SUCCESS(InfpGetIntField(Context, FieldIndex, IntegerValue));
}
Modified: trunk/reactos/lib/newinflib/infget.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infget.c?rev…
==============================================================================
--- trunk/reactos/lib/newinflib/infget.c [iso-8859-1] (original)
+++ trunk/reactos/lib/newinflib/infget.c [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -416,7 +416,7 @@
INFSTATUS
InfpGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue)
+ PINT IntegerValue)
{
PINFCACHELINE CacheLine;
PINFCACHEFIELD CacheField;
Modified: trunk/reactos/lib/newinflib/infhostget.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhostget.c…
==============================================================================
--- trunk/reactos/lib/newinflib/infhostget.c [iso-8859-1] (original)
+++ trunk/reactos/lib/newinflib/infhostget.c [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -138,11 +138,11 @@
int
InfHostGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- ULONG *IntegerValue)
-{
- INFSTATUS Status;
-
- Status = InfpGetIntField(Context, FieldIndex, (PLONG)IntegerValue);
+ PINT IntegerValue)
+{
+ INFSTATUS Status;
+
+ Status = InfpGetIntField(Context, FieldIndex, IntegerValue);
if (INF_SUCCESS(Status))
{
return 0;
Modified: trunk/reactos/lib/newinflib/infpriv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infpriv.h?re…
==============================================================================
--- trunk/reactos/lib/newinflib/infpriv.h [iso-8859-1] (original)
+++ trunk/reactos/lib/newinflib/infpriv.h [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -116,7 +116,7 @@
PULONG RequiredSize);
extern INFSTATUS InfpGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue);
+ PINT IntegerValue);
extern INFSTATUS InfpGetMultiSzField(PINFCONTEXT Context,
ULONG FieldIndex,
PWSTR ReturnBuffer,
Modified: trunk/reactos/lib/newinflib/infros.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infros.h?rev…
==============================================================================
--- trunk/reactos/lib/newinflib/infros.h [iso-8859-1] (original)
+++ trunk/reactos/lib/newinflib/infros.h [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -50,7 +50,7 @@
PULONG RequiredSize);
extern BOOLEAN InfGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue);
+ PINT IntegerValue);
extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context,
ULONG FieldIndex,
PWSTR ReturnBuffer,
Modified: trunk/reactos/lib/newinflib/infrosget.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infrosget.c?…
==============================================================================
--- trunk/reactos/lib/newinflib/infrosget.c [iso-8859-1] (original)
+++ trunk/reactos/lib/newinflib/infrosget.c [iso-8859-1] Sun Jul 25 13:46:54 2010
@@ -84,7 +84,7 @@
BOOLEAN
InfGetIntField(PINFCONTEXT Context,
ULONG FieldIndex,
- PLONG IntegerValue)
+ PINT IntegerValue)
{
return INF_SUCCESS(InfpGetIntField(Context, FieldIndex, IntegerValue));
}