shcore: Add process reference API.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
e74a36f5c8
commit
4e22ba2627
|
@ -19792,6 +19792,7 @@ wine_fn_config_makefile dlls/setupx.dll16 enable_win16
|
||||||
wine_fn_config_makefile dlls/sfc enable_sfc
|
wine_fn_config_makefile dlls/sfc enable_sfc
|
||||||
wine_fn_config_makefile dlls/sfc_os enable_sfc_os
|
wine_fn_config_makefile dlls/sfc_os enable_sfc_os
|
||||||
wine_fn_config_makefile dlls/shcore enable_shcore
|
wine_fn_config_makefile dlls/shcore enable_shcore
|
||||||
|
wine_fn_config_makefile dlls/shcore/tests enable_tests
|
||||||
wine_fn_config_makefile dlls/shdoclc enable_shdoclc
|
wine_fn_config_makefile dlls/shdoclc enable_shdoclc
|
||||||
wine_fn_config_makefile dlls/shdocvw enable_shdocvw
|
wine_fn_config_makefile dlls/shdocvw enable_shdocvw
|
||||||
wine_fn_config_makefile dlls/shdocvw/tests enable_tests
|
wine_fn_config_makefile dlls/shdocvw/tests enable_tests
|
||||||
|
|
|
@ -3655,6 +3655,7 @@ WINE_CONFIG_MAKEFILE(dlls/setupx.dll16,enable_win16)
|
||||||
WINE_CONFIG_MAKEFILE(dlls/sfc)
|
WINE_CONFIG_MAKEFILE(dlls/sfc)
|
||||||
WINE_CONFIG_MAKEFILE(dlls/sfc_os)
|
WINE_CONFIG_MAKEFILE(dlls/sfc_os)
|
||||||
WINE_CONFIG_MAKEFILE(dlls/shcore)
|
WINE_CONFIG_MAKEFILE(dlls/shcore)
|
||||||
|
WINE_CONFIG_MAKEFILE(dlls/shcore/tests)
|
||||||
WINE_CONFIG_MAKEFILE(dlls/shdoclc)
|
WINE_CONFIG_MAKEFILE(dlls/shdoclc)
|
||||||
WINE_CONFIG_MAKEFILE(dlls/shdocvw)
|
WINE_CONFIG_MAKEFILE(dlls/shdocvw)
|
||||||
WINE_CONFIG_MAKEFILE(dlls/shdocvw/tests)
|
WINE_CONFIG_MAKEFILE(dlls/shdocvw/tests)
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
@ stub GetProcessReference
|
@ stdcall GetProcessReference(ptr) shcore.GetProcessReference
|
||||||
@ stdcall SHCreateThread(ptr ptr long ptr) shcore.SHCreateThread
|
@ stdcall SHCreateThread(ptr ptr long ptr) shcore.SHCreateThread
|
||||||
@ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef
|
@ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef
|
||||||
@ stub SHCreateThreadWithHandle
|
@ stub SHCreateThreadWithHandle
|
||||||
@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef
|
@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef
|
||||||
@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef
|
@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef
|
||||||
@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef
|
@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef
|
||||||
@ stub SetProcessReference
|
@ stdcall SetProcessReference(ptr) shcore.SetProcessReference
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(shcore);
|
WINE_DEFAULT_DEBUG_CHANNEL(shcore);
|
||||||
|
|
||||||
static DWORD shcore_tls;
|
static DWORD shcore_tls;
|
||||||
|
static IUnknown *process_ref;
|
||||||
|
|
||||||
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
|
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
|
||||||
{
|
{
|
||||||
|
@ -1261,3 +1262,31 @@ HRESULT WINAPI SHReleaseThreadRef(void)
|
||||||
FIXME("() - stub!\n");
|
FIXME("() - stub!\n");
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*************************************************************************
|
||||||
|
* GetProcessReference [SHCORE.@]
|
||||||
|
*/
|
||||||
|
HRESULT WINAPI GetProcessReference(IUnknown **obj)
|
||||||
|
{
|
||||||
|
TRACE("(%p)\n", obj);
|
||||||
|
|
||||||
|
*obj = process_ref;
|
||||||
|
|
||||||
|
if (!process_ref)
|
||||||
|
return E_FAIL;
|
||||||
|
|
||||||
|
if (*obj)
|
||||||
|
IUnknown_AddRef(*obj);
|
||||||
|
|
||||||
|
return S_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*************************************************************************
|
||||||
|
* SetProcessReference [SHCORE.@]
|
||||||
|
*/
|
||||||
|
void WINAPI SetProcessReference(IUnknown *obj)
|
||||||
|
{
|
||||||
|
TRACE("(%p)\n", obj);
|
||||||
|
|
||||||
|
process_ref = obj;
|
||||||
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
@ stdcall GetDpiForMonitor(long long ptr ptr)
|
@ stdcall GetDpiForMonitor(long long ptr ptr)
|
||||||
@ stub GetDpiForShellUIComponent
|
@ stub GetDpiForShellUIComponent
|
||||||
@ stdcall GetProcessDpiAwareness(long ptr)
|
@ stdcall GetProcessDpiAwareness(long ptr)
|
||||||
@ stub GetProcessReference
|
@ stdcall GetProcessReference(ptr)
|
||||||
@ stub GetScaleFactorForDevice
|
@ stub GetScaleFactorForDevice
|
||||||
@ stub GetScaleFactorForMonitor
|
@ stub GetScaleFactorForMonitor
|
||||||
@ stub IStream_Copy
|
@ stub IStream_Copy
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode
|
@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode
|
||||||
@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr)
|
@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr)
|
||||||
@ stdcall SetProcessDpiAwareness(long)
|
@ stdcall SetProcessDpiAwareness(long)
|
||||||
@ stub SetProcessReference
|
@ stdcall SetProcessReference(ptr)
|
||||||
@ stub UnregisterScaleChangeEvent
|
@ stub UnregisterScaleChangeEvent
|
||||||
|
|
||||||
100 stub @
|
100 stub @
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
TESTDLL = shcore.dll
|
||||||
|
|
||||||
|
C_SRCS = \
|
||||||
|
shcore.c
|
|
@ -0,0 +1,140 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2018 Nikolay Sivov for CodeWeavers
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define COBJMACROS
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
|
#include "initguid.h"
|
||||||
|
#include "objidl.h"
|
||||||
|
|
||||||
|
#include "wine/test.h"
|
||||||
|
|
||||||
|
static HRESULT (WINAPI *pGetProcessReference)(IUnknown **);
|
||||||
|
static void (WINAPI *pSetProcessReference)(IUnknown *);
|
||||||
|
static HRESULT (WINAPI *pSHGetInstanceExplorer)(IUnknown **);
|
||||||
|
|
||||||
|
static void init(HMODULE hshcore)
|
||||||
|
{
|
||||||
|
#define X(f) p##f = (void*)GetProcAddress(hshcore, #f)
|
||||||
|
X(GetProcessReference);
|
||||||
|
X(SetProcessReference);
|
||||||
|
#undef X
|
||||||
|
}
|
||||||
|
|
||||||
|
static HRESULT WINAPI unk_QI(IUnknown *iface, REFIID riid, void **obj)
|
||||||
|
{
|
||||||
|
if (IsEqualIID(riid, &IID_IUnknown))
|
||||||
|
{
|
||||||
|
*obj = iface;
|
||||||
|
IUnknown_AddRef(iface);
|
||||||
|
return S_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
*obj = NULL;
|
||||||
|
return E_NOINTERFACE;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct test_unk
|
||||||
|
{
|
||||||
|
IUnknown IUnknown_iface;
|
||||||
|
LONG refcount;
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct test_unk *impl_from_IUnknown(IUnknown *iface)
|
||||||
|
{
|
||||||
|
return CONTAINING_RECORD(iface, struct test_unk, IUnknown_iface);
|
||||||
|
}
|
||||||
|
|
||||||
|
static ULONG WINAPI unk_AddRef(IUnknown *iface)
|
||||||
|
{
|
||||||
|
struct test_unk *obj = impl_from_IUnknown(iface);
|
||||||
|
return InterlockedIncrement(&obj->refcount);
|
||||||
|
}
|
||||||
|
|
||||||
|
static ULONG WINAPI unk_Release(IUnknown *iface)
|
||||||
|
{
|
||||||
|
struct test_unk *obj = impl_from_IUnknown(iface);
|
||||||
|
return InterlockedDecrement(&obj->refcount);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const IUnknownVtbl testunkvtbl =
|
||||||
|
{
|
||||||
|
unk_QI,
|
||||||
|
unk_AddRef,
|
||||||
|
unk_Release,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void test_unk_init(struct test_unk *testunk)
|
||||||
|
{
|
||||||
|
testunk->IUnknown_iface.lpVtbl = &testunkvtbl;
|
||||||
|
testunk->refcount = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_process_reference(void)
|
||||||
|
{
|
||||||
|
struct test_unk test_unk, test_unk2;
|
||||||
|
IUnknown *obj;
|
||||||
|
HMODULE hmod;
|
||||||
|
HRESULT hr;
|
||||||
|
|
||||||
|
obj = (void *)0xdeadbeef;
|
||||||
|
hr = pGetProcessReference(&obj);
|
||||||
|
ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
|
||||||
|
ok(obj == NULL, "Unexpected pointer.\n");
|
||||||
|
|
||||||
|
test_unk_init(&test_unk);
|
||||||
|
test_unk_init(&test_unk2);
|
||||||
|
|
||||||
|
pSetProcessReference(&test_unk.IUnknown_iface);
|
||||||
|
ok(test_unk.refcount == 1, "Unexpected refcount %u.\n", test_unk.refcount);
|
||||||
|
pSetProcessReference(&test_unk2.IUnknown_iface);
|
||||||
|
ok(test_unk.refcount == 1, "Unexpected refcount %u.\n", test_unk.refcount);
|
||||||
|
ok(test_unk2.refcount == 1, "Unexpected refcount %u.\n", test_unk2.refcount);
|
||||||
|
|
||||||
|
hr = pGetProcessReference(&obj);
|
||||||
|
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 == 2, "Unexpected refcount %u.\n", test_unk2.refcount);
|
||||||
|
|
||||||
|
hmod = LoadLibraryA("shell32.dll");
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
HMODULE hshcore = LoadLibraryA("shcore.dll");
|
||||||
|
|
||||||
|
if (!hshcore)
|
||||||
|
{
|
||||||
|
win_skip("Shcore.dll is not available.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
init(hshcore);
|
||||||
|
|
||||||
|
test_process_reference();
|
||||||
|
}
|
Loading…
Reference in New Issue