diff options
Diffstat (limited to 'src/dlls/mscoree')
| -rw-r--r-- | src/dlls/mscoree/coreclr/coreclr.nativeproj | 6 | ||||
| -rw-r--r-- | src/dlls/mscoree/mscoree.cpp | 2 | ||||
| -rw-r--r-- | src/dlls/mscoree/mscorwks_unixexports.src | 1 | ||||
| -rw-r--r-- | src/dlls/mscoree/unixinterface.cpp | 26 |
4 files changed, 21 insertions, 14 deletions
diff --git a/src/dlls/mscoree/coreclr/coreclr.nativeproj b/src/dlls/mscoree/coreclr/coreclr.nativeproj index d9350bcf4c..484790ee6f 100644 --- a/src/dlls/mscoree/coreclr/coreclr.nativeproj +++ b/src/dlls/mscoree/coreclr/coreclr.nativeproj @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood"> + <PropertyGroup> + <!-- Work around problems with loading System.Private.CoreLib.dll, --> + <!-- caused by inconsistent setting of UseLegacyCompiler and FeatureSpanOfT --> + <!-- between System.Private.CoreLib.dll and the runtime. --> + <UseLegacyCompiler>true</UseLegacyCompiler> + </PropertyGroup> <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" /> <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\dlls\mscoree\mscoree.settings.targets" /> <PropertyGroup Label="Globals"> diff --git a/src/dlls/mscoree/mscoree.cpp b/src/dlls/mscoree/mscoree.cpp index 3d33337c62..4c613fff6a 100644 --- a/src/dlls/mscoree/mscoree.cpp +++ b/src/dlls/mscoree/mscoree.cpp @@ -75,8 +75,6 @@ HINSTANCE g_hThisInst; // This library. #include <process.h> // for __security_init_cookie() -void* __stdcall GetCLRFunction(LPCSTR FunctionName); - extern "C" IExecutionEngine* __stdcall IEE(); #ifdef NO_CRT_INIT diff --git a/src/dlls/mscoree/mscorwks_unixexports.src b/src/dlls/mscoree/mscorwks_unixexports.src index 9c151a942c..f7862d3afe 100644 --- a/src/dlls/mscoree/mscorwks_unixexports.src +++ b/src/dlls/mscoree/mscorwks_unixexports.src @@ -98,6 +98,7 @@ UnlockFile UnmapViewOfFile VirtualAlloc VirtualFree +GlobalMemoryStatusEx VirtualQuery WideCharToMultiByte WriteFile diff --git a/src/dlls/mscoree/unixinterface.cpp b/src/dlls/mscoree/unixinterface.cpp index 8d75ff2721..edd361c0c2 100644 --- a/src/dlls/mscoree/unixinterface.cpp +++ b/src/dlls/mscoree/unixinterface.cpp @@ -247,21 +247,23 @@ int coreclr_initialize( host.SuppressRelease(); *hostHandle = host; #ifdef FEATURE_GDBJIT - - hr = coreclr_create_delegate(*hostHandle, - *domainId, - "SOS.NETCore", - "SOS.SymbolReader", - "GetInfoForMethod", - (void**)&getInfoForMethodDelegate); - - if (!SUCCEEDED(hr)) + HRESULT createDelegateResult; + createDelegateResult = coreclr_create_delegate(*hostHandle, + *domainId, + "SOS.NETCore", + "SOS.SymbolReader", + "GetInfoForMethod", + (void**)&getInfoForMethodDelegate); + +#if defined(_DEBUG) + if (!SUCCEEDED(createDelegateResult)) { fprintf(stderr, - "Can't create delegate for 'System.Diagnostics.Debug.SymbolReader.SymbolReader.GetInfoForMethod' " - "method - status: 0x%08x\n", hr); + "Can't create delegate for 'SOS.SymbolReader.GetInfoForMethod' " + "method - status: 0x%08x\n", createDelegateResult); } - hr = S_OK; // We don't need to fail if we can't create delegate +#endif // _DEBUG + #endif } return hr; |