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

[misc] fix MinGW and Clang warnings

Browse source 
* Also fix "MSG_176 UNTRANSLATED" for English and Chinese
This commit is contained in:
Pete Batard 2013-12-02 18:24:54 +00:00
parent acac7504f3
commit cb3de685ee
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/localization/embedded.sed
View file

@ -13,8 +13,8 @@ s/[ \t]*$//
# 1,300 means we only do this for the the first 300 lines # 1,300 means we only do this for the the first 300 lines
1,300 {/^g IDD_DIALOG/,/^g IDD_MESSAGES/{/^g IDD_MESSAGES/!d}} 1,300 {/^g IDD_DIALOG/,/^g IDD_MESSAGES/{/^g IDD_MESSAGES/!d}}
# also remove the "translated by" line for English # also replace the "translated by" line for English
1,500{/^t MSG_176/d} 1,500{s/^t MSG_176.*$/t MSG_176 \"mailto:pete@akeo.ie\"/}
# output file *MUST* be CR/LF # output file *MUST* be CR/LF
s/$/\r/ s/$/\r/

3
res/localization/rufus.loc
View file

@ -505,6 +505,7 @@ t MSG_004 "更新方案和设置"
t MSG_005 "你要允許此應用程序檢查更新？" t MSG_005 "你要允許此應用程序檢查更新？"
t MSG_006 "关闭" t MSG_006 "关闭"
t MSG_007 "撤消" t MSG_007 "撤消"
t MSG_176 ""
################################################################################ ################################################################################
l "zh-TW" "Chinese Traditional (正體中文)" 0x0404, 0x0c04, 0x1404, 0x7c04 l "zh-TW" "Chinese Traditional (正體中文)" 0x0404, 0x0c04, 0x1404, 0x7c04
@ -574,7 +575,6 @@ t IDC_CHECK_NOW "立即檢查"
t IDCANCEL "關閉" t IDCANCEL "關閉"
# Dialog that appears when a new version is available # Dialog that appears when a new version is available
# I will provide a way to trigger this dialog in future versions
g IDD_NEW_VERSION g IDD_NEW_VERSION
t IDD_NEW_VERSION "線上更新 - Rufus" t IDD_NEW_VERSION "線上更新 - Rufus"
t IDS_NEW_VERSION_AVAIL_TXT "找到更新版本，請下載更新!" t IDS_NEW_VERSION_AVAIL_TXT "找到更新版本，請下載更新!"
@ -952,7 +952,6 @@ m IDCANCEL +25,0
s IDS_UPDATE_SETTINGS_GRP 25,0 s IDS_UPDATE_SETTINGS_GRP 25,0
# Dialog that appears when a new is available # Dialog that appears when a new is available
# I will provide a way to trigger this dialog in future versions
g IDD_NEW_VERSION g IDD_NEW_VERSION
t IDD_NEW_VERSION "Controleer op updates - Rufus" t IDD_NEW_VERSION "Controleer op updates - Rufus"
t IDS_NEW_VERSION_AVAIL_TXT "Een nieuwere versie is beschikbaar. Download de laatste versie a.u.b!" t IDS_NEW_VERSION_AVAIL_TXT "Een nieuwere versie is beschikbaar. Download de laatste versie a.u.b!"

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329 IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.4.0.338" CAPTION "Rufus v1.4.0.339"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -288,8 +288,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,0,338 FILEVERSION 1,4,0,339
PRODUCTVERSION 1,4,0,338 PRODUCTVERSION 1,4,0,339
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -306,13 +306,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", "1.4.0.338" VALUE "FileVersion", "1.4.0.339"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2013 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2013 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", "1.4.0.338" VALUE "ProductVersion", "1.4.0.339"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

15
src/stdlg.c
View file

@ -1147,7 +1147,7 @@ INT_PTR CALLBACK NewVersionCallback(HWND hDlg, UINT message, WPARAM wParam, LPAR
{ {
int i; int i;
HWND hNotes; HWND hNotes;
char tmp[128], cmdline[] = APPLICATION_NAME " -w 150"; char cmdline[] = APPLICATION_NAME " -w 150";
static char* filepath = NULL; static char* filepath = NULL;
static int download_status = 0; static int download_status = 0;
STARTUPINFOA si; STARTUPINFOA si;
@ -1216,10 +1216,17 @@ INT_PTR CALLBACK NewVersionCallback(HWND hDlg, UINT message, WPARAM wParam, LPAR
} }
break; break;
default: // Download default: // Download
for (i=(int)safe_strlen(update.download_url); (i>0)&&(update.download_url[i]!='/'); i--); if (update.download_url == NULL) {
uprintf("Could not get download URL\n");
break;
}
for (i=(int)strlen(update.download_url); (i>0)&&(update.download_url[i]!='/'); i--);
filepath = FileDialog(TRUE, app_dir, (char*)&update.download_url[i+1], "exe", lmprintf(MSG_037)); filepath = FileDialog(TRUE, app_dir, (char*)&update.download_url[i+1], "exe", lmprintf(MSG_037));
if (filepath != NULL) if (filepath == NULL) {
DownloadFileThreaded(update.download_url, filepath, hDlg); uprintf("Could not get save path\n");
break;
}
DownloadFileThreaded(update.download_url, filepath, hDlg);
break; break;
} }
return (INT_PTR)TRUE; return (INT_PTR)TRUE;