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

v2.4 (build 755)

Browse source 
* Also set global scaling factor before the dialog is initialized and
  remove unneeded scaling initialization.
This commit is contained in:
Pete Batard 2015-09-27 19:59:28 +01:00
parent 2b390aaf80
commit ae06a39d2f
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.txt
View file

@ -1,11 +1,11 @@
o Version 2.4 (2015.09.??) o Version 2.4 (2015.09.27)
Allow some settings and cheat modes to be persisted between sessions Allow some settings and cheat modes to be persisted between sessions
Fix multiple issues with flash drive detection Fix multiple issues with flash drive detection
Fix listing of drives that contain no media Fix listing of drives that contain no media
Fix cheat mode to save the current USB to *uncompressed* VHD (Alt-V) Fix cheat mode to save the current USB to *uncompressed* VHD (Alt-V)
Fix an UI scaling issue with high DPI displays for non English languages Fix an UI scaling issue with high DPI displays for non English languages
Update most of the translations Update most of the translations
Minor cosmetic changes Additional cosmetic improvements
o Version 2.3 (2015.08.28) o Version 2.3 (2015.08.28)
Detect ISOHybrid images and ask users how they should be written Detect ISOHybrid images and ask users how they should be written

7
src/rufus.c
View file

@ -2749,6 +2749,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
PF_TYPE_DECL(CDECL, int, __wgetmainargs, (int*, wchar_t***, wchar_t***, int, int*)); PF_TYPE_DECL(CDECL, int, __wgetmainargs, (int*, wchar_t***, wchar_t***, int, int*));
HANDLE mutex = NULL, hogmutex = NULL, hFile = NULL; HANDLE mutex = NULL, hogmutex = NULL, hFile = NULL;
HWND hDlg = NULL; HWND hDlg = NULL;
HDC hDC;
MSG msg; MSG msg;
struct option long_options[] = { struct option long_options[] = {
{"fixed", no_argument, NULL, 'f'}, {"fixed", no_argument, NULL, 'f'},
@ -2888,6 +2889,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
force_large_fat32 = ReadSettingBool(SETTING_FORCE_LARGE_FAT32_FORMAT); force_large_fat32 = ReadSettingBool(SETTING_FORCE_LARGE_FAT32_FORMAT);
enable_vmdk = ReadSettingBool(SETTING_ENABLE_VMDK_DETECTION); enable_vmdk = ReadSettingBool(SETTING_ENABLE_VMDK_DETECTION);
// Initialize the global scaling, in case we need it before we initialize the dialog
hDC = GetDC(NULL);
fScale = GetDeviceCaps(hDC, LOGPIXELSX) / 96.0f;
if (hDC != NULL)
ReleaseDC(NULL, hDC);
// Init localization // Init localization
init_localization(); init_localization();
// Seek for a loc file in the current directory // Seek for a loc file in the current directory

10
src/rufus.rc
View file

@ -32,7 +32,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
CAPTION "Rufus 2.4.754" CAPTION "Rufus 2.4.755"
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
@ -317,8 +317,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,754,0 FILEVERSION 2,4,755,0
PRODUCTVERSION 2,4,754,0 PRODUCTVERSION 2,4,755,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -335,13 +335,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.4.754" VALUE "FileVersion", "2.4.755"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2015 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.4.754" VALUE "ProductVersion", "2.4.755"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

5
src/stdlg.c
View file

@ -1557,16 +1557,11 @@ void DownloadNewVersion(void)
void SetTitleBarIcon(HWND hDlg) void SetTitleBarIcon(HWND hDlg)
{ {
HDC hDC;
int i16, s16, s32; int i16, s16, s32;
HICON hSmallIcon, hBigIcon; HICON hSmallIcon, hBigIcon;
// High DPI scaling // High DPI scaling
i16 = GetSystemMetrics(SM_CXSMICON); i16 = GetSystemMetrics(SM_CXSMICON);
hDC = GetDC(hDlg);
fScale = GetDeviceCaps(hDC, LOGPIXELSX) / 96.0f;
if (hDC != NULL)
ReleaseDC(hDlg, hDC);
// Adjust icon size lookup // Adjust icon size lookup
s16 = i16; s16 = i16;
s32 = (int)(32.0f*fScale); s32 = (int)(32.0f*fScale);