Changeset 9450eca in tol for toltcl

Timestamp:

Jan 11, 2016, 1:14:34 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

8685395

Parents:

a61660c

Message:

fixes #1908,

Aseguramos que windows busque las dll primero en el directorio bin de tol. Si invocamos la funcion SetDllDirectory deshabilitamos el modo "safe DLL search" que cambia el orden de búsqueda de las dll. Ver los enlaces más abajo para una descripción de este modo.

Dynamic-Link Library Search Order: ​https://msdn.microsoft.com/en-us/library/windows/desktop/ms682586(v=vs.85).aspx

SetDllDirectory function: ​https://msdn.microsoft.com/en-us/library/windows/desktop/ms686203(v=vs.85).aspx

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7186 be4846ae-f051-483a-831f-b64e7d08527f

File:

• toltcl/generic/tolsh.c (modified) (3 diffs)

toltcl/generic/tolsh.c

@@ -2 +2 @@
 #include "toltcl.h"
 
-#if !defined(WIN32)
+#if defined(WIN32)
+#include "windows.h"
+#else
 #include "tol/tol_init.h"
 #endif
@@ -27 +29 @@
 }
 
+#if defined(WIN32)
+void SetupDllSearchPath( const char *argv0 )
+{
+  int n;
+  //const char **strArr;
+  const char **ptr;
+  Tcl_DString dstr;
+  
+  //ptr = &strArr;
+  Tcl_SplitPath( argv0, &n, &ptr );
+  if( n >= 2 )
+    {
+          Tcl_DStringInit( &dstr );
+      Tcl_JoinPath( n - 1, ptr,  &dstr );
+          SetDllDirectory( Tcl_DStringValue( &dstr ) );
+          Tcl_DStringFree( &dstr );
+    }
+  Tcl_Free( (char*)ptr );
+}
+#endif
+
 int AppInit(Tcl_Interp *interp)
 {
@@ -34 +57 @@
     }
   SetupArgv( interp );
+  const char *argv0 = Tcl_GetNameOfExecutable();
+#if defined(WIN32)
+  SetupDllSearchPath( argv0 );
+#endif   
   Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
-               " [file dir [file dir ", Tcl_GetNameOfExecutable(),
+               " [file dir [file dir ", argv0,
                " ] ] lib ]", NULL );
   if ( !Tcl_PkgRequire( interp, "TolshApp", TOLTCL_VERSION, 1) )