ChangeSet ID:	15997
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2005/02/09 07:26:46

Modified files:
	dlls/itss      : moniker.c 

Log message:
	Tom Fogal <tfogal@cisunix.unh.edu>
	Simple aggregation fix.

Patch: http://cvs.winehq.org/patch.py?id=15997

Old revision  New revision  Changes     Path
 1.5           1.6           +3 -0       wine/dlls/itss/moniker.c

Index: wine/dlls/itss/moniker.c
diff -u -p wine/dlls/itss/moniker.c:1.5 wine/dlls/itss/moniker.c:1.6
--- wine/dlls/itss/moniker.c:1.5	Sat May 25 09:55:42 2013
+++ wine/dlls/itss/moniker.c	Sat May 25 09:55:42 2013
@@ -471,6 +471,9 @@ HRESULT ITS_IParseDisplayName_create(IUn
 {
     ITS_IParseDisplayNameImpl *its;
 
+    if( pUnkOuter )
+        return CLASS_E_NOAGGREGATION;
+
     its = HeapAlloc( GetProcessHeap(), 0, sizeof(ITS_IParseDisplayNameImpl) );
     its->vtbl_ITS_IParseDisplayName = &ITS_IParseDisplayNameImpl_Vtbl;
     its->ref = 1;