From 7567ddef07b24b0239570821f11a980f0e3384a1 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 17 Jun 2015 18:32:19 +0100 Subject: [PATCH] [ui] fix cursor being displayed within Info field * Also fix an MSVC code analysis warning in iso.c * Closes #527 --- src/iso.c | 2 +- src/rufus.c | 5 ++++- src/rufus.rc | 16 ++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/iso.c b/src/iso.c index 423e80ae..109fc5f0 100644 --- a/src/iso.c +++ b/src/iso.c @@ -822,7 +822,7 @@ out: fd = NULL; safe_sprintf(path2, sizeof(path2), "%s\\syslinux.org", dest_dir); uprintf("Renaming: %s ⇨ %s", path, path2); - rename(path, path2); + IGNORE_RETVAL(rename(path, path2)); } if (fd == NULL) { fd = fopen(path, "w"); // No "/syslinux.cfg" => create a new one diff --git a/src/rufus.c b/src/rufus.c index 32922a2e..5128820f 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1552,13 +1552,16 @@ static INT_PTR CALLBACK InfoCallback(HWND hCtrl, UINT message, WPARAM wParam, LP PAINTSTRUCT ps; wchar_t winfo[128]; + // Prevent the cursor (caret) from appearing within the edit control + HideCaret(hCtrl); + switch (message) { // Prevent select (which screws up our display as it redraws the font using different settings) case WM_LBUTTONDOWN: return (INT_PTR)FALSE; - // Prevent the select cursor from appearing + // Prevent the text selection pointer from appearing on hover case WM_SETCURSOR: SetCursor(LoadCursor(NULL, IDC_ARROW)); return (INT_PTR)TRUE; diff --git a/src/rufus.rc b/src/rufus.rc index 1c2765ee..d955d7a8 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,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 -CAPTION "Rufus 2.3.675" +CAPTION "Rufus 2.3.676" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -157,7 +157,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.3.675" +CAPTION "Rufus 2.3.676" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -283,7 +283,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.3.675" +CAPTION "Rufus 2.3.676" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -415,7 +415,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.3.675" +CAPTION "Rufus 2.3.676" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -671,8 +671,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,675,0 - PRODUCTVERSION 2,3,675,0 + FILEVERSION 2,3,676,0 + PRODUCTVERSION 2,3,676,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -689,13 +689,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.3.675" + VALUE "FileVersion", "2.3.676" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.3.675" + VALUE "ProductVersion", "2.3.676" END END BLOCK "VarFileInfo"