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

some more warnings of bug #1676243

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5097 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-17 20:05:56 +00:00
parent 04cb60bc69
commit f91406647a
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Makensisw/makensisw.h
View file

@ -143,7 +143,7 @@ int compressor_strings[] = {IDS_SCRIPT,
extern const char* NSISW_VERSION; extern const char* NSISW_VERSION;
int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmdShow); int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmdShow);
static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
DWORD WINAPI MakeNSISProc(LPVOID p); DWORD WINAPI MakeNSISProc(LPVOID p);
BOOL CALLBACK DialogResize(HWND hWnd, LPARAM /* unused*/); BOOL CALLBACK DialogResize(HWND hWnd, LPARAM /* unused*/);
BOOL CALLBACK AboutNSISProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); BOOL CALLBACK AboutNSISProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

7
Contrib/zip2exe/main.cpp
View file

@ -489,7 +489,6 @@ void makeEXE(HWND hwndDlg)
if (g_compressor_solid == 1) if (g_compressor_solid == 1)
fprintf(fp,"!define ZIP2EXE_COMPRESSOR_SOLID\n"); fprintf(fp,"!define ZIP2EXE_COMPRESSOR_SOLID\n");
GetDlgItemText(hwndDlg,IDC_INSTPATH,buf,sizeof(buf)); GetDlgItemText(hwndDlg,IDC_INSTPATH,buf,sizeof(buf));
char *outpath = "$INSTDIR";
int iswinamp=0; int iswinamp=0;
char *iswinampmode=NULL; char *iswinampmode=NULL;
if (!strcmp(buf,gp_poi)) lstrcpy(buf,"$EXEDIR"); if (!strcmp(buf,gp_poi)) lstrcpy(buf,"$EXEDIR");
@ -732,8 +731,7 @@ BOOL CALLBACK DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
ShowWindow(GetDlgItem(hwndDlg,IDC_TEST),SW_HIDE); ShowWindow(GetDlgItem(hwndDlg,IDC_TEST),SW_HIDE);
ShowWindow(GetDlgItem(hwndDlg,IDC_OUTPUTTEXT),SW_HIDE); ShowWindow(GetDlgItem(hwndDlg,IDC_OUTPUTTEXT),SW_HIDE);
{ {
int x; for (size_t x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
for (x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
ShowWindow(GetDlgItem(hwndDlg,ids[x]),SW_SHOWNA); ShowWindow(GetDlgItem(hwndDlg,ids[x]),SW_SHOWNA);
SetDlgItemText(hwndDlg,IDOK,"&Generate"); SetDlgItemText(hwndDlg,IDOK,"&Generate");
EnableWindow(GetDlgItem(hwndDlg,IDOK),1); EnableWindow(GetDlgItem(hwndDlg,IDOK),1);
@ -764,8 +762,7 @@ BOOL CALLBACK DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
g_compressor_solid = 0; g_compressor_solid = 0;
g_mui=!IsDlgButtonChecked(hwndDlg,IDC_CLASSICUI); g_mui=!IsDlgButtonChecked(hwndDlg,IDC_CLASSICUI);
SetDlgItemText(g_hwnd, IDC_OUTPUTTEXT, ""); SetDlgItemText(g_hwnd, IDC_OUTPUTTEXT, "");
int x; for (size_t x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
for (x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
ShowWindow(GetDlgItem(hwndDlg,ids[x]),SW_HIDE); ShowWindow(GetDlgItem(hwndDlg,ids[x]),SW_HIDE);
ShowWindow(GetDlgItem(hwndDlg,IDC_OUTPUTTEXT),SW_SHOWNA); ShowWindow(GetDlgItem(hwndDlg,IDC_OUTPUTTEXT),SW_SHOWNA);
SetDlgItemText(hwndDlg,IDOK,"&Close"); SetDlgItemText(hwndDlg,IDOK,"&Close");