From b2fd7eb8917a1ee45bd05fa24a3a37c51c9de1ee Mon Sep 17 00:00:00 2001
From: basil00 <basil@reqrypt.org>
Date: Sun, 22 Oct 2017 21:07:06 +0800
Subject: [PATCH] Bump version to 1.4

---
 README                     |  2 +-
 VERSION                    |  2 +-
 doc/windivert.html         |  8 ++++----
 include/windivert_device.h |  6 +++---
 inf/windivert32.inf        |  2 +-
 inf/windivert64.inf        |  2 +-
 sys/windivert.c            | 24 ++++++++++++------------
 sys/windivert.rc           |  8 ++++----
 8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/README b/README
index 717f05d..82c3f12 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-WinDivert 1.2: Windows Packet Divert
+WinDivert 1.4: Windows Packet Divert
 ====================================
 
 1. Introduction
diff --git a/VERSION b/VERSION
index f0bb29e..88c5fb8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.0
+1.4.0
diff --git a/doc/windivert.html b/doc/windivert.html
index d406d4d..b8eeb1e 100644
--- a/doc/windivert.html
+++ b/doc/windivert.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html>
 <head>
-    <title>WinDivert 1.3 Documentation</title>
+    <title>WinDivert 1.4 Documentation</title>
 </head>
 <body>
-<h1>WinDivert 1.3: Windows Packet Divert</h1>
+<h1>WinDivert 1.4: Windows Packet Divert</h1>
 <h2>Table of Contents</h2>
 <ul>
 <li><a href="#introduction">1. Introduction</a></li>
@@ -286,8 +286,8 @@ uninstalled during the next machine reboot.
 The WinDivert driver can also be manually removed by issuing the following
 commands at the command prompt
 <pre>
-sc stop WinDivert1.3
-sc delete WinDivert1.3
+sc stop WinDivert1.4
+sc delete WinDivert1.4
 </pre>
 Note that this is not recommended as it will interfere with other
 applications that depend on WinDivert.
diff --git a/include/windivert_device.h b/include/windivert_device.h
index 7be4fa9..616f01c 100644
--- a/include/windivert_device.h
+++ b/include/windivert_device.h
@@ -29,7 +29,7 @@
 #include "windivert.h"
 
 #define WINDIVERT_VERSION                           1
-#define WINDIVERT_VERSION_MINOR                     3
+#define WINDIVERT_VERSION_MINOR                     4
 
 #define WINDIVERT_STR2(s)                           #s
 #define WINDIVERT_STR(s)                            WINDIVERT_STR2(s)
@@ -43,8 +43,8 @@
 #define WINDIVERT_DEVICE_NAME                                               \
     L"WinDivert" WINDIVERT_VERSION_LSTR
 
-#define WINDIVERT_IOCTL_VERSION                     5
-#define WINDIVERT_IOCTL_MAGIC                       0x1E06
+#define WINDIVERT_IOCTL_VERSION                     6
+#define WINDIVERT_IOCTL_MAGIC                       0xA2BF
 
 #define WINDIVERT_FILTER_FIELD_ZERO                 0
 #define WINDIVERT_FILTER_FIELD_INBOUND              1
diff --git a/inf/windivert32.inf b/inf/windivert32.inf
index b6a107c..2fdec6c 100644
--- a/inf/windivert32.inf
+++ b/inf/windivert32.inf
@@ -4,7 +4,7 @@ Class = WFPCALLOUTS
 ClassGuid = {57465043-616C-6C6F-7574-5F636C617373}
 Provider = %Basil%
 CatalogFile = WinDivert32.Cat
-DriverVer = 09/24/2017,1.3.0
+DriverVer = 10/22/2017,1.4.0
 
 [SourceDisksNames]
 1 = %DiskName%
diff --git a/inf/windivert64.inf b/inf/windivert64.inf
index 1b75a6f..3ab956d 100644
--- a/inf/windivert64.inf
+++ b/inf/windivert64.inf
@@ -4,7 +4,7 @@ Class = WFPCALLOUTS
 ClassGuid = {57465043-616C-6C6F-7574-5F636C617373}
 Provider = %Basil%
 CatalogFile = WinDivert64.Cat
-DriverVer = 09/24/2017,1.3.0
+DriverVer = 10/22/2017,1.4.0
 
 [SourceDisksNames]
 1 = %DiskName%
diff --git a/sys/windivert.c b/sys/windivert.c
index b90b682..32ab573 100644
--- a/sys/windivert.c
+++ b/sys/windivert.c
@@ -447,23 +447,23 @@ static BOOL windivert_filter_test(filter_t filter, UINT16 ip, UINT8 protocol,
  * WinDivert sublayer GUIDs
  */
 DEFINE_GUID(WINDIVERT_SUBLAYER_INBOUND_IPV4_GUID,
-    0x8DB169DF, 0xFA88, 0x42FC,
-    0x8E, 0xB3, 0x17, 0x10, 0x5F, 0x62, 0x5B, 0x31);
+    0x09C273C5, 0x0FB1, 0x4453,
+    0x95, 0xDF, 0x7E, 0x1C, 0x28, 0x78, 0xED, 0xDF);
 DEFINE_GUID(WINDIVERT_SUBLAYER_OUTBOUND_IPV4_GUID,
-    0x8E9B9512, 0x6D8D, 0x4846,
-    0xB8, 0x85, 0x6b, 0x70, 0xc0, 0xE1, 0x15, 0x43);
+    0x11C342F5, 0x4276, 0x494F,
+    0xBB, 0x30, 0x84, 0x55, 0x78, 0x6C, 0x67, 0x30);
 DEFINE_GUID(WINDIVERT_SUBLAYER_INBOUND_IPV6_GUID,
-    0xC5CC9A51, 0xD4E7, 0x4D92,
-    0x9C, 0xF0, 0xEF, 0xC8, 0xE1, 0x84, 0x00, 0x23);
+    0x2E5F6801, 0xE721, 0x4A0D,
+    0x8D, 0x48, 0xC8, 0x1D, 0x4F, 0x25, 0x45, 0x93);
 DEFINE_GUID(WINDIVERT_SUBLAYER_OUTBOUND_IPV6_GUID,
-    0xE4ED7583, 0x7F64, 0x4678,
-    0x9E, 0xCB, 0x2A, 0x05, 0x94, 0xA7, 0x53, 0x91);
+    0xB6511564, 0xD5E6, 0x44C8,
+    0x9C, 0x73, 0xBB, 0x22, 0x15, 0x39, 0xEB, 0x8A);
 DEFINE_GUID(WINDIVERT_SUBLAYER_FORWARD_IPV4_GUID,
-    0x33507872, 0x278D, 0x42F7,
-    0xBD, 0x23, 0x8A, 0x60, 0xA2, 0x6A, 0x3D, 0x44);
+    0xEC5C40E3, 0xE508, 0x408B,
+    0xB9, 0x86, 0x58, 0xDE, 0xC7, 0x5F, 0x86, 0xE4);
 DEFINE_GUID(WINDIVERT_SUBLAYER_FORWARD_IPV6_GUID,
-    0xB51E5EB5, 0xCC2B, 0x42ED,
-    0x9A, 0xCD, 0x94, 0x28, 0xE4, 0x41, 0x09, 0x4A);
+    0xE70D0973, 0x935F, 0x4790,
+    0x8E, 0x64, 0xF7, 0xF7, 0x36, 0x27, 0xA5, 0x8F);
 
 /*
  * WinDivert supported layers.
diff --git a/sys/windivert.rc b/sys/windivert.rc
index cd0ee77..0fc15e9 100644
--- a/sys/windivert.rc
+++ b/sys/windivert.rc
@@ -22,20 +22,20 @@
 #define VER_FILETYPE                VFT_DRV
 #define VER_FILESUBTYPE             VFT2_DRV_NETWORK
 #define VER_FILEDESCRIPTION_STR     \
-    "WinDivert 1.3" \
+    "WinDivert 1.4" \
     " https://reqrypt.org/windivert.html" \
     " 1C5vZVSbizPeZ8ydTYhUfm4LA2cNwBfcYh"
 #define VER_INTERNALNAME_STR        "WinDivert.sys"
 #define VER_ORIGINALFILENAME_STR    "WinDivert.sys"
-#define VER_PRODUCTVERSION          1.3
-#define VER_PRODUCTVERSION_STR      "1.3"
+#define VER_PRODUCTVERSION          1.4
+#define VER_PRODUCTVERSION_STR      "1.4"
 #define VER_COMPANYNAME_STR         "Basil"
 #define VER_LEGALCOPYRIGHT_YEARS    "2011-2017"
 #define VER_LEGALCOPYRIGHT_STR      \
     "Copyright \251 " VER_COMPANYNAME_STR " " VER_LEGALCOPYRIGHT_YEARS 
 #define VER_FILEVERSION             VER_PRODUCTVERSION
 #define VER_FILEVERSION_STR         VER_PRODUCTVERSION_STR
-#define VER_PRODUCTNAME_STR         "WinDivert 1.3 driver"
+#define VER_PRODUCTNAME_STR         "WinDivert 1.4 driver"
 
 #include "common.ver"
 
