Changeset 218

Timestamp:

Aug 5, 2007, 6:49:01 AM (13 years ago)

Author:

Eugene Romanenko

Message:

make UClip package optional (closes #115)

Location:

trunk/Lucide

Files:

• SOURCE/gui/UClip.lib (deleted)
• SOURCE/gui/clipbrd.cpp (modified) (4 diffs)
• SOURCE/gui/makefile (modified) (1 diff)
• changelog (modified) (1 diff)

trunk/Lucide/SOURCE/gui/clipbrd.cpp

@@ -43 +43 @@
 #include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "cpconv.h"
 
 #include "UClip.h"
+
+
+static BOOL APIENTRY (*pUWinOpenClipbrd)(HAB)                      = NULL;
+static BOOL APIENTRY (*pUWinEmptyClipbrd)(HAB)                     = NULL;
+static BOOL APIENTRY (*pUWinSetClipbrdData)(HAB,ULONG,ULONG,ULONG) = NULL;
+static BOOL APIENTRY (*pUWinCloseClipbrd)(HAB)                     = NULL;
+
+static bool loadUClip();
+
+static HMODULE ucHandle = NULLHANDLE;
+static bool uclipLoaded = loadUClip();
+
+
+static void freeUClip()
+{
+    if ( ucHandle != NULLHANDLE ) {
+        DosFreeModule( ucHandle );
+    }
+}
+
+static bool loadUClip()
+{
+    bool res = false;
+    do
+    {
+      if ( DosLoadModule( NULL, 0, "UCLIP", &ucHandle ) != 0 )
+        break;
+      if (DosQueryProcAddr(ucHandle,0,"UWinOpenClipbrd",(PFN *)&pUWinOpenClipbrd)!= 0)
+        break;
+      if (DosQueryProcAddr(ucHandle,0,"UWinEmptyClipbrd",(PFN *)&pUWinEmptyClipbrd)!= 0)
+        break;
+      if (DosQueryProcAddr(ucHandle,0,"UWinSetClipbrdData",(PFN *)&pUWinSetClipbrdData)!= 0)
+        break;
+      if (DosQueryProcAddr(ucHandle,0,"UWinCloseClipbrd",(PFN *)&pUWinCloseClipbrd)!= 0)
+        break;
+
+      res = true;
+    } while (0);
+
+    atexit( freeUClip );
+
+    return res;
+}
 
 
@@ -73 +117 @@
     size_t olen = 0;
 
-    if ( UWinOpenClipbrd( hab ) )
+    if ( uclipLoaded ? pUWinOpenClipbrd( hab ) : WinOpenClipbrd( hab ) )
     {
-        UWinEmptyClipbrd( hab );
+        if ( uclipLoaded ) {
+            pUWinEmptyClipbrd( hab );
+        } else {
+            WinEmptyClipbrd( hab );
+        }
 
         size_t cSubs = 0;
@@ -94 +142 @@
             memcpy( memuni, shmemuni, olen );
 
-            UWinSetClipbrdData( hab, (ULONG)shmemuni, UCLIP_CF_UNICODETEXT, CFI_POINTER );
+            if ( uclipLoaded ) {
+                pUWinSetClipbrdData( hab,(ULONG)shmemuni,UCLIP_CF_UNICODETEXT,CFI_POINTER );
+            } else {
+                DosFreeMem( shmemuni );
+            }
 
             int liglen = uniLigaturesLength( (UniChar *)memuni );
@@ -118 +170 @@
                 UniUconvFromUcs( objtosys, &tmpuni, &unilen, &tmpsys, &olen, &cSubs );
 
-                UWinSetClipbrdData( hab, (ULONG)shmemsys, UCLIP_CF_TEXT, CFI_POINTER );
+                if ( uclipLoaded ) {
+                    pUWinSetClipbrdData( hab, (ULONG)shmemsys, UCLIP_CF_TEXT, CFI_POINTER );
+                } else {
+                    WinSetClipbrdData( hab, (ULONG)shmemsys, CF_TEXT, CFI_POINTER );
+                }
             }
             delete memuni;
         }
 
-        UWinCloseClipbrd( hab );
+        if ( uclipLoaded ) {
+            pUWinCloseClipbrd( hab );
+        } else {
+            WinCloseClipbrd( hab );
+        }
     }
 

trunk/Lucide/SOURCE/gui/makefile

@@ -78 +78 @@
 lib libconv
 lib libuls
-lib UClip
 export LucideMain
 | tmpmake.lnk >NUL

trunk/Lucide/changelog

@@ -4 +4 @@
     it will check file data to determine a suitable plugin (closed
     ticket #43).
+  - UClip package is optional now.
   - Updated NLS-files: German, ...