shell32: Forward process reference calls to shcore.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Forward process reference calls to shcore.
444b1cb3 · Nikolay Sivov · Alexandre Julliard · 4e22ba26 · 444b1cb3 · 444b1cb3
Commit 444b1cb3 authored Nov 27, 2018 by Nikolay Sivov Committed by Alexandre Julliard Nov 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 32 deletions

shcore.c dlls/shcore/tests/shcore.c +0 -2

shell32.spec dlls/shell32/shell32.spec +2 -2

shellord.c dlls/shell32/shellord.c +0 -28

No files found.
--- a/dlls/shcore/tests/shcore.c
+++ b/dlls/shcore/tests/shcore.c
@@ -117,12 +117,10 @@ static void test_process_reference(void)

    pSHGetInstanceExplorer = (void *)GetProcAddress(hmod, "SHGetInstanceExplorer");
    hr = pSHGetInstanceExplorer(&obj);
-todo_wine {
    ok(hr == S_OK, "Failed to get reference, hr %#x.\n", hr);
    ok(obj == &test_unk2.IUnknown_iface, "Unexpected pointer.\n");
    ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount);
 }
-}

 START_TEST(shcore)
 {

--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -165,7 +165,7 @@
 173 stdcall -ordinal SHValidateUNC(long wstr long)
 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr)
 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW
- 176 stdcall -ordinal SHSetInstanceExplorer(ptr)
+ 176 stdcall -ordinal SHSetInstanceExplorer(ptr) shcore.SetProcessReference
 177 stub DAD_SetDragImageFromListView
 178 stdcall -ordinal SHObjectProperties(long long wstr wstr)
 179 stdcall -ordinal SHGetNewLinkInfoA(str str ptr ptr long)
@@ -380,7 +380,7 @@
 @ stdcall SHGetIconOverlayIndexA(str long)
 @ stdcall SHGetIconOverlayIndexW(wstr long)
 @ stdcall SHGetIDListFromObject(ptr ptr)
-@ stdcall SHGetInstanceExplorer(ptr)
+@ stdcall SHGetInstanceExplorer(ptr) shcore.GetProcessReference
 @ stdcall SHGetItemFromDataObject(ptr long ptr ptr)
 @ stdcall SHGetItemFromObject(ptr ptr ptr)
 @ stdcall SHGetKnownFolderIDList(ptr long ptr ptr)

--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1103,34 +1103,6 @@ BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent)
 	return FALSE;
 }

-static LPUNKNOWN SHELL32_IExplorerInterface=0;
-/*************************************************************************
- * SHSetInstanceExplorer			[SHELL32.176]
- *
- * NOTES
- *  Sets the interface
- */
-VOID WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown)
-{	TRACE("%p\n", lpUnknown);
-	SHELL32_IExplorerInterface = lpUnknown;
-}
-/*************************************************************************
- * SHGetInstanceExplorer			[SHELL32.@]
- *
- * NOTES
- *  gets the interface pointer of the explorer and a reference
- */
-HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown)
-{	TRACE("%p\n", lpUnknown);
-
-	*lpUnknown = SHELL32_IExplorerInterface;
-
-	if (!SHELL32_IExplorerInterface)
-	  return E_FAIL;
-
-	IUnknown_AddRef(SHELL32_IExplorerInterface);
-	return S_OK;
-}
 /*************************************************************************
 * SHFreeUnusedLibraries			[SHELL32.123]
 *