Changeset 29

Timestamp:

Jan 26, 2016, 4:13:36 PM (10 years ago)

Author:

Alex Taylor

Message:

Added optional second parameter to Sys2LocateDLL, and updated/clarified function documentation.

Location:

rxutilex/trunk

Files:

• FUNCTIONS (modified) (3 diffs)
• rxutilex.c (modified) (4 diffs)
• rxutilex.def (modified) (1 diff)
• testlib.cmd (modified) (1 diff)

rxutilex/trunk/FUNCTIONS

@@ -25 +25 @@
 Sys2ReplaceModule           - Unlock a DLL (DosReplaceModule wrapper)
 Sys2Seek                    - Set file read/write pointer (with >2GB support)
+Sys2SyncBuffer              - synchronize read/write (DosResetBuffer wrapper)
 Sys2Version                 - Get the version of this library
 Sys2Write                   - Write bytes to a file or named pipe
@@ -278 +279 @@
 
 If a DLL with the given name is currently loaded, that instance of the
-DLL will be returned.  Otherwise, standard DLL loading rules (according
-to the current LIBPATH and/or extended LIBPATH configuration) are used to
-search for a DLL whose module name matches the one specified.
+DLL will be returned.  Otherwise, unless 'L' is specified in the second 
+parameter, standard DLL loading rules (which will be governed by the 
+current LIBPATH and/or extended LIBPATH configuration) are used to
+search for a loadable DLL whose module name matches the one specified.
+(A loadable DLL is one whose runtime dependencies are also loadable,
+and whose initialization routine can be executed successfully.)
 
 REXX ARGUMENTS:
   1. The name of the DLL to search for.  (REQUIRED)
+  2. Flag to limit search context, must be one of:                       
+       A : 'All', search for both loaded and loadable DLLs      (DEFAULT)
+       L : 'Loaded', search only for currently-loaded DLLs 
 
 
@@ -490 +497 @@
 
 -------------------------------------------------------------------------
-Sys2SyncBuffer                                                           
+Sys2SyncBuffer
 
 Used to synchronize buffer read/write transactions (wrapper to 
-DosResetBuffer)  For external files, writes the buffer to disk. 
+DosResetBuffer).  For external files, writes the buffer to disk. 
 For named pipes, blocks until the remote client end of the pipe has read 
 the contents.

rxutilex/trunk/rxutilex.c

@@ -1382 +1382 @@
  *                                                                           *
  * REXX ARGUMENTS:                                                           *
- *   1. The name of the DLL to search for.  (REQUIRED)                       *
+ *   1. The name of the DLL to search for.                        (REQUIRED) *
+ *   2. Flag to limit search context, must be one of:                        *
+ *        ALL       : Search for both loaded and loadable DLLs     (DEFAULT) *
+ *        LOADEDONLY: Search only for currently-loaded DLLs                  *
+ *      Only the first letter (A/L) is significant.                          *
  *                                                                           *
  * REXX RETURN VALUE:                                                        *
@@ -1391 +1395 @@
     HMODULE hmod;
     CHAR    achModuleName[ CCHMAXPATH ];
-    BOOL    bUnload = FALSE;
+    BOOL    bLoadedOnly = FALSE,
+            bUnload     = FALSE;
     APIRET  rc;
 
@@ -1397 +1402 @@
     WriteErrorCode( 0, NULL );
 
-    if ( !(argc == 1 && RXVALIDSTRING(argv[0])) ) return ( 40 );
+    if ( argc < 1  || ( !RXVALIDSTRING(argv[0]) )) return ( 40 );
+
+    // Second argument: flag
+    if ( argc >= 2 && RXVALIDSTRING(argv[1]) ) {
+        strupr( argv[1].strptr );
+        if ( strcspn(argv[1].strptr, "AL") > 0 ) return ( 40 );
+        switch ( argv[1].strptr[0] ) {
+            case 'A': bLoadedOnly = FALSE; break;
+            case 'L': bLoadedOnly = TRUE;  break;
+            default : return ( 40 );
+        }
+    }
 
     // See if the DLL is already loaded
     rc = DosQueryModuleHandle( argv[0].strptr, &hmod );
     if ( rc ) {
-        // Guess not; try to load it now
+        // Guess not...
+        if ( bLoadedOnly ) {
+            // Just return
+            MAKERXSTRING( *prsResult, "", 0 );
+            return 0;
+        }
+        // Try to load it now
         rc = DosLoadModule( NULL, 0, argv[0].strptr, &hmod );
         if ( rc ) {
@@ -2384 +2406 @@
         // REXX API does not free this kind of buffer
         ulBytes = strlen( pszValue );
-        }
+    }
     MAKERXSTRING( shvVar.shvname, szCompoundName, strlen(szCompoundName) );
     shvVar.shvvalue.strptr    = pszValue;

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.2#@##1## 15 Jul 2015 00:14:13     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.2#@##1## 27 Jan 2016 00:11:55     REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs

rxutilex/trunk/testlib.cmd

@@ -36 +36 @@
 
 say Sys2LocateDLL('ehxdlmri')
+say Sys2LocateDLL('ehxdlmri', 'a')
+say Sys2LocateDLL('ehxdlmri', 'l')
+say Sys2LocateDLL('gcc1', 'l')
+
 
 call Sys2DropFuncs