Changeset 21941

Timestamp:

Jan 18, 2012, 11:30:59 AM (13 years ago)

Author:

dmik

Message:

Add DEF_VAL macro to define argument's default values.

This is necessary to use functions with default values in C code.

Location:

trunk/include

Files:

• odin.h (modified) (1 diff)
• odinlx.h (modified) (2 diffs)
• wprocess.h (modified) (2 diffs)

trunk/include/odin.h ¶

@@ -172 +172 @@
 #endif
 
+#ifdef __cplusplus
+#define DEF_VAL(v) = v
+#else
+#define DEF_VAL(v)
+#endif
+
 #ifdef __GNUC__
 // __stdcall in GCC for OS/2 incorrectly mangles vararg functions; according to

trunk/include/odinlx.h ¶

@@ -29 +29 @@
 typedef int (* WIN32API WINMAIN)(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nShowCmd);
 
-#ifdef __cplusplus
-
 //******************************************************************************
 //Create LX Dll object and send process attach message
@@ -47 +45 @@
 DWORD WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint,
                              PVOID pResData,
-                             DWORD MajorImageVersion = ODINNT_MAJOR_VERSION,
-                             DWORD MinorImageVersion = ODINNT_MINOR_VERSION,
-                             DWORD Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI);
-#else
-
-DWORD WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint,
-                             PVOID pResData,
-                             DWORD MajorImageVersion,
-                             DWORD MinorImageVersion,
-                             DWORD Subsystem) ;
-
-#endif
+                             DWORD MajorImageVersion DEF_VAL(ODINNT_MAJOR_VERSION),
+                             DWORD MinorImageVersion DEF_VAL(ODINNT_MINOR_VERSION),
+                             DWORD Subsystem DEF_VAL(IMAGE_SUBSYSTEM_WINDOWS_CUI));
 
 //******************************************************************************

trunk/include/wprocess.h ¶

@@ -40 +40 @@
 // Set up the TEB structure of the CURRENT (!) thread
 //******************************************************************************
-BOOL   WIN32API InitializeThread(TEB *teb, BOOL fMainThread = FALSE);
+BOOL   WIN32API InitializeThread(TEB *teb, BOOL fMainThread DEF_VAL(FALSE));
 
 void   WIN32API DestroyTEB(TEB *teb);
@@ -51 +51 @@
 //NOTE: This is not done for Odin32 applications (LX), unless
 //      fForceSwitch is TRUE)
-USHORT WIN32API SetWin32TIB(BOOL fForceSwitch = TIB_SWITCH_DEFAULT);
+USHORT WIN32API SetWin32TIB(BOOL fForceSwitch DEF_VAL(TIB_SWITCH_DEFAULT));
 void   WIN32API RestoreOS2TIB();