Changeset 2332 for trunk/src

Timestamp:

Jan 5, 2000, 8:52:37 PM (26 years ago)

Author:

sandervl

Message:

JW: twain update

Location:

trunk/src/twain_32

Files:

• initterm.cpp (modified) (4 diffs)
• twain_32.cpp (modified) (3 diffs)

trunk/src/twain_32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.2 2000-01-04 22:26:19 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.3 2000-01-05 19:52:37 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 #include <odinlx.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
+#include <twain.h>
 
 extern "C" {
@@ -40 +41 @@
 void CDECL _ctordtorTerm( void );
 
- //Win32 resource table (produced by wrc)
- extern DWORD _Resource_PEResTab;
+//Win32 resource table (produced by wrc)
+extern DWORD _Resource_PEResTab;
+
+extern FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
+extern HMODULE   WINAPI LoadLibraryA(LPCSTR);
+extern BOOL      WINAPI FreeLibrary(HMODULE);
+TW_UINT16 (APIENTRY *TWAINOS2_DSM_Entry)( pTW_IDENTITY, pTW_IDENTITY,
+           TW_UINT32, TW_UINT16, TW_UINT16, TW_MEMREF) = 0;
+static HINSTANCE hTWAINOS2 = 0;
+
 }
 
@@ -91 +100 @@
                 return 0UL;
 
+         hTWAINOS2 = LoadLibraryA("TWAINOS2.DLL");
+         if(hTWAINOS2) 
+         {   
+                *(VOID **)&TWAINOS2_DSM_Entry=(void*)GetProcAddress(hTWAINOS2, (LPCSTR)"DSM_Entry");
+         }
+         else   return 0;       //SvL: fail to load otherwise
+
          break;
       case 1 :
+         if(hTWAINOS2) 
+                FreeLibrary(hTWAINOS2);
+         hTWAINOS2 = 0;
          UnregisterLxDll(hModule);
          break;

trunk/src/twain_32/twain_32.cpp

@@ -1 @@
-/* $Id: twain_32.cpp,v 1.1 2000-01-04 22:19:01 sandervl Exp $ */
+/* $Id: twain_32.cpp,v 1.2 2000-01-05 19:52:37 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 
 #include <memory.h>
-
+#include <misc.h>
 #include <twain.h>
 
-#include "misc.h"
-
-
-TW_UINT16 (APIENTRY *TWAINOS2_DSM_Entry)( pTW_IDENTITY, pTW_IDENTITY,
-           TW_UINT32, TW_UINT16, TW_UINT16, TW_MEMREF) = 0;
+extern TW_UINT16 (APIENTRY *TWAINOS2_DSM_Entry)( pTW_IDENTITY, pTW_IDENTITY,
+           TW_UINT32, TW_UINT16, TW_UINT16, TW_MEMREF);
 
 
@@ -37 +34 @@
 {
     int returnval;
-    static HINSTANCE hInstance = 0;
-    hInstance = LoadLibraryA("TWAINOS2.DLL");
-    if(hInstance) 
-    {   
-        *(VOID **)&TWAINOS2_DSM_Entry=(void*)GetProcAddress(hInstance, (LPCSTR)"DSM_Entry");
-    }
-    WriteLog("TWAIN_32: DSM_Entry called with parameters:");
-    WriteLog("TWAIN_32: pOrigin.Id: %08xh ", pOrigin->Id);
-//    WriteLog("TWAIN_32: pOrigin.Version: %08xh ", pOrigin->Version);
-//    WriteLog("TWAIN_32: pOrigin.ProtocolMajor: %08xh ", pOrigin->ProtocolMajor);
-//    WriteLog("TWAIN_32: pOrigin.ProtocolMinor: %08xh ", pOrigin->ProtocolMinor);
-    WriteLog("TWAIN_32: pOrigin.SupportedGroups: %08xh ", pOrigin->SupportedGroups);
-    WriteLog("TWAIN_32: pOrigin.Manufacturer: %s ", pOrigin->Manufacturer);
-    WriteLog("TWAIN_32: pOrigin.ProductFamily: %s ", pOrigin->ProductFamily);
-    WriteLog("TWAIN_32: pOrigin.Productname: %s ", pOrigin->ProductName);
-    WriteLog("TWAIN_32: pDest: %08xh ", pDest);
-    WriteLog("TWAIN_32: Data Group: %04xh ", DG);
-    WriteLog("TWAIN_32: Data Attribute Type: %04xh ", DAT);
-    WriteLog("TWAIN_32: Message: %04xh ", MSG);
-    WriteLog("TWAIN_32: pData: %08xh ", pData);
-    returnval = TWAINOS2_DSM_Entry( pOrigin, pDest, DG, DAT, MSG, pData);       
-    WriteLog("TWAIN_32: DSM_Entry returned: %04xh \n\n", returnval);
+    dprintf(("TWAIN_32: DSM_Entry called with parameters:"));
+    dprintf(("TWAIN_32: pOrigin.Id: %08xh ", pOrigin->Id));
+//    dprintf(("TWAIN_32: pOrigin.Version: %08xh ", pOrigin->Version));
+    dprintf(("TWAIN_32: pOrigin.ProtocolMajor: %08xh ", pOrigin->ProtocolMajor));
+    dprintf(("TWAIN_32: pOrigin.ProtocolMinor: %08xh ", pOrigin->ProtocolMinor));
+    dprintf(("TWAIN_32: pOrigin.SupportedGroups: %08xh ", pOrigin->SupportedGroups));
+    dprintf(("TWAIN_32: pOrigin.Manufacturer: %s ", pOrigin->Manufacturer));
+    dprintf(("TWAIN_32: pOrigin.ProductFamily: %s ", pOrigin->ProductFamily));
+    dprintf(("TWAIN_32: pOrigin.Productname: %s ", pOrigin->ProductName));
+    dprintf(("TWAIN_32: pDest: %08xh ", pDest));
+    dprintf(("TWAIN_32: Data Group: %04xh ", DG));
+    dprintf(("TWAIN_32: Data Attribute Type: %04xh ", DAT));
+    dprintf(("TWAIN_32: Message: %04xh ", MSG));
+    dprintf(("TWAIN_32: pData: %08xh ", pData));
+    returnval = TWAINOS2_DSM_Entry( pOrigin, pDest, DG, DAT, MSG, pData);
+    dprintf(("TWAIN_32: DSM_Entry returned: %04xh \n\n", returnval));
     if (returnval == 3)
     {