Changeset 2455 for trunk/src

Timestamp:

Jan 15, 2000, 11:02:07 PM (26 years ago)

Author:

sandervl

Message:

JW: Update

File:

• trunk/src/twain_32/initterm.cpp (modified) (7 diffs)

trunk/src/twain_32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.6 2000-01-11 20:38:48 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.7 2000-01-15 22:02:07 sandervl Exp $ */
 
 /*
@@ -76 +76 @@
    size_t i;
    APIRET rc;
+   ULONG  twaintype;
 
    /*-------------------------------------------------------------------------*/
@@ -89 +90 @@
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         if (PROFILE_GetOdinIniInt("TWAIN","TwainIF",1) == 1)
+        twaintype = PROFILE_GetOdinIniInt("TWAIN","TwainIF",1);
+        switch(twaintype) 
+        {
+         case 1:
+         default:
          {
             dprintf(("TWAIN_32: Using CFM-Twain as Twain Source.\n\n"));
@@ -101 +106 @@
               return 0UL;
             }
+            break;
          }
-
-         if (PROFILE_GetOdinIniInt("TWAIN","TwainIF",0) == 2)
+         case 2:
          {
             dprintf(("TWAIN_32: Using STI-Twain as Twain Source.\n\n"));
@@ -115 +120 @@
               return 0UL;
             }
+            break;
          }
-
-         if (PROFILE_GetOdinIniInt("TWAIN","TwainIF",0) == 3)
+         case 3:
          {
             dprintf(("TWAIN_32: Using SANE as Twain Source  (currently not supported).\n\n"));
@@ -127 +132 @@
             return 0UL;
          }
-         if (PROFILE_GetOdinIniInt("TWAIN","TwainIF",0) != 1 &&
-             PROFILE_GetOdinIniInt("TWAIN","TwainIF",0) != 2 &&
-             PROFILE_GetOdinIniInt("TWAIN","TwainIF",0) != 3)
-         {
-            dprintf(("TWAIN_32: No or wrong TwainIF specified, using CFM-Twain as Twain Source.\n\n"));
-            hTWAIN = LoadLibraryA("TWAINOS2.DLL");
-            if(hTWAIN) 
-            {   
-                *(VOID **)&TWAINOS2_DSM_Entry=(void*)GetProcAddress(hTWAIN, (LPCSTR)"DSM_Entry");
-            }
-            else
-            {
-              return 0UL;
-            }
-         }
-
+        }
          /*******************************************************************/
          /* A DosExitList routine must be used to clean up if runtime calls */
@@ -157 +147 @@
          break;
       case 1 :
+         if(hTWAIN) 
+                FreeLibrary(hTWAIN);
+         hTWAIN = 0;
          UnregisterLxDll(hModule);
          break;