[core] Link to the standalone WDK 8 redistributables

* These redistributables have not changed since Windows 8 (since Windows 10 doesn't actually need them) and Microsoft has finally started making them as standalone at: https://go.microsoft.com/fwlink/p/?LinkID=253170. * Switch our default WDK location to the default install location of the redistributable MSI.
pbatard · Jun 11, 2021 · a6ae23a · a6ae23a
1 parent cc0b96e
commit a6ae23a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 24 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -38,10 +38,10 @@ build:
   verbosity: detailed
 
 install:
-  - curl -o wdk10-redist.7z -L http://files.akeo.ie/appveyor/libwdi/wdk10-redist.7z
-  - curl -o libusb-win32-bin-1.2.6.0.zip -L http://files.akeo.ie/appveyor/libwdi/libusb-win32-bin-1.2.6.0.zip
-  - curl -o libusbK-3.0.7.0-bin.7z -L http://files.akeo.ie/appveyor/libwdi/libusbK-3.0.7.0-bin.7z
-  - 7z x wdk10-redist.7z
+  - curl -o wdk8-redist.7z -L https://files.akeo.ie/appveyor/libwdi/wdk8-redist.7z
+  - curl -o libusb-win32-bin-1.2.6.0.zip -L https://files.akeo.ie/appveyor/libwdi/libusb-win32-bin-1.2.6.0.zip
+  - curl -o libusbK-3.0.7.0-bin.7z -L https://files.akeo.ie/appveyor/libwdi/libusbK-3.0.7.0-bin.7z
+  - 7z x wdk8-redist.7z
   - 7z x libusb-win32-bin-1.2.6.0.zip
   - 7z x libusbK-3.0.7.0-bin.7z
   - if [%PLATFORM%]==[x86_64] set BITS=64

diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,743,0
- PRODUCTVERSION 1,3,743,0
+ FILEVERSION 1,3,744,0
+ PRODUCTVERSION 1,3,744,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.3.743"
+            VALUE "FileVersion", "1.3.744"
             VALUE "InternalName", "WDI-Simple"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "wdi-simple.exe"
             VALUE "ProductName", "WDI-Simple"
-            VALUE "ProductVersion", "1.3.743"
+            VALUE "ProductVersion", "1.3.744"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadic.rc b/examples/zadic.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,743,0
- PRODUCTVERSION 1,3,743,0
+ FILEVERSION 1,3,744,0
+ PRODUCTVERSION 1,3,744,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.3.743"
+            VALUE "FileVersion", "1.3.744"
             VALUE "InternalName", "Zadic"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "zadic.exe"
             VALUE "ProductName", "Zadic"
-            VALUE "ProductVersion", "1.3.743"
+            VALUE "ProductVersion", "1.3.744"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/examples/zadig.h b/examples/zadig.h
@@ -59,7 +59,7 @@
 #define FIELD_ORANGE                RGB(255,240,200)
 #define ARROW_GREEN                 RGB(92,228,65)
 #define ARROW_ORANGE                RGB(253,143,56)
-#define APP_VERSION                 "Zadig 2.5.743"
+#define APP_VERSION                 "Zadig 2.5.744"
 
 // These are used to flag end users about the driver they are going to replace
 enum driver_type {

diff --git a/examples/zadig.rc b/examples/zadig.rc
@@ -246,8 +246,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,743,0
- PRODUCTVERSION 2,5,743,0
+ FILEVERSION 2,5,744,0
+ PRODUCTVERSION 2,5,744,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.5.743"
+            VALUE "FileVersion", "2.5.744"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.5.743"
+            VALUE "ProductVersion", "2.5.744"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,743,0
- PRODUCTVERSION 1,3,743,0
+ FILEVERSION 1,3,744,0
+ PRODUCTVERSION 1,3,744,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
-            VALUE "FileVersion", "1.3.743"
+            VALUE "FileVersion", "1.3.744"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.3.743"
+            VALUE "ProductVersion", "1.3.744"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

diff --git a/msvc/config.h b/msvc/config.h
@@ -16,12 +16,14 @@
 #endif
 
 /*
- * Embed WinUSB driver files from the following WDK location
+ * Embed WinUSB driver files from the following WDK location.
+ * If needed, you can obtain the WDK redistributable components from:
+ * https://go.microsoft.com/fwlink/p/?LinkID=253170
  * NB: You must also make sure the WDF_VER, COINSTALLER_DIR and X64_DIR
- * match your WinUSB redist directories
+ * match your WinUSB redist directories.
  */
 #ifndef WDK_DIR
-#define WDK_DIR "C:/Program Files (x86)/Windows Kits/10"
+#define WDK_DIR "C:/Program Files (x86)/Windows Kits/8.0"
 #endif
 
 /* WDK WDF coinstaller version */