From f4dc659850a2e90d61df8d96e7e5705a4a21226b Mon Sep 17 00:00:00 2001 From: Sirio Builder Date: Mon, 9 Dec 2019 09:36:04 +0100 Subject: [PATCH] Patch level : 12.0 908 Files correlati : ba1 Commento : firma --- src/include/utility.cpp | 4 ++-- src/include/utility.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/utility.cpp b/src/include/utility.cpp index 60274bde7..ac632ffe2 100755 --- a/src/include/utility.cpp +++ b/src/include/utility.cpp @@ -278,7 +278,7 @@ bool input_filename(TFilename& file) return good; } -BOOLEAN sirio_codesigning(const TFilename& filename, bool verify) +bool sirio_codesigning(const TFilename& filename, bool verify) { const char * const default_sign = R"("C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v)"; const char * const default_verify = R"("C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" verify /a /pa /v)"; @@ -286,7 +286,7 @@ BOOLEAN sirio_codesigning(const TFilename& filename, bool verify) TString command = installini.get(!verify ? "SirioSignCommand" : "SirioSignVerifyCommand", nullptr, -1, ""); if (command.empty()) command << !verify ? default_sign : default_verify; - command << " \"" << filename.path() << static_cast((const TFilename&)filename) << "\""; + command << " \"" << filename << "\""; const int exit = xvt_sys_execute(command, TRUE, FALSE); return exit == 0 || exit == 2; // Execution was successful [0] OR Execution has completed with warnings [2] } diff --git a/src/include/utility.h b/src/include/utility.h index 147339db7..5eb7900ec 100755 --- a/src/include/utility.h +++ b/src/include/utility.h @@ -20,7 +20,7 @@ #define SAFE_DELETE(p) { delete p; p = NULL; } #define DEBUG_ENABLED is_debug_station() -BOOLEAN sirio_codesigning(const TFilename& filename, bool verify = false); +bool sirio_codesigning(const TFilename& filename, bool verify = false); #define SIRIOSIGN(filename) sirio_codesigning((const TFilename&)((filename)), false) #define SIRIOSIGN_VERIFY(filename) sirio_codesigning((const TFilename&)((filename)), true)