wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Detlef Riekenberg : include: Add mprerror.h from mingw w64.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: c1de9e2380da3e020ca2a287d9779906fbfe346a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1de9e2380da3e020ca2a287d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 4 23:51:36 2010 +0200 include: Add mprerror.h from mingw w64. --- include/Makefile.in | 1 + include/mprerror.h | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0c41dd4..e27c6ca 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -326,6 +326,7 @@ SRCDIR_INCLUDES = \ mmreg.h \ mmsystem.h \ mprapi.h \ + mprerror.h \ msacm.h \ msacmdlg.h \ msacmdrv.h \ diff --git a/include/mprerror.h b/include/mprerror.h new file mode 100644 index 0000000..ac87e81 --- /dev/null +++ b/include/mprerror.h @@ -0,0 +1,74 @@ +/* + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given: + * The w64 mingw-runtime package and its code is distributed in the hope that it + * will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR + * IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to + * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +#ifndef _MPRERROR_H_ +#define _MPRERROR_H_ + +#define ROUTEBASE 900 +#define SUCCESS 0 + +#define ERROR_ROUTER_STOPPED (ROUTEBASE+0) +#define ERROR_ALREADY_CONNECTED (ROUTEBASE+1) +#define ERROR_UNKNOWN_PROTOCOL_ID (ROUTEBASE+2) +#define ERROR_DDM_NOT_RUNNING (ROUTEBASE+3) +#define ERROR_INTERFACE_ALREADY_EXISTS (ROUTEBASE+4) +#define ERROR_NO_SUCH_INTERFACE (ROUTEBASE+5) +#define ERROR_INTERFACE_NOT_CONNECTED (ROUTEBASE+6) +#define ERROR_PROTOCOL_STOP_PENDING (ROUTEBASE+7) +#define ERROR_INTERFACE_CONNECTED (ROUTEBASE+8) +#define ERROR_NO_INTERFACE_CREDENTIALS_SET (ROUTEBASE+9) +#define ERROR_ALREADY_CONNECTING (ROUTEBASE+10) +#define ERROR_UPDATE_IN_PROGRESS (ROUTEBASE+11) +#define ERROR_INTERFACE_CONFIGURATION (ROUTEBASE+12) +#define ERROR_NOT_CLIENT_PORT (ROUTEBASE+13) +#define ERROR_NOT_ROUTER_PORT (ROUTEBASE+14) +#define ERROR_CLIENT_INTERFACE_ALREADY_EXISTS (ROUTEBASE+15) +#define ERROR_INTERFACE_DISABLED (ROUTEBASE+16) +#define ERROR_AUTH_PROTOCOL_REJECTED (ROUTEBASE+17) +#define ERROR_NO_AUTH_PROTOCOL_AVAILABLE (ROUTEBASE+18) +#define ERROR_PEER_REFUSED_AUTH (ROUTEBASE+19) +#define ERROR_REMOTE_NO_DIALIN_PERMISSION (ROUTEBASE+20) +#define ERROR_REMOTE_PASSWD_EXPIRED (ROUTEBASE+21) +#define ERROR_REMOTE_ACCT_DISABLED (ROUTEBASE+22) +#define ERROR_REMOTE_RESTRICTED_LOGON_HOURS (ROUTEBASE+23) +#define ERROR_REMOTE_AUTHENTICATION_FAILURE (ROUTEBASE+24) +#define ERROR_INTERFACE_HAS_NO_DEVICES (ROUTEBASE+25) +#define ERROR_IDLE_DISCONNECTED (ROUTEBASE+26) +#define ERROR_INTERFACE_UNREACHABLE (ROUTEBASE+27) +#define ERROR_SERVICE_IS_PAUSED (ROUTEBASE+28) +#define ERROR_INTERFACE_DISCONNECTED (ROUTEBASE+29) +#define ERROR_AUTH_SERVER_TIMEOUT (ROUTEBASE+30) +#define ERROR_PORT_LIMIT_REACHED (ROUTEBASE+31) +#define ERROR_PPP_SESSION_TIMEOUT (ROUTEBASE+32) +#define ERROR_MAX_LAN_INTERFACE_LIMIT (ROUTEBASE+33) +#define ERROR_MAX_WAN_INTERFACE_LIMIT (ROUTEBASE+34) +#define ERROR_MAX_CLIENT_INTERFACE_LIMIT (ROUTEBASE+35) +#define ERROR_BAP_DISCONNECTED (ROUTEBASE+36) +#define ERROR_USER_LIMIT (ROUTEBASE+37) +#define ERROR_NO_RADIUS_SERVERS (ROUTEBASE+38) +#define ERROR_INVALID_RADIUS_RESPONSE (ROUTEBASE+39) +#define ERROR_DIALIN_HOURS_RESTRICTION (ROUTEBASE+40) +#define ERROR_ALLOWED_PORT_TYPE_RESTRICTION (ROUTEBASE+41) +#define ERROR_AUTH_PROTOCOL_RESTRICTION (ROUTEBASE+42) +#define ERROR_BAP_REQUIRED (ROUTEBASE+43) +#define ERROR_DIALOUT_HOURS_RESTRICTION (ROUTEBASE+44) +#define ERROR_ROUTER_CONFIG_INCOMPATIBLE (ROUTEBASE+45) +#define WARNING_NO_MD5_MIGRATION (ROUTEBASE+46) +#define ERROR_PROTOCOL_ALREADY_INSTALLED (ROUTEBASE+48) +#define ERROR_INVALID_SIGNATURE_LENGTH (ROUTEBASE+49) +#define ERROR_INVALID_SIGNATURE (ROUTEBASE+50) +#define ERROR_NO_SIGNATURE (ROUTEBASE+51) +#define ERROR_INVALID_PACKET_LENGTH_OR_ID (ROUTEBASE+52) +#define ERROR_INVALID_ATTRIBUTE_LENGTH (ROUTEBASE+53) +#define ERROR_INVALID_PACKET (ROUTEBASE+54) +#define ERROR_AUTHENTICATOR_MISMATCH (ROUTEBASE+55) +#define ROUTEBASEEND (ROUTEBASE+56) + +#endif

1 0

Detlef Riekenberg : inetcpl: Make a TRACE more silent.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 5f1c6542c06c2117ba060e9e132805a9864ba9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1c6542c06c2117ba060e9e1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 4 23:52:57 2010 +0200 inetcpl: Make a TRACE more silent. --- dlls/inetcpl.cpl/content.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/content.c b/dlls/inetcpl.cpl/content.c index 10f2201..8fb1729 100644 --- a/dlls/inetcpl.cpl/content.c +++ b/dlls/inetcpl.cpl/content.c @@ -79,8 +79,8 @@ BOOL WINAPI LaunchSiteCertDialog(HWND parent) */ INT_PTR CALLBACK content_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - - TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam); + if ((msg != WM_SETCURSOR) && (msg != WM_NCHITTEST) && (msg != WM_MOUSEMOVE)) + TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam); if (msg == WM_COMMAND) {

1 0

Detlef Riekenberg : comctl32: Dump a parameter in a TRACE.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 51db7f0a15ac2e15057558006a1f57ebdfb66c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51db7f0a15ac2e15057558006… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 5 00:29:49 2010 +0200 comctl32: Dump a parameter in a TRACE. --- dlls/comctl32/propsheet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3d2cd3b..e25db1d 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -613,7 +613,7 @@ static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo) DWORD resSize; WORD resID = IDD_PROPSHEET; - TRACE("\n"); + TRACE("(%p)\n", psInfo); if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) resID = IDD_WIZARD;

1 0

Dmitry Timoshkov : comctl32: Postpone setting the property sheet focus until the tab control is initialized .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 09539e4219c0019b4155dea1f1414ac753bed937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09539e4219c0019b4155dea1f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 5 15:18:21 2010 +0900 comctl32: Postpone setting the property sheet focus until the tab control is initialized. --- dlls/comctl32/propsheet.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3e313ba..3d2cd3b 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3415,10 +3415,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { /* set up the Next and Back buttons by default */ PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT); - SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON)); } - else - SetFocus(GetDlgItem(hwnd, IDOK)); /* Set up fonts */ SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -3464,6 +3461,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ShowWindow(hwndTabCtrl, SW_HIDE); PROPSHEET_AdjustSizeWizard(hwnd, psInfo); PROPSHEET_AdjustButtonsWizard(hwnd, psInfo); + SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON)); } else { @@ -3472,6 +3470,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PROPSHEET_AdjustSize(hwnd, psInfo); PROPSHEET_AdjustButtons(hwnd, psInfo); } + SetFocus(GetDlgItem(hwnd, IDOK)); } if (IS_INTRESOURCE(psInfo->ppshheader.pszCaption) &&

1 0

Detlef Riekenberg : winspool: Remove unused code.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: b23be05eefcb8c1195f1055e0062040022a39328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23be05eefcb8c1195f1055e0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 5 07:04:41 2010 +0200 winspool: Remove unused code. --- dlls/winspool.drv/info.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2db3100..92098f1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -337,24 +337,6 @@ static inline BOOL is_local_file(LPWSTR name) return (name[0] && (name[1] == ':') && (name[2] == '\\')); } -/****************************************************************** - * Return the number of bytes for an multi_sz string. - * The result includes all \0s - * (specifically the extra \0, that is needed as multi_sz terminator). - */ -#if 0 -static int multi_sz_lenW(const WCHAR *str) -{ - const WCHAR *ptr = str; - if(!str) return 0; - do - { - ptr += lstrlenW(ptr) + 1; - } while(*ptr); - - return (ptr - str + 1) * sizeof(WCHAR); -} -#endif /* ################################ */ static int multi_sz_lenA(const char *str)

1 0

Austin English : psapi/tests: Macro cleanup.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: f2d1145142d9a5736dbf8517b9d83a700b267f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d1145142d9a5736dbf8517b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 5 00:56:49 2010 +0000 psapi/tests: Macro cleanup. --- dlls/psapi/tests/psapi_main.c | 138 ++++++++++++++++++++++++++++++----------- 1 files changed, 101 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2d1145142d9a5736dbf8…

1 0

Vincent Povirk : mscoree: Add test for ICLRMetaHost_GetRuntime.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: f9db77231786273693f14394123c6d951657170a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9db77231786273693f143941… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 28 16:52:01 2010 -0500 mscoree: Add test for ICLRMetaHost_GetRuntime. --- dlls/mscoree/tests/metahost.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index f09038e..75f1220 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -23,6 +23,7 @@ #include "windef.h" #include "ole2.h" +#include "corerror.h" #include "initguid.h" #include "metahost.h" #include "wine/test.h" @@ -107,6 +108,35 @@ void test_enumruntimes(void) IEnumUnknown_Release(runtime_enum); } +void test_getruntime(void) +{ + static const WCHAR twodotzero[] = {'v','2','.','0','.','5','0','7','2','7',0}; + static const WCHAR twodotzerodotzero[] = {'v','2','.','0','.','0',0}; + HRESULT hr; + ICLRRuntimeInfo *info; + DWORD count; + WCHAR buf[MAX_PATH]; + + hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info); + todo_wine ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); + + hr = ICLRMetaHost_GetRuntime(metahost, twodotzero, &IID_ICLRRuntimeInfo, (void**)&info); + todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + if (hr != S_OK) return; + + count = MAX_PATH; + hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1); + ok(lstrcmpW(buf, twodotzero) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf)); + + ICLRRuntimeInfo_Release(info); + + /* Versions must match exactly. */ + hr = ICLRMetaHost_GetRuntime(metahost, twodotzerodotzero, &IID_ICLRRuntimeInfo, (void**)&info); + todo_wine ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); +} + START_TEST(metahost) { if (!init_pointers()) @@ -114,5 +144,7 @@ START_TEST(metahost) test_enumruntimes(); + test_getruntime(); + cleanup(); }

1 0

Vincent Povirk : mscoree: Implement ICLRRuntimeInfo_GetInterface.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: d54b800793046e9f15718bebf9d4bd13c9614191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54b800793046e9f15718bebf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 26 15:54:13 2010 -0500 mscoree: Implement ICLRRuntimeInfo_GetInterface. --- dlls/mscoree/corruntimehost.c | 78 ++++++++++++++++++++++++++++++++------- dlls/mscoree/metahost.c | 73 +++++++++++++++++++++++++++++++------ dlls/mscoree/mscoree_main.c | 1 + dlls/mscoree/mscoree_private.h | 29 +++++++++++++++ include/mscoree.idl | 2 + 5 files changed, 157 insertions(+), 26 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 9de9bf5..794f1c8 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -29,20 +29,24 @@ #include "cor.h" #include "mscoree.h" +#include "mscoree_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -typedef struct _corruntimehost +struct RuntimeHost { const struct ICorRuntimeHostVtbl *lpVtbl; + const CLRRuntimeInfo *version; + const loaded_mono *mono; LONG ref; -} corruntimehost; + BOOL legacy; /* if True, this was created by create_corruntimehost, and Release frees it */ +}; -static inline corruntimehost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) +static inline RuntimeHost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) { - return (corruntimehost *)((char*)iface - FIELD_OFFSET(corruntimehost, lpVtbl)); + return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpVtbl)); } /*** IUnknown methods ***/ @@ -50,7 +54,7 @@ static HRESULT WINAPI corruntimehost_QueryInterface(ICorRuntimeHost* iface, REFIID riid, void **ppvObject) { - corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_ICorRuntimeHost ) || @@ -71,19 +75,19 @@ static HRESULT WINAPI corruntimehost_QueryInterface(ICorRuntimeHost* iface, static ULONG WINAPI corruntimehost_AddRef(ICorRuntimeHost* iface) { - corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); return InterlockedIncrement( &This->ref ); } static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) { - corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); ULONG ref; ref = InterlockedDecrement( &This->ref ); - if ( ref == 0 ) + if ( ref == 0 && This->legacy ) { - HeapFree( GetProcessHeap(), 0, This ); + RuntimeHost_Destroy(This); } return ref; @@ -271,18 +275,64 @@ static const struct ICorRuntimeHostVtbl corruntimehost_vtbl = corruntimehost_CurrentDomain }; -IUnknown* create_corruntimehost(void) +HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, + const loaded_mono *loaded_mono, RuntimeHost** result) { - corruntimehost *This; + RuntimeHost *This; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) - return NULL; + return E_OUTOFMEMORY; This->lpVtbl = &corruntimehost_vtbl; This->ref = 1; + This->version = runtime_version; + This->mono = loaded_mono; + This->legacy = FALSE; + + return S_OK; +} + +HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv) +{ + IUnknown *unk; + + if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) + unk = (IUnknown*)&This->lpVtbl; + else + unk = NULL; + + if (unk) + return IUnknown_QueryInterface(unk, riid, ppv); + else + FIXME("not implemented for class %s\n", debugstr_guid(clsid)); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT RuntimeHost_Destroy(RuntimeHost *This) +{ + HeapFree( GetProcessHeap(), 0, This ); + return S_OK; +} + +IUnknown* create_corruntimehost(void) +{ + RuntimeHost *This; + IUnknown *result; + + if (FAILED(RuntimeHost_Construct(NULL, NULL, &This))) + return NULL; + + This->legacy = TRUE; + + if (FAILED(RuntimeHost_GetInterface(This, &CLSID_CorRuntimeHost, &IID_IUnknown, (void**)&result))) + { + RuntimeHost_Destroy(This); + return NULL; + } - FIXME("return iface %p\n", This); + FIXME("return iface %p\n", result); - return (IUnknown*) &This->lpVtbl; + return result; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 159258b..f32afed 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -43,16 +43,6 @@ static const WCHAR net_11_subdir[] = {'1','.','0',0}; static const WCHAR net_20_subdir[] = {'2','.','0',0}; static const WCHAR net_40_subdir[] = {'4','.','0',0}; -struct CLRRuntimeInfo -{ - const struct ICLRRuntimeInfoVtbl *ICLRRuntimeInfo_vtbl; - LPCWSTR mono_libdir; - DWORD major; - DWORD minor; - DWORD build; - int mono_abi_version; -}; - const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; #define NUM_RUNTIMES 3 @@ -75,6 +65,53 @@ static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = }; static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, 0 }; +static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) +{ + /* FIXME: stub */ + *result = NULL; + + return S_OK; +} + +static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost **result) +{ + HRESULT hr = S_OK; + loaded_mono *ploaded_mono; + + if (This->loaded_runtime) + { + *result = This->loaded_runtime; + return hr; + } + + EnterCriticalSection(&runtime_list_cs); + + if (!This->loaded_runtime) + goto end; + + hr = load_mono(This, &ploaded_mono); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_Construct(This, ploaded_mono, &This->loaded_runtime); + +end: + LeaveCriticalSection(&runtime_list_cs); + + if (SUCCEEDED(hr)) + *result = This->loaded_runtime; + + return hr; +} + +void unload_all_runtimes(void) +{ + int i; + + for (i=0; i<NUM_RUNTIMES; i++) + if (runtimes[i].loaded_runtime) + RuntimeHost_Destroy(runtimes[i].loaded_runtime); +} + static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, REFIID riid, void **ppvObject) @@ -178,9 +215,18 @@ static HRESULT WINAPI CLRRuntimeInfo_GetProcAddress(ICLRRuntimeInfo* iface, static HRESULT WINAPI CLRRuntimeInfo_GetInterface(ICLRRuntimeInfo* iface, REFCLSID rclsid, REFIID riid, LPVOID *ppUnk) { - FIXME("%p %s %s %p\n", iface, debugstr_guid(rclsid), debugstr_guid(riid), ppUnk); + struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + RuntimeHost *host; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p %s %s %p\n", iface, debugstr_guid(rclsid), debugstr_guid(riid), ppUnk); + + hr = CLRRuntimeInfo_GetRuntimeHost(This, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetInterface(host, rclsid, riid, ppUnk); + + return hr; } static HRESULT WINAPI CLRRuntimeInfo_IsLoadable(ICLRRuntimeInfo* iface, @@ -404,6 +450,9 @@ static void find_runtimes(void) { runtimes[i].mono_abi_version = abi_version; + strcpyW(runtimes[i].mono_path, mono_path); + strcpyW(runtimes[i].mscorlib_path, lib_path); + any_runtimes_found = TRUE; } } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 5203a41..fe7c35b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -343,6 +343,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + unload_all_runtimes(); break; } return TRUE; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5c80848..8604c81 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -30,6 +30,21 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); +typedef struct RuntimeHost RuntimeHost; + +typedef struct CLRRuntimeInfo +{ + const struct ICLRRuntimeInfoVtbl *ICLRRuntimeInfo_vtbl; + LPCWSTR mono_libdir; + DWORD major; + DWORD minor; + DWORD build; + int mono_abi_version; + WCHAR mono_path[MAX_PATH]; + WCHAR mscorlib_path[MAX_PATH]; + struct RuntimeHost *loaded_runtime; +} CLRRuntimeInfo; + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; @@ -44,4 +59,18 @@ extern MonoDomain* (*mono_jit_init)(const char *file); extern int (*mono_jit_set_trace_options)(const char* options); extern void (*mono_set_dirs)(const char *assembly_dir, const char *config_dir); +typedef struct loaded_mono +{ +} loaded_mono; + +/* loaded runtime interfaces */ +extern void unload_all_runtimes(void); + +extern HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, + const loaded_mono *loaded_mono, RuntimeHost** result); + +extern HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv); + +extern HRESULT RuntimeHost_Destroy(RuntimeHost *This); + #endif /* __MSCOREE_PRIVATE__ */ diff --git a/include/mscoree.idl b/include/mscoree.idl index 56861cd..07231af 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -131,6 +131,8 @@ interface IHostControl : IUnknown [in] IUnknown* appDomainManager); } +cpp_quote("DEFINE_GUID(CLSID_CorRuntimeHost, 0xcb2f6723,0xab3a,0x11d2,0x9c,0x40,0x00,0xc0,0x4f,0xa3,0x0a,0x3e);") + [ uuid(CB2F6722-AB3A-11d2-9C40-00C04FA30A3E), version(1.0),

1 0

Vincent Povirk : mscoree: Implement ICLRMetaHost_EnumerateInstalledRuntimes .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 0d1c687563013b6d2f8228d5ed9672d581c4b24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1c687563013b6d2f8228d5e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 22 17:24:56 2010 -0500 mscoree: Implement ICLRMetaHost_EnumerateInstalledRuntimes. --- dlls/mscoree/metahost.c | 556 ++++++++++++++++++++++++++++++++++++++++- dlls/mscoree/tests/metahost.c | 2 +- 2 files changed, 555 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1c687563013b6d2f822…

1 0

Vincent Povirk : mscoree: Implement ICLRMetaHost_GetVersionFromFile.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 3f211a5126ae29c817fa0ca1e298b8097d754c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f211a5126ae29c817fa0ca1e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 22 15:27:52 2010 -0500 mscoree: Implement ICLRMetaHost_GetVersionFromFile. --- dlls/mscoree/Makefile.in | 3 +- dlls/mscoree/assembly.c | 246 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/metahost.c | 31 +++++- dlls/mscoree/mscoree_private.h | 6 + 4 files changed, 283 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 6346aa9..dfbd58a 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -1,7 +1,8 @@ MODULE = mscoree.dll -IMPORTS = uuid shell32 advapi32 +IMPORTS = dbghelp uuid shell32 advapi32 C_SRCS = \ + assembly.c \ corruntimehost.c \ metahost.c \ mscoree_main.c diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c new file mode 100644 index 0000000..b4b72d4 --- /dev/null +++ b/dlls/mscoree/assembly.c @@ -0,0 +1,246 @@ +/* + * assembly parser + * + * Copyright 2008 James Hawkins + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" +#include "dbghelp.h" +#include "ole2.h" +#include "corhdr.h" +#include "mscoree_private.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +typedef struct +{ + ULONG Signature; + USHORT MajorVersion; + USHORT MinorVersion; + ULONG Reserved; + ULONG VersionLength; + LPSTR Version; + BYTE Flags; + WORD Streams; +} METADATAHDR; + +typedef struct +{ + DWORD Offset; + DWORD Size; +} METADATASTREAMHDR; + +typedef struct tagCLRTABLE +{ + INT rows; + DWORD offset; +} CLRTABLE; + +struct tagASSEMBLY +{ + LPWSTR path; + + HANDLE hfile; + HANDLE hmap; + BYTE *data; + + IMAGE_NT_HEADERS *nthdr; + IMAGE_COR20_HEADER *corhdr; + + METADATAHDR *metadatahdr; +}; + +static inline LPWSTR strdupW(LPCWSTR src) +{ + LPWSTR dest; + + if (!src) + return NULL; + + dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); + if (dest) + lstrcpyW(dest, src); + + return dest; +} + +static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) +{ + METADATAHDR *metadatahdr; + BYTE *ptr, *dest; + DWORD size, ofs; + ULONG rva; + + rva = assembly->corhdr->MetaData.VirtualAddress; + ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + if (!ptr) + return E_FAIL; + + metadatahdr = (METADATAHDR *)ptr; + + assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); + if (!assembly->metadatahdr) + return E_OUTOFMEMORY; + + size = FIELD_OFFSET(METADATAHDR, Version); + memcpy(assembly->metadatahdr, metadatahdr, size); + + assembly->metadatahdr->Version = (LPSTR)&metadatahdr->Version; + + ofs = FIELD_OFFSET(METADATAHDR, Flags); + ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1; + dest = (BYTE *)assembly->metadatahdr + ofs; + memcpy(dest, ptr, sizeof(METADATAHDR) - ofs); + + *hdrsz = sizeof(METADATAHDR) - sizeof(LPSTR) + metadatahdr->VersionLength + 1; + + return S_OK; +} + +static HRESULT parse_clr_metadata(ASSEMBLY *assembly) +{ + HRESULT hr; + DWORD hdrsz; + + hr = parse_metadata_header(assembly, &hdrsz); + if (FAILED(hr)) + return hr; + + return S_OK; +} + +static HRESULT parse_pe_header(ASSEMBLY *assembly) +{ + IMAGE_DATA_DIRECTORY *datadirs; + + assembly->nthdr = ImageNtHeader(assembly->data); + if (!assembly->nthdr) + return E_FAIL; + + if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + IMAGE_OPTIONAL_HEADER64 *opthdr = + (IMAGE_OPTIONAL_HEADER64 *)&assembly->nthdr->OptionalHeader; + datadirs = opthdr->DataDirectory; + } + else + { + IMAGE_OPTIONAL_HEADER32 *opthdr = + (IMAGE_OPTIONAL_HEADER32 *)&assembly->nthdr->OptionalHeader; + datadirs = opthdr->DataDirectory; + } + + if (!datadirs) + return E_FAIL; + + if (!datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress || + !datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size) + { + return E_FAIL; + } + + assembly->corhdr = ImageRvaToVa(assembly->nthdr, assembly->data, + datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress, NULL); + if (!assembly->corhdr) + return E_FAIL; + + return S_OK; +} + +HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) +{ + ASSEMBLY *assembly; + HRESULT hr; + + *out = NULL; + + assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + if (!assembly) + return E_OUTOFMEMORY; + + assembly->path = strdupW(file); + if (!assembly->path) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + assembly->hfile = CreateFileW(file, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (assembly->hfile == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + assembly->hmap = CreateFileMappingW(assembly->hfile, NULL, PAGE_READONLY, + 0, 0, NULL); + if (!assembly->hmap) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + assembly->data = MapViewOfFile(assembly->hmap, FILE_MAP_READ, 0, 0, 0); + if (!assembly->data) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + hr = parse_pe_header(assembly); + if (FAILED(hr)) goto failed; + + hr = parse_clr_metadata(assembly); + if (FAILED(hr)) goto failed; + + *out = assembly; + return S_OK; + +failed: + assembly_release(assembly); + return hr; +} + +HRESULT assembly_release(ASSEMBLY *assembly) +{ + if (!assembly) + return S_OK; + + HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); + HeapFree(GetProcessHeap(), 0, assembly->path); + UnmapViewOfFile(assembly->data); + CloseHandle(assembly->hmap); + CloseHandle(assembly->hfile); + HeapFree(GetProcessHeap(), 0, assembly); + + return S_OK; +} + +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) +{ + *version = assembly->metadatahdr->Version; + + return S_OK; +} diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index a6de737..619743f 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -86,9 +86,36 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) { - FIXME("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer); + ASSEMBLY *assembly; + HRESULT hr; + LPSTR version; + ULONG buffer_size=*pcchBuffer; - return E_NOTIMPL; + TRACE("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer); + + hr = assembly_create(&assembly, pwzFilePath); + + if (SUCCEEDED(hr)) + { + hr = assembly_get_runtime_version(assembly, &version); + + if (SUCCEEDED(hr)) + { + *pcchBuffer = MultiByteToWideChar(CP_UTF8, 0, version, -1, NULL, 0); + + if (pwzBuffer) + { + if (buffer_size >= *pcchBuffer) + MultiByteToWideChar(CP_UTF8, 0, version, -1, pwzBuffer, buffer_size); + else + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + } + + assembly_release(assembly); + } + + return hr; } static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface, diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index dda9bc0..5c80848 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -24,6 +24,12 @@ extern IUnknown* create_corruntimehost(void); extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); +typedef struct tagASSEMBLY ASSEMBLY; + +HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); +HRESULT assembly_release(ASSEMBLY *assembly); +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010