diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-08-27 19:24:44 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-08-27 19:24:44 +0000 |
| commit | feb11115a7a1c5ac01e571901bbad5b33e867e99 (patch) | |
| tree | 235461f9dab517e630204934e4527b6eeced52d6 /wsutil/file_util.h | |
| parent | 8e3fdc551dd185313f947657fcd0263ffd98d369 (diff) | |
Forward-port r33953.
Move the SetDllDirectory calls to ws_init_dll_search_path. If
SetDllDirectory fails, pass the Wireshark program path to
SetCurrentDirectory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33958 f5534014-38df-0310-8fa8-9805f1628bb7
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. * |