dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed some warnings

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5055 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-11 21:27:19 +00:00
parent 480be96fcd
commit 5dcb76d379
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/lang.cpp
View file

@ -518,7 +518,7 @@ int CEXEBuild::GenerateLangTables() {
if (dlg) { \ if (dlg) { \
CDialogTemplate td(dlg); \ CDialogTemplate td(dlg); \
res_editor->FreeResource(dlg); \ res_editor->FreeResource(dlg); \
td.SetFont(build_font, build_font_size); \ td.SetFont(build_font, (WORD) build_font_size); \
DWORD dwSize; \ DWORD dwSize; \
dlg = td.Save(dwSize); \ dlg = td.Save(dwSize); \
res_editor->UpdateResourceA(RT_DIALOG, MAKEINTRESOURCE(id), NSIS_DEFAULT_LANG, dlg, dwSize); \ res_editor->UpdateResourceA(RT_DIALOG, MAKEINTRESOURCE(id), NSIS_DEFAULT_LANG, dlg, dwSize); \
@ -573,7 +573,7 @@ int CEXEBuild::GenerateLangTables() {
if (dlg) { \ if (dlg) { \
CDialogTemplate td(dlg,lt[i].nlf.m_uCodePage); \ CDialogTemplate td(dlg,lt[i].nlf.m_uCodePage); \
res_editor->FreeResource(dlg); \ res_editor->FreeResource(dlg); \
if (font) td.SetFont(font, lt[i].nlf.m_iFontSize); \ if (font) td.SetFont(font, (WORD) lt[i].nlf.m_iFontSize); \
if (lt[i].nlf.m_bRTL) { \ if (lt[i].nlf.m_bRTL) { \
td.ConvertToRTL(); \ td.ConvertToRTL(); \
DialogItemTemplate* dir = td.GetItem(IDC_DIR); \ DialogItemTemplate* dir = td.GetItem(IDC_DIR); \
@ -619,7 +619,7 @@ int CEXEBuild::GenerateLangTables() {
// Add all installer language strings // Add all installer language strings
int j, l, tabsset; int j, l, tabsset;
struct langstring* lang_strings; struct langstring* lang_strings = NULL;
TinyGrowBuf *string_ptrs = new TinyGrowBuf[num_lang_tables]; TinyGrowBuf *string_ptrs = new TinyGrowBuf[num_lang_tables];
tabsset = 1; tabsset = 1;
@ -671,7 +671,7 @@ int CEXEBuild::GenerateLangTables() {
sprintf(fn, "LangString %s", lsn); sprintf(fn, "LangString %s", lsn);
curfilename = fn; curfilename = fn;
linecnt = lt[i].lang_id; linecnt = lt[i].lang_id;
*ptr = add_string(str, lang_strings[j].process, lt[i].nlf.m_uCodePage); *ptr = add_string(str, lang_strings[j].process, (WORD) lt[i].nlf.m_uCodePage);
curfilename = 0; curfilename = 0;
// Indicate that we should check again for any newly referenced language strings // Indicate that we should check again for any newly referenced language strings
tabsset++; tabsset++;
@ -783,7 +783,7 @@ int CEXEBuild::GenerateLangTables() {
sprintf(fn, "LangString %s", lsn); sprintf(fn, "LangString %s", lsn);
curfilename = fn; curfilename = fn;
linecnt = lt[i].lang_id; linecnt = lt[i].lang_id;
*ptr = add_string(str, lang_strings[j].process, lt[i].nlf.m_uCodePage); *ptr = add_string(str, lang_strings[j].process, (WORD) lt[i].nlf.m_uCodePage);
curfilename = 0; curfilename = 0;
// Indicate that we should check again for any newly referenced language strings // Indicate that we should check again for any newly referenced language strings
tabsset++; tabsset++;
@ -904,7 +904,7 @@ void CEXEBuild::FillLanguageTable(LanguageTable *table) {
} }
else if (i == NLF_FONTSIZE) else if (i == NLF_FONTSIZE)
{ {
int font_size = *build_font ? build_font_size : table->nlf.m_iFontSize; WORD font_size = *build_font ? (WORD) build_font_size : (WORD) table->nlf.m_iFontSize;
if (font_size) if (font_size)
{ {
char temp[64]; char temp[64];
@ -923,7 +923,7 @@ void CEXEBuild::FillLanguageTable(LanguageTable *table) {
} }
char SkipComments(FILE *f) { char SkipComments(FILE *f) {
char c; int c;
while ((c = fgetc(f))) { while ((c = fgetc(f))) {
while (c == '\n' || c == '\r') { while (c == '\n' || c == '\r') {
c = fgetc(f); // Skip empty lines c = fgetc(f); // Skip empty lines
@ -935,7 +935,7 @@ char SkipComments(FILE *f) {
} }
else break; else break;
} }
return c; return (char) c;
} }
#ifndef _WIN32 #ifndef _WIN32