Fixed signed code check for Vista & XP

multitheftauto · Feb 26, 2016 · 5b2c55d · 5b2c55d
1 parent 5a62615
commit 5b2c55d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/MTA10/loader/Utils.cpp b/MTA10/loader/Utils.cpp
@@ -2031,6 +2031,12 @@ bool VerifyEmbeddedSignature( const SString& strFilename )
     WinTrustData.dwUnionChoice = WTD_CHOICE_FILE;
     WinTrustData.pFile = &FileData;
 
+    if ( !IsWindows7OrGreater() )
+    {
+        // Basic check for Vista and down due to incompatibility with current signing methodology
+        WinTrustData.dwProvFlags = WTD_HASH_ONLY_FLAG;
+    }
+
     GUID WVTPolicyGUID = WINTRUST_ACTION_GENERIC_VERIFY_V2;
     LONG lStatus = WinVerifyTrust( NULL, &WVTPolicyGUID, &WinTrustData );
     return lStatus == ERROR_SUCCESS;

diff --git a/Shared/sdk/SharedUtil.Misc.h b/Shared/sdk/SharedUtil.Misc.h
@@ -150,6 +150,7 @@ namespace SharedUtil
     bool            IsWindowsVersionOrGreater       ( WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor );
     bool            IsWindowsXPSP3OrGreater         ( void );
     bool            IsWindowsVistaOrGreater         ( void );
+    bool            IsWindows7OrGreater             ( void );
     bool            IsWindows8OrGreater             ( void );
 
 #endif

diff --git a/Shared/sdk/SharedUtil.Misc.hpp b/Shared/sdk/SharedUtil.Misc.hpp
@@ -964,6 +964,11 @@ bool SharedUtil::IsWindowsVistaOrGreater()
     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0);
 }
 
+bool SharedUtil::IsWindows7OrGreater()
+{
+    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0);
+}
+
 bool SharedUtil::IsWindows8OrGreater()
 {
     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0);