updated for version 7.3.707

Problem:    Problems loading a library for a file name with non-latin
            characters.
Solution:   Use wide system functions when possible. (Ken Takata)

diff --git a/src/os_win32.c b/src/os_win32.c
index 006a3614489d49f4c28cb9ea8dc156688808c562..96e115ca2f124c52d78b1536cddd343e86552b2e 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -287,27 +287,40 @@ unescape_shellxquote(char_u *p, char_u *escaped)
     HINSTANCE
 vimLoadLib(char *name)
 {
-    HINSTANCE dll = NULL;
-    TCHAR old_dir[MAXPATHL];
+    HINSTANCE  dll = NULL;
+    char       old_dir[MAXPATHL];
 
     /* NOTE: Do not use mch_dirname() and mch_chdir() here, they may call
      * vimLoadLib() recursively, which causes a stack overflow. */
     if (exe_path == NULL)
        get_exe_name();
-    if (exe_path != NULL && GetCurrentDirectory(MAXPATHL, old_dir) != 0)
+    if (exe_path != NULL)
     {
-       /* Change directory to where the executable is, both to make sure we
-        * find a .dll there and to avoid looking for a .dll in the current
-        * directory. */
-       SetCurrentDirectory(exe_path);
-       dll = LoadLibrary(name);
-       SetCurrentDirectory(old_dir);
-    }
-    else
-    {
-       /* We are not able to change directory to where the executable is, try
-        * to load library anyway. */
-       dll = LoadLibrary(name);
+#ifdef FEAT_MBYTE
+       WCHAR old_dirw[MAXPATHL];
+
+       if (GetCurrentDirectoryW(MAXPATHL, old_dirw) != 0)
+       {
+           /* Change directory to where the executable is, both to make
+            * sure we find a .dll there and to avoid looking for a .dll
+            * in the current directory. */
+           SetCurrentDirectory(exe_path);
+           dll = LoadLibrary(name);
+           SetCurrentDirectoryW(old_dirw);
+           return dll;
+       }
+       /* Retry with non-wide function (for Windows 98). */
+       if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+#endif
+           if (GetCurrentDirectory(MAXPATHL, old_dir) != 0)
+           {
+               /* Change directory to where the executable is, both to make
+                * sure we find a .dll there and to avoid looking for a .dll
+                * in the current directory. */
+               SetCurrentDirectory(exe_path);
+               dll = LoadLibrary(name);
+               SetCurrentDirectory(old_dir);
+           }
     }
     return dll;
 }

diff --git a/src/os_win32.h b/src/os_win32.h
index 5303d6ddcc31fc8d527acc4a4d5c0e9497b92fcd..c155fb23fa13149b2d6200a1943b071d9918f461 100644 (file)
--- a/src/os_win32.h
+++ b/src/os_win32.h
@@ -108,7 +108,7 @@
  */
 #define CMDBUFFSIZE 1024       /* size of the command processing buffer */
 
-/* _MAX_PATH is only 256 (stdlib.h), but we want more for the 'path' option,
+/* _MAX_PATH is only 260 (stdlib.h), but we want more for the 'path' option,
  * thus use a larger number. */
 #define MAXPATHL       1024
 

diff --git a/src/version.c b/src/version.c
index 321dfdfd58251088b64fbfc1ea878ec4d2bbff0f..4631c72045e0df09b29e38b179f7bf0d8b8b170a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    707,
 /**/
     706,
 /**/