Nikolay Sivov : shell32: Forward process reference calls to shcore.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 444b1cb34eed7c117d7b290b3a6906770f9792ed
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=444b1cb34eed7c117d7b290b3...

Author: Nikolay Sivov 
Date:   Tue Nov 27 11:55:48 2018 +0300

shell32: Forward process reference calls to shcore.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/shcore/tests/shcore.c |  2 --
 dlls/shell32/shell32.spec  |  4 ++--
 dlls/shell32/shellord.c    | 28 ----------------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c
index de6a921..904d826 100644
--- 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)
 {
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 23243e1..bf8b512 100644
--- 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)
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 6fc49dc..6ed0c90 100644
--- 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]
  *