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

[loc] fix Cyrillic not displaying properly in About dialog

Browse source 
* Issue was introduced in 0f56c2d1ef
* Closes #670
This commit is contained in:
Pete Batard 2016-01-11 13:06:33 +00:00
parent 4b3969e475
commit a952221a9b
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rufus.c
View file

@ -114,7 +114,6 @@ extern uint8_t* grub2_buf;
extern long grub2_len; extern long grub2_len;
extern const char* old_c32_name[NB_OLD_C32]; extern const char* old_c32_name[NB_OLD_C32];
static int selection_default; static int selection_default;
static loc_cmd* selected_locale = NULL;
static UINT_PTR UM_LANGUAGE_MENU_MAX = UM_LANGUAGE_MENU; static UINT_PTR UM_LANGUAGE_MENU_MAX = UM_LANGUAGE_MENU;
static RECT relaunch_rc = { -65536, -65536, 0, 0}; static RECT relaunch_rc = { -65536, -65536, 0, 0};
static UINT uBootChecked = BST_CHECKED, uQFChecked = BST_CHECKED, uMBRChecked = BST_UNCHECKED; static UINT uBootChecked = BST_CHECKED, uQFChecked = BST_CHECKED, uMBRChecked = BST_UNCHECKED;
@ -136,6 +135,7 @@ char* image_path = NULL;
float fScale = 1.0f; float fScale = 1.0f;
int default_fs; int default_fs;
uint32_t dur_mins, dur_secs; uint32_t dur_mins, dur_secs;
loc_cmd* selected_locale = NULL;
WORD selected_langid = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT); WORD selected_langid = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT);
HWND hDeviceList, hPartitionScheme, hFileSystem, hClusterSize, hLabel, hBootType, hNBPasses, hLog = NULL; HWND hDeviceList, hPartitionScheme, hFileSystem, hClusterSize, hLabel, hBootType, hNBPasses, hLog = NULL;
HWND hLogDlg = NULL, hProgress = NULL, hInfo, hDiskID, hStatusToolbar; HWND hLogDlg = NULL, hProgress = NULL, hInfo, hDiskID, hStatusToolbar;

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.7.826" CAPTION "Rufus 2.7.827"
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
@ -319,8 +319,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,826,0 FILEVERSION 2,7,827,0
PRODUCTVERSION 2,7,826,0 PRODUCTVERSION 2,7,827,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -337,13 +337,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.7.826" VALUE "FileVersion", "2.7.827"
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.7.826" VALUE "ProductVersion", "2.7.827"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

16
src/stdlg.c
View file

@ -64,6 +64,8 @@ static const notification_info* notification_more_info;
static BOOL settings_commcheck = FALSE; static BOOL settings_commcheck = FALSE;
static WNDPROC update_original_proc = NULL; static WNDPROC update_original_proc = NULL;
extern loc_cmd* selected_locale;
/* /*
* We need a sub-callback to read the content of the edit box on exit and update * We need a sub-callback to read the content of the edit box on exit and update
* our path, else if what the user typed does match the selection, it is discarded. * our path, else if what the user typed does match the selection, it is discarded.
@ -1663,15 +1665,17 @@ LPCDLGTEMPLATE GetDialogTemplate(int Dialog_ID)
dwBuf[2] = WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL; dwBuf[2] = WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL;
} }
// All our dialogs are set to use 'Segoe UI Symbol': // All our dialogs are set to use 'Segoe UI Symbol' by default:
// 1. So that we can replace the font name with 'MS Shell Dlg' if needed (XP) // 1. So that we can replace the font name with 'MS Shell Dlg' (XP) or 'Segoe UI'
// 2. So that Thai displays properly on RTF controls (don't work with regular 'Segoe UI') // 2. So that Thai displays properly on RTF controls as it won't work with regular
// 'Segoe UI'... but Cyrillic won't work with 'Segoe UI Symbol'
// If 'Segoe UI Symbol' is available, we're done here // If 'Segoe UI Symbol' is available, and we are using Thai, we're done here
if (IsFontAvailable("Segoe UI Symbol")) if (IsFontAvailable("Segoe UI Symbol") && (selected_locale != 0)
&& (safe_strcmp(selected_locale->txt[0], "th-TH") == 0))
return rcTemplate; return rcTemplate;
// 'Segoe UI Symbol' is not available => Fall back to the best we have // 'Segoe UI Symbol' cannot be used => Fall back to the best we have
wBuf = (WCHAR*)rcTemplate; wBuf = (WCHAR*)rcTemplate;
wBuf = &wBuf[14]; // Move to class name wBuf = &wBuf[14]; // Move to class name
// Skip class name and title // Skip class name and title