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

- Fixed bug #858010 - defines were read wrongly into the settings dialog (`i' wasn't reset to 0)

Browse source 
- Made Compile and Run execute the installer even if there were warnings


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3287 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-12-17 16:13:04 +00:00
parent da92941bfc
commit 5f58389c12
2 changed files with 222 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Contrib/Makensisw/makensisw.cpp
View file

@ -151,8 +151,9 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
g_sdata.script[n-1] = '\0'; g_sdata.script[n-1] = '\0';
} }
PushMRUFile(argv[argc-1]); PushMRUFile(argv[argc-1]);
LocalFree(argv);
} }
if (argSpaceSize)
GlobalFree(argv);
if(g_sdata.compressor == (NCOMPRESSOR)-1) { if(g_sdata.compressor == (NCOMPRESSOR)-1) {
SetCompressor(g_sdata.default_compressor); SetCompressor(g_sdata.default_compressor);
@ -338,15 +339,15 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
} }
} }
EnableItems(g_sdata.hwnd); EnableItems(g_sdata.hwnd);
if (g_sdata.retcode==0) { if (!g_sdata.retcode) {
MessageBeep(MB_ICONASTERISK); MessageBeep(MB_ICONASTERISK);
if (g_sdata.warnings) SetTitle(g_sdata.hwnd,"Finished with Warnings"); if (g_sdata.warnings)
else { SetTitle(g_sdata.hwnd,"Finished with Warnings");
else
SetTitle(g_sdata.hwnd,"Finished Sucessfully"); SetTitle(g_sdata.hwnd,"Finished Sucessfully");
// Added by Darren Owen (DrO) on 1/10/2003 // Added by Darren Owen (DrO) on 1/10/2003
if(g_sdata.recompile_test) if(g_sdata.recompile_test)
PostMessage(g_sdata.hwnd, WM_COMMAND, LOWORD(IDM_TEST), 0); PostMessage(g_sdata.hwnd, WM_COMMAND, LOWORD(IDC_TEST), 0);
}
} }
else { else {
MessageBeep(MB_ICONEXCLAMATION); MessageBeep(MB_ICONEXCLAMATION);
@ -806,6 +807,7 @@ BOOL CALLBACK SettingsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
} }
rv = SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_SETCURSEL, (WPARAM)g_sdata.default_compressor, (LPARAM)0); rv = SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_SETCURSEL, (WPARAM)g_sdata.default_compressor, (LPARAM)0);
i = 0;
if (g_sdata.defines) { if (g_sdata.defines) {
while (g_sdata.defines[i]) { while (g_sdata.defines[i]) {
SendDlgItemMessage(hwndDlg, IDC_DEFINES, LB_ADDSTRING, 0, (LPARAM)g_sdata.defines[i]); SendDlgItemMessage(hwndDlg, IDC_DEFINES, LB_ADDSTRING, 0, (LPARAM)g_sdata.defines[i]);

15
Contrib/Makensisw/utils.cpp
View file

@ -52,7 +52,10 @@ int SetArgv(char *cmdLine, int *argc, char ***argv)
} }
argSpaceSize = size * sizeof(char *) + lstrlen(cmdLine) + 1; argSpaceSize = size * sizeof(char *) + lstrlen(cmdLine) + 1;
argSpace = (char *) LocalAlloc(GMEM_FIXED, argSpaceSize); argSpace = (char *) GlobalAlloc(GMEM_FIXED, argSpaceSize);
if (!argSpace)
return 0;
*argv = (char **) argSpace; *argv = (char **) argSpace;
argSpace += size * sizeof(char *); argSpace += size * sizeof(char *);
size--; size--;
@ -332,16 +335,22 @@ void RestoreDefines()
if (RegCreateKey(hKey,REGDEFSUBKEY,&hSubKey) == ERROR_SUCCESS) { if (RegCreateKey(hKey,REGDEFSUBKEY,&hSubKey) == ERROR_SUCCESS) {
char buf[8]; char buf[8];
g_sdata.defines = (char **)GlobalAlloc(GPTR, (n+1)*sizeof(char *)); g_sdata.defines = (char **)GlobalAlloc(GPTR, (n+1)*sizeof(char *));
if (g_sdata.defines)
{
for(int i = 0; i < n; i++) { for(int i = 0; i < n; i++) {
wsprintf(buf,"%d",i); wsprintf(buf,"%d",i);
l = 0; l = 0;
if ((RegQueryValueEx(hSubKey,buf,NULL,&t,NULL,&l)==ERROR_SUCCESS)&&(t == REG_SZ)) { if ((RegQueryValueEx(hSubKey,buf,NULL,&t,NULL,&l)==ERROR_SUCCESS)&&(t == REG_SZ)) {
l++; l++;
g_sdata.defines[i] = (char *)GlobalAlloc(GPTR, l*sizeof(char)); g_sdata.defines[i] = (char *)GlobalAlloc(GPTR, l*sizeof(char));
if (g_sdata.defines[i])
RegQueryValueEx(hSubKey,buf,NULL,&t,(unsigned char*)g_sdata.defines[i],&l); RegQueryValueEx(hSubKey,buf,NULL,&t,(unsigned char*)g_sdata.defines[i],&l);
else
break;
} }
} }
g_sdata.defines[n] = NULL; g_sdata.defines[n] = NULL;
}
RegCloseKey(hSubKey); RegCloseKey(hSubKey);
} }
} }
@ -362,7 +371,7 @@ void SaveDefines()
char buf[8]; char buf[8];
while(g_sdata.defines[n]) { while(g_sdata.defines[n]) {
wsprintf(buf,"%d",n); wsprintf(buf,"%d",n);
RegSetValueEx(hSubKey,buf,0,REG_SZ,(CONST BYTE *)g_sdata.defines[n],lstrlen(g_sdata.defines[n])); RegSetValueEx(hSubKey,buf,0,REG_SZ,(CONST BYTE *)g_sdata.defines[n],lstrlen(g_sdata.defines[n])+1);
n++; n++;
} }
RegCloseKey(hSubKey); RegCloseKey(hSubKey);
@ -520,7 +529,7 @@ char* BuildDefines()
} }
else { else {
buf = (char *)GlobalAlloc(GPTR, sizeof(char)); buf = (char *)GlobalAlloc(GPTR, sizeof(char));
lstrcpy(buf,""); buf[0] = NULL;
} }
return buf; return buf;