Changeset 104 for trunk/JPGPROC/source

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• JPGPROC/source/gbmsrc/gbm.def (modified) (1 diff)
• JPGPROC/source/gbmsrc/os2/gbm.def (modified) (1 diff)
• JPGPROC/source/jpegio.def (modified) (2 diffs)
• JPGPROC/source/jpgfunc.c (modified) (6 diffs)

trunk/JPGPROC/source/gbmsrc/gbm.def

@@ -1 +1 @@
 LIBRARY GBM INITINSTANCE TERMINSTANCE
 
-DATA MULTIPLE NONSHARED READWRITE
-
-CODE PRELOAD EXECUTEREAD
+DATA MULTIPLE NONSHARED
 
 EXPORTS

trunk/JPGPROC/source/gbmsrc/os2/gbm.def

@@ -1 +1 @@
 LIBRARY GBM INITINSTANCE TERMINSTANCE
 
-DATA MULTIPLE NONSHARED READWRITE
-
-CODE PRELOAD EXECUTEREAD
+DATA MULTIPLE NONSHARED
 
 EXPORTS

trunk/JPGPROC/source/jpegio.def

@@ -1 +1 @@
 ;/*
-; * Copyright (c) Chris Wohlgemuth 2002 
+; * Copyright (c) Chris Wohlgemuth 2002
 ; * All rights reserved.
 ; *
@@ -31 +31 @@
 ; */
 LIBRARY JPEGIO INITINSTANCE TERMINSTANCE
-DESCRIPTION '$@#(C) C. Wohlgemuth 2002:#@##1## 13.07.2002 15:17:00      My ;-)  : :::0::@@ JPEG IO procedure V0.1.0' 
+DESCRIPTION '$@#(C) C. Wohlgemuth 2002:#@##1## 13.07.2002 15:17:00      My ;-)  : :::0::@@ JPEG IO procedure V0.1.0'
 DATA MULTIPLE NONSHARED
 SEGMENTS
    shardata CLASS 'DATA' SHARED
-HEAPSIZE 0
-BASE = 0x1B130000
-IMPORTS
 EXPORTS
-   IOProc_Entry    @1
+   IOProc_Entry
 

trunk/JPGPROC/source/jpgfunc.c

@@ -1 +1 @@
 /*
- * Copyright (c) Chris Wohlgemuth 2002 
+ * Copyright (c) Chris Wohlgemuth 2002
  * All rights reserved.
  *
@@ -35 +35 @@
 /************************************************************************/
 
-#define INCL_32                          * force 32 bit compile
+#define INCL_32                         /* force 32 bit compile */
 #define INCL_GPIBITMAPS
 #define INCL_DOSFILEMGR
@@ -42 +42 @@
 #define INCL_WIN
 #define INCL_GPI
-#define INCL_PM                         /* force 32 bit compile */
+#define INCL_PM
 
 /************************************************************************/
@@ -62 +62 @@
  * Caller assures that no two instances execute this code
  * at the same time.
- * 00) Change name to _DLL_InitTerm and use the linkage pragma.
  *************************************************************************************/
 /*************************************************************************************
@@ -71 +70 @@
 HMODULE hModuleHandle;
 
-#pragma linkage (_DLL_InitTerm, system)
-//#pragma checkout (suspend)       /* Prevent unreferenced parameter messages */
-ULONG _DLL_InitTerm (ULONG hModHandle, ULONG fTerm/*, BOOL FirstInstance*/)
+
+ULONG APIENTRY _DLL_InitTerm(ULONG modhandle,ULONG flag);
+int _CRT_init(void);
+void _CRT_term(void);
+
+ULONG APIENTRY _DLL_InitTerm (ULONG hModHandle, ULONG fTerm)
 {
    hModuleHandle = hModHandle;  /* Remember for NLS lookup */
@@ -80 +82 @@
          return (0L);
    } /* endif */
+   else {
+      _CRT_term();
+   }
 
    return (1L);                 /* Success */
 } /* DLL_InitTerm */
-//#pragma checkout (resume)