From: Dirk B. <db...@us...> - 2005-04-18 17:40:02
|
Update of /cvsroot/win32forth/win32forth/apps/Setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10915/apps/Setup Modified Files: Setup.f Log Message: zEXEC rewritten (see Shell.f), made DEPRECATED work for class members,SF[1178189] fixed, SF[1178189] fixed, SF[1178186] fixed, SF[1167791] fixed, SF[774094] fixed; and some other small changes I can't remebere any more Index: Setup.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Setup/Setup.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Setup.f 21 Dec 2004 00:18:49 -0000 1.1 --- Setup.f 18 Apr 2005 17:39:22 -0000 1.2 *************** *** 25,30 **** FLOAD ..\..\src\Keyboard.f \ function and special key constants FLOAD ..\..\src\pointer.f ! FLOAD ..\..\src\registry.f \ Win32 Registry support FLOAD ..\..\src\ansfile.f \ the Setup starts here... --- 25,31 ---- FLOAD ..\..\src\Keyboard.f \ function and special key constants FLOAD ..\..\src\pointer.f ! \ FLOAD ..\..\src\registry.f \ Win32 Registry support FLOAD ..\..\src\ansfile.f + FLOAD ..\..\src\shell.f \ the Setup starts here... *************** *** 61,71 **** -if ." invoked with commandline <" type ." >" cr then ! s" console" getsetting regsett place ! s" 80,80,520,600" s" console" setsetting GetSystemDirectory ; : setupterm ( -- ) 1 Show-Window ! regsett count s" console" setsetting ; : setup-bye ( -- ) --- 62,73 ---- -if ." invoked with commandline <" type ." >" cr then ! \ s" console" getsetting regsett place ! \ s" 80,80,520,600" s" console" setsetting GetSystemDirectory ; : setupterm ( -- ) 1 Show-Window ! \ regsett count s" console" setsetting ! ; : setup-bye ( -- ) *************** *** 160,200 **** checkend cls SetUpForth ; - create ProcInfo - 0 , \ hProcess - 0 , \ hThread - 0 , \ dwPriocessId - 0 , \ dwThreadId - - create StartupInfo - here 0 , \ cb - 0 , \ lpReserved - 0 , \ lpDesktop - 0 , \ lpTitle - 373 , \ dwX - 3 , \ dwY - 0 , \ dwXSize - 0 , \ dwYSize - 80 , \ dwXCountChars - 50 , \ dwYCountChars - 0 , \ dwFillAttribute - STARTF_USEPOSITION - STARTF_USECOUNTCHARS + - STARTF_USESHOWWINDOW + - , \ dwFlags - SW_SHOWNORMAL W, \ wShowWindow - 0 W, \ cbReserved2 - 0 , \ lpReserved2 - 0 , \ hStdInput - 0 , \ hStdOutput - 0 , \ hStdError - here over - swap ! - - 10 proc CreateProcess - 2 proc WaitForSingleObject : procexec \ pass to NT without any interpretation \ f1 = TRUE on error dup ." Executing process <" count type ." >" cr ProcInfo 4 cells erase \ clear procinfo ! >r \ null setupterminated parameter string ProcInfo \ lppiProcInfo StartupInfo \ lpsiStartInfo --- 162,172 ---- checkend cls SetUpForth ; : procexec \ pass to NT without any interpretation \ f1 = TRUE on error + [ also hidden ] dup ." Executing process <" count type ." >" cr + ProcInfo 4 cells erase \ clear procinfo ! >r \ null terminated parameter string ProcInfo \ lppiProcInfo StartupInfo \ lpsiStartInfo *************** *** 207,223 **** r> 1+ \ lpszCommandLine 0 \ lpszImageName ! call CreateProcess 0= if ! ." *** CreateProcess failed ***" ! wait&bye then - ." Waiting for process to finish..." - -1 ProcInfo @ call WaitForSingleObject drop - ProcInfo @ call CloseHandle drop \ close process - ProcInfo cell+ @ call CloseHandle drop \ close thread - _conHndl call SetForegroundWindow drop - ." process finished" cr - key? drop ; ! previous : cleanbuild ( f -- ) \ clean up the files before install --- 179,197 ---- r> 1+ \ lpszCommandLine 0 \ lpszImageName ! call CreateProcess 0= ! if ." *** CreateProcess failed ***" ! wait&bye ! else ! ." Waiting for process to finish..." ! EXEC-CLOSE-THREAD-HANDLE \ close the thread handle ! EXEC-PROCESS-WAIT \ wait for the process ! EXEC-CLOSE-PROCESS-HANDLE \ and close the process handle ! ! _conHndl call SetForegroundWindow drop ! ." process finished" cr ! key? drop then ! [ previous ] ; : cleanbuild ( f -- ) \ clean up the files before install |