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

Added Load Script option on File menu and fixed save output string filter

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@967 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-09-09 23:02:48 +00:00
parent ee9ff95356
commit e8c8f37f9b
5 changed files with 69 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Contrib/Makensisw/Readme.txt
View file

@ -146,6 +146,7 @@ Version History
- Fixed some random crashes - Fixed some random crashes
- Drag and Drop Support into the Makensisw window - Drag and Drop Support into the Makensisw window
- Updated icon to Trace's modern NSIS icon - Updated icon to Trace's modern NSIS icon
- Added Load Script option on File menu
Copyright Information Copyright Information

28
Contrib/Makensisw/makensisw.cpp
View file

@ -186,6 +186,30 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
ShellExecute(g_hwnd,"open",DOCPATH,NULL,NULL,SW_SHOWNORMAL); ShellExecute(g_hwnd,"open",DOCPATH,NULL,NULL,SW_SHOWNORMAL);
return TRUE; return TRUE;
} }
case IDM_LOADSCRIPT:
{
if (!g_hThread) {
OPENFILENAME l={sizeof(l),};
char buf[MAX_STRING];
l.hwndOwner = hwndDlg;
l.lpstrFilter = "NSIS Script (*.nsi)\0*.nsi\0All Files (*.*)\0*.*\0";
l.lpstrFile = buf;
l.nMaxFile = MAX_STRING-1;
l.lpstrTitle = "Load Script";
l.lpstrDefExt = "log";
l.lpstrFileTitle = NULL;
l.lpstrInitialDir = NULL;
l.Flags = OFN_HIDEREADONLY|OFN_EXPLORER|OFN_PATHMUSTEXIST|OFN_FILEMUSTEXIST;
lstrcpy(buf,"");
if (GetOpenFileName(&l)) {
g_script = (char *)GlobalAlloc(GPTR,sizeof(buf)+7);
wsprintf(g_script,"/CD \"%s\"",buf);
ResetObjects();
CompileNSISScript();
}
}
return TRUE;
}
case IDM_RECOMPILE: case IDM_RECOMPILE:
{ {
CompileNSISScript(); CompileNSISScript();
@ -235,14 +259,14 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
OPENFILENAME l={sizeof(l),}; OPENFILENAME l={sizeof(l),};
char buf[MAX_STRING]; char buf[MAX_STRING];
l.hwndOwner = hwndDlg; l.hwndOwner = hwndDlg;
l.lpstrFilter = "Log Files (*.log)\0Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; l.lpstrFilter = "Log Files (*.log)\0*.log\0Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0";
l.lpstrFile = buf; l.lpstrFile = buf;
l.nMaxFile = MAX_STRING-1; l.nMaxFile = MAX_STRING-1;
l.lpstrTitle = "Save Output"; l.lpstrTitle = "Save Output";
l.lpstrDefExt = "log"; l.lpstrDefExt = "log";
l.lpstrInitialDir = NULL; l.lpstrInitialDir = NULL;
l.Flags = OFN_HIDEREADONLY|OFN_EXPLORER|OFN_PATHMUSTEXIST; l.Flags = OFN_HIDEREADONLY|OFN_EXPLORER|OFN_PATHMUSTEXIST;
lstrcpy(buf,"output.log"); lstrcpy(buf,"output");
if (GetSaveFileName(&l)) { if (GetSaveFileName(&l)) {
HANDLE hFile = CreateFile(buf,GENERIC_WRITE,0,0,CREATE_ALWAYS,0,0); HANDLE hFile = CreateFile(buf,GENERIC_WRITE,0,0,CREATE_ALWAYS,0,0);
if (hFile) { if (hFile) {

3
Contrib/Makensisw/resource.h
View file

@ -26,13 +26,14 @@
#define IDM_TEST 40002 #define IDM_TEST 40002
#define IDM_EDITSCRIPT 40003 #define IDM_EDITSCRIPT 40003
#define IDM_DOCS 40004 #define IDM_DOCS 40004
#define IDM_LOADSCRIPT 40005
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 111 #define _APS_NEXT_RESOURCE_VALUE 111
#define _APS_NEXT_COMMAND_VALUE 40005 #define _APS_NEXT_COMMAND_VALUE 40006
#define _APS_NEXT_CONTROL_VALUE 1009 #define _APS_NEXT_CONTROL_VALUE 1009
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

2
Contrib/Makensisw/resource.rc
View file

@ -69,6 +69,8 @@ BEGIN
MENUITEM "&Test\tCtrl+T", IDM_TEST MENUITEM "&Test\tCtrl+T", IDM_TEST
MENUITEM "&Save Output...", IDM_SAVE MENUITEM "&Save Output...", IDM_SAVE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Load Script...", IDM_LOADSCRIPT
MENUITEM SEPARATOR
MENUITEM "E&xit\tCtrl+X", IDM_EXIT MENUITEM "E&xit\tCtrl+X", IDM_EXIT
END END
POPUP "&Edit" POPUP "&Edit"

74
Contrib/Makensisw/utils.cpp
View file

@ -77,6 +77,7 @@ void DisableItems(HWND hwnd) {
EnableMenuItem(m,IDM_SAVE,MF_GRAYED); EnableMenuItem(m,IDM_SAVE,MF_GRAYED);
EnableMenuItem(m,IDM_TEST,MF_GRAYED); EnableMenuItem(m,IDM_TEST,MF_GRAYED);
EnableMenuItem(m,IDM_EXIT,MF_GRAYED); EnableMenuItem(m,IDM_EXIT,MF_GRAYED);
EnableMenuItem(m,IDM_LOADSCRIPT,MF_GRAYED);
EnableMenuItem(m,IDM_RECOMPILE,MF_GRAYED); EnableMenuItem(m,IDM_RECOMPILE,MF_GRAYED);
EnableMenuItem(m,IDM_COPY,MF_GRAYED); EnableMenuItem(m,IDM_COPY,MF_GRAYED);
EnableMenuItem(m,IDM_COPYSELECTED,MF_GRAYED); EnableMenuItem(m,IDM_COPYSELECTED,MF_GRAYED);
@ -84,48 +85,48 @@ void DisableItems(HWND hwnd) {
} }
void EnableItems(HWND hwnd) { void EnableItems(HWND hwnd) {
#define MSG(a) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,0,0) #define MSG(a) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,0,0)
#define MSG1(a,b) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,b,0) #define MSG1(a,b) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,b,0)
#define MSG2(a,b,c) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,b,c) #define MSG2(a,b,c) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,b,c)
if (g_input_script) { if (g_input_script) {
GlobalFree(g_input_script); GlobalFree(g_input_script);
g_input_script = 0; g_input_script = 0;
} }
if (g_output_exe) { if (g_output_exe) {
GlobalFree(g_output_exe); GlobalFree(g_output_exe);
g_output_exe = 0; g_output_exe = 0;
} }
TEXTRANGE tr; TEXTRANGE tr;
FINDTEXT ft; FINDTEXT ft;
// find input script // find input script
ft.chrg.cpMin = 0; ft.chrg.cpMin = 0;
ft.chrg.cpMax = MSG(WM_GETTEXTLENGTH); ft.chrg.cpMax = MSG(WM_GETTEXTLENGTH);
ft.lpstrText = "Processing script file: \""; ft.lpstrText = "Processing script file: \"";
ft.chrg.cpMin = tr.chrg.cpMin = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) + lstrlen("Processing script file: \""); ft.chrg.cpMin = tr.chrg.cpMin = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) + lstrlen("Processing script file: \"");
ft.lpstrText = "\""; ft.lpstrText = "\"";
tr.chrg.cpMax = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft); tr.chrg.cpMax = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft);
tr.lpstrText = g_input_script = (char *)GlobalAlloc(GPTR, tr.chrg.cpMax-tr.chrg.cpMin+1); tr.lpstrText = g_input_script = (char *)GlobalAlloc(GPTR, tr.chrg.cpMax-tr.chrg.cpMin+1);
MSG2(EM_GETTEXTRANGE, 0, (WPARAM)&tr); MSG2(EM_GETTEXTRANGE, 0, (WPARAM)&tr);
// find output exe // find output exe
ft.chrg.cpMin = 0; ft.chrg.cpMin = 0;
ft.chrg.cpMax = MSG(WM_GETTEXTLENGTH); ft.chrg.cpMax = MSG(WM_GETTEXTLENGTH);
ft.lpstrText = "Output: \""; ft.lpstrText = "Output: \"";
ft.chrg.cpMin = tr.chrg.cpMin = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) + lstrlen("Output: \""); ft.chrg.cpMin = tr.chrg.cpMin = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) + lstrlen("Output: \"");
ft.lpstrText = "\""; ft.lpstrText = "\"";
tr.chrg.cpMax = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft); tr.chrg.cpMax = MSG2(EM_FINDTEXT, 0, (LPARAM)&ft);
tr.lpstrText = g_output_exe = (char *)GlobalAlloc(GPTR, tr.chrg.cpMax-tr.chrg.cpMin+1); tr.lpstrText = g_output_exe = (char *)GlobalAlloc(GPTR, tr.chrg.cpMax-tr.chrg.cpMin+1);
MSG2(EM_GETTEXTRANGE, 0, (WPARAM)&tr); MSG2(EM_GETTEXTRANGE, 0, (WPARAM)&tr);
g_warnings = FALSE; g_warnings = FALSE;
ft.lpstrText = "warning:"; ft.lpstrText = "warning:";
if (MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) != -1) g_warnings++; if (MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) != -1) g_warnings++;
ft.lpstrText = "warnings:"; ft.lpstrText = "warnings:";
if (MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) != -1) g_warnings++; if (MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) != -1) g_warnings++;
HMENU m = GetMenu(hwnd); HMENU m = GetMenu(hwnd);
if (g_output_exe && !g_retcode) { if (g_output_exe && !g_retcode) {
@ -135,6 +136,7 @@ void EnableItems(HWND hwnd) {
EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),1); EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),1);
EnableMenuItem(m,IDM_SAVE,MF_ENABLED); EnableMenuItem(m,IDM_SAVE,MF_ENABLED);
EnableMenuItem(m,IDM_EXIT,MF_ENABLED); EnableMenuItem(m,IDM_EXIT,MF_ENABLED);
EnableMenuItem(m,IDM_LOADSCRIPT,MF_ENABLED);
EnableMenuItem(m,IDM_RECOMPILE,MF_ENABLED); EnableMenuItem(m,IDM_RECOMPILE,MF_ENABLED);
EnableMenuItem(m,IDM_COPY,MF_ENABLED); EnableMenuItem(m,IDM_COPY,MF_ENABLED);
EnableMenuItem(m,IDM_COPYSELECTED,MF_ENABLED); EnableMenuItem(m,IDM_COPYSELECTED,MF_ENABLED);