patch 7.4.1383
Problem: GvimExt only loads the old libintl.dll.
Solution: Also try loading libint-8.dll. (Ken Takata, closes #608)
diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp
index e644443..b682b74 100644
--- a/src/GvimExt/gvimext.cpp
+++ b/src/GvimExt/gvimext.cpp
@@ -158,6 +158,7 @@
# define VIMPACKAGE "vim"
# ifndef GETTEXT_DLL
# define GETTEXT_DLL "libintl.dll"
+# define GETTEXT_DLL_ALT "libintl-8.dll"
# endif
// Dummy functions
@@ -194,21 +195,36 @@
{(char *)"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain},
{NULL, NULL}
};
+ DWORD len, len2;
+ LPWSTR buf = NULL;
+ LPWSTR buf2 = NULL;
// No need to initialize twice.
if (hLibintlDLL)
return 1;
- // Load gettext library, first try the Vim runtime directory, then search
- // the path.
- strcat(dir, GETTEXT_DLL);
- hLibintlDLL = LoadLibrary(dir);
- if (!hLibintlDLL)
+ // Load gettext library from the Vim runtime directory.
+ // Add the directory to $PATH temporarily.
+ len = GetEnvironmentVariableW(L"PATH", NULL, 0);
+ len2 = MAX_PATH + 1 + len;
+ buf = (LPWSTR)malloc(len * sizeof(WCHAR));
+ buf2 = (LPWSTR)malloc(len2 * sizeof(WCHAR));
+ if (buf != NULL && buf2 != NULL)
{
+ GetEnvironmentVariableW(L"PATH", buf, len);
+ _snwprintf(buf2, len2, L"%S;%s", dir, buf);
+ SetEnvironmentVariableW(L"PATH", buf2);
hLibintlDLL = LoadLibrary(GETTEXT_DLL);
+#ifdef GETTEXT_DLL_ALT
if (!hLibintlDLL)
- return 0;
+ hLibintlDLL = LoadLibrary(GETTEXT_DLL_ALT);
+#endif
+ SetEnvironmentVariableW(L"PATH", buf);
}
+ free(buf);
+ free(buf2);
+ if (!hLibintlDLL)
+ return 0;
// Get the addresses of the functions we need.
for (i = 0; libintl_entry[i].name != NULL
diff --git a/src/GvimExt/gvimext.h b/src/GvimExt/gvimext.h
index 426cae5..e17f2ac 100644
--- a/src/GvimExt/gvimext.h
+++ b/src/GvimExt/gvimext.h
@@ -42,6 +42,7 @@
#include <windows.h>
#include <windowsx.h>
#include <shlobj.h>
+#include <wchar.h>
/* Accommodate old versions of VC that don't have a modern Platform SDK */
#if (defined(_MSC_VER) && _MSC_VER < 1300) || !defined(MAXULONG_PTR)
diff --git a/src/version.c b/src/version.c
index 5e6878f..27d8c92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1383,
+/**/
1382,
/**/
1381,
