diff --git a/src/rufus.rc b/src/rufus.rc index 6e4734bd..ae424a10 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,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 EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.11.1003" +CAPTION "Rufus 2.11.1004" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -320,8 +320,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,11,1003,0 - PRODUCTVERSION 2,11,1003,0 + FILEVERSION 2,11,1004,0 + PRODUCTVERSION 2,11,1004,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -338,13 +338,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.11.1003" + VALUE "FileVersion", "2.11.1004" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.11.1003" + VALUE "ProductVersion", "2.11.1004" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index e6e3a6f0..c5fa54fb 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -562,10 +562,20 @@ void ResizeMoveCtrl(HWND hDlg, HWND hCtrl, int dx, int dy, int dw, int dh, float */ INT_PTR CALLBACK LicenseCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + long style; + HWND hLicense; switch (message) { case WM_INITDIALOG: + hLicense = GetDlgItem(hDlg, IDC_LICENSE_TEXT); apply_localization(IDD_LICENSE, hDlg); CenterDialog(hDlg); + // Suppress any inherited RTL flags + style = GetWindowLong(hLicense, GWL_EXSTYLE); + style &= ~(WS_EX_RTLREADING | WS_EX_RIGHT | WS_EX_LEFTSCROLLBAR); + SetWindowLong(hLicense, GWL_EXSTYLE, style); + style = GetWindowLong(hLicense, GWL_STYLE); + style &= ~(ES_RIGHT); + SetWindowLong(hLicense, GWL_STYLE, style); SetDlgItemTextA(hDlg, IDC_LICENSE_TEXT, gplv3); break; case WM_COMMAND: