rtoss - Diff between revs 232 and 333

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 232 Rev 333
Line 30... Line 30...
30 Var argv6 30 Var argv6
31 Var argv7 31 Var argv7
32 Var argv8 32 Var argv8
33 Var argv9 33 Var argv9
34 Var lineno 34 Var lineno
-   35 Var skiplines
35 36
36 Var retval 37 Var retval
37 Var var0 38 Var var0
38 Var var1 39 Var var1
39 Var var2 40 Var var2
Line 638... Line 639...
638 ${If} $argv2 = '' 639 ${If} $argv2 = ''
639 StrCpy $retval "$argv0" "$argv1" 640 StrCpy $retval "$argv0" "$argv1"
640 ${Else} 641 ${Else}
641 StrCpy $retval "$argv0" "$argv1" "$argv2" 642 StrCpy $retval "$argv0" "$argv1" "$argv2"
642 ${EndIf} 643 ${EndIf}
-   644 ${EndIf}
-   645 ${Break}
-   646 ${Case} '!shellctx'
-   647 ${If} $argv0 == 'all'
-   648 SetShellVarContext all
-   649 ${Else}
-   650 SetShellVarContext current
643 ${EndIf} 651 ${EndIf}
644 ${Break} 652 ${Break}
645 ${Case} '!expendenv' 653 ${Case} '!expendenv'
646 StrLen $retval $argv0 -  
-   654 ExpandEnvStrings $retval $argv0
647 ${Break} 655 ${Break}
648 ${Case} '!readenv' 656 ${Case} '!readenv'
649 StrLen $retval $argv0 -  
-   657 ReadEnvStr $retval $argv0
650 ${Break} 658 ${Break}
-   659 ; ${Case} '!readregdword'
-   660 ; ReadRegDWORD $retval $argv0 $argv1 $argv2
-   661 ; ${Break}
-   662 ; ${Case} '!readregstr'
-   663 ; ReadRegStr $retval $argv0 $argv1 $argv2
-   664 ; ${Break}
-   665 ; ${Case} '!writeregstr'
-   666 ; WriteRegStr $argv0 $argv1 $argv2
-   667 ; ${Break}
651 ${Case} '!readini' 668 ${Case} '!readini'
652 ReadINIStr $retval $argv0 $argv1 $argv2 669 ReadINIStr $retval $argv0 $argv1 $argv2
-   670 ${Break}
-   671 ${Case} '!writeini'
-   672 WriteINIStr $argv0 $argv1 $argv2 $argv3
-   673 ${Break}
-   674 ${Case} '!mklink'
-   675 CreateShortcut $argv0 $argv1 $argv2 $argv3
653 ${Break} 676 ${Break}
654 ${Case} '!findwin' 677 ${Case} '!findwin'
655 ${If} $argvc = 4 678 ${If} $argvc = 4
656 ${If} $argv1 = '' 679 ${If} $argv1 = ''
657 FindWindow $retval $argv0 "" $argv2 $argv3 680 FindWindow $retval $argv0 "" $argv2 $argv3
Line 673... Line 696...
673 ${Case} '!showwin' 696 ${Case} '!showwin'
674 ShowWindow $argv0 $argv1 697 ShowWindow $argv0 $argv1
675 ${Break} 698 ${Break}
676 ${Case} '!sendmsg' 699 ${Case} '!sendmsg'
677 SendMessage $argv0 $argv1 $argv2 $argv3 700 SendMessage $argv0 $argv1 $argv2 $argv3
-   701 ${Break}
-   702 ${Case} '!skip'
-   703 IntOp $skiplines $argv0 + 0
678 ${Break} 704 ${Break}
679 ${Case} '!vartoret' 705 ${Case} '!vartoret'
680 ${Switch} $argv0 706 ${Switch} $argv0
681 ${Case} 'var0' 707 ${Case} 'var0'
682 ${VarToRetval} $var0 708 ${VarToRetval} $var0
Line 781... Line 807...
781 FileReadUTF16LE $4 $oline 807 FileReadUTF16LE $4 $oline
782 !else 808 !else
783 FileRead $4 $oline 809 FileRead $4 $oline
784 !endif 810 !endif
785 StrCpy $lineno 1 811 StrCpy $lineno 1
-   812 StrCpy $skiplines 0
786 ${DoUntil} ${Errors} 813 ${DoUntil} ${Errors}
787 ${processLine} $oline -  
-   814 ${If} $skiplines = 0
-   815 ${processLine} $oline
-   816 ${Else}
-   817 IntOp $skiplines $skiplines - 1
-   818 ${EndIf}
788 IntOp $lineno $lineno + 1 819 IntOp $lineno $lineno + 1
789 !ifdef UTF16Script 820 !ifdef UTF16Script
790 FileReadUTF16LE $4 $oline 821 FileReadUTF16LE $4 $oline
791 !else 822 !else
792 ${If} $utf8script = 1 823 ${If} $utf8script = 1
Line 814... Line 845...
814 845
815 ${If} $args == "" 846 ${If} $args == ""
816 ${If} ${FileExists} `$EXEDIR\$SetupName.txt` 847 ${If} ${FileExists} `$EXEDIR\$SetupName.txt`
817 ${readFile} "$EXEDIR\$SetupName.txt" 848 ${readFile} "$EXEDIR\$SetupName.txt"
818 ${EndIf} 849 ${EndIf}
819 ${Else} -  
-   850 ${Else}
820 ${StrRep} $args "$args" '"' "" 851 ${StrRep} $args "$args" '"' ""
821 852
822 ${If} ${FileExists} `$args` 853 ${If} ${FileExists} `$args`
823 ${readFile} "$args" 854 ${readFile} "$args"
824 ${Else} -  
-   855 ${Else}
825 ${If} ${FileExists} `$EXEDIR\$args` 856 ${If} ${FileExists} `$EXEDIR\$args`
826 ${readFile} "$EXEDIR\$args" 857 ${readFile} "$EXEDIR\$args"
827 ${Else} 858 ${Else}
828 ${processLine} $args 859 ${processLine} $args
829 ${EndIf} 860 ${EndIf}