From 60578aa16f4f27d37ea0a90e964c58cc1dc22953 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 15 Jun 2016 13:42:56 -0700 Subject: file_util.c: do not search in Npcap installation folder when calling ws_load_library() ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this). Let's not lose time checking the folder content. Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b Reviewed-on: https://code.wireshark.org/review/15938 Reviewed-by: Pascal Quantin --- wsutil/file_util.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'wsutil') diff --git a/wsutil/file_util.c b/wsutil/file_util.c index da8f91487c..a5cd62fdb7 100644 --- a/wsutil/file_util.c +++ b/wsutil/file_util.c @@ -575,19 +575,6 @@ ws_load_library(const gchar *library_name) } } - /* At last try the Npcap directory */ - full_path = g_module_build_path(npcap_path, library_name); - full_path_w = g_utf8_to_utf16(full_path, -1, NULL, NULL, NULL); - - if (full_path && full_path_w) { - dll_h = LoadLibraryW(full_path_w); - if (dll_h) { - g_free(full_path); - g_free(full_path_w); - return dll_h; - } - } - return NULL; } -- cgit v1.2.1