Changeset 9985 for trunk/include

Timestamp:

Apr 7, 2003, 8:40:07 PM (22 years ago)

Author:

sandervl

Message:

PF: header updates

Location:

trunk/include

Files:

• FastInfoBlocks.h (modified) (2 diffs)
• odin.h (modified) (3 diffs)
• win/debugtools.h (modified) (4 diffs)
• win/ntddk.h (modified) (2 diffs)
• win/ntdef.h (modified) (2 diffs)

trunk/include/FastInfoBlocks.h

@@ -1 @@
-/* $Id: FastInfoBlocks.h,v 1.1 2003-02-28 10:28:09 sandervl Exp $
+/* $Id: FastInfoBlocks.h,v 1.2 2003-04-07 18:40:06 sandervl Exp $
  *
  * Fast InfoBlock Access.
@@ -98 +98 @@
 
 
+/**
+ * System stuff
+ */
+#define fibGetMsCount()         (_gpfibGIS->SIS_MsCount)
 
 

trunk/include/odin.h

@@ -73 +73 @@
 /* ---------- GCC/EMX ---------- */
 #ifdef __GNUC__
-  #if defined(__GNUC__) && (__GNUC__ <= 2) && (__GNUC_MINOR__ < 7)
-    #error You need gcc >= 2.7 to build Odin32
+  #if defined(__GNUC__) && (__GNUC__ <= 3) && (__GNUC_MINOR__ < 2)
+    #error You need gcc >= 3.2 to build Odin32
   #endif
   #if !defined(__stdcall__)             /* this is also defined in windef.h if !defined(WIN32OS2) */
@@ -84 +84 @@
   #define WIN32API  __stdcall
   #define WINAPI    __stdcall
-  #define SYSTEM   
+  #define SYSTEM    CDECL
   #define PASCAL    __stdcall
   #define INLINE    __inline__
@@ -90 +90 @@
   #define NONAMELESSUNION
   #define NONAMELESSSTRUCT
+  #undef  APIENTRY
+  #define APIENTRY  CDECL
+
 #else
 

trunk/include/win/debugtools.h

@@ -6 +6 @@
 #include <odinwrap.h>
 #include <odin.h>
+#include <stdio.h>
 
 #ifndef __MISC_H__
@@ -206 +207 @@
 #endif
 
+#ifdef __GNUC__
+inline static const char *debugstr_guid( const GUID *id )
+#else
 static char *debugstr_guid( const GUID *id )
+#endif
 {
     static char temp[64];
-    char *str;
 
     if (!id) return "(null)";
@@ -230 +234 @@
 #endif
 
+#ifdef __GNUC__
+inline static LPCSTR debugstr_an (LPCSTR src, int n)
+#else
 static LPCSTR debugstr_an (LPCSTR src, int n)
+#endif
 {
   LPSTR dst;
@@ -281 +289 @@
 /* ---------------------------------------------------------------------- */
 
+#ifdef __GNUC__
+inline static LPCSTR debugstr_wn (LPCWSTR src, int n)
+#else
 static LPCSTR debugstr_wn (LPCWSTR src, int n)
+#endif
 {
   LPSTR dst;

trunk/include/win/ntddk.h

@@ -1043 +1043 @@
 NTSTATUS WINAPI RtlInitializeCriticalSection( RTL_CRITICAL_SECTION *crit );
 NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION *crit, DWORD spincount );
+
+void     WINAPI RtlInitializeBitMap(PRTL_BITMAP,LPBYTE,ULONG);
+void     WINAPI RtlSetBits(PRTL_BITMAP,ULONG,ULONG);
+BOOLEAN  WINAPI RtlAreBitsSet(PCRTL_BITMAP,ULONG,ULONG);
+BOOLEAN  WINAPI RtlAreBitsClear(PCRTL_BITMAP,ULONG,ULONG);
+
 NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit );
 NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit );
@@ -1066 +1072 @@
 
 DWORD WINAPI RtlAdjustPrivilege(DWORD x1,DWORD x2,DWORD x3,DWORD x4);
-DWORD WINAPI RtlIntegerToChar(DWORD x1,DWORD x2,DWORD x3,DWORD x4);
+NTSTATUS  WINAPI RtlIntegerToChar(ULONG,ULONG,ULONG,PCHAR);
 LPVOID WINAPI RtlNormalizeProcessParams(LPVOID x);
 DWORD WINAPI RtlNtStatusToDosError(NTSTATUS status);

trunk/include/win/ntdef.h

@@ -1 @@
-/* $Id: ntdef.h,v 1.2 1999-06-08 15:49:37 phaller Exp $ */
-
 #ifndef __WINE_NTDEF_H
 #define __WINE_NTDEF_H
@@ -31 +29 @@
 typedef LONG NTSTATUS;
 typedef NTSTATUS *PNTSTATUS;
+
+typedef CONST char *PCSZ;
 
 typedef short CSHORT;