[PATCH 3/3] shell32: Stub IObjectWithSite on the New menu.

[Zebediah Figura]

From: Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24812
---
 dlls/shell32/new_menu.c      | 53 ++++++++++++++++++++++++++++++++++++
 dlls/shell32/tests/shlview.c |  5 ++--
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/new_menu.c b/dlls/shell32/new_menu.c
index 83e07b70988..87ea93f9964 100644
--- a/dlls/shell32/new_menu.c
+++ b/dlls/shell32/new_menu.c
@@ -28,6 +28,7 @@ struct new_menu
 {
     IShellExtInit IShellExtInit_iface;
     IContextMenu3 IContextMenu3_iface;
+    IObjectWithSite IObjectWithSite_iface;
     LONG refcount;
 };

@@ -48,6 +49,8 @@ static HRESULT WINAPI ext_init_QueryInterface(IShellExtInit *iface, REFIID iid,
             || IsEqualGUID(iid, &IID_IContextMenu2)
             || IsEqualGUID(iid, &IID_IContextMenu3))
         *out = &menu->IContextMenu3_iface;
+    else if (IsEqualGUID(iid, &IID_IObjectWithSite))
+        *out = &menu->IObjectWithSite_iface;
     else
     {
         *out = NULL;
@@ -178,6 +181,55 @@ static const IContextMenu3Vtbl context_menu_vtbl =
     context_menu_HandleMenuMsg2,
 };

+static struct new_menu *impl_from_IObjectWithSite(IObjectWithSite *iface)
+{
+    return CONTAINING_RECORD(iface, struct new_menu, IObjectWithSite_iface);
+}
+
+static HRESULT WINAPI object_with_site_QueryInterface(IObjectWithSite *iface, REFIID iid, void **out)
+{
+    struct new_menu *menu = impl_from_IObjectWithSite(iface);
+
+    return IShellExtInit_QueryInterface(&menu->IShellExtInit_iface, iid, out);
+}
+
+static ULONG WINAPI object_with_site_AddRef(IObjectWithSite *iface)
+{
+    struct new_menu *menu = impl_from_IObjectWithSite(iface);
+
+    return IShellExtInit_AddRef(&menu->IShellExtInit_iface);
+}
+
+static ULONG WINAPI object_with_site_Release(IObjectWithSite *iface)
+{
+    struct new_menu *menu = impl_from_IObjectWithSite(iface);
+
+    return IShellExtInit_Release(&menu->IShellExtInit_iface);
+}
+
+static HRESULT WINAPI object_with_site_SetSite(IObjectWithSite *iface, IUnknown *site)
+{
+    FIXME("iface %p, site %p, stub!\n", iface, site);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI object_with_site_GetSite(IObjectWithSite *iface, REFIID iid, void **out)
+{
+    FIXME("iface %p, iid %s, out %p, stub!\n", iface, debugstr_guid(iid), out);
+
+    return E_NOTIMPL;
+}
+
+static const IObjectWithSiteVtbl object_with_site_vtbl =
+{
+    object_with_site_QueryInterface,
+    object_with_site_AddRef,
+    object_with_site_Release,
+    object_with_site_SetSite,
+    object_with_site_GetSite,
+};
+
 HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out)
 {
     struct new_menu *menu;
@@ -191,6 +243,7 @@ HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out)

menu->IShellExtInit_iface.lpVtbl = &ext_init_vtbl;
     menu->IContextMenu3_iface.lpVtbl = &context_menu_vtbl;
+    menu->IObjectWithSite_iface.lpVtbl = &object_with_site_vtbl;
     menu->refcount = 1;

TRACE("Created New menu %p.\n", menu);
diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c
index d2eeafd3323..0de7f2768c1 100644
--- a/dlls/shell32/tests/shlview.c
+++ b/dlls/shell32/tests/shlview.c
@@ -1493,9 +1493,8 @@ static void test_newmenu(void)
     IUnknown_Release(unk2);

hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&unk2);
-    todo_wine ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr);
-    if (hr == S_OK)
-        IUnknown_Release(unk2);
+    ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr);
+    IUnknown_Release(unk2);

IUnknown_Release(unk);
 }