nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[misc] increase SetLGP thread wait delay

Browse source 
* Someone running Rufus in a VirtualBox environment, where their CPU
  was also seeing 100% usage, reported getting the following message:
  "SetLGP: Killing stuck thread!"
This commit is contained in:
Pete Batard 2016-03-17 21:56:36 +00:00
parent b1c5545205
commit 3fe6894f8b
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -5,7 +5,6 @@ o Version 2.8 (2016.03.??)
Fix computation of FAT size for Large FAT32 (with thanks to Ady) Fix computation of FAT size for Large FAT32 (with thanks to Ady)
Syslinux improvements Syslinux improvements
Update GRUB to 2.02~beta3 Update GRUB to 2.02~beta3
Switch to https when downloading updates
o Version 2.7 (2016.02.14) o Version 2.7 (2016.02.14)
Add Thai translation, courtesy of Sippapas Wangsri Add Thai translation, courtesy of Sippapas Wangsri

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.8.884" CAPTION "Rufus 2.8.885"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,8,884,0 FILEVERSION 2,8,885,0
PRODUCTVERSION 2,8,884,0 PRODUCTVERSION 2,8,885,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.8.884" VALUE "FileVersion", "2.8.885"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.8.884" VALUE "ProductVersion", "2.8.885"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
src/stdfn.c
View file

@ -803,7 +803,7 @@ BOOL SetLGP(BOOL bRestore, BOOL* bExistingKey, const char* szPath, const char* s
uprintf("SetLGP: Unable to start thread"); uprintf("SetLGP: Unable to start thread");
return FALSE; return FALSE;
} }
if (WaitForSingleObject(thread_id, 2500) != WAIT_OBJECT_0) { if (WaitForSingleObject(thread_id, 5000) != WAIT_OBJECT_0) {
uprintf("SetLGP: Killing stuck thread!"); uprintf("SetLGP: Killing stuck thread!");
TerminateThread(thread_id, 0); TerminateThread(thread_id, 0);
CloseHandle(thread_id); CloseHandle(thread_id);