ole32: Add pointer moniker implementation.

dlls/ole32/Makefile.in

@@ -35,6 +35,7 @@ C_SRCS = \
 	ole32_main.c \
 	oleobj.c \
 	oleproxy.c \
+	pointermoniker.c \
 	regsvr.c \
 	rpc.c \
 	stg_bigblockfile.c \

dlls/ole32/moniker.c

@@ -1677,27 +1677,3 @@ void __RPC_USER MIDL_user_free(void *p)
 {
     HeapFree(GetProcessHeap(), 0, p);
 }
-
-/***********************************************************************
- *           CreatePointerMoniker (OLE32.@)
- *
- * Creates a moniker which represents a pointer.
- *
- * PARAMS
- *  punk [I] Pointer to the object to represent.
- *  ppmk [O] Address that receives the pointer to the created moniker.
- *
- * RETURNS
- *  Success: S_OK.
- *  Failure: Any HRESULT code.
- */
-HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk)
-{
-    FIXME("(%p, %p): stub\n", punk, ppmk);
-
-    if (!ppmk)
-        return E_INVALIDARG;
-
-    *ppmk = NULL;
-    return E_NOTIMPL;
-}

dlls/ole32/moniker.h

@@ -28,12 +28,14 @@ DEFINE_OLEGUID( CLSID_ItemMoniker,      0x304, 0, 0 );
 DEFINE_OLEGUID( CLSID_AntiMoniker,      0x305, 0, 0 );
 DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 );
 DEFINE_OLEGUID( CLSID_ClassMoniker,     0x31a, 0, 0 );
+DEFINE_OLEGUID( CLSID_PointerMoniker,   0x306, 0, 0 );
 
 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 PointerMonikerCF_Create(REFIID riid, LPVOID *ppv);
 
 /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */
 int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable);

dlls/ole32/oleproxy.c

@@ -1030,6 +1030,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
         return CompositeMonikerCF_Create(iid, ppv);
     if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker))
         return ClassMonikerCF_Create(iid, ppv);
+    if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker))
+        return PointerMonikerCF_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/regsvr.c

@@ -403,9 +403,6 @@ error_close_progid_key:
 static GUID const CLSID_StdOleLink = {
     0x00000300, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
 
-static GUID const CLSID_PointerMoniker = {
-    0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
 static GUID const CLSID_PackagerMoniker = {
     0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
 

dlls/ole32/tests/moniker.c

@@ -1609,7 +1609,6 @@ static void test_pointer_moniker(void)
     ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr);
 
     hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker);
-    todo_wine
     ok_ole_success(hr, CreatePointerMoniker);
     if (!moniker) return;