[internal] bumped internal version

pbatard · pbatard · commit 72f05c631379 · 2012-11-14T23:39:50.000Z
diff --git a/_bm.sh b/_bm.sh
@@ -2,7 +2,7 @@
 # Create and upload a Zadig release
 # !!!THIS SCRIPT IS FOR INTERNAL DEVELOPER USE ONLY!!!
 
-zadig_version=2.0.1.159
+zadig_version=2.0.1.160
 target_dir=/e/dailies/libwdi
 
 type -P git &>/dev/null || { echo "Git not found. Aborting." >&2; exit 1; }
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,2,159
- PRODUCTVERSION 1,2,2,159
+ FILEVERSION 1,2,2,160
+ PRODUCTVERSION 1,2,2,160
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.2.2.159"
+            VALUE "FileVersion", "1.2.2.160"
             VALUE "InternalName", "WDI-Simple"
             VALUE "LegalCopyright", "� 2010-2011 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.2.2.159"
+            VALUE "ProductVersion", "1.2.2.160"
             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,2,2,159
- PRODUCTVERSION 1,2,2,159
+ FILEVERSION 1,2,2,160
+ PRODUCTVERSION 1,2,2,160
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.2.2.159"
+            VALUE "FileVersion", "1.2.2.160"
             VALUE "InternalName", "Zadic"
             VALUE "LegalCopyright", "� 2010-2011 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "zadic.exe"
             VALUE "ProductName", "Zadic"
-            VALUE "ProductVersion", "1.2.2.159"
+            VALUE "ProductVersion", "1.2.2.160"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadig.h b/examples/zadig.h
@@ -54,7 +54,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 v2.0.1.159"
+#define APP_VERSION                 "Zadig v2.0.1.160"
 
 // 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
@@ -174,7 +174,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,231,174,50,16,WS_GROUP
     CONTROL         "<a href=""http://libwdi.akeo.ie"">http://libwdi.akeo.ie</a>",IDC_ABOUT_LIBWDI_URL,
                     "SysLink",WS_TABSTOP,46,47,87,9
-    LTEXT           "Version 2.0.1 (Build 159)",IDC_STATIC,46,19,78,8
+    LTEXT           "Version 2.0.1 (Build 160)",IDC_STATIC,46,19,78,8
     DEFPUSHBUTTON   "License...",IDC_ABOUT_LICENSE,46,174,50,16,WS_GROUP
     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -211,8 +211,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,159
- PRODUCTVERSION 2,0,1,159
+ FILEVERSION 2,0,1,160
+ PRODUCTVERSION 2,0,1,160
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -229,13 +229,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.0.1.159"
+            VALUE "FileVersion", "2.0.1.160"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2011 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.0.1.159"
+            VALUE "ProductVersion", "2.0.1.160"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadig_README.creole b/examples/zadig_README.creole
@@ -1,10 +1,15 @@
 **Note**: You will need [[http://www.7-zip.org/|7-zip]] to extract the file. You can download 7-zip for Windows **[[http://www.7-zip.org/download.html|here]]**.
-== **IMPORTANT: WINDOWS XP USERS PLEASE DOWNLOAD Zadig v2.0.1.154** ==
-From v2.0.1.155 on, Zadig uses [[http://msdn.microsoft.com/en-us/library/windows/hardware/gg463279.aspx|KMDF]] v1.11, from the Windows 8 Driver Kit, for WinUSB and libusbK driver installation.\\
+== **IMPORTANT: WINDOWS XP USERS, PLEASE DOWNLOAD THE _XP VERSION: ** ==
+From v2.0.1.156 on, the default version of Zadig uses [[http://msdn.microsoft.com/en-us/library/windows/hardware/gg463279.aspx|KMDF]] v1.11, from the Windows 8 Driver Kit, for WinUSB and libusbK driver installation.\\
 However this version of KMDF is **INCOMPATIBLE** with Windows XP.\\
-In the future, I will ne releasing 2 versions of Zadig: one with KMDF 1.11 for Windows Vista and later and one with KMDF 1.9. For the time being however, Windows XP users should download Zadig v2.0.1.154.
+Since v2.0.1.160, a specific version of Zadig is also released for XP users, using KMDF v1.09. If you are running XP, please download the **_xp** version!
 
 = Screenshot:\\{{https://github.com/pbatard/libwdi/wiki/images/zadig.png|Zadig screenshot}}\\Changelog: =
+=== v2.0.1.160: ===
+* Zadig is now provided in 2 versions: One for XP users that includes KMDF/WDF 1.09 and one for Vista, Windows 7 and Windows 8 users that includes KMDF/WDF 1.11. Make sure you pick the right one!
+* libusb-win32 should now install the libusbK DLL. This is needed for libusbx applications using libusb-win32.
+* embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0 & libusbK v3.0.5.16
+
 === v2.0.1.159: ===
 * token release to align with libwdi v1.2.2
 * binary build compiler upgradded to gcc v4.7 (MinGW-w64)
diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,2,159
- PRODUCTVERSION 1,2,2,159
+ FILEVERSION 1,2,2,160
+ PRODUCTVERSION 1,2,2,160
  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.2.2.159"
+            VALUE "FileVersion", "1.2.2.160"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "� 2010-2011 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.2.2.159"
+            VALUE "ProductVersion", "1.2.2.160"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/libwdi/vid_data.c b/libwdi/vid_data.c
@@ -28,7 +28,7 @@ struct vendor_name {
 
 /*
  * http://www.linux-usb.org/usb.ids
- * Version: 2012.09.19
+ * Version: 2012.09.20
  */
 static struct vendor_name usb_vendor[] = {
 	{ 0x0001, "Fry's Electronics" },
@@ -1222,6 +1222,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0a70, "International Game Technology" },
 	{ 0x0a71, "VIPColor Technologies USA, Inc." },
 	{ 0x0a72, "Sanwa Denshi" },
+	{ 0x0a73, "Mackie Designs" },
 	{ 0x0a7d, "NSTL, Inc." },
 	{ 0x0a7e, "Octagon Systems Corp." },
 	{ 0x0a80, "Rexon Technology Corp., Ltd" },
@@ -1438,7 +1439,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0c25, "Sampo Corp." },
 	{ 0x0c26, "Prolific Technology Inc." },
 	{ 0x0c27, "RFIDeas, Inc" },
-	{ 0x0c2e, "Metro" },
+	{ 0x0c2e, "Metrologic Instruments" },
 	{ 0x0c35, "Eagletron, Inc." },
 	{ 0x0c36, "E Ink Corp." },
 	{ 0x0c37, "e.Digital" },
@@ -1581,6 +1582,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0d41, "Ta Yun Terminals Industrial Co., Ltd" },
 	{ 0x0d42, "Full Der Co., Ltd" },
 	{ 0x0d46, "Kobil Systems GmbH" },
+	{ 0x0d48, "Promethean Limited" },
 	{ 0x0d49, "Maxtor" },
 	{ 0x0d4a, "NF Corp." },
 	{ 0x0d4b, "Grape Systems, Inc." },
@@ -1701,6 +1703,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0e0f, "VMware, Inc." },
 	{ 0x0e16, "JMTek, LLC" },
 	{ 0x0e17, "Walex Electronic, Ltd" },
+	{ 0x0e1a, "Unisys" },
 	{ 0x0e1b, "Crewave" },
 	{ 0x0e20, "Pegasus Technologies Ltd." },
 	{ 0x0e21, "Cowon Systems, Inc." },
@@ -2023,6 +2026,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x10f5, "Turtle Beach" },
 	{ 0x10fb, "Pictos Technologies, Inc." },
 	{ 0x10fd, "Anubis Electronics, Ltd" },
+	{ 0x10fe, "Thrane & Thrane" },
 	{ 0x1100, "VirTouch, Ltd" },
 	{ 0x1101, "EasyPass Industrial Co., Ltd" },
 	{ 0x1108, "Brightcom Technologies, Ltd" },
@@ -2205,6 +2209,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1436, "Denali Software, Inc." },
 	{ 0x143c, "Altek Corporation" },
 	{ 0x1443, "Digilent" },
+	{ 0x1446, "X.J.GROUP" },
 	{ 0x1453, "Radio Shack" },
 	{ 0x1456, "Extending Wire & Cable Co., Ltd." },
 	{ 0x1457, "First International Computer, Inc." },
@@ -2223,6 +2228,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x148e, "EVATRONIX SA" },
 	{ 0x148f, "Ralink Technology, Corp." },
 	{ 0x1491, "Futronic Technology Co. Ltd." },
+	{ 0x1493, "Suunto" },
 	{ 0x1497, "Panstrong Company Ltd." },
 	{ 0x1498, "Microtek International Inc." },
 	{ 0x149a, "Imagination Technologies" },
@@ -2254,10 +2260,12 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1524, "ENE Technology Inc" },
 	{ 0x1527, "Silicon Portals" },
 	{ 0x1529, "UBIQUAM Co., Ltd." },
+	{ 0x152a, "Thesycon Systemsoftware & Consulting GmbH" },
 	{ 0x152d, "JMicron Technology Corp. / JMicron USA Technology Corp." },
 	{ 0x152e, "LG (HLDS)" },
 	{ 0x1532, "Razer USA, Ltd" },
 	{ 0x1546, "U-Blox AG" },
+	{ 0x1547, "SG Intec Ltd & Co KG" },
 	{ 0x154a, "Celectronic GmbH" },
 	{ 0x154b, "PNY" },
 	{ 0x154d, "ConnectCounty Holdings Berhad" },
@@ -2302,6 +2310,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1606, "Umax" },
 	{ 0x1608, "Inside Out Networks [hex]" },
 	{ 0x160a, "VIA Technologies, Inc." },
+	{ 0x160e, "INRO" },
 	{ 0x1614, "Amoi Electronics" },
 	{ 0x1619, "L & K Precision Technology Co., Ltd." },
 	{ 0x1621, "Wionics Research" },
@@ -2316,6 +2325,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x164c, "Matrix Vision GmbH" },
 	{ 0x1657, "Struck Innovative Systeme GmbH" },
 	{ 0x165b, "Frontier Design Group" },
+	{ 0x165c, "Kondo Kagaku" },
 	{ 0x1660, "Creatix Polymedia GmbH" },
 	{ 0x1668, "Actiontec Electronics, Inc. [hex]" },
 	{ 0x1669, "PiKRON Ltd. [hex]" },
@@ -2329,6 +2339,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1686, "ZOOM Corporation" },
 	{ 0x1687, "Kingmax Digital Inc." },
 	{ 0x1688, "Saab AB" },
+	{ 0x1689, "Razer USA, Ltd" },
 	{ 0x168c, "Atheros Communications" },
 	{ 0x1690, "Askey Computer Corp. [hex]" },
 	{ 0x1696, "Hitachi Video and Information System, Inc." },
@@ -2339,10 +2350,10 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x16ac, "Dongguan ChingLung Wire & Cable Co., Ltd." },
 	{ 0x16b4, "iStation" },
 	{ 0x16b5, "Persentec, Inc." },
-	{ 0x16c0, "VOTI" },
+	{ 0x16c0, "Van Ooijen Technische Informatica" },
 	{ 0x16ca, "Wireless Cables, Inc." },
 	{ 0x16cc, "silex technology, Inc." },
-	{ 0x16d0, "GrauTec" },
+	{ 0x16d0, "MCS" },
 	{ 0x16d3, "Frontline Test Equipment, Inc." },
 	{ 0x16d5, "AnyDATA Corporation" },
 	{ 0x16d6, "JABLOCOM s.r.o." },
