* modules/audio_output/alsa.c: fix the leak in a nice way.

[vlc] / activex / objectsafety.h

diff --git a/activex/objectsafety.h b/activex/objectsafety.h
index b62f917e07ed1d3d7f5cc9e280ba7e922c08830b..1550b869d0de6a711d8a5ea5e6c6b7d5dcd7a9a6 100644 (file)
--- a/activex/objectsafety.h
+++ b/activex/objectsafety.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * objectsafety.h: ActiveX control for VLC
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2005 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
  *
@@ -30,6 +30,9 @@
 #include <objsafe.h>
 
 #else
+/*
+** mingw does not yet support objsafe.h, redefine what we need here
+*/
 
 // {CB5BDC81-93C1-11cf-8F20-00805F2CD064}
 extern "C" const IID IID_IObjectSafety;
@@ -72,11 +75,11 @@ public:
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
         }
-        return _p_instance->QueryInterface(riid, ppv);
+        return _p_instance->pUnkOuter->QueryInterface(riid, ppv);
     };
 
-    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->AddRef(); };
-    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->Release(); };
+    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->pUnkOuter->AddRef(); };
+    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->pUnkOuter->Release(); };
 
     // IUnknown methods
     STDMETHODIMP GetInterfaceSafetyOptions(