diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-08-25 20:30:59 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-08-25 20:30:59 +0000 |
| commit | f81e185fabdbc4e01de2e4af01a408fb6640bea5 (patch) | |
| tree | 6d1cf5c9dae154869fc6a13d181489834d7a190e /airpcap_loader.c | |
| parent | 728a7ad30739b48e99778b7e93e7135d7284e0a3 (diff) | |
Add ws_load_library and ws_module_open, which respectively call
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33924 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'airpcap_loader.c')
| -rw-r--r-- | airpcap_loader.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index 65148975db..a6ef77364d 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -47,6 +47,7 @@ #include <epan/strutil.h> #include <epan/frequency-utils.h> #include "capture_ui_utils.h" +#include <wsutil/file_util.h> #include "simple_dialog.h" @@ -2450,7 +2451,7 @@ int load_airpcap(void) gboolean base_functions = TRUE; gboolean eleven_n_functions = TRUE; - if((AirpcapLib = LoadLibrary(TEXT("airpcap.dll"))) == NULL) + if((AirpcapLib = ws_load_library("airpcap.dll")) == NULL) { /* Report the error but go on */ AirpcapVersion = AIRPCAP_DLL_NOT_FOUND; |