diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-08-27 19:24:44 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-08-27 19:24:44 +0000 |
| commit | 5aae07254f8000c6f7b40fbe14e2287800e9f38e (patch) | |
| tree | 235461f9dab517e630204934e4527b6eeced52d6 /wsutil/file_util.h | |
| parent | 9d96012b57cfea4b309ce9ed00d729b73062cc2f (diff) | |
| download | wireshark-5aae07254f8000c6f7b40fbe14e2287800e9f38e.tar.gz | |
Forward-port r33953.
Move the SetDllDirectory calls to ws_init_dll_search_path. If
SetDllDirectory fails, pass the Wireshark program path to
SetCurrentDirectory.
svn path=/trunk/; revision=33958
Diffstat (limited to 'wsutil/file_util.h')
| -rw-r--r-- | wsutil/file_util.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wsutil/file_util.h b/wsutil/file_util.h index 3427d417ad..798cea9261 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -100,6 +100,13 @@ extern FILE * ws_stdio_freopen (const gchar *filename, const gchar *mode, FILE * /* DLL loading */ +/** Try to remove the current directory from the DLL search path. + * SetDllDirectory is tried, then SetCurrentDirectory(program_dir) + * + * @return TRUE if we were able to call SetDllDirectory, FALSE otherwise. + */ +gboolean ws_init_dll_search_path(); + /** Load a DLL using LoadLibrary. * Only the system and program directories are searched. * |