Rebase against 38e95ed2227dd3f0fc3d1394c884265d43e3b283

This commit is contained in:
Alistair Leslie-Hughes
2020-04-08 09:15:39 +10:00
parent 160a5024b4
commit bf3fbb7bdf
18 changed files with 109 additions and 486 deletions

View File

@@ -92,7 +92,7 @@ index d2f1be7a3..c355fc6e1 100644
+
+static BOOL load_functions(void)
+{
+ pcap_handle = wine_dlopen(SONAME_LIBPCAP, RTLD_NOW, NULL, 0);
+ pcap_handle = dlopen(SONAME_LIBPCAP, RTLD_NOW);
+
+ if (!pcap_handle)
+ {
@@ -100,7 +100,7 @@ index d2f1be7a3..c355fc6e1 100644
+ return FALSE;
+ }
+
+ #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(pcap_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;}
+ #define LOAD_FUNCPTR(f) if((p##f = dlsym(pcap_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;}
+ LOAD_FUNCPTR(pcap_breakloop);
+ LOAD_FUNCPTR(pcap_close);
+ LOAD_FUNCPTR(pcap_compile);
@@ -412,7 +412,7 @@ index d2f1be7a3..c355fc6e1 100644
+ break;
+ case DLL_PROCESS_DETACH:
+ if (lpvReserved) break;
+ if (pcap_handle) wine_dlclose(pcap_handle, NULL, 0);
+ if (pcap_handle) dlclose(pcap_handle);
+ break;
+ }
+