diff options
Diffstat (limited to 'src/vm/ceemain.cpp')
| -rw-r--r-- | src/vm/ceemain.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp index 6b0c0dfbba..9cce46d2f0 100644 --- a/src/vm/ceemain.cpp +++ b/src/vm/ceemain.cpp @@ -869,7 +869,7 @@ void EEStartupHelper(COINITIEE fFlags) // Initialize remoting - if (!GCHandleTableUtilities::GetGCHandleTable()->Initialize()) + if (!GCHandleUtilities::GetGCHandleManager()->Initialize()) { IfFailGo(E_OUTOFMEMORY); } @@ -1880,7 +1880,7 @@ part2: #ifdef SHOULD_WE_CLEANUP if (!g_fFastExitProcess) { - GCHandleTableUtilities::GetGCHandleTable()->Shutdown(); + GCHandleUtilities::GetGCHandleManager()->Shutdown(); } #endif /* SHOULD_WE_CLEANUP */ @@ -2386,7 +2386,7 @@ BOOL CanRunManagedCode(LoaderLockCheck::kind checkKind, HINSTANCE hInst /*= 0*/) // no longer maintains a ref count since the EE doesn't support being // unloaded and re-loaded. It simply ensures the EE has been started. // --------------------------------------------------------------------------- -HRESULT STDMETHODCALLTYPE CoInitializeEE(DWORD fFlags) +HRESULT STDAPICALLTYPE CoInitializeEE(DWORD fFlags) { CONTRACTL { @@ -2417,7 +2417,7 @@ HRESULT STDMETHODCALLTYPE CoInitializeEE(DWORD fFlags) // Description: // Must be called by client on shut down in order to free up the system. // --------------------------------------------------------------------------- -void STDMETHODCALLTYPE CoUninitializeEE(BOOL fIsDllUnloading) +void STDAPICALLTYPE CoUninitializeEE(BOOL fIsDllUnloading) { LIMITED_METHOD_CONTRACT; //BEGIN_ENTRYPOINT_VOIDRET; @@ -2483,17 +2483,17 @@ void InitializeGarbageCollector() IGCToCLR* gcToClr = nullptr; #endif - IGCHandleTable *pGcHandleTable; + IGCHandleManager *pGcHandleManager; IGCHeap *pGCHeap; - if (!InitializeGarbageCollector(gcToClr, &pGCHeap, &pGcHandleTable, &g_gc_dac_vars)) + if (!InitializeGarbageCollector(gcToClr, &pGCHeap, &pGcHandleManager, &g_gc_dac_vars)) { ThrowOutOfMemory(); } assert(pGCHeap != nullptr); g_pGCHeap = pGCHeap; - g_pGCHandleTable = pGcHandleTable; + g_pGCHandleManager = pGcHandleManager; g_gcDacGlobals = &g_gc_dac_vars; // Apparently the Windows linker removes global variables if they are never |