From 3fe6894f8beff09ea4ffeb565b66c23a089770d7 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 17 Mar 2016 21:56:36 +0000 Subject: [PATCH] [misc] increase SetLGP thread wait delay * Someone running Rufus in a VirtualBox environment, where their CPU was also seeing 100% usage, reported getting the following message: "SetLGP: Killing stuck thread!" --- ChangeLog.txt | 1 - src/rufus.rc | 10 +++++----- src/stdfn.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a741868e..ddbf7d31 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -5,7 +5,6 @@ o Version 2.8 (2016.03.??) Fix computation of FAT size for Large FAT32 (with thanks to Ady) Syslinux improvements Update GRUB to 2.02~beta3 - Switch to https when downloading updates o Version 2.7 (2016.02.14) Add Thai translation, courtesy of Sippapas Wangsri diff --git a/src/rufus.rc b/src/rufus.rc index 5ab01cab..2aaadc80 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.8.884" +CAPTION "Rufus 2.8.885" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -320,8 +320,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,884,0 - PRODUCTVERSION 2,8,884,0 + FILEVERSION 2,8,885,0 + PRODUCTVERSION 2,8,885,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -338,13 +338,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.8.884" + VALUE "FileVersion", "2.8.885" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.8.884" + VALUE "ProductVersion", "2.8.885" END END BLOCK "VarFileInfo" diff --git a/src/stdfn.c b/src/stdfn.c index cdca1180..47648b43 100644 --- a/src/stdfn.c +++ b/src/stdfn.c @@ -803,7 +803,7 @@ BOOL SetLGP(BOOL bRestore, BOOL* bExistingKey, const char* szPath, const char* s uprintf("SetLGP: Unable to start thread"); return FALSE; } - if (WaitForSingleObject(thread_id, 2500) != WAIT_OBJECT_0) { + if (WaitForSingleObject(thread_id, 5000) != WAIT_OBJECT_0) { uprintf("SetLGP: Killing stuck thread!"); TerminateThread(thread_id, 0); CloseHandle(thread_id);