*** StrFunc.nsh.orig	2004-10-12 17:29:36.000000000 +0200
--- StrFunc.nsh	2004-10-22 11:22:30.000000000 +0200
***************
*** 209,214 ****
--- 209,215 ----
        Exch $1
        Exch
        Exch $0
+       Exch
        Push $2
        Push $3
        Push $4
***************
*** 371,381 ****
  
      /*After this point:
        ------------------------------------------
!        $0 = Action (input)
!        $1 = String (input)
         $2 = Lock/Unlock (temp)
         $3 = Temp (temp)
!        $4 = Temp2 (temp)*/
  
        ;Get input from user
  
--- 372,383 ----
  
      /*After this point:
        ------------------------------------------
!        $0 = String (input)
!        $1 = Action (input)
         $2 = Lock/Unlock (temp)
         $3 = Temp (temp)
!        $4 = Temp2 (temp)
!        $5 = Temp3 (temp)*/
  
        ;Get input from user
  
***************
*** 386,391 ****
--- 388,394 ----
        Push $2
        Push $3
        Push $4
+       Push $5
  
        ;Open the clipboard to do the operations the user chose (kichik's fix)
        System::Call 'user32::OpenClipboard(i $HWNDPARENT)'
***************
*** 432,437 ****
--- 435,441 ----
  
  		    ;Step 2: Lock and copy data (kichik's fix)
  		    System::Call 'kernel32::GlobalLock(i r2) t .r4'
+         StrCpy $5 $2
  
  		    ;Step 3: Unlock (kichik's fix)
  		    System::Call 'kernel32::GlobalUnlock(i r2)'
***************
*** 456,462 ****
          ;Step 9: Set the information to the clipboard
          System::Call 'user32::SetClipboardData(i 1, i r2)'
  
!         StrCpy $0 $4
        ${Else} ;Clear
  
          ;Step 1: Clear the clipboard
--- 460,466 ----
          ;Step 9: Set the information to the clipboard
          System::Call 'user32::SetClipboardData(i 1, i r2)'
  
!         StrCpy $0 $5
        ${Else} ;Clear
  
          ;Step 1: Clear the clipboard
***************
*** 473,478 ****
--- 477,483 ----
         $0 = OutVar (output)*/
  
        ;Return result to user
+       Pop $5
        Pop $4
        Pop $3
        Pop $2
***************
*** 767,772 ****
--- 772,778 ----
        Pop $R6
        Pop $R5
        Pop $R4
+       Pop $R3
        Pop $R2
        Pop $R1
        Exch $R0
***************
*** 1341,1346 ****
--- 1347,1354 ----
        Push $6
        Push $7
        Push $8
+       Push $9
+       Push $R0
  
        ;Parameter defaults
        ${IfThen} $2 == `` ${|} StrCpy $2 `|` ${|}
***************
*** 1434,1439 ****
--- 1442,1449 ----
  
        ;Return output to user
  
+       Pop $R0
+       Pop $9
        Pop $8
        Pop $7
        Pop $6