system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 21:57:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell32: Forward process reference calls to shcore.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2018-11-27 11:55:48 +03:00 committed by Alexandre Julliard
parent 4e22ba2627
commit 444b1cb34e
3 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/shcore/tests/shcore.c
View file

@ -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)
{

4
dlls/shell32/shell32.spec
View file

@ -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)

28
dlls/shell32/shellord.c
View file

@ -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]
*