thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.3208: dynamic library load error does not mention why it failed

Browse Source 
Problem:    Dynamic library load error does not mention why it failed.
Solution:   Add the error message. (Martin Tournoij, closes #8621)
This commit is contained in:
Martin Tournoij 2021-07-24 13:57:29 +02:00 committed by Bram Moolenaar
parent 5a234eb18e
commit 1a3e5747b7
14 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/globals.h
View File

@ -1632,7 +1632,7 @@ EXTERN char e_fsync[] INIT(= N_("E667: Fsync failed"));
|| defined(DYNAMIC_MZSCHEME) \
|| defined(DYNAMIC_LUA) \
|| defined(FEAT_TERMINAL)
EXTERN char e_loadlib[] INIT(= N_("E370: Could not load library %s"));
EXTERN char e_loadlib[] INIT(= N_("E370: Could not load library %s: %s"));
EXTERN char e_loadfunc[] INIT(= N_("E448: Could not load library function %s"));
#endif
EXTERN char e_nobang[] INIT(= N_("E477: No ! allowed"));

18
src/if_cscope.c
View File

@ -1329,24 +1329,6 @@ clear_csinfo(int i)
#endif
}
#ifndef UNIX
static char *
GetWin32Error(void)
{
char *msg = NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, GetLastError(), 0, (LPSTR)&msg, 0, NULL);
if (msg != NULL)
{
// remove trailing \r\n
char *pcrlf = strstr(msg, "\r\n");
if (pcrlf != NULL)
*pcrlf = '\0';
}
return msg;
}
#endif
/*
* Insert a new cscope database filename into the filelist.
*/

4
src/if_lua.c
View File

@ -105,10 +105,12 @@ static void luaV_call_lua_func_free(void *state);
# define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
# define symbol_from_dll dlsym
# define close_dll dlclose
# define load_dll_error dlerror
#else
# define load_dll vimLoadLib
# define symbol_from_dll GetProcAddress
# define close_dll FreeLibrary
# define load_dll_error GetWin32Error
#endif
// lauxlib
@ -446,7 +448,7 @@ lua_link_init(char *libname, int verbose)
if (!hinstLua)
{
if (verbose)
semsg(_(e_loadlib), libname);
semsg(_(e_loadlib), libname, load_dll_error());
return FAIL;
}
for (reg = luaV_dll; reg->func; reg++)

4
src/if_mzsch.c
View File

@ -668,14 +668,14 @@ mzscheme_runtime_link_init(char *sch_dll, char *gc_dll, int verbose)
if (!hMzGC)
{
if (verbose)
semsg(_(e_loadlib), gc_dll);
semsg(_(e_loadlib), gc_dll, GetWin32Error());
return FAIL;
}
if (!hMzSch)
{
if (verbose)
semsg(_(e_loadlib), sch_dll);
semsg(_(e_loadlib), sch_dll, GetWin32Error());
return FAIL;
}

2
src/if_perl.xs
View File

@ -175,11 +175,13 @@ typedef int perl_key;
# define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
# define symbol_from_dll dlsym
# define close_dll dlclose
# define load_dll_error dlerror
# else
# define PERL_PROC FARPROC
# define load_dll vimLoadLib
# define symbol_from_dll GetProcAddress
# define close_dll FreeLibrary
# define load_dll_error GetWin32Error
# endif
/*
* Wrapper defines

4
src/if_python.c
View File

@ -141,10 +141,12 @@ struct PyMethodDef { Py_ssize_t a; };
# endif
# define close_dll dlclose
# define symbol_from_dll dlsym
# define load_dll_error dlerror
# else
# define load_dll vimLoadLib
# define close_dll FreeLibrary
# define symbol_from_dll GetProcAddress
# define load_dll_error GetWin32Error
# endif
// This makes if_python.c compile without warnings against Python 2.5
@ -688,7 +690,7 @@ python_runtime_link_init(char *libname, int verbose)
if (!hinstPython)
{
if (verbose)
semsg(_(e_loadlib), libname);
semsg(_(e_loadlib), libname, load_dll_error());
return FAIL;
}

4
src/if_python3.c
View File

@ -125,10 +125,12 @@ typedef PySliceObject PySliceObject_T;
# endif
# define close_dll dlclose
# define symbol_from_dll dlsym
# define load_dll_error dlerror
# else
# define load_dll vimLoadLib
# define close_dll FreeLibrary
# define symbol_from_dll GetProcAddress
# define load_dll_error GetWin32Error
# endif
/*
* Wrapper defines
@ -795,7 +797,7 @@ py3_runtime_link_init(char *libname, int verbose)
if (!hinstPy3)
{
if (verbose)
semsg(_(e_loadlib), libname);
semsg(_(e_loadlib), libname, load_dll_error());
return FAIL;
}

4
src/if_ruby.c
View File

@ -184,11 +184,13 @@
# define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
# define symbol_from_dll dlsym
# define close_dll dlclose
# define load_dll_error dlerror
# else
# define RUBY_PROC FARPROC
# define load_dll vimLoadLib
# define symbol_from_dll GetProcAddress
# define close_dll FreeLibrary
# define load_dll_error GetWin32Error
# endif
#endif
@ -806,7 +808,7 @@ ruby_runtime_link_init(char *libname, int verbose)
if (!hinstRuby)
{
if (verbose)
semsg(_(e_loadlib), libname);
semsg(_(e_loadlib), libname, load_dll_error());
return FAIL;
}

4
src/if_tcl.c
View File

@ -167,11 +167,13 @@ typedef int HANDLE;
# define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
# define symbol_from_dll dlsym
# define close_dll dlclose
# define load_dll_error dlerror
# else
# define TCL_PROC FARPROC
# define load_dll vimLoadLib
# define symbol_from_dll GetProcAddress
# define close_dll FreeLibrary
# define load_dll_error GetWin32Error
# endif
/*
@ -213,7 +215,7 @@ tcl_runtime_link_init(char *libname, int verbose)
if (!(hTclLib = load_dll(libname)))
{
if (verbose)
semsg(_(e_loadlib), libname);
semsg(_(e_loadlib), libname, load_dll_error());
return FAIL;
}
for (i = 0; tcl_funcname_table[i].ptr; ++i)

3
src/mbyte.c
View File

@ -4902,7 +4902,8 @@ iconv_enabled(int verbose)
{
verbose_enter();
semsg(_(e_loadlib),
hIconvDLL == 0 ? DYNAMIC_ICONV_DLL : DYNAMIC_MSVCRT_DLL);
hIconvDLL == 0 ? DYNAMIC_ICONV_DLL : DYNAMIC_MSVCRT_DLL,
GetWin32Error());
verbose_leave();
}
iconv_end();

18
src/os_win32.c
View File

@ -716,7 +716,7 @@ dyn_libintl_init(void)
if (p_verbose > 0)
{
verbose_enter();
semsg(_(e_loadlib), GETTEXT_DLL);
semsg(_(e_loadlib), GETTEXT_DLL, GetWin32Error());
verbose_leave();
}
return 0;
@ -8353,3 +8353,19 @@ resize_console_buf(void)
}
}
#endif
char *
GetWin32Error(void)
{
char *msg = NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, GetLastError(), 0, (LPSTR)&msg, 0, NULL);
if (msg != NULL)
{
// remove trailing \r\n
char *pcrlf = strstr(msg, "\r\n");
if (pcrlf != NULL)
*pcrlf = '\0';
}
return msg;
}

1
src/proto/os_win32.pro
View File

@ -83,4 +83,5 @@ int get_conpty_type(void);
int is_conpty_stable(void);
int get_conpty_fix_type(void);
void resize_console_buf(void);
char * GetWin32Error(void);
/* vim: set ft=c : */

5
src/terminal.c
View File

@ -6862,8 +6862,9 @@ dyn_winpty_init(int verbose)
if (!hWinPtyDLL)
{
if (verbose)
semsg(_(e_loadlib), *p_winptydll != NUL ? p_winptydll
: (char_u *)WINPTY_DLL);
semsg(_(e_loadlib),
(*p_winptydll != NUL ? p_winptydll : (char_u *)WINPTY_DLL),
GetWin32Error());
return FAIL;
}
for (i = 0; winpty_entry[i].name != NULL

2
src/version.c
View File

@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3208,
/**/
3207,
/**/