load internals refactoring

1 files changed, 24 insertions, 24 deletions

diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index 8e23490..48a6c3b 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinLoad.c,v 1.11 2002/01/25 21:36:10 dgp Exp $
+ * RCS: @(#) $Id: tclWinLoad.c,v 1.12 2002/07/17 20:00:46 vincentdarley Exp $
  */
 
 #include "tclWinInt.h"
@@ -36,17 +36,11 @@
  */
 
 int
-TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, 
-	     clientDataPtr, unloadProcPtr)
+TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
     Tcl_Interp *interp;		/* Used for error reporting. */
     Tcl_Obj *pathPtr;		/* Name of the file containing the desired
-				 * code. */
-    CONST char *sym1, *sym2;	/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
+				 * code (UTF-8). */
+    TclLoadHandle *loadHandle;	/* Filled with token for dynamically loaded
 				 * file which will be passed back to 
 				 * (*unloadProcPtr)() to unload the file. */
     Tcl_FSUnloadFileProc **unloadProcPtr;	
@@ -63,7 +57,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr,
     handle = (*tclWinProcs->loadLibraryProc)(nativeName);
     Tcl_DStringFree(&ds);
 
-    *clientDataPtr = (ClientData) handle;
+    *loadHandle = (TclLoadHandle) handle;
     
     if (handle == NULL) {
 	DWORD lastError = GetLastError();
@@ -117,27 +111,33 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr,
     } else {
 	*unloadProcPtr = &TclpUnloadFile;
     }
+    return TCL_OK;
+}
+
+Tcl_PackageInitProc*
+TclpFindSymbol(interp, loadHandle, symbol) 
+    Tcl_Interp *interp;
+    TclLoadHandle loadHandle;
+    CONST char *symbol;
+{
+    Tcl_PackageInitProc *proc = NULL;
+    HINSTANCE handle = (HINSTANCE)loadHandle;
+
     /*
      * For each symbol, check for both Symbol and _Symbol, since Borland
      * generates C symbols with a leading '_' by default.
      */
 
-    *proc1Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym1);
-    if (*proc1Ptr == NULL) {
+    proc = (Tcl_PackageInitProc *) GetProcAddress(handle, symbol);
+    if (proc == NULL) {
+	Tcl_DString ds;
+	Tcl_DStringInit(&ds);
 	Tcl_DStringAppend(&ds, "_", 1);
-	sym1 = Tcl_DStringAppend(&ds, sym1, -1);
-	*proc1Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym1);
+	symbol = Tcl_DStringAppend(&ds, symbol, -1);
+	proc = (Tcl_PackageInitProc *) GetProcAddress(handle, symbol);
 	Tcl_DStringFree(&ds);
     }
-    
-    *proc2Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym2);
-    if (*proc2Ptr == NULL) {
-	Tcl_DStringAppend(&ds, "_", 1);
-	sym2 = Tcl_DStringAppend(&ds, sym2, -1);
-	*proc2Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym2);
-	Tcl_DStringFree(&ds);
-    }
-    return TCL_OK;
+    return proc;
 }
 
 /*