devenum: COM cleanup for IMoniker (MediaCatMoniker).

25aa60b3 · Michael Stefaniuc · Alexandre Julliard · 201b72e8 · 25aa60b3 · 25aa60b3
Commit 25aa60b3 authored Apr 03, 2012 by Michael Stefaniuc Committed by Alexandre Julliard Apr 03, 2012
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

devenum_private.h dlls/devenum/devenum_private.h +1 -1

mediacatenum.c dlls/devenum/mediacatenum.c +0 -0

parsedisplayname.c dlls/devenum/parsedisplayname.c +2 -2

No files found.
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -72,7 +72,7 @@ typedef struct

 typedef struct
 {
-    const IMonikerVtbl *lpVtbl;
+    IMoniker IMoniker_iface;
    LONG ref;
    HKEY hkey;
 } MediaCatMoniker;

--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
--- a/dlls/devenum/parsedisplayname.c
+++ b/dlls/devenum/parsedisplayname.c
@@ -136,10 +136,10 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(
            strcatW(wszRegKeyName, pszBetween);

            if (RegCreateKeyW(hbasekey, wszRegKeyName, &pMoniker->hkey) == ERROR_SUCCESS)
-                *ppmkOut = (LPMONIKER)pMoniker;
+                *ppmkOut = &pMoniker->IMoniker_iface;
            else
            {
-                IMoniker_Release((LPMONIKER)pMoniker);
+                IMoniker_Release(&pMoniker->IMoniker_iface);
                res = MK_E_NOOBJECT;
            }
        }