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

1 files changed, 5 insertions, 6 deletions

diff --git a/dumpcap.c b/dumpcap.c
index 46daa0406f..30454d308a 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -3273,8 +3273,6 @@ main(int argc, char *argv[])
 
 #ifdef _WIN32
   WSADATA              wsaData;
-  typedef BOOL (*SetDllDirectoryHandler)(LPCTSTR);
-  SetDllDirectoryHandler PSetDllDirectory;
 #else
   struct sigaction action, oldaction;
 #endif
@@ -3297,10 +3295,11 @@ main(int argc, char *argv[])
 #endif
 
 #ifdef _WIN32
-  if (PSetDllDirectory = (SetDllDirectoryHandler) GetProcAddress(GetModuleHandle(_T("kernel32.dll")), "SetDllDirectoryW")) {
-    PSetDllDirectory(_T(""));
-    /* XXX - Exit on failure? */
-  }
+  /*
+   * Initialize our DLL search path. MUST be called before LoadLibrary
+   * or g_module_open.
+   */
+  ws_init_dll_search_path();
 #endif
 
 #ifdef HAVE_PCAP_REMOTE