fix regression introduced with 38f4820

pbatard · Jul 27, 2018 · b4cd792 · b4cd792
1 parent 38f4820
commit b4cd792
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,720,0
- PRODUCTVERSION 1,3,720,0
+ FILEVERSION 1,3,721,0
+ PRODUCTVERSION 1,3,721,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.720"
+ VALUE "FileVersion", "1.3.721"
  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.720"
+ VALUE "ProductVersion", "1.3.721"
  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,720,0
- PRODUCTVERSION 1,3,720,0
+ FILEVERSION 1,3,721,0
+ PRODUCTVERSION 1,3,721,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
  BEGIN
  VALUE "CompanyName", "akeo.ie"
  VALUE "FileDescription", "Zadic"
- VALUE "FileVersion", "1.3.720"
+ VALUE "FileVersion", "1.3.721"
  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.720"
+ VALUE "ProductVersion", "1.3.721"
  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.4.720"
+#define APP_VERSION "Zadig 2.4.721"
 
 // 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,4,720,0
- PRODUCTVERSION 2,4,720,0
+ FILEVERSION 2,4,721,0
+ PRODUCTVERSION 2,4,721,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
  BEGIN
  VALUE "CompanyName", "akeo.ie"
  VALUE "FileDescription", "Zadig"
- VALUE "FileVersion", "2.4.720"
+ VALUE "FileVersion", "2.4.721"
  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.4.720"
+ VALUE "ProductVersion", "2.4.721"
  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,720,0
- PRODUCTVERSION 1,3,720,0
+ FILEVERSION 1,3,721,0
+ PRODUCTVERSION 1,3,721,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.720"
+ VALUE "FileVersion", "1.3.721"
  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.720"
+ VALUE "ProductVersion", "1.3.721"
  VALUE "Comments", "http://libwdi.akeo.ie"
  END
  END

diff --git a/libwdi/msapi_utf8.h b/libwdi/msapi_utf8.h
@@ -681,7 +681,13 @@ static __inline DWORD GetFileAttributesU(const char* lpFileName)
 {
  DWORD ret = 0xFFFFFFFF, err = ERROR_INVALID_DATA;
  wconvert(lpFileName);
- ret = GetFileAttributesW(wlpFileName);
+ // Unlike Microsoft's version, ours doesn't fail if the string is quoted
+ if ((wlpFileName[0] == L'"') && (wlpFileName[wcslen(wlpFileName) - 1] == L'"')) {
+ wlpFileName[wcslen(wlpFileName) - 1] = 0;
+ ret = GetFileAttributesW(&wlpFileName[1]);
+ } else {
+ ret = GetFileAttributesW(wlpFileName);
+ }
  err = GetLastError();
  wfree(lpFileName);
  SetLastError(err);