[PATCH 1/2] dmusic: This COM classes don't support COM aggregation.
Michael Stefaniuc
mstefani at redhat.de
Sat Dec 28 16:34:11 CST 2013
---
dlls/dmusic/collection.c | 13 ++++++++-----
dlls/dmusic/dmusic.c | 2 ++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index e30f89d..f98bc19 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -814,12 +814,15 @@ static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = {
HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter)
{
IDirectMusicCollectionImpl* obj;
-
+
+ *ppobj = NULL;
+ if (pUnkOuter)
+ return CLASS_E_NOAGGREGATION;
+
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCollectionImpl));
- if (NULL == obj) {
- *ppobj = NULL;
- return E_OUTOFMEMORY;
- }
+ if (!obj)
+ return E_OUTOFMEMORY;
+
obj->IDirectMusicCollection_iface.lpVtbl = &DirectMusicCollection_Collection_Vtbl;
obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicCollection_Object_Vtbl;
obj->IPersistStream_iface.lpVtbl = &DirectMusicCollection_PersistStream_Vtbl;
diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 0c2584f..6c837f7 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -408,6 +408,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU
TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter);
*ret_iface = NULL;
+ if (unkouter)
+ return CLASS_E_NOAGGREGATION;
dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl));
if (!dmusic)
--
1.8.3.1
More information about the wine-patches
mailing list