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

mscoree: Implement CreateInterface.

Browse source
This commit is contained in:
Alistair Leslie-Hughes 2013-10-01 10:17:50 +10:00 committed by Alexandre Julliard
parent 88acc9c899
commit 7028e2bbbc
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/mscoree/mscoree.spec
View file

@ -30,6 +30,7 @@
@ stub CorTickleSvc
@ stdcall CreateConfigStream(wstr ptr)
@ stdcall CreateDebuggingInterfaceFromVersion(long wstr ptr)
@ stdcall CreateInterface(ptr ptr ptr)
@ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer()

7
dlls/mscoree/mscoree_main.c
View file

@ -594,6 +594,13 @@ HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterfac
return CLASS_E_CLASSNOTAVAILABLE;
}
HRESULT WINAPI CreateInterface(REFCLSID clsid, REFIID riid, LPVOID *ppInterface)
{
TRACE("(%s,%s,%p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface);
return CLRCreateInstance(clsid, riid, ppInterface);
}
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
{
mscorecf *This;

29
dlls/mscoree/tests/mscoree.c
View file

@ -21,6 +21,7 @@
#include "corerror.h"
#include "mscoree.h"
#include "metahost.h"
#include "shlwapi.h"
#include "wine/test.h"
@ -31,6 +32,7 @@ static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*);
static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*);
static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*);
static HRESULT (WINAPI *pCreateConfigStream)(LPCWSTR, IStream**);
static HRESULT (WINAPI *pCreateInterface)(REFCLSID, REFIID, VOID**);
static BOOL init_functionpointers(void)
{
@ -47,8 +49,10 @@ static BOOL init_functionpointers(void)
pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo");
pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim");
pCreateConfigStream = (void *)GetProcAddress(hmscoree, "CreateConfigStream");
pCreateInterface = (void *)GetProcAddress(hmscoree, "CreateInterface");
if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim)
if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim ||
!pCreateInterface)
{
win_skip("functions not available\n");
FreeLibrary(hmscoree);
@ -386,6 +390,28 @@ static void test_createconfigstream(void)
DeleteFileW(file);
}
void test_createinstance(void)
{
HRESULT hr;
ICLRMetaHost *host;
if(!pCreateInterface)
{
win_skip("Function CreateInterface not found.\n");
return;
}
hr = pCreateInterface(&CLSID_CLRMetaHost, &IID_ICLRMetaHost, (void**)&host);
if(SUCCEEDED(hr))
{
ICLRMetaHost_Release(host);
}
else
{
win_skip(".NET 4 not installed.\n");
}
}
START_TEST(mscoree)
{
if (!init_functionpointers())
@ -394,6 +420,7 @@ START_TEST(mscoree)
test_versioninfo();
test_loadlibraryshim();
test_createconfigstream();
test_createinstance();
FreeLibrary(hmscoree);
}