Replace GetHandleTableContext with GetHandleContext.

diff --git a/src/gc/gchandletable.cpp b/src/gc/gchandletable.cpp
index accc72d..77c1ad1 100644 (file)
--- a/src/gc/gchandletable.cpp
+++ b/src/gc/gchandletable.cpp
@@ -23,9 +23,9 @@ void GCHandleTable::Shutdown()
     Ref_Shutdown();
 }
 
-void* GCHandleTable::GetHandleTableContext(void* handleTable)
+void* GCHandleTable::GetHandleContext(OBJECTHANDLE handle)
 {
-    return (void*)((uintptr_t)::HndGetHandleTableADIndex((HHANDLETABLE)handleTable).m_dwIndex);
+    return (void*)((uintptr_t)::HndGetHandleTableADIndex(::HndGetHandleTable(handle)).m_dwIndex);
 }
 
 void* GCHandleTable::GetHandleTableForHandle(OBJECTHANDLE handle)

diff --git a/src/gc/gchandletableimpl.h b/src/gc/gchandletableimpl.h
index 350ae58..df803a2 100644 (file)
--- a/src/gc/gchandletableimpl.h
+++ b/src/gc/gchandletableimpl.h
@@ -14,7 +14,7 @@ public:
 
     virtual void Shutdown();
 
-    virtual void* GetHandleTableContext(void* handleTable);
+    virtual void* GetHandleContext(OBJECTHANDLE handle);
 
     virtual void* GetHandleTableForHandle(OBJECTHANDLE handle);
 

diff --git a/src/gc/gcinterface.h b/src/gc/gcinterface.h
index b10e081..7c62a82 100644 (file)
--- a/src/gc/gcinterface.h
+++ b/src/gc/gcinterface.h
@@ -409,7 +409,7 @@ public:
 
     virtual void Shutdown() = 0;
 
-    virtual void* GetHandleTableContext(void* handleTable) = 0;
+    virtual void* GetHandleContext(OBJECTHANDLE handle) = 0;
 
     virtual void* GetHandleTableForHandle(OBJECTHANDLE handle) = 0;
 

diff --git a/src/vm/gcheaputilities.cpp b/src/vm/gcheaputilities.cpp
index e63655d..e155583 100644 (file)
--- a/src/vm/gcheaputilities.cpp
+++ b/src/vm/gcheaputilities.cpp
@@ -48,8 +48,7 @@ void ValidateHandleAndAppDomain(OBJECTHANDLE handle)
 
     IGCHandleTable *pHandleTable = GCHandleTableUtilities::GetGCHandleTable();
 
-    void* handleTable = pHandleTable->GetHandleTableForHandle(handle);
-    DWORD context = (DWORD)pHandleTable->GetHandleTableContext(handleTable);
+    DWORD context = (DWORD)pHandleTable->GetHandleContext(handle);
 
     ADIndex appDomainIndex = ADIndex(context);
     AppDomain *domain = SystemDomain::GetAppDomainAtIndex(appDomainIndex);