From: Daniel Miller <dmiller@nmap.org>
Date: Wed, 27 Oct 2021 20:55:26 +0000 (-0500)
Subject: Use correct strings for DLL VersionInfo
X-Git-Tag: libpcap-1.10.2~384
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/9df6bb2c1a64cae631c1f34edd1cb35b89e7d2b5

Use correct strings for DLL VersionInfo

Previous DLL build reported FileVersion as literally
"PACKAGE_VERSION_DLL" instead of expanding the macro because of the
quotes. Also reported original filename as "wpcap.dll" regardless of
library name configured via CMake.

This change also preserves the "libpcap" product name, since regardless
of the library name configured, the code is still the libpcap product.

(cherry picked from commit b51f5e88096415fa5e53e32909ae784af261b253)
---

diff --git a/pcap-dll.rc b/pcap-dll.rc
index fc4f42b2..85de542f 100644
--- a/pcap-dll.rc
+++ b/pcap-dll.rc
@@ -20,12 +20,12 @@
         VALUE "Comments",         "https://github.com/the-tcpdump-group/libpcap/"
         VALUE "CompanyName",      "The TCPdump Group"
         VALUE "FileDescription",  "System-Independent Interface for User-Level Packet Capture"
-        VALUE "FileVersion",      "PACKAGE_VERSION_DLL"
+        VALUE "FileVersion",      PACKAGE_VERSION
         VALUE "InternalName",     PACKAGE_NAME
         VALUE "LegalCopyright",   "Copyright (c) The TCPdump Group"
         VALUE "LegalTrademarks",  ""
-        VALUE "OriginalFilename", "wpcap.dll"
-        VALUE "ProductName",      PACKAGE_NAME
+        VALUE "OriginalFilename", PACKAGE_NAME ".dll"
+        VALUE "ProductName",      "libpcap"
         VALUE "ProductVersion",   PACKAGE_VERSION
       END
     END