- Fix various warnings in inflib (thanks to Ged for help with what appears to be...

[reactos.git] / reactos / lib / inflib / infpriv.h

diff --git a/reactos/lib/inflib/infpriv.h b/reactos/lib/inflib/infpriv.h
index ec6810f..4796515 100644 (file)
--- a/reactos/lib/inflib/infpriv.h
+++ b/reactos/lib/inflib/infpriv.h
@@ -9,12 +9,15 @@
 #ifndef INFPRIV_H_INCLUDED
 #define INFPRIV_H_INCLUDED
 
+#ifndef FIELD_OFFSET
+#define FIELD_OFFSET(t,f) ((ptrdiff_t)&(((t*)0)->f))
+#endif
 
-#define INF_STATUS_INSUFFICIENT_RESOURCES  (0xC000009A)
-#define INF_STATUS_BAD_SECTION_NAME_LINE   (0xC0700001)
-#define INF_STATUS_SECTION_NAME_TOO_LONG   (0xC0700002)
-#define INF_STATUS_WRONG_INF_STYLE         (0xC0700003)
-#define INF_STATUS_NOT_ENOUGH_MEMORY       (0xC0700004)
+#define INF_STATUS_INSUFFICIENT_RESOURCES  ((INFSTATUS)0xC000009A)
+#define INF_STATUS_BAD_SECTION_NAME_LINE   ((INFSTATUS)0xC0700001)
+#define INF_STATUS_SECTION_NAME_TOO_LONG   ((INFSTATUS)0xC0700002)
+#define INF_STATUS_WRONG_INF_STYLE         ((INFSTATUS)0xC0700003)
+#define INF_STATUS_NOT_ENOUGH_MEMORY       ((INFSTATUS)0xC0700004)
 
 typedef struct _INFCACHEFIELD
 {
@@ -66,7 +69,7 @@ typedef struct _INFCONTEXT
   PINFCACHELINE Line;
 } INFCONTEXT;
 
-typedef long INFSTATUS;
+typedef int INFSTATUS;
 
 /* FUNCTIONS ****************************************************************/
 
@@ -88,8 +91,8 @@ extern PINFCACHESECTION InfpFindSection(PINFCACHE Cache,
                                         PCTSTR Section);
 
 extern INFSTATUS InfpBuildFileBuffer(PINFCACHE InfHandle,
-                                     char **Buffer,
-                                     unsigned long *BufferSize);
+                                     PCHAR *Buffer,
+                                     PULONG BufferSize);
 
 extern INFSTATUS InfpFindFirstLine(PINFCACHE InfHandle,
                                    PCTSTR Section,