Changeset 21818

Timestamp:

Nov 24, 2011, 7:14:57 PM (13 years ago)

Author:

dmik

Message:

Port IMM32 to GCC.

Location:

branches/gcc-kmk/src/imm32

Files:

• Makefile.kmk (modified) (1 diff)
• initterm.cpp (moved) (moved from branches/gcc-kmk/src/imm32/initimm32.cpp ) (3 diffs)

branches/gcc-kmk/src/imm32/Makefile.kmk ¶

@@ -12 +12 @@
 
 imm32os2_SOURCES    = \
+    im32.cpp \
+    imm32.cpp \
+    initterm.cpp \
+    imm32rsrc.orc
 
 imm32os2_LIBS       = \
+    $(PATH_STAGE_LIB)/libwrap.lib \
+    $(PATH_STAGE_LIB)/odincrt.lib \
+    $(PATH_STAGE_LIB)/kernel32.lib \
+    $(PATH_STAGE_LIB)/user32.lib
 
 include $(FILE_KBUILD_SUB_FOOTER)

branches/gcc-kmk/src/imm32/initterm.cpp ¶

@@ -1 +1 @@
 /*
- * DLL entry point
+ * IMM32OS2 DLL entry point
  *
  * Copyright 1998 Sander van Leeuwen
  * Copyright 1998 Peter Fitzsimmons
  *
- *
  * Project Odin Software License can be found in LICENSE.TXT
- *
  */
 
-/*-------------------------------------------------------------*/
-/* INITERM.C -- Source for a custom dynamic link library       */
-/*              initialization and termination (_DLL_InitTerm) */
-/*              function.                                      */
-/*                                                             */
-/* When called to perform initialization, this sample function */
-/* gets storage for an array of integers, and initializes its  */
-/* elements with random integers.  At termination time, it     */
-/* frees the array.  Substitute your own special processing.   */
-/*-------------------------------------------------------------*/
-
-
-/* Include files */
 #define  INCL_DOSMODULEMGR
 #define  INCL_DOSPROCESS
-#define  INCL_GPI
 #include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <stdlib.h>
@@ -31 +15 @@
 #include <string.h>
 #include <odin.h>
-#include <win32api.h>
+#include <win32type.h>
 #include <winconst.h>
 #include <odinlx.h>
 #include <initdll.h>
+#include <exitlist.h>
 #include <dbglog.h>
 
 #include "im32.h"
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD imm32os2_PEResTab;
-}
+// Win32 resource table (produced by wrc)
+extern DWORD imm32os2_PEResTab;
 
 static HMODULE dllHandle = 0;
 
-//******************************************************************************
-//******************************************************************************
 BOOL WINAPI ImmLibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
@@ -64 +45 @@
    return FALSE;
 }
-/****************************************************************************/
-/* _DLL_InitTerm is the function that gets called by the operating system   */
-/* loader when it loads and frees this DLL for each process that accesses   */
-/* this DLL.  However, it only gets called the first time the DLL is loaded */
-/* and the last time it is freed for a particular process.  The system      */
-/* linkage convention MUST be used because the operating system loader is   */
-/* calling this function.                                                   */
-/****************************************************************************/
-ULONG APIENTRY inittermImm32(ULONG hModule, ULONG ulFlag)
+
+ULONG SYSTEM DLL_InitImm32(ULONG hModule)
 {
-   size_t i;
-   APIRET rc;
+    if (!IM32Init())
+       dprintf(("IM32Init failed"));
 
-   /*-------------------------------------------------------------------------*/
-   /* If ulFlag is zero then the DLL is being loaded so initialization should */
-   /* be performed.  If ulFlag is 1 then the DLL is being freed so            */
-   /* termination should be performed.                                        */
-   /*-------------------------------------------------------------------------*/
+    CheckVersionFromHMOD(PE2LX_VERSION, hModule);
+    dllHandle = RegisterLxDll(hModule, ImmLibMain, (PVOID)&imm32os2_PEResTab,
+                              IMM32_MAJORIMAGE_VERSION, IMM32_MINORIMAGE_VERSION,
+                              IMAGE_SUBSYSTEM_WINDOWS_GUI);
+    if (dllHandle == 0)
+        return 0UL;
 
-   switch (ulFlag) {
-      case 0 :
-         if( !IM32Init())
-            dprintf(("IM32Init failed"));
+    dprintf(("imm32 init %s %s (%x)", __DATE__, __TIME__, inittermImm32));
 
-         CheckVersionFromHMOD(PE2LX_VERSION, hModule);
-         dllHandle = RegisterLxDll(hModule, ImmLibMain, (PVOID)&imm32os2_PEResTab,
-                                   IMM32_MAJORIMAGE_VERSION, IMM32_MINORIMAGE_VERSION,
-                                   IMAGE_SUBSYSTEM_WINDOWS_GUI);
-         if(dllHandle == 0)
-             return 0UL;
+    return EXITLIST_NONCRITDLL;
+}
 
-         dprintf(("imm32 init %s %s (%x)", __DATE__, __TIME__, inittermImm32));
+void SYSTEM DLL_TermImm32(ULONG hModule)
+{
+    dprintf(("imm32 exit"));
 
-         break;
+    if(dllHandle)
+        UnregisterLxDll(dllHandle);
+}
 
-      case 1 :
-         if(dllHandle)
-             UnregisterLxDll(dllHandle);
-         break;
+ULONG SYSTEM DLL_Init(ULONG hModule)
+{
+    if (DLL_InitDefault(hModule) == -1)
+        return -1;
+    return DLL_InitImm32(hModule);
+}
 
-      default  :
-         return 0UL;
-   }
-
-   /***********************************************************/
-   /* A non-zero value must be returned to indicate success.  */
-   /***********************************************************/
-   return 1UL;
+void SYSTEM DLL_Term(ULONG hModule)
+{
+    DLL_TermImm32(hModule);
+    DLL_TermDefault(hModule);
 }
-//******************************************************************************
-//******************************************************************************