[misc] fix 2 small issues

Spiro Trikaliotis · pbatard · commit f8c408d28069 · 2021-10-28T13:31:02.000+01:00
* The short -w option of wdi-simple was missing, while the long option --wcid worked. * The wrong variable was used in an error message. * Closes pbatard#230 * Closes pbatard#231 * Closes pbatard#232 * Closes pbatard#233
diff --git a/examples/wdi-simple.c b/examples/wdi-simple.c
@@ -134,7 +134,7 @@ int __cdecl main(int argc, char** argv)
 
 	while(1)
 	{
-		c = getopt_long(argc, argv, "n:f:m:d:c:v:p:i:l:t:o:hxsb", long_options, NULL);
+		c = getopt_long(argc, argv, "n:f:m:d:c:v:p:i:l:t:o:hxsbw", long_options, NULL);
 		if (c == -1)
 			break;
 		switch(c) {
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,759,0
- PRODUCTVERSION 1,4,759,0
+ FILEVERSION 1,4,760,0
+ PRODUCTVERSION 1,4,760,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.759"
+            VALUE "FileVersion", "1.3.760"
             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.759"
+            VALUE "ProductVersion", "1.3.760"
             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.6.759"
+#define APP_VERSION                 "Zadig 2.6.760"
 
 // 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,6,759,0
- PRODUCTVERSION 2,6,759,0
+ FILEVERSION 2,6,760,0
+ PRODUCTVERSION 2,6,760,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.6.759"
+            VALUE "FileVersion", "2.6.760"
             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.6.759"
+            VALUE "ProductVersion", "2.6.760"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/libwdi/libwdi.c b/libwdi/libwdi.c
@@ -1421,7 +1421,7 @@ int LIBWDI_API wdi_prepare_driver(struct wdi_device_info* device_info, const cha
 		// Tokenize the cat file (for WDF version)
 		if ((cat_file_size = tokenize_internal(cat_template[driver_type],
 			&dst, inf_entities, "#", "#", 0)) <= 0) {
-			wdi_err("Could not tokenize cat file (%d)", inf_file_size);
+			wdi_err("Could not tokenize cat file (%d)", cat_file_size);
 			r = WDI_ERROR_ACCESS;
 			goto out;
 		}
diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,759,0
- PRODUCTVERSION 1,4,759,0
+ FILEVERSION 1,4,760,0
+ PRODUCTVERSION 1,4,760,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.759"
+            VALUE "FileVersion", "1.3.760"
             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.759"
+            VALUE "ProductVersion", "1.3.760"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ int __cdecl main(int argc, char** argv)`
`134`	`134`
`135`	`135`	`while(1)`
`136`	`136`	`{`
`137`		`- c = getopt_long(argc, argv, "n:f:m:d:c:v:p:i:l:t:o:hxsb", long_options, NULL);`
	`137`	`+ c = getopt_long(argc, argv, "n:f:m:d:c:v:p:i:l:t:o:hxsbw", long_options, NULL);`
`138`	`138`	`if (c == -1)`
`139`	`139`	`break;`
`140`	`140`	`switch(c) {`
Original file line number	Diff line number	Diff line change
`@@ -1421,7 +1421,7 @@ int LIBWDI_API wdi_prepare_driver(struct wdi_device_info* device_info, const cha`
`1421`	`1421`	`// Tokenize the cat file (for WDF version)`
`1422`	`1422`	`if ((cat_file_size = tokenize_internal(cat_template[driver_type],`
`1423`	`1423`	`&dst, inf_entities, "#", "#", 0)) <= 0) {`
`1424`		`- wdi_err("Could not tokenize cat file (%d)", inf_file_size);`
	`1424`	`+ wdi_err("Could not tokenize cat file (%d)", cat_file_size);`
`1425`	`1425`	`r = WDI_ERROR_ACCESS;`
`1426`	`1426`	`goto out;`
`1427`	`1427`	`}`