[core] fix 32 bit support

pbatard · pbatard · commit 5b9429625af4 · 2014-02-04T01:20:07.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.1.0.657
+zadig_version=2.1.0.658
 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,657
- PRODUCTVERSION 1,2,2,657
+ FILEVERSION 1,2,2,658
+ PRODUCTVERSION 1,2,2,658
  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.657"
+            VALUE "FileVersion", "1.2.2.658"
             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.657"
+            VALUE "ProductVersion", "1.2.2.658"
             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,657
- PRODUCTVERSION 1,2,2,657
+ FILEVERSION 1,2,2,658
+ PRODUCTVERSION 1,2,2,658
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.2.2.657"
+            VALUE "FileVersion", "1.2.2.658"
             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.657"
+            VALUE "ProductVersion", "1.2.2.658"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadig.h b/examples/zadig.h
@@ -46,7 +46,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.1.0.657"
+#define APP_VERSION                 "Zadig 2.1.0.658"
 
 // 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
@@ -242,8 +242,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,657
- PRODUCTVERSION 2,1,0,657
+ FILEVERSION 2,1,0,658
+ PRODUCTVERSION 2,1,0,658
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -260,13 +260,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.1.0.657"
+            VALUE "FileVersion", "2.1.0.658"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2014 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.1.0.657"
+            VALUE "ProductVersion", "2.1.0.658"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/libwdi/libwdi.c b/libwdi/libwdi.c
@@ -1678,7 +1678,7 @@ static int install_driver_internal(void* arglist)
 	if (!filter_driver) {
 		// Why do we need two installers? Glad you asked. If you try to run the x86 installer on an x64
 		// system, you will get a "System does not work under WOW64 and requires 64-bit version" message.
-		safe_sprintf(exename, sizeof(exename), "\"%s\\installer_x%s.exe\"", path, is_x64?"64":"32");
+		safe_sprintf(exename, sizeof(exename), "\"%s\\installer_x%s.exe\"", path, is_x64?"64":"86");
 		safe_sprintf(exeargs, sizeof(exeargs), "\"%s\"", params->inf_name);
 	} else {
 		// Use libusb-win32's filter driver installer
diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,2,657
- PRODUCTVERSION 1,2,2,657
+ FILEVERSION 1,2,2,658
+ PRODUCTVERSION 1,2,2,658
  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.657"
+            VALUE "FileVersion", "1.2.2.658"
             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.657"
+            VALUE "ProductVersion", "1.2.2.658"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
