diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-08-25 20:30:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-08-25 20:30:59 +0000 |
| commit | 607b228df6f1f754bf9bda6cfa21563913b1e7ff (patch) | |
| tree | 6d1cf5c9dae154869fc6a13d181489834d7a190e /airpcap_loader.c | |
| parent | 43af5f6344d47af3ccfa574c1013dbc6a011904c (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.
svn path=/trunk/; revision=33924
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; |