Changeset 5305

Timestamp:

Mar 12, 2001, 7:10:09 PM (25 years ago)

Author:

sandervl

Message:

dll entrypoint update

Location:

trunk

Files:

• include/initdll.h (modified) (2 diffs)
• src/ddraw/initterm.cpp (modified) (4 diffs)
• src/dsound/initterm.cpp (modified) (3 diffs)

trunk/include/initdll.h

@@ -3 +3 @@
 
 #if (defined(__IBMCPP__) || defined(__IBMC__))
+
+#define DLLENTRYPOINT_CCONV SYSTEM
+#define DLLENTRYPOINT_NAME  _DLL_InitTerm
+
 #ifdef __cplusplus
 extern "C" {
@@ -44 +48 @@
 #endif
 
+#elif defined(__WATCOMC__)
+
+#define DLLENTRYPOINT_CCONV APIENTRY
+#define DLLENTRYPOINT_NAME  LibMain
+
+#define ctordtorInit()
+#define ctordtorTerm()
+
 #endif
 

trunk/src/ddraw/initterm.cpp

@@ -46 +46 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+BOOL WINAPI OdinLibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
    switch (fdwReason)
@@ -58 +58 @@
 
    case DLL_PROCESS_DETACH:
-#ifdef __IBMCPP__
         ctordtorTerm();
-#endif
         return TRUE;
    }
@@ -73 +71 @@
 /* calling this function.                                                   */
 /****************************************************************************/
-unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long
-                                   ulFlag)
+ULONG DLLENTRYPOINT_CCONV DLLENTRYPOINT_NAME(ULONG hModule, ULONG ulFlag)
 {
 
@@ -86 +83 @@
       case 0 :
       {
-#ifdef __IBMCPP__
-         ctordtorInit();
-#endif
          DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
          char *endofpath = strrchr(ddrawPath, '\\');
          if(endofpath) *(endofpath+1) = 0;
 
+         ctordtorInit();
+
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab,
+         dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab,
                                    DDRAW_MAJORIMAGE_VERSION, DDRAW_MINORIMAGE_VERSION,
                                    IMAGE_SUBSYSTEM_WINDOWS_GUI);

trunk/src/dsound/initterm.cpp

@@ -58 +58 @@
 
    case DLL_PROCESS_DETACH:
-#ifdef __IBMCPP__
         ctordtorTerm();
-#endif
         return TRUE;
    }
@@ -73 +71 @@
 /* calling this function.                                                   */
 /****************************************************************************/
-#ifdef __IBMCPP__
-unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long ulFlag)
-#else
-unsigned long APIENTRY LibMain(unsigned long hModule, unsigned long ulFlag)
-#endif
+ULONG DLLENTRYPOINT_CCONV DLLENTRYPOINT_NAME(ULONG hModule, ULONG ulFlag)
 {
 
@@ -92 +86 @@
          char *endofpath = strrchr(dsoundPath, '\\');
          if(endofpath) *(endofpath+1) = 0;
-#ifdef __IBMCPP__
+
          ctordtorInit();
-#endif
+
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/