[or-cvs] r16988: {torvm} Revert naming for packet.dll - we set our library path expli (torvm/trunk/build/win32/patches)

[coderman at seul.org]

Author: coderman
Date: 2008-09-28 03:02:55 -0400 (Sun, 28 Sep 2008)
New Revision: 16988

Modified:
   torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch
Log:
Revert naming for packet.dll - we set our library path explicitly to a local instance so there is no risk of colliding with official winpcap installations.

Modified: torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch
===================================================================
--- torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch	2008-09-27 10:18:55 UTC (rev 16987)
+++ torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch	2008-09-28 07:02:55 UTC (rev 16988)
@@ -72,27 +72,6 @@
  
  #endif //__WPCAPNAMES_H_EED6D131C6DB4dd696757D219977A7E5
  
-diff -Naur orig-winpcap/packetNtx/Dll/AdInfo.c mod-winpcap/packetNtx/Dll/AdInfo.c
---- orig-winpcap/packetNtx/Dll/AdInfo.c	2007-11-13 22:59:14.000000000 +0000
-+++ mod-winpcap/packetNtx/Dll/AdInfo.c	2008-09-26 07:13:21.960100696 +0000
-@@ -96,7 +96,7 @@
- #endif /* HAVE_DAG_API */
- 
- /// Title of error windows
--TCHAR   szWindowTitle[] = TEXT("PACKET.DLL");
-+TCHAR   szWindowTitle[] = TEXT("TPACKET.DLL");
- 
- ULONG inet_addrU(const WCHAR *cp);
- 
-diff -Naur orig-winpcap/packetNtx/Dll/Packet.def mod-winpcap/packetNtx/Dll/Packet.def
---- orig-winpcap/packetNtx/Dll/Packet.def	2006-08-09 00:11:04.000000000 +0000
-+++ mod-winpcap/packetNtx/Dll/Packet.def	2008-09-26 07:13:21.961100544 +0000
-@@ -1,4 +1,4 @@
--LIBRARY packet
-+LIBRARY tpacket
- 
- EXPORTS
- 		PacketLibraryVersion
 diff -Naur orig-winpcap/packetNtx/Dll/Packet32.c mod-winpcap/packetNtx/Dll/Packet32.c
 --- orig-winpcap/packetNtx/Dll/Packet32.c	2007-11-13 22:59:30.000000000 +0000
 +++ mod-winpcap/packetNtx/Dll/Packet32.c	2008-09-27 09:17:40.512431904 +0000
@@ -117,33 +96,25 @@
  
 diff -Naur orig-winpcap/packetNtx/Dll/version.rc2 mod-winpcap/packetNtx/Dll/version.rc2
 --- orig-winpcap/packetNtx/Dll/version.rc2	2006-07-25 00:46:54.000000000 +0000
-+++ mod-winpcap/packetNtx/Dll/version.rc2	2008-09-26 08:13:33.693033832 +0000
-@@ -26,19 +26,19 @@
++++ mod-winpcap/packetNtx/Dll/version.rc2	2008-09-28 06:58:58.871717096 +0000
+@@ -26,7 +26,7 @@
      BEGIN
          BLOCK "000004b0"
          BEGIN
 -			VALUE "CompanyName",       WINPCAP_COMPANY_NAME
 +			VALUE "CompanyName",       "The Tor Project, Inc."
  #ifdef _WINNT4
--			VALUE "FileDescription",   "packet.dll (NT4) Dynamic Link Library"
-+			VALUE "FileDescription",   "tpacket.dll (NT4) Dynamic Link Library"
+ 			VALUE "FileDescription",   "packet.dll (NT4) Dynamic Link Library"
  #elif defined(_WINVISTA)
--			VALUE "FileDescription",   "packet.dll (Vista) Dynamic Link Library"
-+			VALUE "FileDescription",   "tpacket.dll (Vista) Dynamic Link Library"
- #else
--			VALUE "FileDescription",   "packet.dll (NT5) Dynamic Link Library"
-+			VALUE "FileDescription",   "tpacket.dll (NT5) Dynamic Link Library"
- #endif
- 			VALUE "FileVersion",       WINPCAP_VER_STRING
--			VALUE "InternalName",      "packet.dll"
-+			VALUE "InternalName",      "tpacket.dll"
+@@ -39,7 +39,7 @@
  			VALUE "LegalCopyright",    WINPCAP_COPYRIGHT_STRING
  			VALUE "LegalTrademarks",   ""
--			VALUE "OriginalFilename",  "packet.dll"
-+			VALUE "OriginalFilename",  "tpacket.dll"
- 			VALUE "ProductName",       WINPCAP_PRODUCT_NAME
+ 			VALUE "OriginalFilename",  "packet.dll"
+-			VALUE "ProductName",       WINPCAP_PRODUCT_NAME
++			VALUE "ProductName",       "Tor VM WinPcap Packet.dll Library"
  			VALUE "ProductVersion",    WINPCAP_VER_STRING
              VALUE "Build Description", WINPCAP_BUILD_DESCRIPTION
+         END
 diff -Naur orig-winpcap/packetNtx/driver/NPF.RC mod-winpcap/packetNtx/driver/NPF.RC
 --- orig-winpcap/packetNtx/driver/NPF.RC	2007-11-01 21:34:16.000000000 +0000
 +++ mod-winpcap/packetNtx/driver/NPF.RC	2008-09-26 07:18:26.893743736 +0000