Do not check winpcap dll version.

diff --git a/od-win32/win32_uaenet.cpp b/od-win32/win32_uaenet.cpp
index 982524c9dbfd93296c8c38d91410012e3ee144b0..7c049c6b275f7196cc9b1a793035198381233bcc 100644 (file)
--- a/od-win32/win32_uaenet.cpp
+++ b/od-win32/win32_uaenet.cpp
@@ -382,14 +382,12 @@ struct netdriverdata *uaenet_enumerate (const TCHAR *name)
        }
        wpcap = LoadLibrary(_T("wpcap.dll"));
        packet = LoadLibrary(_T("packet.dll"));
-       isdll = isdllversion(_T("wpcap.dll"), 4, 0, 0, 0);
        SetDllDirectory(_T(""));
        if (wpcap == NULL) {
                FreeLibrary(packet);
                int err = GetLastError();
                wpcap = LoadLibrary (_T("wpcap.dll"));
                packet = LoadLibrary(_T("packet.dll"));
-               isdll = isdllversion(_T("wpcap.dll"), 4, 0, 0, 0);
                if (wpcap == NULL) {
                        write_log (_T("uaenet: npcap/winpcap not installed (wpcap.dll)\n"));
                        return NULL;
@@ -403,11 +401,6 @@ struct netdriverdata *uaenet_enumerate (const TCHAR *name)
                return NULL;
        }
 
-       if (!isdll) {
-               write_log (_T("uaenet: too old npcap/winpcap, v4 or newer required\n"));
-               return NULL;
-       }
-
        ppcap_lib_version = (PCAP_LIB_VERSION)GetProcAddress(wpcap, "pcap_lib_version");
        ppcap_findalldevs_ex = (PCAP_FINDALLDEVS_EX)GetProcAddress(wpcap, "pcap_findalldevs_ex");
        ppcap_freealldevs = (PCAP_FREEALLDEVS)GetProcAddress(wpcap, "pcap_freealldevs");
@@ -422,6 +415,13 @@ struct netdriverdata *uaenet_enumerate (const TCHAR *name)
        pPacketCloseAdapter = (PACKETCLOSEADAPTER)GetProcAddress(packet, "PacketCloseAdapter");
        pPacketRequest = (PACKETREQUEST)GetProcAddress(packet, "PacketRequest");
 
+       if (!ppcap_lib_version || !ppcap_findalldevs_ex || !ppcap_freealldevs ||
+               !ppcap_open || !ppcap_close || !ppcap_datalink || !ppcap_sendpacket ||
+               !ppcap_next_ex || !pPacketOpenAdapter || !pPacketCloseAdapter || !pPacketRequest) {
+               write_log(_T("uaenet: too old npcap/winpcap, missing function(s).\n"));
+               return NULL;
+       }
+
        ss = au (ppcap_lib_version());
        if (!done)
                write_log (_T("uaenet: %s\n"), ss);