ole32: Add an implementation of class monikers.

dlls/ole32/Makefile.in

@@ -11,6 +11,7 @@ EXTRALIBS = -luuid $(LIBUNICODE)
 C_SRCS = \
 	antimoniker.c \
 	bindctx.c \
+	classmoniker.c \
 	clipboard.c \
 	compobj.c \
 	compositemoniker.c \

dlls/ole32/moniker.c

@@ -694,17 +694,6 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName,
     return MK_E_SYNTAX;
 }
 
-/******************************************************************************
- *              CreateClassMoniker        [OLE32.@]
- */
-HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker ** ppmk)
-{
-    FIXME("%s\n", debugstr_guid( rclsid ));
-    if( ppmk )
-        *ppmk = NULL;
-    return E_NOTIMPL;
-}
-
 /* Virtual function table for the IRunningObjectTable class. */
 static const IRunningObjectTableVtbl VT_RunningObjectTableImpl =
 {

dlls/ole32/moniker.h

@@ -5,11 +5,13 @@ extern const CLSID CLSID_FileMoniker;
 extern const CLSID CLSID_ItemMoniker;
 extern const CLSID CLSID_AntiMoniker;
 extern const CLSID CLSID_CompositeMoniker;
+extern const CLSID CLSID_ClassMoniker;
 
 HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv);
 HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv);
 HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv);
 HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv);
+HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv);
 
 HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer);
 

dlls/ole32/oleproxy.c

@@ -1018,6 +1018,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
         return AntiMonikerCF_Create(iid, ppv);
     if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker))
         return CompositeMonikerCF_Create(iid, ppv);
+    if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker))
+        return ClassMonikerCF_Create(iid, ppv);
 
     FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));
     return CLASS_E_CLASSNOTAVAILABLE;

dlls/ole32/tests/moniker.c

@@ -488,7 +488,7 @@ static void test_class_moniker(void)
     FILETIME filetime;
 
     hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker);
-    todo_wine ok_ole_success(hr, CreateClassMoniker);
+    ok_ole_success(hr, CreateClassMoniker);
     if (!moniker) return;
 
     test_moniker("class moniker", moniker, 
@@ -523,13 +523,16 @@ static void test_class_moniker(void)
     ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08lx\n", hr);
 
     hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime);
+    todo_wine
     ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08lx\n", hr);
 
     hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);
+    todo_wine
     ok_ole_success(hr, IMoniker_BindToStorage);
     IUnknown_Release(unknown);
 
     hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);
+    todo_wine
     ok_ole_success(hr, IMoniker_BindToStorage);
     IUnknown_Release(unknown);