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

Fixed some minor GCC warnings

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6817 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-12-11 21:01:48 +00:00
parent 82c714e853
commit 015aea3f49
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/MakeLangId/MakeLangId.cpp
View file

@ -230,9 +230,9 @@ static const INTLNG g_IntLang[] = {
HWND g_hList; HWND g_hList;
static UINT AddLocale(HWND hCtl, LPCTSTR Name, UINT LangId) static INT AddLocale(HWND hCtl, LPCTSTR Name, UINT LangId)
{ {
UINT idx = SendMessage(hCtl, CB_ADDSTRING, 0, (LPARAM) Name); INT idx = SendMessage(hCtl, CB_ADDSTRING, 0, (LPARAM) Name);
if (idx != CB_ERR) SendMessage(hCtl, CB_SETITEMDATA, idx, LangId); if (idx != CB_ERR) SendMessage(hCtl, CB_SETITEMDATA, idx, LangId);
return idx; return idx;
} }
@ -374,6 +374,6 @@ EXTERN_C void NSISWinMainNOCRT()
InitCommonControls(); InitCommonControls();
HINSTANCE hInst = GetModuleHandle(0); HINSTANCE hInst = GetModuleHandle(0);
HANDLE hIco = LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE|LR_SHARED); HANDLE hIco = LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE|LR_SHARED);
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DIALOG), 0, DialogProc, (LPARAM) hIco); INT_PTR retval = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DIALOG), 0, DialogProc, (LPARAM) hIco);
ExitProcess(0); ExitProcess((UINT) retval);
} }

2
Contrib/zip2exe/main.cpp
View file

@ -98,7 +98,7 @@ int WINAPI _tWinMain(HINSTANCE hInst,HINSTANCE hOldInst,LPTSTR CmdLineParams,int
static bool IsEncrypted(unz_file_info&zfi) static bool IsEncrypted(unz_file_info&zfi)
{ {
const unsigned short gpf_encrypted = (1<< 0); // 2.0.0+ const unsigned short gpf_encrypted = (1<< 0); // 2.0.0+
const unsigned short gpf_encstrong = (1<< 6); // 5.0.0+ APPNOTE says that bit 0 MUST be set if bit 6 is set //nst unsigned short gpf_encstrong = (1<< 6); // 5.0.0+ APPNOTE says that bit 0 MUST be set if bit 6 is set
const unsigned short gpf_enccntdir = (1<<13); // 6.2.0+ Central Directory Encryption const unsigned short gpf_enccntdir = (1<<13); // 6.2.0+ Central Directory Encryption
return (zfi.flag & (gpf_encrypted|gpf_enccntdir)) != 0; return (zfi.flag & (gpf_encrypted|gpf_enccntdir)) != 0;
} }