diff options
Diffstat (limited to 'odk/examples/OLE/activex')
-rw-r--r-- | odk/examples/OLE/activex/SOActiveX.cpp | 146 | ||||
-rw-r--r-- | odk/examples/OLE/activex/SOActiveX.h | 52 | ||||
-rw-r--r-- | odk/examples/OLE/activex/SOComWindowPeer.cpp | 6 | ||||
-rw-r--r-- | odk/examples/OLE/activex/SOComWindowPeer.h | 50 | ||||
-rw-r--r-- | odk/examples/OLE/activex/StdAfx2.cpp | 4 | ||||
-rw-r--r-- | odk/examples/OLE/activex/StdAfx2.h | 4 | ||||
-rw-r--r-- | odk/examples/OLE/activex/resource.h | 6 | ||||
-rw-r--r-- | odk/examples/OLE/activex/so_activex.cpp | 6 | ||||
-rw-r--r-- | odk/examples/OLE/activex/so_activex.idl | 24 |
9 files changed, 149 insertions, 149 deletions
diff --git a/odk/examples/OLE/activex/SOActiveX.cpp b/odk/examples/OLE/activex/SOActiveX.cpp index 46f03bb68eab..ef9a2ef72c86 100644 --- a/odk/examples/OLE/activex/SOActiveX.cpp +++ b/odk/examples/OLE/activex/SOActiveX.cpp @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,7 +30,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // SOActiveX.cpp : Implementation of CSOActiveX @@ -45,28 +45,28 @@ #define BARS_NUMBER 3 #define BARS_TO_SHOW 2 -OLECHAR* pSlotUrl[BARS_NUMBER] = +OLECHAR* pSlotUrl[BARS_NUMBER] = {L"slot:5910" // SID_TOGGLEFUNCTIONBAR ,L"slot:5920" // SID_TOGGLESTATUSBAR ,L"slot:6661" // SID_TOGGLE_MENUBAR -// ,L"slot:10603" // SID_HYPERLINK_INSERT +// ,L"slot:10603" // SID_HYPERLINK_INSERT }; -OLECHAR* pSlotName[BARS_NUMBER] = - {L"FunctionBarVisible" // SID_TOGGLEFUNCTIONBAR - ,L"StatusBarVisible" // SID_TOGGLESTATUSBAR - ,L"MenuBarVisible" // SID_TOGGLE_MENUBAR -// ,L"InsertHyperlink" // SID_HYPERLINK_INSERT +OLECHAR* pSlotName[BARS_NUMBER] = + {L"FunctionBarVisible" // SID_TOGGLEFUNCTIONBAR + ,L"StatusBarVisible" // SID_TOGGLESTATUSBAR + ,L"MenuBarVisible" // SID_TOGGLE_MENUBAR +// ,L"InsertHyperlink" // SID_HYPERLINK_INSERT }; ///////////////////////////////////////////////////////////////////////////// -HRESULT ExecuteFunc( IDispatch* idispUnoObject, - OLECHAR* sFuncName, - CComVariant* params, - unsigned int count, +HRESULT ExecuteFunc( IDispatch* idispUnoObject, + OLECHAR* sFuncName, + CComVariant* params, + unsigned int count, CComVariant* pResult ) { if( !idispUnoObject ) @@ -80,14 +80,14 @@ HRESULT ExecuteFunc( IDispatch* idispUnoObject, // DEBUG EXCEPINFO myInfo; - return idispUnoObject->Invoke( id, IID_NULL,LOCALE_USER_DEFAULT, DISPATCH_METHOD, + return idispUnoObject->Invoke( id, IID_NULL,LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispparams, pResult, &myInfo, 0); } -HRESULT GetIDispByFunc( IDispatch* idispUnoObject, - OLECHAR* sFuncName, - CComVariant* params, - unsigned int count, +HRESULT GetIDispByFunc( IDispatch* idispUnoObject, + OLECHAR* sFuncName, + CComVariant* params, + unsigned int count, CComPtr<IDispatch>& pdispResult ) { if( !idispUnoObject ) @@ -105,9 +105,9 @@ HRESULT GetIDispByFunc( IDispatch* idispUnoObject, return S_OK; } -HRESULT PutPropertiesToIDisp( IDispatch* pdispObject, - OLECHAR** sMemberNames, - CComVariant* pVariant, +HRESULT PutPropertiesToIDisp( IDispatch* pdispObject, + OLECHAR** sMemberNames, + CComVariant* pVariant, unsigned int count ) { for( unsigned int ind = 0; ind < count; ind++ ) @@ -134,19 +134,19 @@ CSOActiveX::CSOActiveX() , mOffWin( NULL ) , mbViewOnly( FALSE ) { - CLSID clsFactory = {0x82154420,0x0FBF,0x11d4,{0x83, 0x13,0x00,0x50,0x04,0x52,0x6A,0xB4}}; + CLSID clsFactory = {0x82154420,0x0FBF,0x11d4,{0x83, 0x13,0x00,0x50,0x04,0x52,0x6A,0xB4}}; HRESULT hr = CoCreateInstance( clsFactory, NULL, CLSCTX_ALL, __uuidof(IDispatch), (void**)&mpDispFactory); - mPWinClass.style = CS_HREDRAW|CS_VREDRAW; - mPWinClass.lpfnWndProc = ::DefWindowProc; - mPWinClass.cbClsExtra = 0; - mPWinClass.cbWndExtra = 0; - mPWinClass.hInstance = (HINSTANCE) GetModuleHandle(NULL); //myInstance; - mPWinClass.hIcon = NULL; - mPWinClass.hCursor = NULL; - mPWinClass.hbrBackground = (HBRUSH) COLOR_BACKGROUND; - mPWinClass.lpszMenuName = NULL; - mPWinClass.lpszClassName = STAROFFICE_WINDOWCLASS; + mPWinClass.style = CS_HREDRAW|CS_VREDRAW; + mPWinClass.lpfnWndProc = ::DefWindowProc; + mPWinClass.cbClsExtra = 0; + mPWinClass.cbWndExtra = 0; + mPWinClass.hInstance = (HINSTANCE) GetModuleHandle(NULL); //myInstance; + mPWinClass.hIcon = NULL; + mPWinClass.hCursor = NULL; + mPWinClass.hbrBackground = (HBRUSH) COLOR_BACKGROUND; + mPWinClass.lpszMenuName = NULL; + mPWinClass.lpszClassName = STAROFFICE_WINDOWCLASS; RegisterClass(&mPWinClass); } @@ -192,7 +192,7 @@ STDMETHODIMP CSOActiveX::Load ( LPSTREAM pStm ) // may be later? // for now just ignore - + return S_OK; } @@ -201,19 +201,19 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) IPropertyBag2* pPropBag2; HRESULT hr = pPropBag->QueryInterface( IID_IPropertyBag2, (void**)&pPropBag2 ); ATLASSERT( hr >= 0 ); - + if( !SUCCEEDED( hr ) ) return hr; - + unsigned long aNum; hr = pPropBag2->CountProperties( &aNum ); ATLASSERT( hr >= 0 ); if( !SUCCEEDED( hr ) ) return hr; - + PROPBAG2* aPropNames = new PROPBAG2[aNum]; unsigned long aReaded; - + hr = pPropBag2->GetPropertyInfo( 0, aNum, aPropNames, @@ -230,7 +230,7 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) hr = pPropBag2->Read( aNum, aPropNames, NULL, - aVal, + aVal, hvs ); ATLASSERT( hr >= 0 ); if( !SUCCEEDED( hr ) ) @@ -249,7 +249,7 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) { mCurFileUrl = wcsdup( aVal[ind].bstrVal ); } - else if( aVal[ind].vt == VT_BSTR + else if( aVal[ind].vt == VT_BSTR && !strcmp( OLE2T( aPropNames[ind].pstrName ), "readonly" ) ) { if( !strcmp( OLE2T( aVal[ind].bstrVal ), "true" ) ) @@ -270,10 +270,10 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) if( !mpDispFactory ) return hr; - + mbLoad = TRUE; - Invalidate(); + Invalidate(); UpdateWindow(); return hr; @@ -297,10 +297,10 @@ HRESULT CSOActiveX::GetUrlStruct( OLECHAR* sUrl, CComPtr<IDispatch>& pdispUrl ) if( !SUCCEEDED( hr ) ) return hr; CComPtr<IDispatch> pdispTransformer; - hr = GetIDispByFunc( mpDispFactory, - L"createInstance", - &CComVariant( L"com.sun.star.util.URLTransformer" ), - 1, + hr = GetIDispByFunc( mpDispFactory, + L"createInstance", + &CComVariant( L"com.sun.star.util.URLTransformer" ), + 1, pdispTransformer ); if( !SUCCEEDED( hr ) ) return hr; @@ -330,9 +330,9 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height ) HRESULT hr = GetUnoStruct( L"com.sun.star.awt.Rectangle", pdispRectangle ); if( !SUCCEEDED( hr ) ) return hr; - OLECHAR* sRectMemberNames[4] = { L"X", - L"Y", - L"Width", + OLECHAR* sRectMemberNames[4] = { L"X", + L"Y", + L"Width", L"Height" }; CComVariant pRectVariant[4]; pRectVariant[0] = pRectVariant[1] = pRectVariant[2] = pRectVariant[3] = CComVariant( 0 ); @@ -346,10 +346,10 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height ) if( !SUCCEEDED( hr ) ) return hr; // fill in descriptor with info - OLECHAR* sDescriptorMemberNames[6] = { L"Type", - L"WindowServiceName", - L"ParentIndex", - L"Parent", + OLECHAR* sDescriptorMemberNames[6] = { L"Type", + L"WindowServiceName", + L"ParentIndex", + L"Parent", L"Bounds", L"WindowAttributes" }; CComVariant pDescriptorVar[6]; @@ -403,7 +403,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height ) // initialize window hr = ExecuteFunc( mpDispWin, L"setBackground", &CComVariant( (long)0xFFFFFFFF ), 1, &dummyResult ); if( !SUCCEEDED( hr ) ) return hr; - + hr = ExecuteFunc( mpDispWin, L"setVisible", &CComVariant( TRUE ), 1, &dummyResult ); if( !SUCCEEDED( hr ) ) return hr; @@ -431,10 +431,10 @@ HRESULT CSOActiveX::CallDispatch1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL s aArgs[2] = CComVariant( pdispURL ); aArgs[1] = CComVariant( L"" ); aArgs[0] = CComVariant( (int)0 ); - hr = GetIDispByFunc( mpDispFrame, - L"queryDispatch", - aArgs, - 3, + hr = GetIDispByFunc( mpDispFrame, + L"queryDispatch", + aArgs, + 3, pdispXDispatch ); if( !SUCCEEDED( hr ) ) return hr; @@ -444,7 +444,7 @@ HRESULT CSOActiveX::CallDispatch1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL s hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal ); if( !SUCCEEDED( hr ) ) return hr; - OLECHAR* sPropMemberNames[2] = { L"Name", L"Value" }; + OLECHAR* sPropMemberNames[2] = { L"Name", L"Value" }; CComVariant pPropVar[2]; pPropVar[0] = CComVariant( sArgName ); pPropVar[1] = CComVariant(); pPropVar[1].vt = VT_BOOL; pPropVar[1].boolVal = sArgVal ? VARIANT_TRUE : VARIANT_FALSE ; @@ -452,7 +452,7 @@ HRESULT CSOActiveX::CallDispatch1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL s if( !SUCCEEDED( hr ) ) return hr; SafeArrayPutElement( pPropVals, &ix, pdispPropVal ); - + CComVariant aDispArgs[2]; aDispArgs[1] = CComVariant( pdispURL ); // aDispArgs[0] = CComVariant( pPropVals ); such constructor is not defined ??! @@ -498,7 +498,7 @@ HRESULT CSOActiveX::LoadURLToFrame( ) return S_OK; } - + HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) { if( m_spInPlaceSite && mCurFileUrl ) @@ -517,7 +517,7 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) } mParentWin = hwnd; - mOffWin = CreateWindow( + mOffWin = CreateWindow( STAROFFICE_WINDOWCLASS, "OfficeContainer", WS_CHILD | WS_CLIPCHILDREN | WS_BORDER, @@ -536,16 +536,16 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) { RECT aRect; ::GetWindowRect( mOffWin, &aRect ); - + if( aRect.left != di.prcBounds->left || aRect.top != di.prcBounds->top || aRect.right != di.prcBounds->right || aRect.bottom != di.prcBounds->bottom ) { // on this state the office window should exist already ::SetWindowPos( mOffWin, HWND_TOP, - di.prcBounds->left, - di.prcBounds->top, - di.prcBounds->right - di.prcBounds->left, + di.prcBounds->left, + di.prcBounds->top, + di.prcBounds->right - di.prcBounds->left, di.prcBounds->bottom - di.prcBounds->top, SWP_NOZORDER ); @@ -559,7 +559,7 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) hr = ExecuteFunc( mpDispWin, L"setPosSize", aPosArgs, 5, &dummyResult ); if( !SUCCEEDED( hr ) ) return hr; } - } + } if( ! mpDispFrame ) { @@ -616,12 +616,12 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite ) return hr; } -STDMETHODIMP CSOActiveX::Invoke(DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, +STDMETHODIMP CSOActiveX::Invoke(DISPID dispidMember, + REFIID riid, + LCID lcid, + WORD wFlags, DISPPARAMS* pDispParams, - VARIANT* pvarResult, + VARIANT* pvarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) { @@ -633,8 +633,8 @@ STDMETHODIMP CSOActiveX::Invoke(DISPID dispidMember, if ( dispidMember == DISPID_ONQUIT ) Cleanup(); - - IDispatchImpl<ISOActiveX, &IID_ISOActiveX, + + IDispatchImpl<ISOActiveX, &IID_ISOActiveX, &LIBID_SO_ACTIVEXLib>::Invoke( dispidMember, riid, lcid, wFlags, pDispParams, pvarResult, pExcepInfo, puArgErr); diff --git a/odk/examples/OLE/activex/SOActiveX.h b/odk/examples/OLE/activex/SOActiveX.h index 2f71bcd3108f..f115d49ebcc1 100644 --- a/odk/examples/OLE/activex/SOActiveX.h +++ b/odk/examples/OLE/activex/SOActiveX.h @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,7 +30,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // SOActiveX.h : Declaration of the CSOActiveX @@ -48,7 +48,7 @@ ///////////////////////////////////////////////////////////////////////////// // CSOActiveX -class ATL_NO_VTABLE CSOActiveX : +class ATL_NO_VTABLE CSOActiveX : public CComObjectRootEx<CComSingleThreadModel>, public IDispatchImpl<ISOActiveX, &IID_ISOActiveX, &LIBID_SO_ACTIVEXLib>, public CComControl<CSOActiveX>, @@ -58,29 +58,29 @@ class ATL_NO_VTABLE CSOActiveX : public IOleInPlaceActiveObjectImpl<CSOActiveX>, public IViewObjectExImpl<CSOActiveX>, public IOleInPlaceObjectWindowlessImpl<CSOActiveX>, -// public IConnectionPointContainerImpl<CSOActiveX>, +// public IConnectionPointContainerImpl<CSOActiveX>, public CComCoClass<CSOActiveX, &CLSID_SOActiveX>, -// public CProxy_ItryPluginEvents< CSOActiveX >, +// public CProxy_ItryPluginEvents< CSOActiveX >, public IPersistPropertyBagImpl< CSOActiveX >, - public IProvideClassInfo2Impl< &CLSID_SOActiveX, + public IProvideClassInfo2Impl< &CLSID_SOActiveX, &DIID__ISOActiveXEvents, &LIBID_SO_ACTIVEXLib >, - public IObjectSafetyImpl< CSOActiveX, + public IObjectSafetyImpl< CSOActiveX, INTERFACESAFE_FOR_UNTRUSTED_DATA > { protected: - CComPtr<IWebBrowser2> mWebBrowser2; - DWORD mCookie; - - CComPtr<IDispatch> mpDispFactory; - CComPtr<IDispatch> mpDispFrame; - CComPtr<IDispatch> mpDispWin; - OLECHAR* mCurFileUrl; - BOOL mbLoad; - BOOL mbViewOnly; + CComPtr<IWebBrowser2> mWebBrowser2; + DWORD mCookie; + + CComPtr<IDispatch> mpDispFactory; + CComPtr<IDispatch> mpDispFrame; + CComPtr<IDispatch> mpDispWin; + OLECHAR* mCurFileUrl; + BOOL mbLoad; + BOOL mbViewOnly; WNDCLASS mPWinClass; - HWND mParentWin; - HWND mOffWin; + HWND mParentWin; + HWND mOffWin; public: CSOActiveX(); ~CSOActiveX(); @@ -103,7 +103,7 @@ BEGIN_COM_MAP(CSOActiveX) COM_INTERFACE_ENTRY(IOleObject) COM_INTERFACE_ENTRY(IPersistStreamInit) COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit) -// COM_INTERFACE_ENTRY(IConnectionPointContainer) +// COM_INTERFACE_ENTRY(IConnectionPointContainer) COM_INTERFACE_ENTRY(IProvideClassInfo) COM_INTERFACE_ENTRY(IProvideClassInfo2) COM_INTERFACE_ENTRY(IPersistPropertyBag) @@ -137,14 +137,14 @@ END_MSG_MAP() // ISOActiveX public: - + STDMETHOD(SetClientSite)( IOleClientSite* aClientSite ); - STDMETHOD(Invoke)( DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, + STDMETHOD(Invoke)( DISPID dispidMember, + REFIID riid, + LCID lcid, + WORD wFlags, DISPPARAMS* pDispParams, - VARIANT* pvarResult, + VARIANT* pvarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr); STDMETHOD(Load) ( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ); @@ -160,7 +160,7 @@ public: HRESULT HideAllBars(); HRESULT CallDispatch1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL sArgVal ); HRESULT GetUrlStruct( OLECHAR* sUrl, CComPtr<IDispatch>& pdispUrl ); - HRESULT Cleanup(); + HRESULT Cleanup(); }; #endif //__SOACTIVEX_H_ diff --git a/odk/examples/OLE/activex/SOComWindowPeer.cpp b/odk/examples/OLE/activex/SOComWindowPeer.cpp index 35982bda75a3..0b2fabfffa81 100644 --- a/odk/examples/OLE/activex/SOComWindowPeer.cpp +++ b/odk/examples/OLE/activex/SOComWindowPeer.cpp @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,7 +30,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // SOComWindowPeer.cpp : Implementation of CHelpApp and DLL registration. @@ -44,7 +44,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) { - static const IID* arr[] = + static const IID* arr[] = { &IID_ISOComWindowPeer, }; diff --git a/odk/examples/OLE/activex/SOComWindowPeer.h b/odk/examples/OLE/activex/SOComWindowPeer.h index dfd39b5b1859..e843aa705ee2 100644 --- a/odk/examples/OLE/activex/SOComWindowPeer.h +++ b/odk/examples/OLE/activex/SOComWindowPeer.h @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,7 +30,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // SOComWindowPeer.h: Definition of the SOComWindowPeer class @@ -55,8 +55,8 @@ ///////////////////////////////////////////////////////////////////////////// // SOComWindowPeer -class SOComWindowPeer : - public IDispatchImpl<ISOComWindowPeer, &IID_ISOComWindowPeer, &LIBID_SO_ACTIVEXLib>, +class SOComWindowPeer : + public IDispatchImpl<ISOComWindowPeer, &IID_ISOComWindowPeer, &LIBID_SO_ACTIVEXLib>, public ISupportErrorInfo, public CComObjectRoot, public CComCoClass<SOComWindowPeer,&CLSID_SOComWindowPeer> @@ -70,9 +70,9 @@ BEGIN_COM_MAP(SOComWindowPeer) COM_INTERFACE_ENTRY(ISOComWindowPeer) COM_INTERFACE_ENTRY(ISupportErrorInfo) END_COM_MAP() -DECLARE_NOT_AGGREGATABLE(SOComWindowPeer) -// Remove the comment from the line above if you don't want your object to -// support aggregation. +DECLARE_NOT_AGGREGATABLE(SOComWindowPeer) +// Remove the comment from the line above if you don't want your object to +// support aggregation. DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER) @@ -80,7 +80,7 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER) STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid); // ISOComWindowPeer - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE getWindowHandle( + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE getWindowHandle( /* [in] */ SAFEARRAY __RPC_FAR * procId, /* [in] */ short s, /* [retval][out] */ long __RPC_FAR *ret) @@ -88,57 +88,57 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER) *ret = (long) m_hwnd; return S_OK; } - - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE getToolkit( + + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE getToolkit( /* [retval][out] */ IDispatch __RPC_FAR *__RPC_FAR *retVal) { *retVal = NULL; return S_OK; } - - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE setPointer( + + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE setPointer( /* [in] */ IDispatch __RPC_FAR *xPointer) { return S_OK; } - - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE setBackground( + + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE setBackground( /* [in] */ int nColor) { return S_OK; } - - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE invalidate( + + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE invalidate( /* [in] */ short __MIDL_0015) { return S_OK; } - - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE invalidateRect( + + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE invalidateRect( /* [in] */ IDispatch __RPC_FAR *aRect, /* [in] */ short nFlags) { return S_OK; } - + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE dispose( void) { return S_OK; } - - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE addEventListener( + + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE addEventListener( /* [in] */ IDispatch __RPC_FAR *xListener) { return S_OK; } - - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE removeEventListener( + + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE removeEventListener( /* [in] */ IDispatch __RPC_FAR *xListener) { return S_OK; } - - virtual /* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE get_Bridge_implementedInterfaces( + + virtual /* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE get_Bridge_implementedInterfaces( /* [retval][out] */ SAFEARRAY __RPC_FAR * __RPC_FAR *pVal) { *pVal = SafeArrayCreateVector( VT_BSTR, 0, 2 ); diff --git a/odk/examples/OLE/activex/StdAfx2.cpp b/odk/examples/OLE/activex/StdAfx2.cpp index 3911bcf24003..12ffbc184220 100644 --- a/odk/examples/OLE/activex/StdAfx2.cpp +++ b/odk/examples/OLE/activex/StdAfx2.cpp @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,7 +30,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // stdafx1.cpp : source file that includes just the standard includes diff --git a/odk/examples/OLE/activex/StdAfx2.h b/odk/examples/OLE/activex/StdAfx2.h index bfb06fa7b34d..548e334fd6d4 100644 --- a/odk/examples/OLE/activex/StdAfx2.h +++ b/odk/examples/OLE/activex/StdAfx2.h @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,7 +30,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // stdafx1.h : include file for standard system include files, diff --git a/odk/examples/OLE/activex/resource.h b/odk/examples/OLE/activex/resource.h index bf1bf5c7dedc..7587e0c1a2af 100644 --- a/odk/examples/OLE/activex/resource.h +++ b/odk/examples/OLE/activex/resource.h @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,7 +30,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ //{{NO_DEPENDENCIES}} @@ -44,7 +44,7 @@ #define IDR_SOCOMWINDOWPEER 104 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/odk/examples/OLE/activex/so_activex.cpp b/odk/examples/OLE/activex/so_activex.cpp index 64349fb34439..9581c21473b6 100644 --- a/odk/examples/OLE/activex/so_activex.cpp +++ b/odk/examples/OLE/activex/so_activex.cpp @@ -3,7 +3,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -30,14 +30,14 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // so_activex.cpp : Implementation of DLL Exports. // Note: Proxy/Stub Information -// To build a separate proxy/stub DLL, +// To build a separate proxy/stub DLL, // run nmake -f so_activexps.mk in the project directory. #include "stdafx2.h" diff --git a/odk/examples/OLE/activex/so_activex.idl b/odk/examples/OLE/activex/so_activex.idl index 545d5643569d..23a4eb4965b8 100644 --- a/odk/examples/OLE/activex/so_activex.idl +++ b/odk/examples/OLE/activex/so_activex.idl @@ -2,7 +2,7 @@ * * The Contents of this file are made available subject to the terms of * the BSD license. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * All rights reserved. * @@ -29,7 +29,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * *************************************************************************/ // so_activex.idl : IDL source for so_activex.dll @@ -63,36 +63,36 @@ import "ocidl.idl"; ] interface ISOComWindowPeer : IDispatch { - [id(1), helpstring("method getWindowHandle")] + [id(1), helpstring("method getWindowHandle")] HRESULT getWindowHandle( [in] SAFEARRAY(VARIANT) procId, [in] short s, [out,retval] long* ret); - [id(2), helpstring("method getToolkit")] + [id(2), helpstring("method getToolkit")] HRESULT getToolkit( [out,retval] IDispatch** retVal ); - [id(3), helpstring("method setPointer")] + [id(3), helpstring("method setPointer")] HRESULT setPointer( [in] IDispatch* xPointer ); - [id(4), helpstring("method setBackground")] + [id(4), helpstring("method setBackground")] HRESULT setBackground( [in] int nColor ); - [id(5), helpstring("method invalidate")] + [id(5), helpstring("method invalidate")] HRESULT invalidate( [in] short ); - [id(6), helpstring("method invalidateRect")] + [id(6), helpstring("method invalidateRect")] HRESULT invalidateRect( [in] IDispatch* aRect, [in] short nFlags ); - [id(7), helpstring("method dispose")] + [id(7), helpstring("method dispose")] HRESULT dispose(); - [id(8), helpstring("method addEventListener")] + [id(8), helpstring("method addEventListener")] HRESULT addEventListener( [in] IDispatch* xListener ); - [id(9), helpstring("method removeEventListener")] + [id(9), helpstring("method removeEventListener")] HRESULT removeEventListener( [in] IDispatch* xListener ); - [propget, id(10), helpstring("property_implementedInterfaces")] + [propget, id(10), helpstring("property_implementedInterfaces")] HRESULT Bridge_implementedInterfaces([out, retval] SAFEARRAY(BSTR) *pVal); }; |