diff --git a/res/appstore/Package.appxmanifest b/res/appstore/Package.appxmanifest index d3fd6157..8302608d 100644 --- a/res/appstore/Package.appxmanifest +++ b/res/appstore/Package.appxmanifest @@ -10,7 +10,7 @@ + Version="3.13.1732.0" /> Rufus diff --git a/res/appstore/appstore.wapproj b/res/appstore/appstore.wapproj index 30311b77..6192726b 100644 --- a/res/appstore/appstore.wapproj +++ b/res/appstore/appstore.wapproj @@ -38,7 +38,7 @@ - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp $(OutDir)rufus.exe + echo "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp rufus.exe $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ diff --git a/src/rufus.c b/src/rufus.c index 4d4cd755..45d21bc8 100755 --- a/src/rufus.c +++ b/src/rufus.c @@ -3087,7 +3087,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine int wait_for_mutex = 0; FILE* fd; BOOL attached_console = FALSE, external_loc_file = FALSE, lgp_set = FALSE, automount = TRUE; - BOOL disable_hogger = FALSE, previous_enable_HDDs = FALSE, vc = IsRegistryNode(REGKEY_HKCU, vs_reg); + BOOL disable_hogger = FALSE, previous_enable_HDDs = FALSE; // , vc = IsRegistryNode(REGKEY_HKCU, vs_reg); BOOL alt_pressed = FALSE, alt_command = FALSE; BYTE *loc_data; DWORD loc_size, u, size = sizeof(u); @@ -3230,6 +3230,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine case '?': case 'h': default: +uprintf("Rufus usage selected"); PrintUsage(argv[0]); goto out; } @@ -3238,7 +3239,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else { uprintf("Could not access UTF-16 args"); } - +uprintf("Post args processing"); // Retrieve various app & system directories if (GetCurrentDirectoryU(sizeof(app_dir), app_dir) == 0) { uprintf("Could not get current directory: %s", WindowsErrorString()); @@ -3252,6 +3253,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine uprintf("Could not get temp directory: %s", WindowsErrorString()); static_strcpy(temp_dir, ".\\"); } +uprintf("Post dirs processing"); // Construct Sysnative ourselves as there is no GetSysnativeDirectory() call // By default (64bit app running on 64 bit OS or 32 bit app running on 32 bit OS) // Sysnative and System32 are the same @@ -3270,7 +3272,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine // Look for a .ini file in the current app directory static_sprintf(ini_path, "%s\\rufus.ini", app_dir); fd = fopenU(ini_path, ini_flags); // Will create the file if portable mode is requested - vc |= (safe_strcmp(GetSignatureName(NULL, NULL), cert_name[0]) == 0); +// vc |= (safe_strcmp(GetSignatureName(NULL, NULL), cert_name[0]) == 0); if (fd != NULL) { ini_file = ini_path; fclose(fd); @@ -3429,12 +3431,12 @@ relaunch: if (get_loc_data_file(loc_file, selected_locale)) WriteSettingStr(SETTING_LOCALE, selected_locale->txt[0]); - if (!vc) { - if (MessageBoxExU(NULL, lmprintf(MSG_296), lmprintf(MSG_295), - MB_YESNO | MB_ICONWARNING | MB_IS_RTL | MB_SYSTEMMODAL, selected_langid) != IDYES) - goto out; - vc = TRUE; - } + //if (!vc) { + // if (MessageBoxExU(NULL, lmprintf(MSG_296), lmprintf(MSG_295), + // MB_YESNO | MB_ICONWARNING | MB_IS_RTL | MB_SYSTEMMODAL, selected_langid) != IDYES) + // goto out; + // vc = TRUE; + //} /* * Create the main Window diff --git a/src/rufus.rc b/src/rufus.rc index bbfef716..32255167 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.14.1731" +CAPTION "Rufus 3.14.1732" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -395,8 +395,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,14,1731,0 - PRODUCTVERSION 3,14,1731,0 + FILEVERSION 3,14,1732,0 + PRODUCTVERSION 3,14,1732,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -414,13 +414,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.14.1731" + VALUE "FileVersion", "3.14.1732" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.13.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.14.1731" + VALUE "ProductVersion", "3.14.1732" END END BLOCK "VarFileInfo"