ole32: Clarify the timestamp fields in StgProperty.
[wine] / dlls / dmusic / downloadedinstrument.c
index eb0a302..2a71a3e 100644 (file)
@@ -2,19 +2,19 @@
  *
  * Copyright (C) 2003-2004 Rok Mandeljc
  *
- * 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 free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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 Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser 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-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "dmusic_private.h"
 WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 /* IDirectMusicDownloadedInstrumentImpl IUnknown part: */
-HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface, REFIID riid, LPVOID *ppobj) {
-       ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface);
+static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface, REFIID riid, LPVOID *ppobj) {
+       IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface;
        TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
 
        if (IsEqualIID (riid, &IID_IUnknown)
-               || IsEqualIID (riid, &IID_IDirectMusicDownloadedInstrument)) {
-               IDirectMusicDownloadedInstrumentImpl_AddRef(iface);
+               || IsEqualIID (riid, &IID_IDirectMusicDownloadedInstrument)
+               || IsEqualIID (riid, &IID_IDirectMusicDownloadedInstrument8)) {
+               IUnknown_AddRef(iface);
                *ppobj = This;
                return S_OK;
        }
@@ -36,27 +37,36 @@ HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSI
        return E_NOINTERFACE;
 }
 
-ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) {
-       ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface);
-       TRACE("(%p): AddRef from %ld\n", This, This->ref);
-       return ++(This->ref);
+static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) {
+       IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface;
+       ULONG refCount = InterlockedIncrement(&This->ref);
+
+       TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
+
+       DMUSIC_LockModule();
+
+       return refCount;
 }
 
-ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) {
-       ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface);
-       ULONG ref = --This->ref;
-       TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
-       if (ref == 0) {
+static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) {
+       IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface;
+       ULONG refCount = InterlockedDecrement(&This->ref);
+
+       TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
+
+       if (!refCount) {
                HeapFree(GetProcessHeap(), 0, This);
        }
-       return ref;
+
+       DMUSIC_UnlockModule();
+       
+       return refCount;
 }
 
 /* IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstrument part: */
 /* none at this time */
 
-ICOM_VTABLE(IDirectMusicDownloadedInstrument) DirectMusicDownloadedInstrument_Vtbl = {
-    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrument_Vtbl = {
        IDirectMusicDownloadedInstrumentImpl_QueryInterface,
        IDirectMusicDownloadedInstrumentImpl_AddRef,
        IDirectMusicDownloadedInstrumentImpl_Release
@@ -68,7 +78,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID
        
        dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl));
        if (NULL == dmdlinst) {
-               *ppobj = (LPVOID) NULL;
+               *ppobj = NULL;
                return E_OUTOFMEMORY;
        }
        dmdlinst->lpVtbl = &DirectMusicDownloadedInstrument_Vtbl;