Changeset 486

Timestamp:

May 22, 2009, 3:40:06 PM (16 years ago)

Author:

pr

Message:

Implement WirexxCancel(). Bug 1166.

Location:

trunk

Files:

• 001/wpi_prog/rexx_3functions.html (modified) (2 diffs)
• 001/wpi_prog_old/rexx_3functions.html (modified) (2 diffs)
• src/engine/fe_rexx.cpp (modified) (6 diffs)

trunk/001/wpi_prog/rexx_3functions.html ¶

@@ -29 +29 @@
 the WarpIN environment will also contain all other environment variables
 inherited from the parent process or the CONFIG.SYS file, you should always
-use <CODE>WirexxGetEnv</CODE> to retrieve environment variables
+use <CODE>WirexxGetEnv</CODE> to retrieve environment variables.
 
 <BR><DT><CODE>rc=WirexxShowMessage(<I>title</I>, <I>message</I>, <I>flags</I>)</CODE>
@@ -103 +103 @@
 any files and directories created in the process.
 <P><CODE>rc</CODE> is 0 if the function succeeded, otherwise 1.
+
+<BR><DT><CODE>rc=WirexxCancel()</CODE>
+<DD>This function causes WarpIN to cancel installation and exit.
+<P><CODE>rc</CODE> is always 0.
 </DL>
 

trunk/001/wpi_prog_old/rexx_3functions.html ¶

@@ -90 +90 @@
 </PRE>
 
-<DT><CODE>rc=WirexxExtract(<I>index</I>,[<I>filemask</I>],<I>directory</I>)</CODE>
+<DT><CODE><B>rc=WirexxExtract(<I>index</I>,[<I>filemask</I>],<I>directory</I>)</B></CODE>
 <DD>This function extracts files specified by <CODE><I>filemask</I></CODE> from the package
 index specified by <CODE><I>index</I></CODE> into <CODE><I>directory</I></CODE>.<BR>
@@ -97 +97 @@
 any files and directories created in the process.
 <P><CODE>rc</CODE> is 0 if the function succeeded, otherwise 1.
+
+<BR><DT><CODE><B>rc=WirexxCancel()</B></CODE>
+<DD>This function causes WarpIN to cancel installation and exit.
+<P><CODE>rc</CODE> is always 0.
 </DL>
 

trunk/src/engine/fe_rexx.cpp ¶

@@ -17 +17 @@
 /*
  *      Copyright (C) 2000 Cornelis Bockemhl.
- *      Copyright (C) 2000-2008 Ulrich M”ller.
+ *      Copyright (C) 2000-2009 Ulrich M”ller.
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -101 +101 @@
                              PCSZ queuename, PRXSTRING retstr);
 
+ULONG APIENTRY WirexxCancel(PCSZ name, ULONG argc, RXSTRING argv[],
+                            PCSZ queuename, PRXSTRING retstr);
+
 } // end extern "C"
 
@@ -153 +156 @@
             "WirexxGetEnv", ::WirexxGetEnv,
             "WirexxShowMessage", ::WirexxShowMessage,
-            "WirexxExtract", ::WirexxExtract
+            "WirexxExtract", ::WirexxExtract,
+            "WirexxCancel", ::WirexxCancel
           };
 
@@ -427 +431 @@
  *@@added V0.9.2 (2000-03-10) [cbo]
  *@@changed V0.9.20 (2002-07-03) [umoeller]: adjusted for unicode conversions
+ *@@changed V1.0.19 (2009-05-20) [pr]: allow hex. strings in flags
  */
 
@@ -457 +462 @@
         flags = 0;
     else
-        flags = atoi(RXSTRPTR(argv[2]));
+        flags = strtoul(RXSTRPTR(argv[2]), NULL, 0);  // V1.0.19
 
     // display the message
@@ -559 +564 @@
     // occurred!
     // (Return error codes to the REXX caller using retstr: See above)
+    return 0;
+}
+
+/*
+ *@@ WirexxCancel:
+ *      cancels package installation and exits.
+ *
+ *      REXX syntax: value=WirexxCancel()
+ *
+ *@@added V1.0.19 (2009-05-19) [pr]: @@fixes 1166
+ */
+
+ULONG WirexxCancel(PCSZ name,
+                   ULONG argc,
+                   RXSTRING argv[],
+                   PCSZ queuename,
+                   PRXSTRING retstr)
+{
+    SetRexxReturn("0", retstr);
+    throw BSCancelExcpt();
     return 0;
 }