X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Folecontrol.h;h=0f16411271b95fb585086c8c2dc942546bd0668c;hb=006c849913eaf70055a988fefc96cc8bd3b09d05;hp=7173105b1511dd496d1066c3f558d2ced6bc7eda;hpb=03e30a851a1df1a06e1dc02d877b636f6adeac1d;p=vlc

diff --git a/activex/olecontrol.h b/activex/olecontrol.h
index 7173105b15..0f16411271 100644
--- a/activex/olecontrol.h
+++ b/activex/olecontrol.h
@@ -1,65 +1,66 @@
-/*****************************************************************************
- * olecontrol.h: ActiveX control for VLC
- *****************************************************************************
- * Copyright (C) 2005 VideoLAN
- *
- * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-#ifndef __OLECONTROL_H__
-#define __OLECONTROL_H__
-
-#include <olectl.h>
-
-class VLCOleControl : public IOleControl
-{
-
-public:
-
-    VLCOleControl(VLCPlugin *p_instance) : _p_instance(p_instance) {};
-    virtual ~VLCOleControl() {};
-
-    // IUnknown methods
-    STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
-    {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid)
-         && (IID_IOleControl == riid) ) 
-        {
-            AddRef();
-            *ppv = reinterpret_cast<LPVOID>(this);
-            return NOERROR;
-        }
-        return _p_instance->QueryInterface(riid, ppv);
-    };
-
-    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->AddRef(); };
-    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->Release(); };
-
-    // IOleControl methods
-    STDMETHODIMP GetControlInfo(CONTROLINFO *pCI);
-    STDMETHODIMP OnMnemonic(LPMSG pMsg);
-    STDMETHODIMP OnAmbientPropertyChange(DISPID dispID);
-    STDMETHODIMP FreezeEvents(BOOL bFreeze);
-
-private:
-
-    VLCPlugin *_p_instance;
-};
-
-#endif
-
+/*****************************************************************************
+ * olecontrol.h: ActiveX control for VLC
+ *****************************************************************************
+ * Copyright (C) 2005 the VideoLAN team
+ *
+ * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef __OLECONTROL_H__
+#define __OLECONTROL_H__
+
+#include <olectl.h>
+
+class VLCOleControl : public IOleControl
+{
+
+public:
+
+    VLCOleControl(VLCPlugin *p_instance) : _p_instance(p_instance) {};
+    virtual ~VLCOleControl() {};
+
+    // IUnknown methods
+    STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
+    {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IOleControl == riid) ) 
+        {
+            AddRef();
+            *ppv = reinterpret_cast<LPVOID>(this);
+            return NOERROR;
+        }
+        return _p_instance->pUnkOuter->QueryInterface(riid, ppv);
+    };
+
+    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->pUnkOuter->AddRef(); };
+    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->pUnkOuter->Release(); };
+
+    // IOleControl methods
+    STDMETHODIMP GetControlInfo(CONTROLINFO *pCI);
+    STDMETHODIMP OnMnemonic(LPMSG pMsg);
+    STDMETHODIMP OnAmbientPropertyChange(DISPID dispID);
+    STDMETHODIMP FreezeEvents(BOOL bFreeze);
+
+private:
+
+    VLCPlugin *_p_instance;
+};
+
+#endif
+