Changeset 21787

Timestamp:

Nov 3, 2011, 5:46:14 PM (14 years ago)

Author:

dmik

Message:

Workaround stdcall bug in GCC related to vararg functions.

This can be easily removed once GCC gets fixed.

Location:

branches/gcc-kmk

Files:

• include/_ras.h (modified) (6 diffs)
• include/odin.h (modified) (1 diff)
• src/kernel32/_ras.cpp (modified) (6 diffs)

branches/gcc-kmk/include/_ras.h

@@ -49 +49 @@
 
 /* Tracked objects logging functions typedefs */
-typedef void WIN32API FNRASLOG_EXTERNAL (const 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);
@@ -150 +150 @@
 
 /* RAS logging functions */
-void WIN32API RasLog (
+void WIN32API_VA RasLog (
                   const char *fmt,                 /* 'printf' style format string */
                   ...
               );
 
-void WIN32API RasLogNoEOL (
+void WIN32API_VA RasLogNoEOL (
                   const char *fmt,                 /* 'printf' style format string */
                   ...
@@ -173 +173 @@
               );
 
-void WIN32API RasLog2 (
+void WIN32API_VA RasLog2 (
                   RAS_LOG_CHANNEL_H hchannel,      /* log channel to log to */
                   char *fmt,                       /* 'printf' style format string */
@@ -179 +179 @@
               );
 
-void WIN32API RasLogNoEOL2 (
+void WIN32API_VA RasLogNoEOL2 (
                   RAS_LOG_CHANNEL_H hchannel,      /* log channel to log to */
                   char *fmt,                       /* 'printf' style format string */
@@ -194 +194 @@
 /* RAS replacement for C runtime sprintf function */
 #ifdef __GNUC__
-int WIN32API ras_snprintf (
+int WIN32API_VA ras_snprintf (
 #else
 int WIN32API snprintf (
@@ -266 +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);

branches/gcc-kmk/include/odin.h

@@ -171 +171 @@
 #endif
 
-
+#ifdef __GNUC__
+// __stdcall in GCC for OS/2 incorrectly mangles vararg functions; according to
+// MSDN, they should be equal to __cdecl instead of getting the @N suffix
+#define WIN32API_VA __cdecl
+#else
+#define WIN32API_VA WIN32API
+#endif
 
 #endif /* _ODIN_H_*/

branches/gcc-kmk/src/kernel32/_ras.cpp

@@ -618 +618 @@
 
 #ifdef __GNUC__
-int WIN32API ras_snprintf (char *buf, int n, const char *fmt, ...)
+int WIN32API_VA ras_snprintf (char *buf, int n, const char *fmt, ...)
 #else
 int WIN32API snprintf (char *buf, int n, const char *fmt, ...)
@@ -853 +853 @@
 }
 
-void WIN32API rasLogExternal (const char *fmt, ...)
+void WIN32API_VA rasLogExternal (const char *fmt, ...)
 {
     va_list args;
@@ -1864 +1864 @@
 
 
-void WIN32API RasLog (const char *fmt, ...)
+void WIN32API_VA RasLog (const char *fmt, ...)
 {
     ENTER_RAS (NO_HANDLE);
@@ -1879 +1879 @@
 }
 
-void WIN32API RasLogNoEOL (const char *fmt, ...)
+void WIN32API_VA RasLogNoEOL (const char *fmt, ...)
 {
     va_list args;
@@ -2008 +2008 @@
 }
 
-void WIN32API RasLog2 (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...)
+void WIN32API_VA RasLog2 (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...)
 {
     ENTER_RAS (NO_HANDLE);
@@ -2023 +2023 @@
 }
 
-void WIN32API RasLogNoEOL2 (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...)
+void WIN32API_VA RasLogNoEOL2 (RAS_LOG_CHANNEL_H hchannel, char *fmt, ...)
 {
     va_list args;