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 /capture_wpcap_packet.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 'capture_wpcap_packet.c')
| -rw-r--r-- | capture_wpcap_packet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c index 39060e8639..58e30ff42b 100644 --- a/capture_wpcap_packet.c +++ b/capture_wpcap_packet.c @@ -49,6 +49,7 @@ #include <Ntddndis.h> #include "capture_wpcap_packet.h" +#include <wsutil/file_util.h> /* packet32.h requires sockaddr_storage * whether sockaddr_storage is defined or not depends on the Platform SDK @@ -157,7 +158,7 @@ wpcap_packet_load(void) GModule *wh; /* wpcap handle */ const symbol_table_t *sym; - wh = g_module_open("packet", 0); + wh = ws_module_open("packet.dll", 0); if (!wh) { return; |