From 7b2edbfd6fef8c5bd8cdc7f2c12e0fd0c6f0a0cf Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 2 Jan 2019 11:41:23 +0000 Subject: [PATCH] [process] also report the PID of conflicting processes * Also update copyright year --- src/process.c | 8 ++++---- src/rufus.rc | 10 +++++----- src/stdlg.c | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/process.c b/src/process.c index ac71ea61..5159adee 100644 --- a/src/process.c +++ b/src/process.c @@ -4,9 +4,9 @@ * * Modified from Process Hacker: * https://github.com/processhacker2/processhacker2/ - * Copyright © 2009-2016 wj32 + * Copyright © 2017-2019 Pete Batard * Copyright © 2017 dmex - * Copyright © 2017 Pete Batard + * Copyright © 2009-2016 wj32 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -380,8 +380,8 @@ static DWORD WINAPI SearchProcessThread(LPVOID param) // If we're switching process and found a match, print it if (bFound) { - vuprintf("● '%s' (pid: %ld, access: %s)", exe_path, pid[cur_pid], access_rights_str[access_rights & 0x7]); - static_sprintf(tmp, "● %s (%s)", exe_path, access_rights_str[access_rights & 0x7]); + static_sprintf (tmp, "● [%06u] %s (%s)", (uint32_t)pid[cur_pid], exe_path, access_rights_str[access_rights & 0x7]); + vuprintf(tmp); StrArrayAdd(&BlockingProcess, tmp, TRUE); bFound = FALSE; access_rights = 0; diff --git a/src/rufus.rc b/src/rufus.rc index d15d0f18..ea45e29f 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.5.1433" +CAPTION "Rufus 3.5.1434" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -394,8 +394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1433,0 - PRODUCTVERSION 3,5,1433,0 + FILEVERSION 3,5,1434,0 + PRODUCTVERSION 3,5,1434,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -413,13 +413,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.5.1433" + VALUE "FileVersion", "3.5.1434" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", " 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.5.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.5.1433" + VALUE "ProductVersion", "3.5.1434" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index 4cf29f21..278c0c04 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Standard Dialog Routines (Browse for folder, About, etc) - * Copyright © 2011-2018 Pete Batard + * Copyright © 2011-2019 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -586,7 +586,7 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP ResizeButtonHeight(hDlg, IDOK); static_sprintf(about_blurb, about_blurb_format, lmprintf(MSG_174|MSG_RTF), lmprintf(MSG_175|MSG_RTF, rufus_version[0], rufus_version[1], rufus_version[2]), - "Copyright © 2011-2018 Pete Batard / Akeo", + "Copyright © 2011-2019 Pete Batard / Akeo", lmprintf(MSG_176|MSG_RTF), lmprintf(MSG_177|MSG_RTF), lmprintf(MSG_178|MSG_RTF)); for (i=0; i