INTEGRATION: CWS jl5vba (1.3.216); FILE MERGED

2004/01/16 13:15:50 jl 1.3.216.1: #112889# #112560# #112509# #112560# #112053# #112052# #109402# #109536# merge from cws ab02vba

1 files changed, 132 insertions, 30 deletions

diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h
index 812b301069f0..6d48f89cc8cf 100644
--- a/extensions/test/ole/AxTestComponents/Basic.h
+++ b/extensions/test/ole/AxTestComponents/Basic.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Basic.h,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jl $ $Date: 2002-03-12 13:25:19 $
+ *  last change: $Author: obo $ $Date: 2004-03-17 13:11:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,31 +64,30 @@
 #define __BASIC_H_
 
 #include "resource.h"       // main symbols
-
+//#include "AxTestComponents.h"
+#import  "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids
+//#include "AxTestComponents.h"
 /////////////////////////////////////////////////////////////////////////////
 // CBasic
 class ATL_NO_VTABLE CBasic :
     public CComObjectRootEx<CComSingleThreadModel>,
     public CComCoClass<CBasic, &CLSID_Basic>,
     public IDispatchImpl<IBasic, &IID_IBasic, &LIBID_AXTESTCOMPONENTSLib>
-{
+    {
 public:
     CBasic();
     ~CBasic();
-/*  CBasic():   m_cPrpByte(0),m_nPrpShort(0),m_lPrpLong(0),m_fPrpFloat(0), m_dPrpDouble(0),m_PrpArray(0)
-    {
-    }
-*/
-DECLARE_REGISTRY_RESOURCEID(IDR_BASIC)
 
-DECLARE_PROTECT_FINAL_CONSTRUCT()
+    DECLARE_REGISTRY_RESOURCEID(IDR_BASIC)
 
-BEGIN_COM_MAP(CBasic)
-    COM_INTERFACE_ENTRY(IBasic)
-    COM_INTERFACE_ENTRY(IDispatch)
-END_COM_MAP()
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-// IBasic
+    BEGIN_COM_MAP(CBasic)
+        COM_INTERFACE_ENTRY(IBasic)
+        COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
+
+    // IBasic
 public:
     STDMETHOD(outMore)(/*[out]*/long* val1, /*[out]*/long* val2);
     STDMETHOD(inMulDimArrayByte2)(LPSAFEARRAY val);
@@ -119,20 +118,10 @@ public:
     STDMETHOD(inSequenceByte)(LPSAFEARRAY ar);
     STDMETHOD(inSequenceLong)(LPSAFEARRAY  ar);
     STDMETHOD(mixed1)(
-            /* [in] */ unsigned char aChar,
-            /* [out] */ unsigned char __RPC_FAR *outChar,
-            /* [out][in] */ unsigned char __RPC_FAR *inoutChar,
-            /* [in] */ VARIANT var,
-            /* [out] */ VARIANT __RPC_FAR *outVar,
-            /* [out][in] */ VARIANT __RPC_FAR *inoutVar,
-            /* [in] */ SAFEARRAY __RPC_FAR * ar,
-            /* [out] */ SAFEARRAY __RPC_FAR * __RPC_FAR *outAr,
-            /* [out][in] */ SAFEARRAY __RPC_FAR * __RPC_FAR *inoutAr,
-            /* [in] */ IDispatch __RPC_FAR *disp,
-            /* [out] */ IDispatch __RPC_FAR *__RPC_FAR *outDisp,
-            /* [out][in] */ IDispatch __RPC_FAR *__RPC_FAR *inoutDisp)  ;
-
-    STDMETHOD(get_prpObject)(/*[out, retval]*/ IDispatch* *pVal);
+        /* [out][in] */ unsigned char *aChar,
+        /* [out][in] */ float *aFloat,
+        /* [out][in] */ VARIANT *aVar);
+        STDMETHOD(get_prpObject)(/*[out, retval]*/ IDispatch* *pVal);
     STDMETHOD(put_prpObject)(/*[in]*/ IDispatch* newVal);
     STDMETHOD(get_prpArray)(/*[out, retval]*/ LPSAFEARRAY *pVal);
     STDMETHOD(put_prpArray)(/*[in]*/ LPSAFEARRAY newVal);
@@ -150,6 +139,8 @@ public:
     STDMETHOD(put_prpShort)(/*[in]*/ short newVal);
     STDMETHOD(get_prpByte)(/*[out, retval]*/ unsigned char *pVal);
     STDMETHOD(put_prpByte)(/*[in]*/ unsigned char newVal);
+    STDMETHOD(get_prpBool)(/*[out, retval]*/ VARIANT_BOOL *pVal);
+    STDMETHOD(put_prpBool)(/*[in]*/ VARIANT_BOOL newVal);
 
     STDMETHOD(outObject)(/*[out]*/ IDispatch* *val);
     STDMETHOD(outArray)(/*[out]*/ LPSAFEARRAY * val);
@@ -160,6 +151,7 @@ public:
     STDMETHOD(outLong)(/*[out]*/ long* val);
     STDMETHOD(outShort)(/*[out]*/ short* val);
     STDMETHOD(outByte)(/*[out]*/ unsigned char* val);
+    STDMETHOD(outBool)(/*[out]*/ VARIANT_BOOL* val);
 
     STDMETHOD(inoutObject)(/*[in,out]*/ IDispatch* *val);
     STDMETHOD(inoutArray)(/*[in,out]*/ LPSAFEARRAY * val);
@@ -170,6 +162,8 @@ public:
     STDMETHOD(inoutLong)(/*[in,out]*/ long * val);
     STDMETHOD(inoutShort)(/*[in,out]*/ short* val);
     STDMETHOD(inoutByte)(/*[in,out]*/ unsigned char* val);
+    STDMETHOD(inoutBool)(/*[in,out]*/ VARIANT_BOOL* val);
+
 
     STDMETHOD(inObject)(/*[in]*/ IDispatch* val);
     STDMETHOD(inArray)(/*[in]*/ LPSAFEARRAY val);
@@ -180,21 +174,129 @@ public:
     STDMETHOD(inLong)(/*[in]*/ long val);
     STDMETHOD(inShort)(/*[in]*/ short val);
     STDMETHOD(inByte)(/*[in]*/ unsigned char val);
+    STDMETHOD(inBool)(/*[in]*/ VARIANT_BOOL val);
+
+
+    STDMETHOD(optional1)(/*[in]*/ long val1, /*[in, optional]*/ VARIANT* val2);
+    STDMETHOD(optional2)(/*[out]*/ long* val1,/*[out, optional]*/ VARIANT* val2);
+    STDMETHOD(optional3)(/*[in, optional]*/ VARIANT* val1,/*[in, optional]*/ VARIANT* val2);
+    STDMETHOD(optional4)(/*[in, out, optional]*/ VARIANT* val1,/*[in, out, optional]*/ VARIANT* val2);
+    STDMETHOD(optional5)(/*[out, optional]*/ VARIANT* val1,/*[out, optional]*/ VARIANT* val2);
+
+
+    STDMETHOD(defaultvalue1)(/*[in, defaultvalue(10)]*/ long val1,
+        /*[in, defaultvalue(3.14)]*/ double* val2,
+        // /*[in, defaultvalue(10)]*/ VARIANT val3,
+        /*[in, defaultvalue(100)]*/ VARIANT* val4);
+
+        STDMETHOD(defaultvalue2)(/*[in, out, defaultvalue(10)]*/ long* val1,
+        /*[in, out, defaultvalue(3.14)]*/ double* val2,
+        // /*[in, out, defaultvalue(10)]*/ VARIANT* val3,
+        /*[in, out, defaultvalue(100)]*/ VARIANT* val4);
+
+        STDMETHOD(varargfunc1)(/*[in]*/ long val1,/*[in]*/ LPSAFEARRAY val2);
 
+    STDMETHOD(varargfunc2)(/*[out]*/ long* val1, /*[out]*/ SAFEARRAY ** val2);
 
-// members for property implementations
+
+    // members for property implementations
     unsigned char m_cPrpByte;
     short m_nPrpShort;
     long m_lPrpLong;
     float m_fPrpFloat;
     double m_dPrpDouble;
     CComPtr<IDispatch> m_PrpObject;
+    CComPtr<IUnknown> m_prpUnknown;
+
     CComBSTR m_bstrPrpString;
     CComVariant m_PropVariant;
     LPSAFEARRAY m_PrpArray;
 protected:
+    VARIANT_BOOL m_bool;
+    unsigned char  m_byte;
+    short m_short;
+    long m_long;
+    long m_long2;
+    float m_float;
+    double m_double;
+    CComVariant m_var1;
+    CComVariant m_var2;
+    CComVariant m_var3;
+    CComVariant m_var4;
+    CComBSTR m_bstr;
+    CY m_cy;
+    DATE m_date;
+    DECIMAL m_decimal;
+    SCODE m_scode;
+    SAFEARRAY * m_safearray;
+    CComPtr<IDispatch> m_obj;
+    CComPtr<IUnknown> m_unknown;
+
+    SAFEARRAY * m_arByte;
+    SAFEARRAY * m_arShort;
+    SAFEARRAY * m_arLong;
+    SAFEARRAY * m_arString;
+    SAFEARRAY * m_arVariant;
+    SAFEARRAY * m_arFloat;
+    SAFEARRAY * m_arDouble;
+    SAFEARRAY * m_arObject;
+    SAFEARRAY * m_arByteDim2;
+
     static void printArray(LPSAFEARRAY val, BSTR message, VARTYPE type);
     static void printMulArray(LPSAFEARRAY val, VARTYPE type);
+
+
+public:
+    STDMETHOD(inSequenceByteDim2)(LPSAFEARRAY val);
+    STDMETHOD(inCurrency)(CY val);
+    STDMETHOD(outCurrency)(CY* val);
+    STDMETHOD(inoutCurrency)(CY* val);
+    STDMETHOD(inDate)(DATE val);
+    STDMETHOD(outDate)(DATE* val);
+    STDMETHOD(inoutDate)(DATE* val);
+    STDMETHOD(get_prpCurrency)(CY* pVal);
+    STDMETHOD(put_prpCurrency)(CY newVal);
+    STDMETHOD(get_prpDate)(DATE* pVal);
+    STDMETHOD(put_prpDate)(DATE newVal);
+    STDMETHOD(inDecimal)(DECIMAL val);
+    STDMETHOD(outDecimal)(DECIMAL* val);
+    STDMETHOD(inoutDecimal)(DECIMAL* val);
+    STDMETHOD(get_prpDecimal)(DECIMAL* pVal);
+    STDMETHOD(put_prpDecimal)(DECIMAL newVal);
+    STDMETHOD(inSCode)(SCODE val);
+    STDMETHOD(outScode)(SCODE* val);
+    STDMETHOD(inoutSCode)(SCODE* val);
+    STDMETHOD(get_prpSCode)(SCODE* pVal);
+    STDMETHOD(put_prpSCode)(SCODE newVal);
+    STDMETHOD(inrefLong)(LONG* val);
+    STDMETHOD(inrefVariant)(VARIANT* val);
+    STDMETHOD(inrefDecimal)(DECIMAL* val);
+    STDMETHOD(get_prpRefLong)(long* pVal);
+    STDMETHOD(putref_prpRefLong)(long* newVal);
+    STDMETHOD(get_prprefVariant)(VARIANT* pVal);
+    STDMETHOD(putref_prprefVariant)(VARIANT* newVal);
+    STDMETHOD(get_prprefDecimal)(DECIMAL* pVal);
+    STDMETHOD(putref_prprefDecimal)(DECIMAL* newVal);
+    STDMETHOD(optional6)(VARIANT* val1, VARIANT* val2, VARIANT* val3, VARIANT* val4);
+    STDMETHOD(optional7)(VARIANT* val1, VARIANT* val2, VARIANT* val3, VARIANT* val4);
+
+    STDMETHOD(get_prpMultiArg1)(VARIANT* val1, VARIANT* val2, VARIANT* pVal);
+    //STDMETHOD(get_prpMultiArg1)(VARIANT* val1, VARIANT* pVal);
+    STDMETHOD(put_prpMultiArg1)(VARIANT* val1, VARIANT* val2, VARIANT* newVal);
+    //STDMETHOD(put_prpMultiArg1)(VARIANT* val1, VARIANT* newVal);
+    STDMETHOD(get_prpMultiArg2)(VARIANT val1, VARIANT* pVal);
+    STDMETHOD(put_prpMultiArg2)(VARIANT val1, VARIANT newVal);
+    STDMETHOD(prpMultiArg2GetValues)(VARIANT* val1, VARIANT* valProperty);
+    STDMETHOD(get_prpMultiArg3)(LONG* val1, LONG* pVal);
+    STDMETHOD(put_prpMultiArg3)(LONG* val1, LONG newVal);
+
+    // IFoo Methods
+public:
+    STDMETHOD(inUnknown)(IUnknown* val);
+    STDMETHOD(outUnknown)(IUnknown** val);
+    STDMETHOD(inoutUnknown)(IUnknown** val);
+    STDMETHOD(get_prpUnknown)(IUnknown** pVal);
+    STDMETHOD(put_prpUnknown)(IUnknown* newVal);
 };
 
 #endif //__BASIC_H_