Fixed saving GIFs on big-endian architectures.

[wxWidgets.git] / src / msw / ole / activex.cpp

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 743689bbb07e146e4110ce4a2dee1a6155785b77..8a08625124bce72d6b24a0525f1ebe4733a015dd 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -54,7 +54,7 @@ wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent );
     {\
         public:\
         LONG l;\
     {\
         public:\
         LONG l;\

-        TAutoInitInt() : l(0) {}\
+        TAutoInitInt() : l(1) {}\

     };\
     TAutoInitInt refCount, lockCount;\
     static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\
     };\
     TAutoInitInt refCount, lockCount;\
     static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\


@@ -354,7 +354,7 @@ public:
     HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD)
     {
         // TODO: send an event with this id
     HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD)
     {
         // TODO: send an event with this id

-        if (m_window->m_oleInPlaceActiveObject.Ok())
+        if (m_window->m_oleInPlaceActiveObject.IsOk())

             m_window->m_oleInPlaceActiveObject->TranslateAccelerator(lpmsg);
         return S_FALSE;
     }
             m_window->m_oleInPlaceActiveObject->TranslateAccelerator(lpmsg);
         return S_FALSE;
     }


@@ -425,7 +425,7 @@ public:
     HRESULT STDMETHODCALLTYPE DeactivateAndUndo(){return S_OK; }
     HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect)
     {
     HRESULT STDMETHODCALLTYPE DeactivateAndUndo(){return S_OK; }
     HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect)
     {

-        if (m_window->m_oleInPlaceObject.Ok() && lprcPosRect)
+        if (m_window->m_oleInPlaceObject.IsOk() && lprcPosRect)

         {
            //
            // Result of several hours and days of bug hunting -
         {
            //
            // Result of several hours and days of bug hunting -


@@ -606,7 +606,7 @@ public:
     {
         wxAutoIOleInPlaceSite inPlaceSite(
             IID_IOleInPlaceSite, (IDispatch *) this);
     {
         wxAutoIOleInPlaceSite inPlaceSite(
             IID_IOleInPlaceSite, (IDispatch *) this);

-        if (!inPlaceSite.Ok())
+        if (!inPlaceSite.IsOk())

             return E_FAIL;
 
         if (pViewToActivate)
             return E_FAIL;
 
         if (pViewToActivate)


@@ -618,7 +618,7 @@ public:
         {
             wxAutoIOleDocument oleDoc(
                 IID_IOleDocument, m_window->m_oleObject);
         {
             wxAutoIOleDocument oleDoc(
                 IID_IOleDocument, m_window->m_oleObject);

-            if (! oleDoc.Ok())
+            if (! oleDoc.IsOk())

                 return E_FAIL;
 
             HRESULT hr = oleDoc->CreateView(inPlaceSite, NULL,
                 return E_FAIL;
 
             HRESULT hr = oleDoc->CreateView(inPlaceSite, NULL,


@@ -878,13 +878,13 @@ wxActiveXContainer::wxActiveXContainer(wxWindow * parent,
 wxActiveXContainer::~wxActiveXContainer()
 {
     // disconnect connection points
 wxActiveXContainer::~wxActiveXContainer()
 {
     // disconnect connection points

-    if (m_oleInPlaceObject.Ok())
+    if (m_oleInPlaceObject.IsOk())

     {
         m_oleInPlaceObject->InPlaceDeactivate();
         m_oleInPlaceObject->UIDeactivate();
     }
 
     {
         m_oleInPlaceObject->InPlaceDeactivate();
         m_oleInPlaceObject->UIDeactivate();
     }
 

-    if (m_oleObject.Ok())
+    if (m_oleObject.IsOk())

     {
         if (m_docAdviseCookie != 0)
             m_oleObject->Unadvise(m_docAdviseCookie);
     {
         if (m_docAdviseCookie != 0)
             m_oleObject->Unadvise(m_docAdviseCookie);


@@ -928,14 +928,13 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     // FrameSite
     m_frameSite = new FrameSite(m_realparent, this);
 
     // FrameSite
     m_frameSite = new FrameSite(m_realparent, this);

-    m_frameSite->AddRef();

     // oleClientSite
     hret = m_clientSite.QueryInterface(
         IID_IOleClientSite, (IDispatch *) m_frameSite);
     CHECK_HR(hret);
     // adviseSink
     wxAutoIAdviseSink adviseSink(IID_IAdviseSink, (IDispatch *) m_frameSite);
     // oleClientSite
     hret = m_clientSite.QueryInterface(
         IID_IOleClientSite, (IDispatch *) m_frameSite);
     CHECK_HR(hret);
     // adviseSink
     wxAutoIAdviseSink adviseSink(IID_IAdviseSink, (IDispatch *) m_frameSite);

-    wxASSERT(adviseSink.Ok());
+    wxASSERT(adviseSink.IsOk());

 
     // Get Dispatch interface
     hret = m_Dispatch.QueryInterface(IID_IDispatch, m_ActiveX);
 
     // Get Dispatch interface
     hret = m_Dispatch.QueryInterface(IID_IDispatch, m_ActiveX);


@@ -947,13 +946,13 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     // get type info via class info
     wxAutoIProvideClassInfo classInfo(IID_IProvideClassInfo, m_ActiveX);
 
     // get type info via class info
     wxAutoIProvideClassInfo classInfo(IID_IProvideClassInfo, m_ActiveX);

-    wxASSERT(classInfo.Ok());
+    wxASSERT(classInfo.IsOk());

 
     // type info
     wxAutoITypeInfo typeInfo;
     hret = classInfo->GetClassInfo(typeInfo.GetRef());
     CHECK_HR(hret);
 
     // type info
     wxAutoITypeInfo typeInfo;
     hret = classInfo->GetClassInfo(typeInfo.GetRef());
     CHECK_HR(hret);

-    wxASSERT(typeInfo.Ok());
+    wxASSERT(typeInfo.IsOk());

 
     // TYPEATTR
     TYPEATTR *ta = NULL;
 
     // TYPEATTR
     TYPEATTR *ta = NULL;


@@ -976,7 +975,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         // get dispatch type info interface
         wxAutoITypeInfo  ti;
         hret = typeInfo->GetRefTypeInfo(rt, ti.GetRef());
         // get dispatch type info interface
         wxAutoITypeInfo  ti;
         hret = typeInfo->GetRefTypeInfo(rt, ti.GetRef());

-        if (! ti.Ok())
+        if (! ti.IsOk())

             continue;
 
         CHECK_HR(hret);
             continue;
 
         CHECK_HR(hret);


@@ -1017,7 +1016,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
                 DWORD                    adviseCookie = 0;
 
                 wxAutoIConnectionPointContainer cpContainer(IID_IConnectionPointContainer, m_ActiveX);
                 DWORD                    adviseCookie = 0;
 
                 wxAutoIConnectionPointContainer cpContainer(IID_IConnectionPointContainer, m_ActiveX);

-                wxASSERT( cpContainer.Ok());
+                wxASSERT( cpContainer.IsOk());

 
                 HRESULT hret =
                     cpContainer->FindConnectionPoint(ta->guid, cp.GetRef());
 
                 HRESULT hret =
                     cpContainer->FindConnectionPoint(ta->guid, cp.GetRef());


@@ -1031,8 +1030,15 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
                 if ( cp )
                 {
 
                 if ( cp )
                 {

-                    hret = cp->Advise(new wxActiveXEvents(this, ta->guid),
-                                      &adviseCookie);
+                    wxActiveXEvents * const
+                        events = new wxActiveXEvents(this, ta->guid);
+                    hret = cp->Advise(events, &adviseCookie);
+
+                    // We don't need this object any more and cp will keep a
+                    // reference to it if it needs it, i.e. if Advise()
+                    // succeeded.
+                    events->Release();
+

                     CHECK_HR(hret);
                 }
             }
                     CHECK_HR(hret);
                 }
             }


@@ -1087,7 +1093,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
     wxAutoIPersistStreamInit
         pPersistStreamInit(IID_IPersistStreamInit, m_oleObject);
 
     wxAutoIPersistStreamInit
         pPersistStreamInit(IID_IPersistStreamInit, m_oleObject);
 

-    if (pPersistStreamInit.Ok())
+    if (pPersistStreamInit.IsOk())

     {
         hret = pPersistStreamInit->InitNew();
         CHECK_HR(hret);
     {
         hret = pPersistStreamInit->InitNew();
         CHECK_HR(hret);


@@ -1099,7 +1105,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     m_oleObjectHWND = 0;
 
 
     m_oleObjectHWND = 0;
 

-    if (m_oleInPlaceObject.Ok())
+    if (m_oleInPlaceObject.IsOk())

     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
         if (SUCCEEDED(hret))
     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
         if (SUCCEEDED(hret))


@@ -1113,7 +1119,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         wxCopyRectToRECT(m_realparent->GetClientSize(), posRect);
 
         if (posRect.right > 0 && posRect.bottom > 0 &&
         wxCopyRectToRECT(m_realparent->GetClientSize(), posRect);
 
         if (posRect.right > 0 && posRect.bottom > 0 &&

-            m_oleInPlaceObject.Ok())
+            m_oleInPlaceObject.IsOk())

         {
             m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
         }
         {
             m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
         }


@@ -1127,7 +1133,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         CHECK_HR(hret);
     }
 
         CHECK_HR(hret);
     }
 

-    if (! m_oleObjectHWND && m_oleInPlaceObject.Ok())
+    if (! m_oleObjectHWND && m_oleInPlaceObject.IsOk())

     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
         CHECK_HR(hret);
     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
         CHECK_HR(hret);


@@ -1176,7 +1182,7 @@ void wxActiveXContainer::OnSize(wxSizeEvent& event)
         return;
 
     // extents are in HIMETRIC units
         return;
 
     // extents are in HIMETRIC units

-    if (m_oleObject.Ok())
+    if (m_oleObject.IsOk())

     {
         m_oleObject->DoVerb(OLEIVERB_HIDE, 0, m_clientSite, 0,
             (HWND)m_realparent->GetHWND(), &posRect);
     {
         m_oleObject->DoVerb(OLEIVERB_HIDE, 0, m_clientSite, 0,
             (HWND)m_realparent->GetHWND(), &posRect);


@@ -1194,7 +1200,7 @@ void wxActiveXContainer::OnSize(wxSizeEvent& event)
             (HWND)m_realparent->GetHWND(), &posRect);
     }
 
             (HWND)m_realparent->GetHWND(), &posRect);
     }
 

-    if (m_oleInPlaceObject.Ok())
+    if (m_oleInPlaceObject.IsOk())

         m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
 
     event.Skip();
         m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
 
     event.Skip();


@@ -1238,7 +1244,7 @@ void wxActiveXContainer::OnPaint(wxPaintEvent& WXUNUSED(event))
 //---------------------------------------------------------------------------
 void wxActiveXContainer::OnSetFocus(wxFocusEvent& event)
 {
 //---------------------------------------------------------------------------
 void wxActiveXContainer::OnSetFocus(wxFocusEvent& event)
 {

-    if (m_oleInPlaceActiveObject.Ok())
+    if (m_oleInPlaceActiveObject.IsOk())

         m_oleInPlaceActiveObject->OnFrameWindowActivate(TRUE);
 
     event.Skip();
         m_oleInPlaceActiveObject->OnFrameWindowActivate(TRUE);
 
     event.Skip();


@@ -1252,7 +1258,7 @@ void wxActiveXContainer::OnSetFocus(wxFocusEvent& event)
 //---------------------------------------------------------------------------
 void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
 {
 //---------------------------------------------------------------------------
 void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
 {

-    if (m_oleInPlaceActiveObject.Ok())
+    if (m_oleInPlaceActiveObject.IsOk())

         m_oleInPlaceActiveObject->OnFrameWindowActivate(FALSE);
 
     event.Skip();
         m_oleInPlaceActiveObject->OnFrameWindowActivate(FALSE);
 
     event.Skip();