[Oorexx-svn] SF.net SVN: oorexx: [2597] sandbox/rick/opt/platform/windows

[<mie...@us...>]

Revision: 2597
          http://oorexx.svn.sourceforge.net/oorexx/?rev=2597&view=rev
Author:   miesfeld
Date:     2008-06-27 13:47:39 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
Fix some orexxole errors from code rework; inverted logical test and an
argument to init() is optional.

Modified Paths:
--------------
    sandbox/rick/opt/platform/windows/buildorx.bat
    sandbox/rick/opt/platform/windows/ole/orexxole.c

Modified: sandbox/rick/opt/platform/windows/buildorx.bat
===================================================================
--- sandbox/rick/opt/platform/windows/buildorx.bat	2008-06-27 20:04:06 UTC (rev 2596)
+++ sandbox/rick/opt/platform/windows/buildorx.bat	2008-06-27 20:47:39 UTC (rev 2597)
@@ -90,7 +90,7 @@
 
 @ECHO Building REXX.IMG ...
 CD %OR_OUTDIR%
-IF %USELOGFILE% equ 1 ( REXXIMAGe >>%OR_ERRLOG% 2>&1 ) else ( REXXIMAGE )
+IF %USELOGFILE% equ 1 ( REXXIMAGE >>%OR_ERRLOG% 2>&1 ) else ( REXXIMAGE )
 if ERRORLEVEL 1 goto error
 
 @ECHO Building RXSUBCOM and RXQUEUE..

Modified: sandbox/rick/opt/platform/windows/ole/orexxole.c
===================================================================
--- sandbox/rick/opt/platform/windows/ole/orexxole.c	2008-06-27 20:04:06 UTC (rev 2596)
+++ sandbox/rick/opt/platform/windows/ole/orexxole.c	2008-06-27 20:47:39 UTC (rev 2597)
@@ -2382,12 +2382,12 @@
 //     will increase the reference count to the OLE object by calling AddRef().
 //
 //******************************************************************************
-RexxMethod4(int,                          // Return type
-            OLEObject_Init,            // Object_method name
-            OSELF, self,               // Pointer to self
-            CSTRING,    pszArg,        // Class specifier for new object
-            CSTRING,    eventString,   // keyword to active event handling
-            RexxObjectPtr, getObjectFlag) // Try a GetActiveObject
+RexxMethod4(int,                             // Return type
+            OLEObject_Init,                  // Object_method name
+            OSELF, self,                     // Pointer to self
+            CSTRING, pszArg,                 // Class specifier for new object
+            OPTIONAL_CSTRING, eventString,   // keyword to active event handling
+            OPTIONAL_RexxObjectPtr, getObjectFlag) // Try a GetActiveObject
 {
     CLSID       clsID;
     HRESULT     hResult;
@@ -3547,7 +3547,7 @@
     // needed for instance of tests
     RexxClassObject variantClass = context->FindClass("OLEVARIANT");
 
-    if (context->IsInstanceOf(RxObject, variantClass))
+    if ( ! context->IsInstanceOf(RxObject, variantClass) )
     {
         *pRxObject = RxObject;
         *pDestVt   = DestVt;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.