Changeset 21916 for trunk/include/_ras.h

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• include/_ras.h (modified) (23 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/include/_ras.h

@@ -15 +15 @@
 #ifdef RAS
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* The RAS subsystem initialization/deinitialization */
 
@@ -20 +24 @@
                  HMODULE hmod                    /* the custom dll handle */
              );
-             
+
 void WIN32API RasUninitialize (
                   void
@@ -33 +37 @@
                   ULONG cb                       /* size of event specific data */
               );
-              
+
 /* RAS events */
 #define RAS_EVENT_Kernel32InitComplete  (1)
@@ -43 +47 @@
 typedef void WIN32API FNCLF (ULONG h);
 typedef void WIN32API FNWL (ULONG h, char *buf, ULONG buflen);
- 
+
 /* Tracked objects logging functions typedefs */
-typedef void WIN32API FNRASLOG_EXTERNAL (char *fmt, ...);
+typedef void WIN32API_VA FNRASLOG_EXTERNAL (const char *fmt, ...);
 
 typedef ULONG WIN32API FNLOC (ULONG objident, ULONG objhandle, void *objdata, ULONG cbobjdata, FNRASLOG_EXTERNAL *pRasLog);
@@ -62 +66 @@
 void WIN32API RasRegisterObjectTracking (
                   RAS_TRACK_HANDLE *ph,           /* returned handle */
-                  char *objname,                  /* arbitrary distinguishable object name */
+                  const char *objname,            /* arbitrary distinguishable object name */
                   ULONG cbuserdata,               /* extra data size */
                   ULONG flags,                    /* object tracking flags */
@@ -68 +72 @@
                   FNCOC *pfnCompareObjectContent  /* custom function to compare two objects */
               );
-              
+
 void WIN32API RasDeregisterObjectTracking (
                   RAS_TRACK_HANDLE h              /* handle previously returned by RasRegisterObjectTracking */
               );
-              
+
 ULONG WIN32API RasAddObject (                     /* returns unique object ident */
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -79 +83 @@
                   ULONG cbobjdata                 /* size of object */
               );
-              
+
 void WIN32API RasTrackMemAlloc (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
                   ULONG size
               );
-              
+
 void WIN32API RasTrackMemRealloc (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -90 +94 @@
                   ULONG newsize
               );
-              
+
 void WIN32API RasTrackMemFree (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
                   ULONG size
               );
-              
+
 void WIN32API RasRemoveObject (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
                   ULONG objhandle                 /* distinctive handle of the object */
               );
-              
+
 void WIN32API RasSetObjectUserData (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -108 +112 @@
                   ULONG *pcbdataret               /* returned size of data actually saved */
               );
-              
+
 void WIN32API RasQueryObjectUserData (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -127 +131 @@
 
 /* RAS logging channels */
-typedef struct _RAS_LOG_CHANNEL;
 typedef struct _RAS_LOG_CHANNEL *RAS_LOG_CHANNEL_H;
 
@@ -135 +138 @@
                   const char *filename             /* file name to log to */
               );
-              
+
 void WIN32API RasWriteLogChannel (
                   RAS_LOG_CHANNEL_H hchannel,      /* log channel handle returned by RasOpenLogChannel */
@@ -147 +150 @@
 
 /* RAS logging functions */
-void WIN32API RasLog (
-                  char *fmt,                       /* 'printf' style format string */
-                  ...
-              );
-
-void WIN32API RasLogNoEOL (
-                  char *fmt,                       /* 'printf' style format string */ 
+void WIN32API_VA RasLog (
+                  const char *fmt,                 /* 'printf' style format string */
+                  ...
+              );
+
+void WIN32API_VA RasLogNoEOL (
+                  const char *fmt,                 /* 'printf' style format string */
                   ...
               );
@@ -162 +165 @@
                   ULONG parm2                      /* message parameter 2 */
               );
-        
+
 #define RAS_FLAG_LOG_OBJECTS (0x1)
 
@@ -170 +173 @@
               );
 
-void WIN32API RasLog2 (
+void WIN32API_VA RasLog2 (
                   RAS_LOG_CHANNEL_H hchannel,      /* log channel to log to */
                   char *fmt,                       /* 'printf' style format string */
@@ -176 +179 @@
               );
 
-void WIN32API RasLogNoEOL2 (
+void WIN32API_VA RasLogNoEOL2 (
                   RAS_LOG_CHANNEL_H hchannel,      /* log channel to log to */
-                  char *fmt,                       /* 'printf' style format string */ 
+                  char *fmt,                       /* 'printf' style format string */
                   ...
               );
@@ -188 +191 @@
                   ULONG parm2                      /* message parameter 2 */
               );
-        
+
 /* RAS replacement for C runtime sprintf function */
+#ifdef __GNUC__
+int WIN32API_VA ras_snprintf (
+#else
 int WIN32API snprintf (
+#endif
                   char *buf,                       /* memory buffer for formatted string */
                   int n,                           /* length of memeory buffer */
-                  const char *fmt,                 /* 'printf' style format string */ 
+                  const char *fmt,                 /* 'printf' style format string */
                   ...
              );
-             
+
 /* Tracked object counting function */
 void WIN32API RasCountObjects (
@@ -215 +222 @@
  * any external API (OS/2 and or C runtime functions).
  */
- 
+
 typedef struct _RASCONTEXT
 {
@@ -238 +245 @@
               );
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 /* RAS entries that are passed to plugin to use
@@ -245 +255 @@
     ULONG cb;
 
-    void  (* WIN32API RasRegisterObjectTracking) (RAS_TRACK_HANDLE *ph, char *objname, ULONG cbuserdata, ULONG flags, FNLOC *pfnLogObjectContent, FNCOC *pfnCompareObjectContent);
+    void  (* WIN32API RasRegisterObjectTracking) (RAS_TRACK_HANDLE *ph, const char *objname, ULONG cbuserdata, ULONG flags, FNLOC *pfnLogObjectContent, FNCOC *pfnCompareObjectContent);
     void  (* WIN32API RasDeregisterObjectTracking) (RAS_TRACK_HANDLE h);
     ULONG (* WIN32API RasAddObject) (RAS_TRACK_HANDLE h, ULONG objhandle, void *objdata, ULONG cbobjdata);
@@ -256 +266 @@
     void  (* WIN32API RasWriteLogChannel) (RAS_LOG_CHANNEL_H hchannel, const char *msg, ULONG length);
     void  (* WIN32API RasCloseLogChannel) (RAS_LOG_CHANNEL_H hchannel);
-    void  (* WIN32API RasLog) (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...);
-    void  (* WIN32API RasLogNoEOL) (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...);
+    void  (* WIN32API_VA RasLog) (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...);
+    void  (* WIN32API_VA RasLogNoEOL) (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...);
     void  (* WIN32API RasLogMsg) (RAS_LOG_CHANNEL_H hchannel, ULONG msg, ULONG parm1, ULONG parm2);
-    int   (* WIN32API snprintf) (char *buf, int n, const char *fmt, ...);
+    int   (* WIN32API_VA snprintf) (char *buf, int n, const char *fmt, ...);
     void  (* WIN32API RasSaveContext) (RASCONTEXT *pcontext);
     void  (* WIN32API RasRestoreContext) (RASCONTEXT *pcontext);
@@ -269 +279 @@
     void  (* WIN32API RasTrackMemFree) (RAS_TRACK_HANDLE h, ULONG size);
     RAS_TRACK_HANDLE (* WIN32API RasGetTrackHandle) (const char *objname);
-              
+
 } RasEntryTable;
 
@@ -286 +296 @@
 
 /* RAS breakpoint support */
+#if defined(__GNUC__)
+#include <sys/builtin.h>
+#else
 #include <builtin.h>
+#endif
 
 #ifdef __cplusplus
@@ -299 +313 @@
 #define RasDebugInt3_x(a, b, c) RasBreakPoint(__FILE__, __FUNCTION__, __LINE__, a, b, c)
 
-void __INLINE RasBreakPoint (char *szFile, char *szFunction, int iLine, ULONG msg, ULONG parm1, ULONG parm2)
+void __INLINE RasBreakPoint (const char *szFile, const char *szFunction, int iLine, ULONG msg, ULONG parm1, ULONG parm2)
 {
     RasLog ("BreakPoint at %s(%d)::%s", szFile, iLine, szFunction);

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk