summaryrefslogtreecommitdiff
path: root/src/vm/util.cpp
diff options
context:
space:
mode:
authorAustin Wise <AustinWise@gmail.com>2017-03-05 17:51:40 -0800
committerJan Kotas <jkotas@microsoft.com>2017-03-05 17:51:40 -0800
commit51e968b013e9b1582035f202e004ed024f747f4f (patch)
tree25b0b82deb3392cbeacb3be81bbf3c29e11e81cb /src/vm/util.cpp
parent118f88dc17c75800ca249330ea41a963d3bae306 (diff)
downloadcoreclr-51e968b013e9b1582035f202e004ed024f747f4f.tar.gz
coreclr-51e968b013e9b1582035f202e004ed024f747f4f.tar.bz2
coreclr-51e968b013e9b1582035f202e004ed024f747f4f.zip
Remove hosting methods that always return false (#9930)
* Remove CLRIoCompletionHosted as it always returns false. * Remove CLRSyncHosted as it always returns false. * Remove CLRMemoryHosted as it always returns false. * Remove CLRTaskHosted as it always returns false. * Remove CLRAssemblyHosted, CLRGCHosted,and CLRSecurityHosted. They are not called. * Remove IsThreadPoolHosted as it always returns false. * Remove EnterRuntime and LeaveRuntime, as they do nothing. * Add back calls to RevertIfImpersonated and GCX_PREEMP. I accidentally deleted the call to RevertIfImpersonated instead of just removing an extra parameter. When I removed the HR_LEAVE_RUNTIME_HOLDER macro from windowsruntime.h, I not only removed a LeaveRuntimeHolder but also a GCX_PREEMP. So I added it back. The holder and GCX_PREEMP where only inserted when the FEATURE_LEAVE_RUNTIME_HOLDER macro was defined. Since it is always defined, I removed it. Also as I understand it, you would always want to have a GCX_PREEMP before calling into the Windows API as not to block the GC, so I'm not sure why you would want to disable it.
Diffstat (limited to 'src/vm/util.cpp')
-rw-r--r--src/vm/util.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/vm/util.cpp b/src/vm/util.cpp
index a33c774654..70ed0e27ca 100644
--- a/src/vm/util.cpp
+++ b/src/vm/util.cpp
@@ -2505,8 +2505,6 @@ HMODULE CLRGetModuleHandle(LPCWSTR lpModuleFileName)
STATIC_CONTRACT_FORBID_FAULT;
STATIC_CONTRACT_SO_TOLERANT;
- ThreadAffinityHolder affinity;
-
HMODULE hMod = WszGetModuleHandle(lpModuleFileName);
return hMod;
}
@@ -2520,8 +2518,6 @@ HMODULE CLRGetCurrentModuleHandle()
STATIC_CONTRACT_FORBID_FAULT;
STATIC_CONTRACT_SO_TOLERANT;
- ThreadAffinityHolder affinity;
-
HMODULE hMod = WszGetModuleHandle(NULL);
return hMod;
}
@@ -2680,7 +2676,6 @@ static HMODULE CLRLoadLibraryWorker(LPCWSTR lpLibFileName, DWORD *pLastError)
STATIC_CONTRACT_FAULT;
STATIC_CONTRACT_SO_TOLERANT;
- ThreadAffinityHolder affinity;
HMODULE hMod;
UINT last = SetErrorMode(SEM_NOOPENFILEERRORBOX|SEM_FAILCRITICALERRORS);
{
@@ -2724,7 +2719,6 @@ static HMODULE CLRLoadLibraryExWorker(LPCWSTR lpLibFileName, HANDLE hFile, DWORD
STATIC_CONTRACT_FAULT;
STATIC_CONTRACT_SO_TOLERANT;
- ThreadAffinityHolder affinity;
HMODULE hMod;
UINT last = SetErrorMode(SEM_NOOPENFILEERRORBOX|SEM_FAILCRITICALERRORS);
{
@@ -2766,7 +2760,6 @@ BOOL CLRFreeLibrary(HMODULE hModule)
STATIC_CONTRACT_FORBID_FAULT;
STATIC_CONTRACT_SO_TOLERANT;
- ThreadAffinityHolder affinity;
return FreeLibrary(hModule);
}
@@ -2778,8 +2771,6 @@ VOID CLRFreeLibraryAndExitThread(HMODULE hModule,DWORD dwExitCode)
STATIC_CONTRACT_FORBID_FAULT;
STATIC_CONTRACT_SO_TOLERANT;
- ThreadAffinityHolder affinity;
-
// This is no-return
FreeLibraryAndExitThread(hModule,dwExitCode);
}