Removed Microsoft DCOM dependencies. See ChangeLog entry of Dec. 6 for details.

30 files changed, 219 insertions, 212 deletions

diff --git a/TAO/tao/any.cpp b/TAO/tao/any.cpp
index 2ca3df9feab..5687c849489 100644
--- a/TAO/tao/any.cpp
+++ b/TAO/tao/any.cpp
@@ -507,7 +507,6 @@ DEFINE_GUID (IID_CORBA_Any,
 0xa201e4c8, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
 ULONG
-__stdcall
 CORBA_Any::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
@@ -515,7 +514,7 @@ CORBA_Any::AddRef (void)
   return ++refcount_;
 }
 
-ULONG __stdcall
+ULONG
 CORBA_Any::Release (void)
 {
   {
@@ -531,27 +530,27 @@ CORBA_Any::Release (void)
   return 0;
 }
 
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_Any::QueryInterface (REFIID riid,
 			   void **ppv)
 {
   *ppv = 0;
 
-  if (IID_CORBA_Any == riid || IID_IUnknown == riid)
+  if (IID_CORBA_Any == riid || IID_TAO_IUnknown == riid)
     *ppv = this;
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
-// VARIANT conversions
+// TAO_VARIANT conversions
 
 // copy constructor
 
-CORBA_Any::CORBA_Any (const VARIANT &src)
+CORBA_Any::CORBA_Any (const TAO_VARIANT &src)
 {
   orb_owns_data_ = CORBA::B_TRUE;
   refcount_ = 1;
@@ -563,7 +562,7 @@ CORBA_Any::CORBA_Any (const VARIANT &src)
 
 // assignment operator
 CORBA_Any &
-CORBA_Any::operator = (const VARIANT &src)
+CORBA_Any::operator = (const TAO_VARIANT &src)
 {
   this->~CORBA_Any ();
 
@@ -640,9 +639,9 @@ CORBA_Any::operator = (const VARIANT &src)
   return *this;
 }
 
-CORBA_Any::operator VARIANT (void)
+CORBA_Any::operator TAO_VARIANT (void)
 {
-  VARIANT retval;
+  TAO_VARIANT retval;
 
   // XXX convert it ... or report exception somehow!
 
diff --git a/TAO/tao/any.h b/TAO/tao/any.h
index 1af48bcf90b..eb253c1084b 100644
--- a/TAO/tao/any.h
+++ b/TAO/tao/any.h
@@ -21,7 +21,7 @@
 #if !defined (TAO_ANY_H)
 #define TAO_ANY_H
 
-class TAO_Export CORBA_Any : public IUnknown
+class TAO_Export CORBA_Any : public TAO_IUnknown
   // = TITLE
   //   Class "Any" can wrap values of any type, with the assistance
   //   of a TypeCode to describe that type.
@@ -208,20 +208,20 @@ public:
 
   // = Methods required for COM <IUnknown> support.
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
+  ULONG  AddRef (void);
+  ULONG  Release (void);
+  TAO_HRESULT  QueryInterface (REFIID riid,
 				    void **ppv);
 
   // = Conversion to/from COM Variant types: 
 
-  CORBA_Any (const VARIANT &src);
+  CORBA_Any (const TAO_VARIANT &src);
   // copy constructor,
 
-  CORBA_Any &operator = (const VARIANT &src);
+  CORBA_Any &operator = (const TAO_VARIANT &src);
   // assignment operator
 
-  operator VARIANT (void);
+  operator TAO_VARIANT (void);
   // cast operator.
 
 private:
diff --git a/TAO/tao/compat/initguid.h b/TAO/tao/compat/initguid.h
index b9315574ca7..f90676559a9 100644
--- a/TAO/tao/compat/initguid.h
+++ b/TAO/tao/compat/initguid.h
@@ -10,6 +10,7 @@
 /* assert DEFINE_GUID is defined */
 #undef	DEFINE_GUID
 
-#define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) EXTERN_C const IID name = { 0 }
+#define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) \
+            EXTERN_C const TAO_IID name = { 0 }
 
 #endif /* TAO_COMPAT_INITGUID_H */
diff --git a/TAO/tao/compat/objbase.h b/TAO/tao/compat/objbase.h
index 1307b5aec24..160baa52080 100644
--- a/TAO/tao/compat/objbase.h
+++ b/TAO/tao/compat/objbase.h
@@ -26,12 +26,12 @@
 // Random data types that come from Microsoft's APIs.
 //
 typedef u_long ULONG;
-typedef u_long HRESULT;
+typedef u_long TAO_HRESULT;
 
 //
 // Details of the procedure calling convention matter.
 //
-#define __stdcall               // MS-Windows non-varargs call convention
+//#define __stdcall                // MS-Windows non-varargs call convention
 
 #if defined(__cplusplus)
 #  define EXTERN_C extern "C"
@@ -44,12 +44,14 @@ typedef u_long HRESULT;
 //      IID -- interface ID
 //      CLSID -- implementation ID
 //
-typedef char IID [16];          // XXX actually a struct
-typedef const IID &REFIID;
+typedef char TAO_IID [16];          // XXX actually a struct
+typedef const TAO_IID &REFIID;
 #if !defined(INITGUID)
-#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) extern "C" const IID name
+#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) \
+                      extern "C" const TAO_IID name
 #else
-#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) extern "C" const IID name = { 0 }
+#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) \
+                      extern "C" const TAO_IID name = { 0 }
 #endif
 
 
@@ -57,25 +59,29 @@ typedef const IID &REFIID;
 // All objects in the "Component Object Model" (COM) inherit from
 // this pure virtual base class.
 //
-DEFINE_GUID (IID_IUnknown, b,c,d,e,f,g,h,i,j,k,l);
+DEFINE_GUID (IID_TAO_IUnknown, b,c,d,e,f,g,h,i,j,k,l);
 
-class IUnknown 
+class TAO_IUnknown 
 {
 public:
-  virtual HRESULT __stdcall QueryInterface (REFIID riid,
-                                            void **ppv) = 0;
-  virtual ULONG __stdcall AddRef (void) = 0;
-  virtual ULONG __stdcall Release (void) = 0;
+  virtual TAO_HRESULT  QueryInterface (REFIID riid,
+                                   void **ppv) = 0;
+  virtual ULONG  AddRef (void) = 0;
+  virtual ULONG  Release (void) = 0;
 };
 
 // XXX haven't looked closely at COM's fault reporting yet ...
 
-typedef u_long SCODE;
+typedef u_long TAO_SCODE;
 
-inline HRESULT ResultFromScode(SCODE scode) { return scode; }
+inline TAO_HRESULT
+ResultFromScode(TAO_SCODE scode)
+{
+  return scode;
+}
 
-#define NOERROR         ((SCODE) 0)
-#define E_NOINTERFACE   ((SCODE) 17)
+#define TAO_NOERROR         ((TAO_SCODE) 0)
+#define TAO_E_NOINTERFACE   ((TAO_SCODE) 17)
 
 
 // VARIANT is OLE's extremely limited version of "Any".  There are
@@ -87,8 +93,8 @@ inline HRESULT ResultFromScode(SCODE scode) { return scode; }
 // and even those that are worth supporting portably aren't fully
 // supported at this writing.
 
-typedef u_short         VARTYPE;
-enum VARENUM 
+typedef u_short         TAO_VARTYPE;
+enum TAO_VARENUM 
 {                  // only types suitable for VARIANTs
   VT_EMPTY    = 0,            // nothing
   VT_NULL     = 1,            // SQL style ull (XXX)
@@ -109,7 +115,7 @@ enum VARENUM
   VT_BYREF    = 0x4000        // pointer to more primitive type
 };
 
-struct CY 
+struct TAO_CY 
   // = TITLE
   //   Currency is an eight byte fixed point number (could be "long long").  
 {
@@ -125,49 +131,49 @@ struct CY
 // DATE format is days since 30-Dec-1889 ... days in the "whole"
 // part, time in the fractional part (part of a day).
 
-typedef double DATE;
+typedef double TAO_DATE;
 
-struct VARIANT 
+struct TAO_VARIANT 
 {
-  VARTYPE               vt;             // type ID
-  u_short       wReserved1, wReserved2, wReserved3;
+  TAO_VARTYPE               vt;             // type ID
+  u_short               wReserved1, wReserved2, wReserved3;
   union 
   {
     //
     // By-Value fields
     //
     long                lVal;                   // VT_I4
-    u_char      bVal;                   // VT_UI1
+    u_char              bVal;                   // VT_UI1
     short               iVal;                   // VT_I2
     float               fltVal;                 // VT_R4
     double              dblVal;                 // VT_R8
     // VARIANT_BOOL     bool;                   // VT_BOOL
-    SCODE               scode;                  // VT_ERROR
-    CY          cyVal;                  // VT_CY
-    DATE                date;                   // VT_DATE
+    TAO_SCODE           scode;                  // VT_ERROR
+    TAO_CY              cyVal;                  // VT_CY
+    TAO_DATE            date;                   // VT_DATE
     // BSTR             bstrVal;                // VT_BSTR
-    IUnknown    *punkVal;               // VT_UNKNOWN
+    TAO_IUnknown        *punkVal;               // VT_UNKNOWN
     // IDispatch        *pdispVal;              // VT_DISPATCH
     // SAFEARRAY        *parray;                // VT_ARRAY
 
     //
     // By-Reference fields (for VARIANTARG)
     //
-    u_char      *pbVal;                 // VT_BYREF|VT_UI1
+    u_char              *pbVal;                 // VT_BYREF|VT_UI1
     short               *piVal;                 // VT_BYREF|VT_I2
     long                *plVal;                 // VT_BYREF|VT_I4
     float               *pfltVal;               // VT_BYREF|VT_R4
     double              *pdblVal;               // VT_BYREF|VT_R8
     // VARIANT_BOOL     *pbool;                 // VT_BYREF|VT_BOOL
-    SCODE               *pscode;                // VT_BYREF|VT_ERROR
-    CY          *pcyVal;                // VT_BYREF|VT_CY
-    DATE                *pdate;                 // VT_BYREF|VT_DATE
+    TAO_SCODE           *pscode;                // VT_BYREF|VT_ERROR
+    TAO_CY              *pcyVal;                // VT_BYREF|VT_CY
+    TAO_DATE            *pdate;                 // VT_BYREF|VT_DATE
     // BSTR             *pbstrVal;              // VT_BYREF|VT_BSTR
-    IUnknown    **ppunkVal;             // VT_BYREF|VT_UNKNOWN
+    TAO_IUnknown            **ppunkVal;             // VT_BYREF|VT_UNKNOWN
     // IDispatch        **ppdisVal;             // VT_BYREF|VT_DISPATCH
     // SAFEARRAY        *pparray;               // VT_BYREF|VT_ARRAY
 
-    VARIANT             *pvarVal;               // VT_BYREF|VT_VARIANT
+    TAO_VARIANT         *pvarVal;               // VT_BYREF|VT_VARIANT
     void                *byref;                 // generic VT_BYREF
   };
 };
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index a08c0061a61..b5d5c4c940b 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -73,8 +73,8 @@
 #endif /* TAO_HAS_DLL */
 
 // COM stuff
-#include <objbase.h>
-#include <initguid.h>
+#include "tao/compat/objbase.h"
+#include "tao/compat/initguid.h"
 
 // ORB configuration
 #include "tao/orbconf.h"
diff --git a/TAO/tao/corbacom.h b/TAO/tao/corbacom.h
index d9fafd3203a..7e6508ac50a 100644
--- a/TAO/tao/corbacom.h
+++ b/TAO/tao/corbacom.h
@@ -664,23 +664,23 @@ typedef void (*TAO_Skeleton)(CORBA::ServerRequest &,
 // signature of a skeleton for every operation of an interface
 
 // COM interface IIDs
-extern "C" TAO_Export const IID IID_CORBA_Any;
-extern "C" TAO_Export const IID IID_BOA;
-extern "C" TAO_Export const IID IID_CORBA_Exception;
-extern "C" TAO_Export const IID IID_CORBA_UserException;
-extern "C" TAO_Export const IID IID_CORBA_SystemException;
-extern "C" TAO_Export const IID IID_CORBA_Request;
-extern "C" TAO_Export const IID IID_CORBA_Object;
-extern "C" TAO_Export const IID IID_CORBA_ORB;
-extern "C" TAO_Export const IID IID_CORBA_NVList;
-extern "C" TAO_Export const IID IID_CORBA_Principal;
-extern "C" TAO_Export const IID IID_CORBA_TypeCode;
-extern "C" TAO_Export const IID IID_CORBA_ServerRequest;
-extern "C" TAO_Export const IID IID_IIOP_ServerRequest;
-extern "C" TAO_Export const IID IID_STUB_Object;
-extern "C" TAO_Export const IID IID_IIOP_Object;
-extern "C" TAO_Export const IID IID_IIOP_ORB;
-extern "C" TAO_Export const IID IID_POA;
+extern "C" TAO_Export const TAO_IID IID_CORBA_Any;
+extern "C" TAO_Export const TAO_IID IID_BOA;
+extern "C" TAO_Export const TAO_IID IID_CORBA_Exception;
+extern "C" TAO_Export const TAO_IID IID_CORBA_UserException;
+extern "C" TAO_Export const TAO_IID IID_CORBA_SystemException;
+extern "C" TAO_Export const TAO_IID IID_CORBA_Request;
+extern "C" TAO_Export const TAO_IID IID_CORBA_Object;
+extern "C" TAO_Export const TAO_IID IID_CORBA_ORB;
+extern "C" TAO_Export const TAO_IID IID_CORBA_NVList;
+extern "C" TAO_Export const TAO_IID IID_CORBA_Principal;
+extern "C" TAO_Export const TAO_IID IID_CORBA_TypeCode;
+extern "C" TAO_Export const TAO_IID IID_CORBA_ServerRequest;
+extern "C" TAO_Export const TAO_IID IID_IIOP_ServerRequest;
+extern "C" TAO_Export const TAO_IID IID_STUB_Object;
+extern "C" TAO_Export const TAO_IID IID_IIOP_Object;
+extern "C" TAO_Export const TAO_IID IID_IIOP_ORB;
+extern "C" TAO_Export const TAO_IID IID_POA;
 
 // NOTE: stub APIs are nonportable, and must be explicitly #included
 // by code emitted from an IDL compiler.
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index c96d0612d1c..375b78fa6af 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -650,7 +650,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
     {
       // retrieve the CORBA::Object from the IIOP_Object we created before.
       if (objdata->QueryInterface (IID_CORBA_Object,
-                                   (void **) data) != NOERROR)
+                                   (void **) data) != TAO_NOERROR)
         continue_decoding = CORBA::B_FALSE;
       objdata->Release ();
     }
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
index 09b74bba667..0977d346f3e 100644
--- a/TAO/tao/encode.cpp
+++ b/TAO/tao/encode.cpp
@@ -326,7 +326,8 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
       IIOP_Object *objdata;
       IIOP::Profile *profile;
 
-      if (obj->QueryInterface (IID_IIOP_Object, (void **) &objdata) != NOERROR)
+      if (obj->QueryInterface (IID_IIOP_Object, (void **) &objdata)
+          != TAO_NOERROR)
         {
           env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
           return CORBA::TypeCode::TRAVERSE_STOP;
diff --git a/TAO/tao/except.cpp b/TAO/tao/except.cpp
index f3fe4aaae9b..8364d90db27 100644
--- a/TAO/tao/except.cpp
+++ b/TAO/tao/except.cpp
@@ -83,7 +83,7 @@ CORBA_Exception::type (void) const
 
 // For COM -- IUnKnown operations
 
-ULONG __stdcall
+ULONG
 CORBA_Exception::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
@@ -91,7 +91,7 @@ CORBA_Exception::AddRef (void)
   return ++refcount_;
 }
 
-ULONG __stdcall
+ULONG
 CORBA_Exception::Release (void)
 {
   {
@@ -112,23 +112,23 @@ CORBA_Exception::Release (void)
   return 0;
 }
 
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_Exception::QueryInterface (REFIID	riid,
 				 void **ppv)
 {
   *ppv = 0;
 
-  if (IID_CORBA_Exception == riid || IID_IUnknown == riid)
+  if (IID_CORBA_Exception == riid || IID_TAO_IUnknown == riid)
     *ppv = this;
 
   // XXX this approach needs modifying to enable returning
   // UserException, SystemException, and other kinds of pointers.
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 // Avoid zillions of not-quite-inlined copies of utilities.
diff --git a/TAO/tao/except.h b/TAO/tao/except.h
index b5130b7e298..25b806aec95 100644
--- a/TAO/tao/except.h
+++ b/TAO/tao/except.h
@@ -19,7 +19,7 @@
 #if !defined (TAO_EXCEPT_H)
 #  define TAO_EXCEPT_H
 
-class TAO_Export CORBA_Exception : public IUnknown
+class TAO_Export CORBA_Exception : public TAO_IUnknown
   // = TITLE
   //   CORBA2-specified exception hierarchy.
   //
@@ -47,10 +47,10 @@ public:
 
   // = Methods required for COM IUnknown support
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
+  ULONG  AddRef (void);
+  ULONG  Release (void);
+  TAO_HRESULT  QueryInterface (REFIID riid,
+                               void **ppv);
 
   CORBA_Exception (CORBA::TypeCode_ptr type);
   virtual ~CORBA_Exception (void);
diff --git a/TAO/tao/giop.cpp b/TAO/tao/giop.cpp
index 2cde05399ba..4068f6ff07f 100644
--- a/TAO/tao/giop.cpp
+++ b/TAO/tao/giop.cpp
@@ -1028,7 +1028,7 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
                                   &obj, 0,
                                   env) != CORBA::TypeCode::TRAVERSE_CONTINUE
 	    || obj->QueryInterface (IID_IIOP_Object,
-                                    (void **) &obj2) != NOERROR)
+                                    (void **) &obj2) != TAO_NOERROR)
 	  {
 	    dexc (env, "invoke, location forward");
 	    send_error (this->handler_);
diff --git a/TAO/tao/iiopobj.cpp b/TAO/tao/iiopobj.cpp
index 4f8ba9c1f64..0d7b57641ce 100644
--- a/TAO/tao/iiopobj.cpp
+++ b/TAO/tao/iiopobj.cpp
@@ -223,7 +223,7 @@ IIOP_Object::is_equivalent (CORBA::Object_ptr other_obj,
 
   if (CORBA::is_nil (other_obj) == CORBA::B_TRUE
       || other_obj->QueryInterface (IID_IIOP_Object,
-                                    (void **) &other_iiop_obj) != NOERROR)
+                                    (void **) &other_iiop_obj) != TAO_NOERROR)
     return CORBA::B_FALSE;
   CORBA::release (other_obj);
 
@@ -250,7 +250,7 @@ IIOP_Object::is_equivalent (CORBA::Object_ptr other_obj,
 DEFINE_GUID (IID_IIOP_Object,
 0xa201e4c3, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
-ULONG __stdcall
+ULONG
 IIOP_Object::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->IUnknown_lock_, 0));
@@ -258,7 +258,7 @@ IIOP_Object::AddRef (void)
   return ++this->refcount_;
 }
 
-ULONG __stdcall
+ULONG
 IIOP_Object::Release (void)
 {
   {
@@ -284,7 +284,7 @@ IIOP_Object::Release (void)
 // CORBA::Object ... contained within this; it delegates back
 //      to this one as its "parent"
 
-HRESULT __stdcall
+TAO_HRESULT
 IIOP_Object::QueryInterface (REFIID riid,
                              void **ppv)
 {
@@ -292,16 +292,16 @@ IIOP_Object::QueryInterface (REFIID riid,
 
   if (IID_IIOP_Object == riid
       || IID_STUB_Object == riid
-      || IID_IUnknown == riid)
+      || IID_TAO_IUnknown == riid)
     *ppv = this;
   else if (IID_CORBA_Object == riid)
     *ppv = &base;
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 //TAO extensions
diff --git a/TAO/tao/iiopobj.h b/TAO/tao/iiopobj.h
index d10c5ec8a85..f0d97898926 100644
--- a/TAO/tao/iiopobj.h
+++ b/TAO/tao/iiopobj.h
@@ -206,10 +206,10 @@ public:
   // Constructor used typically by the server side.
 
   // = COM stuff
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID type_id,
-				    void **ppv);
+  ULONG  AddRef (void);
+  ULONG  Release (void);
+  TAO_HRESULT  QueryInterface (REFIID type_id,
+                               void **ppv);
 
   virtual const char *_get_name (CORBA::Environment &env);
   // Get the underlying object key, which is stored as a
diff --git a/TAO/tao/iioporb.cpp b/TAO/tao/iioporb.cpp
index 585220bc577..8f3c12d4464 100644
--- a/TAO/tao/iioporb.cpp
+++ b/TAO/tao/iioporb.cpp
@@ -86,7 +86,7 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj,
       IIOP_Object *obj2;
 
       if (obj->QueryInterface (IID_IIOP_Object,
-			       (void **) &obj2) != NOERROR)
+			       (void **) &obj2) != TAO_NOERROR)
         {
           env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
           return 0;
@@ -348,7 +348,7 @@ IIOP_ORB::string_to_object (const CORBA::String str,
 DEFINE_GUID (IID_IIOP_ORB,
 0xa201e4c4, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
-HRESULT __stdcall
+TAO_HRESULT
 IIOP_ORB::QueryInterface (REFIID riid,
                           void **ppv)
 {
@@ -356,16 +356,16 @@ IIOP_ORB::QueryInterface (REFIID riid,
 
   if (IID_CORBA_ORB == riid
       || IID_IIOP_ORB == riid
-      || IID_IUnknown == riid)
+      || IID_TAO_IUnknown == riid)
     *ppv = this;
 
   // XXX gotta aggregate ...
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
   (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/iioporb.h b/TAO/tao/iioporb.h
index 3e90b01bed3..675ec3ff964 100644
--- a/TAO/tao/iioporb.h
+++ b/TAO/tao/iioporb.h
@@ -45,8 +45,8 @@ public:
                                   CORBA::Environment &env);
   // Convert an object reference to an IOR stringified form
 
-  HRESULT __stdcall QueryInterface (REFIID riid, 
-				    void **ppv);
+  TAO_HRESULT QueryInterface (REFIID riid, 
+                              void **ppv);
   // COM stuff - get the underlying IUnknown object based on the riid
 
   // = ACCESSORS
diff --git a/TAO/tao/nvlist.cpp b/TAO/tao/nvlist.cpp
index 5aedf80d257..242a0e0999e 100644
--- a/TAO/tao/nvlist.cpp
+++ b/TAO/tao/nvlist.cpp
@@ -14,7 +14,7 @@
 DEFINE_GUID (IID_CORBA_NamedValue, 
 0x77420087, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
-ULONG __stdcall
+ULONG
 CORBA_NamedValue::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
@@ -22,7 +22,7 @@ CORBA_NamedValue::AddRef (void)
   return refcount_++;
 }
  
-ULONG __stdcall
+ULONG
 CORBA_NamedValue::Release (void)
 {
   {
@@ -38,20 +38,20 @@ CORBA_NamedValue::Release (void)
   return 0;
 }
  
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_NamedValue::QueryInterface (REFIID riid,
                                   void **ppv)
 {
   *ppv = 0;
  
-  if (IID_CORBA_NamedValue == riid || IID_IUnknown == riid)
+  if (IID_CORBA_NamedValue == riid || IID_TAO_IUnknown == riid)
     *ppv = this;
  
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
  
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 // Reference counting for DII Request object
@@ -81,7 +81,7 @@ CORBA_NamedValue::~CORBA_NamedValue (void)
 DEFINE_GUID (IID_CORBA_NVList,
 0x77420088, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
-ULONG __stdcall
+ULONG
 CORBA_NVList::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
@@ -89,7 +89,7 @@ CORBA_NVList::AddRef (void)
   return refcount_++;
 }
  
-ULONG __stdcall
+ULONG
 CORBA_NVList::Release (void)
 {
   {
@@ -105,20 +105,20 @@ CORBA_NVList::Release (void)
   return 0;
 }
  
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_NVList::QueryInterface (REFIID riid,
                               void **ppv)
 {
   *ppv = 0;
  
-  if (IID_CORBA_NVList == riid || IID_IUnknown == riid)
+  if (IID_CORBA_NVList == riid || IID_TAO_IUnknown == riid)
     *ppv = this;
  
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
  
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 // Reference counting for DII Request object
diff --git a/TAO/tao/nvlist.h b/TAO/tao/nvlist.h
index 849f06d46ef..b150a4279c6 100644
--- a/TAO/tao/nvlist.h
+++ b/TAO/tao/nvlist.h
@@ -38,10 +38,10 @@ public:
 
   // = Methods required for COM IUnknown support.
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
+  ULONG AddRef (void);
+  ULONG Release (void);
+  TAO_HRESULT QueryInterface (REFIID riid,
+                              void **ppv);
 
 private:
   u_int refcount_;
@@ -87,10 +87,10 @@ public:
 
   // = Methods required for COM IUnknown support
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
+  ULONG AddRef (void);
+  ULONG Release (void);
+  TAO_HRESULT QueryInterface (REFIID riid,
+                              void **ppv);
 
 private:
   // @@ Do we really need to keep these _FAR macros?
diff --git a/TAO/tao/orbobj.cpp b/TAO/tao/orbobj.cpp
index fdf709b9f96..926ffcca4f4 100644
--- a/TAO/tao/orbobj.cpp
+++ b/TAO/tao/orbobj.cpp
@@ -77,7 +77,7 @@ CORBA_ORB::open (void)
   return 0;
 }
 
-ULONG __stdcall
+ULONG
 CORBA_ORB::Release (void)
 {
   {
diff --git a/TAO/tao/orbobj.h b/TAO/tao/orbobj.h
index 263cf0aac95..f6bfd59f903 100644
--- a/TAO/tao/orbobj.h
+++ b/TAO/tao/orbobj.h
@@ -25,7 +25,7 @@
 
 #include "tao/corba.h"
 
-class TAO_Export CORBA_ORB : public IUnknown
+class TAO_Export CORBA_ORB : public TAO_IUnknown
   // = TITLE
   // ORB pseudo-objref.
 {
@@ -117,8 +117,8 @@ public:
   // objrefs, as well as how to marshal and unmarshal them ... as well
   // as provide their own QueryInterface.
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
+  ULONG AddRef (void);
+  ULONG Release (void);
 
   CORBA_Object_ptr resolve_initial_references (CORBA::String name);
   // This method acts as a miniature name service provided by the ORB
diff --git a/TAO/tao/orbobj.i b/TAO/tao/orbobj.i
index 1f901da8c48..2bd0967e784 100644
--- a/TAO/tao/orbobj.i
+++ b/TAO/tao/orbobj.i
@@ -11,7 +11,7 @@ CORBA::release (CORBA::ORB_ptr obj)
     obj->Release ();
 }
 
-ACE_INLINE ULONG __stdcall
+ACE_INLINE ULONG
 CORBA_ORB::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp
index 381a6185298..7f647e9abe5 100644
--- a/TAO/tao/poa.cpp
+++ b/TAO/tao/poa.cpp
@@ -95,7 +95,7 @@ CORBA_POA::create (CORBA::OctetSeq &key,
   CORBA::Object_ptr new_obj;
 
   if (data->QueryInterface (IID_CORBA_Object,
-			    (void **) &new_obj) != NOERROR)
+			    (void **) &new_obj) != TAO_NOERROR)
     env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   data->Release ();
@@ -189,7 +189,7 @@ CORBA_POA::get_named_poa (CORBA::ORB_ptr orb,
   {
     IIOP_ORB *internet;
 
-    if (orb->QueryInterface (IID_IIOP_ORB, (void **) &internet) == NOERROR)
+    if (orb->QueryInterface (IID_IIOP_ORB, (void **) &internet) == TAO_NOERROR)
       {
         CORBA::POA_ptr tcp_oa;
 
@@ -229,7 +229,7 @@ CORBA_POA::get_poa (CORBA::ORB_ptr orb,
   {
     IIOP_ORB	*internet;
 
-    if (orb->QueryInterface (IID_IIOP_ORB, (void **) &internet) == NOERROR)
+    if (orb->QueryInterface (IID_IIOP_ORB, (void **) &internet) == TAO_NOERROR)
       {
         CORBA::POA_ptr tcp_oa;
 
@@ -437,14 +437,14 @@ CORBA_POA::handle_request (TAO_GIOP_RequestHeader hdr,
 }
 
 // IUnknown calls
-ULONG __stdcall
+ULONG
 CORBA_POA::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, poa_mon, com_lock_, 0));
   return ++refcount_;
 }
 
-ULONG __stdcall
+ULONG
 CORBA_POA::Release (void)
 {
   {
@@ -458,19 +458,19 @@ CORBA_POA::Release (void)
   return 0;
 }
 
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_POA::QueryInterface (REFIID riid,
                            void **ppv)
 {
   *ppv = 0;
 
   if (IID_POA == riid
-      || IID_IUnknown == riid)
+      || IID_TAO_IUnknown == riid)
     *ppv = this;
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
diff --git a/TAO/tao/poa.h b/TAO/tao/poa.h
index a3c9c41dfc7..77824927577 100644
--- a/TAO/tao/poa.h
+++ b/TAO/tao/poa.h
@@ -26,7 +26,7 @@ class TAO_GIOP_RequestHeader;
 // @@ Why does this inherit from IUnknown?  This inherits from
 // IUnknown because it's foolish.  There's no good reason to get rid
 // of it, though, until we remove this useless COM stuff.
-class TAO_Export CORBA_POA : public IUnknown
+class TAO_Export CORBA_POA : public TAO_IUnknown
   // = TITLE
   //    The <{TAO}> Basic Object Adapter.
 {
@@ -196,9 +196,9 @@ public:
   // Returns pointer to the ORB with which this OA is associated.
 
   // = COM IUnknown Support
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid, void** ppv);
+  ULONG AddRef (void);
+  ULONG Release (void);
+  TAO_HRESULT QueryInterface (REFIID riid, void** ppv);
 
 private:
   TAO_Object_Table *objtable_;
diff --git a/TAO/tao/principa.cpp b/TAO/tao/principa.cpp
index 052d9d18743..11102ab6732 100644
--- a/TAO/tao/principa.cpp
+++ b/TAO/tao/principa.cpp
@@ -38,7 +38,7 @@ DEFINE_GUID (IID_CORBA_Principal,
 0xa201e4c0, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
 
-ULONG __stdcall
+ULONG
 CORBA_Principal::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->lock_, 0));
@@ -46,7 +46,7 @@ CORBA_Principal::AddRef (void)
   return ++refcount_;
 }
 
-ULONG __stdcall
+ULONG
 CORBA_Principal::Release (void)
 {
   {
@@ -60,18 +60,18 @@ CORBA_Principal::Release (void)
   return 0;
 }
 
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_Principal::QueryInterface (REFIID riid,
 				 void **ppv)
 {
   *ppv = 0;
 
-  if (IID_CORBA_Principal == riid || IID_IUnknown == riid)
+  if (IID_CORBA_Principal == riid || IID_TAO_IUnknown == riid)
     *ppv = this;
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
   (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
diff --git a/TAO/tao/principa.h b/TAO/tao/principa.h
index 397341fa569..7ec3c136bee 100644
--- a/TAO/tao/principa.h
+++ b/TAO/tao/principa.h
@@ -19,7 +19,7 @@
 #if !defined (TAO_PRINCIPAL_H)
 #  define TAO_PRINCIPAL_H
 
-class TAO_Export CORBA_Principal : public IUnknown
+class TAO_Export CORBA_Principal : public TAO_IUnknown
   // = TITLE
   //    A "Principal" identifies an authenticated entity in the
   //    network administration framework.  Identities are used to
@@ -36,10 +36,10 @@ public:
 
   // Stuff required for COM IUnknown support
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
+  ULONG AddRef (void);
+  ULONG Release (void);
+  TAO_HRESULT QueryInterface (REFIID riid,
+                              void **ppv);
 
   CORBA_Principal (void);
 
diff --git a/TAO/tao/request.cpp b/TAO/tao/request.cpp
index 07ba878ece8..ea55775abd2 100644
--- a/TAO/tao/request.cpp
+++ b/TAO/tao/request.cpp
@@ -10,7 +10,7 @@
 DEFINE_GUID (IID_CORBA_Request,
 0x77420085, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
-ULONG __stdcall
+ULONG
 CORBA_Request::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
@@ -18,7 +18,7 @@ CORBA_Request::AddRef (void)
   return refcount_++;
 }
  
-ULONG __stdcall
+ULONG
 CORBA_Request::Release (void)
 {
   {
@@ -34,20 +34,20 @@ CORBA_Request::Release (void)
   return 0;
 }
  
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_Request::QueryInterface (REFIID riid,
 			       void **ppv)
 {
   *ppv = 0;
  
-  if (IID_CORBA_Request == riid || IID_IUnknown == riid)
+  if (IID_CORBA_Request == riid || IID_TAO_IUnknown == riid)
     *ppv = this;
  
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
  
   (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 // Reference counting for DII Request object
@@ -118,7 +118,7 @@ CORBA_Request::invoke (void)
   STUB_Object *stub;
 
   if (target_->QueryInterface (IID_STUB_Object,
-			       (void **) &stub) != NOERROR) 
+			       (void **) &stub) != TAO_NOERROR) 
     {
       env_.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
       return;
@@ -140,7 +140,7 @@ CORBA_Request::send_oneway (void)
   STUB_Object *stub;
 
   if (target_->QueryInterface (IID_STUB_Object,
-			       (void **) &stub) != NOERROR) 
+			       (void **) &stub) != TAO_NOERROR) 
     {
       env_.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
       return;
diff --git a/TAO/tao/request.h b/TAO/tao/request.h
index 5927aed294f..038db1b622a 100644
--- a/TAO/tao/request.h
+++ b/TAO/tao/request.h
@@ -23,7 +23,7 @@
 
 // @@ Please comment everything in this file.
 
-class TAO_Export CORBA_Request : public IUnknown
+class TAO_Export CORBA_Request : public TAO_IUnknown
 {
 public:
   // @@ These inlines should be moved into a *.i file.
@@ -39,10 +39,10 @@ public:
 
   // Stuff required for COM IUnknown support
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
+  ULONG AddRef (void);
+  ULONG Release (void);
+  TAO_HRESULT QueryInterface (REFIID riid,
+                              void **ppv);
 
 private:
   friend class CORBA_Object;
diff --git a/TAO/tao/svrrqst.cpp b/TAO/tao/svrrqst.cpp
index 0533726f883..3d86655678f 100644
--- a/TAO/tao/svrrqst.cpp
+++ b/TAO/tao/svrrqst.cpp
@@ -40,7 +40,7 @@ IIOP_ServerRequest::~IIOP_ServerRequest (void)
     delete exception_;
 }
 
-ULONG __stdcall
+ULONG
 IIOP_ServerRequest::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
@@ -49,7 +49,7 @@ IIOP_ServerRequest::AddRef (void)
   return refcount_++;
 }
 
-ULONG __stdcall
+ULONG 
 IIOP_ServerRequest::Release (void)
 {
   {
@@ -65,7 +65,7 @@ IIOP_ServerRequest::Release (void)
   return 0;
 }
 
-HRESULT __stdcall
+TAO_HRESULT 
 IIOP_ServerRequest::QueryInterface (REFIID riid,
 				    void **ppv)
 {
@@ -74,20 +74,20 @@ IIOP_ServerRequest::QueryInterface (REFIID riid,
 
   if (IID_IIOP_ServerRequest == riid
       || IID_CORBA_ServerRequest == riid
-      || IID_IUnknown == riid)
+      || IID_TAO_IUnknown == riid)
     *ppv = this;
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 // Unmarshal in/inout params, and set up to marshal the appropriate
 // inout/out/return values later on.
 
-void __stdcall
+void 
 IIOP_ServerRequest::params (CORBA::NVList_ptr list,
 			    CORBA::Environment &env)
 {
@@ -158,7 +158,7 @@ IIOP_ServerRequest::params (CORBA::NVList_ptr list,
 // but not both of them.  Results (and exceptions) can be reported
 // only after the parameter list has been provided (maybe empty).
 
-void __stdcall
+void 
 IIOP_ServerRequest::result (CORBA::Any_ptr value,
 			    CORBA::Environment &env)
 {
@@ -174,7 +174,7 @@ IIOP_ServerRequest::result (CORBA::Any_ptr value,
 
 // Store the exception value.
 
-void __stdcall
+void 
 IIOP_ServerRequest::exception (CORBA::ExceptionType type,
 			       CORBA::Any_ptr value,
 			       CORBA::Environment &env)
@@ -193,33 +193,33 @@ IIOP_ServerRequest::exception (CORBA::ExceptionType type,
 
 // Invocation attributes.
 
-CORBA::String __stdcall
+CORBA::String 
 IIOP_ServerRequest::op_name (void)
 {
   return opname_;
 }
 
-CORBA::Object_ptr __stdcall
+CORBA::Object_ptr 
 IIOP_ServerRequest::target (void)
 {
   // XXX implement me!!  Code from TCP_OA exists ...
   return 0;
 }
 
-CORBA::Principal_ptr __stdcall
+CORBA::Principal_ptr 
 IIOP_ServerRequest::caller (void)
 {
   // XXX ... return client's principal
   return 0;
 }
 
-CORBA::ORB_ptr __stdcall
+CORBA::ORB_ptr 
 IIOP_ServerRequest::orb (void)
 {
   return orb_;
 }
 
-CORBA::POA_ptr __stdcall
+CORBA::POA_ptr 
 IIOP_ServerRequest::oa (void)
 {
   return poa_;
diff --git a/TAO/tao/svrrqst.h b/TAO/tao/svrrqst.h
index 5fc623ddf11..4460c470c2d 100644
--- a/TAO/tao/svrrqst.h
+++ b/TAO/tao/svrrqst.h
@@ -24,20 +24,20 @@
 #if !defined (TAO_SVRRQST_H)
 #define TAO_SVRRQST_H
 
-class TAO_Export CORBA_ServerRequest : public IUnknown
+class TAO_Export CORBA_ServerRequest : public TAO_IUnknown
   // = TITLE
   //   XXX this is currently in an intermediate state; this is not
   //   supposed to be IIOP-specific, or to expose quite so many
   //   implementation details, but right now it is.
 {
 public:
-  virtual void __stdcall params (CORBA::NVList_ptr list,
+  virtual void params (CORBA::NVList_ptr list,
 				 CORBA::Environment &env) = 0;
   // Implementation uses this to provide the ORB with the operation's
   // parameter list ... on return, their values are available; the
   // list fed in has typecodes and (perhap) memory assigned.
 
-  virtual void __stdcall result (CORBA::Any_ptr value,
+  virtual void result (CORBA::Any_ptr value,
 				 CORBA::Environment &env) = 0;
   // Implementation uses this to provide the operation result
   // ... illegal if exception() was called or params() was not called.
@@ -45,7 +45,7 @@ public:
   // XXX Implementation should be able to assume response has been
   // sent when this returns, and reclaim memory it allocated.
 
-  virtual void __stdcall exception (CORBA::ExceptionType	type,
+  virtual void exception (CORBA::ExceptionType	type,
 				    CORBA::Any_ptr value,
 				    CORBA::Environment &env) = 0;
   // Implementation uses this to provide the exception value which is
@@ -64,11 +64,11 @@ public:
   // basic CORBA Object Model.
   //
   // XXX should not be not assuming all OAs implement the POA API !!
-  virtual CORBA::Principal_ptr __stdcall	caller (void) = 0;
-  virtual CORBA::Object_ptr __stdcall target (void) = 0;
-  virtual CORBA::String __stdcall op_name (void) = 0;
-  virtual CORBA::POA_ptr __stdcall oa (void) = 0;
-  virtual CORBA::ORB_ptr __stdcall orb (void) = 0;
+  virtual CORBA::Principal_ptr 	caller (void) = 0;
+  virtual CORBA::Object_ptr  target (void) = 0;
+  virtual CORBA::String  op_name (void) = 0;
+  virtual CORBA::POA_ptr  oa (void) = 0;
+  virtual CORBA::ORB_ptr  orb (void) = 0;
 };
 
 class TAO_Export IIOP_ServerRequest : public CORBA_ServerRequest
@@ -85,30 +85,30 @@ public:
   virtual ~IIOP_ServerRequest (void);
 
   // = General ServerRequest operations
-  void __stdcall params (CORBA::NVList_ptr list,
+  void  params (CORBA::NVList_ptr list,
 			 CORBA::Environment &env);
 
-  void __stdcall result (CORBA::Any_ptr value,
+  void  result (CORBA::Any_ptr value,
 			 CORBA::Environment &env);
 
-  void __stdcall exception (CORBA::ExceptionType type,
+  void  exception (CORBA::ExceptionType type,
 			    CORBA::Any_ptr value,
 			    CORBA::Environment &env);
 
   // = Request attributes
 
-  CORBA::String __stdcall op_name (void);
-  CORBA::Principal_ptr __stdcall	caller (void);
-  CORBA::Object_ptr __stdcall target (void);
-  CORBA::ORB_ptr __stdcall orb (void);
-  CORBA::POA_ptr __stdcall oa (void);
+  CORBA::String  op_name (void);
+  CORBA::Principal_ptr 	caller (void);
+  CORBA::Object_ptr  target (void);
+  CORBA::ORB_ptr  orb (void);
+  CORBA::POA_ptr  oa (void);
 
   // Stuff required for COM IUnknown support
 
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
+  ULONG  AddRef (void);
+  ULONG  Release (void);
+  TAO_HRESULT  QueryInterface (REFIID riid,
+                               void **ppv);
 
   // private:
   CORBA::String opname_;        // Operation name.
diff --git a/TAO/tao/typecode.cpp b/TAO/tao/typecode.cpp
index 9016bdc4ec2..1bb44046b33 100644
--- a/TAO/tao/typecode.cpp
+++ b/TAO/tao/typecode.cpp
@@ -192,7 +192,7 @@ DEFINE_GUID (IID_CORBA_TypeCode,
 0xa201e4c1, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
 
 // COM stuff
-u_long __stdcall
+u_long
 CORBA_TypeCode::AddRef (void)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
@@ -210,7 +210,7 @@ CORBA_TypeCode::AddRef (void)
 }
 
 // COM stuff
-u_long __stdcall
+u_long
 CORBA_TypeCode::Release (void)
 {
   // This code is subtle since we need to make sure that we don't try
@@ -343,20 +343,20 @@ TC_Private_State::~TC_Private_State (void)
 }
 
 // COM stuff
-HRESULT __stdcall
+TAO_HRESULT
 CORBA_TypeCode::QueryInterface (REFIID riid,
 				void **ppv)
 {
   *ppv = 0;
 
-  if (IID_CORBA_TypeCode == riid || IID_IUnknown == riid)
+  if (IID_CORBA_TypeCode == riid || IID_TAO_IUnknown == riid)
     *ppv = this;
 
   if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
+    return ResultFromScode (TAO_E_NOINTERFACE);
 
  (void) AddRef ();
-  return NOERROR;
+  return TAO_NOERROR;
 }
 
 // This method is not yet implemented completely - low priority task
diff --git a/TAO/tao/typecode.h b/TAO/tao/typecode.h
index 685736e8ded..c67c9658b66 100644
--- a/TAO/tao/typecode.h
+++ b/TAO/tao/typecode.h
@@ -63,7 +63,7 @@ public:
 
 class TC_Private_State;
 
-class TAO_Export CORBA_TypeCode : public IUnknown
+class TAO_Export CORBA_TypeCode : public TAO_IUnknown
   // = TITLE
   //   The CORBA TypeCode class. It maintains the in-memory
   //   representation of any OMG CORBA IDL data type.
@@ -241,10 +241,10 @@ public:
   // IIOP marshaling engine.
 
   // Stuff required for COM IUnknown support
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-                                    void **ppv);
+  ULONG  AddRef (void);
+  ULONG  Release (void);
+  TAO_HRESULT  QueryInterface (REFIID riid,
+                               void **ppv);
   // private:
   //
   // = The guts of the typecode implementation class