Remove mentions of Rotor from codebase

src/ToolBox/SOS/Strike/vm.cpp

@@ -2,11 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// ==++==
-// 
-
-// 
-// ==--==
 /*++
 
 Module Name:
@@ -22,7 +17,10 @@ Revision History:
 
 --*/
 
-#ifndef FEATURE_PAL
+#ifdef FEATURE_PAL
+#error This file is Win32 only.
+#endif // #ifdef FEATURE_PAL
+
 #include <tchar.h>
 
 
@@ -712,21 +710,3 @@ Return Value:
     }
 
 }   // DECLARE_API( vmmap )
-
-#else
-
-#include <rotor_pal.h>
-#include <assert.h>
-
-void vmstat()
-{
-   assert(false);
-}
-
-void vmmap()
-{
-
-   assert(false);
-}
-
-#endif  // #ifndef FEATURE_PAL

src/debug/ee/rcthread.cpp

@@ -12,8 +12,9 @@
 
 #include "stdafx.h"
 
-
+#ifndef FEATURE_PAL
 #include "securitywrapper.h"
+#endif
 #include <aclapi.h>
 #include <hosting.h>
 

src/debug/ildbsymlib/symwrite.cpp

@@ -78,11 +78,8 @@ COM_METHOD SymWriter::QueryInterface(REFIID riid, void **ppInterface)
 
     if (riid == IID_ISymUnmanagedWriter )
         *ppInterface = (ISymUnmanagedWriter*)this;
-    /* ROTORTODO: Pretend that we do not implement ISymUnmanagedWriter2 to prevent C# compiler from using it.
-       This is against COM rules since ISymUnmanagedWriter3 inherits from ISymUnmanagedWriter2.
     else if (riid == IID_ISymUnmanagedWriter2 )
         *ppInterface = (ISymUnmanagedWriter2*)this;
-    */
     else if (riid == IID_ISymUnmanagedWriter3 )
         *ppInterface = (ISymUnmanagedWriter3*)this;
     else if (riid == IID_IUnknown)

src/inc/MSCOREE.IDL

@@ -105,7 +105,6 @@ cpp_quote("EXTERN_GUID(IID_ITypeNameFactory, 0xB81FF171, 0x20F3, 0x11d2, 0x8d, 0
 #pragma midl_echo("DEPRECATED_CLR_STDAPI CorBindToRuntime(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv);")
 #pragma midl_echo("DEPRECATED_CLR_STDAPI CorBindToCurrentRuntime(LPCWSTR pwszFileName, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv);")
 #pragma midl_echo("DEPRECATED_CLR_STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject);")
-#pragma midl_echo("DECLARE_DEPRECATED void STDMETHODCALLTYPE CorMarkThreadInThreadPool();")
 #pragma midl_echo("DEPRECATED_CLR_STDAPI RunDll32ShimW(HWND hwnd, HINSTANCE hinst, LPCWSTR lpszCmdLine, int nCmdShow);")
 #pragma midl_echo("DEPRECATED_CLR_STDAPI LoadLibraryShim(LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE *phModDll);")
 #pragma midl_echo("DEPRECATED_CLR_STDAPI CallFunctionShim(LPCWSTR szDllName, LPCSTR szFunctionName, LPVOID lpvArgument1, LPVOID lpvArgument2, LPCWSTR szVersion, LPVOID pvReserved);")

src/inc/debugreturn.h

@@ -105,10 +105,6 @@ typedef __SafeToReturn __ReturnOK;
 #define DEBUG_ASSURE_NO_RETURN_BEGIN(arg) { typedef __YouCannotUseAReturnStatementHere __ReturnOK; if (0 && __ReturnOK::used()) { } else {
 #define DEBUG_ASSURE_NO_RETURN_END(arg)   } }
 
-// rotor_pal.h defaulted these to empty macros; this file redefines them
-#undef DEBUG_OK_TO_RETURN_BEGIN
-#undef DEBUG_OK_TO_RETURN_END
-
 #define DEBUG_OK_TO_RETURN_BEGIN(arg) { typedef __SafeToReturn __ReturnOK; if (0 && __ReturnOK::used()) { } else {
 #define DEBUG_OK_TO_RETURN_END(arg) } }
 

src/inc/palclr.h

@@ -141,31 +141,17 @@
 #define IMAGE_IMPORT_DESC_FIELD(img, f)     ((img).f)
 #endif
 
-//Remove these "unanonymous" unions from newer builds for now.  Confirm that they were never needed when we
-//bring back Rotor.
 #define IMAGE_RDE_ID(img) ((img)->Id)
-#ifndef IMAGE_RDE_ID
-#define IMAGE_RDE_ID(img)        ((img)->Id)
-#endif
 
 #define IMAGE_RDE_NAME(img) ((img)->Name)
-#ifndef IMAGE_RDE_NAME
-#define IMAGE_RDE_NAME(img)      ((img)->Name)
-#endif
 
 #define IMAGE_RDE_OFFSET(img) ((img)->OffsetToData)
-#ifndef IMAGE_RDE_OFFSET
-#define IMAGE_RDE_OFFSET(img)    ((img)->OffsetToData)
-#endif
 
 #ifndef IMAGE_RDE_NAME_FIELD
 #define IMAGE_RDE_NAME_FIELD(img, f)    ((img)->f)
 #endif
 
 #define IMAGE_RDE_OFFSET_FIELD(img, f) ((img)->f)
-#ifndef IMAGE_RDE_OFFSET_FIELD
-#define IMAGE_RDE_OFFSET_FIELD(img, f)  ((img)->f)
-#endif
 
 #ifndef IMAGE_FE64_FIELD
 #define IMAGE_FE64_FIELD(img, f)    ((img).f)

src/inc/safemath.h

@@ -22,7 +22,7 @@
 #define _ASSERTE_SAFEMATH _ASSERTE
 #else
 // Otherwise (eg. we're being used from a tool like SOS) there isn't much
-// we can rely on that is both available everywhere and rotor-safe.  In 
+// we can rely on that is available everywhere.  In
 // several other tools we just take the recourse of disabling asserts,
 // we'll do the same here.  
 // Ideally we'd have a collection of common utilities available evererywhere.
@@ -855,18 +855,4 @@ typedef ClrSafeInt<UINT16> S_UINT16;
 typedef ClrSafeInt<UINT64> S_UINT64; 
 typedef ClrSafeInt<SIZE_T> S_SIZE_T;
 
-// Note: we can get bogus /Wp64 compiler warnings when S_SIZE_T is used.
-// This is due to VSWhidbey 138322 which the C++ folks have said they can't 
-// currently fix. We can work around the problem by using this macro to force
-// a no-op cast on 32-bit MSVC platforms.  It's not yet clear why we need to
-// use this in some places (specifically, rotor lkgvc builds) and not others.
-// We also make the error less likely by using a #define instead of a 
-// typedef for S_UINT32 above since that means we're less likely to instantiate
-// ClrSafeInt<UINT32> AND ClrSafeInt<SIZE_T> in the same compliation unit.
-#if defined(_TARGET_X86_) && defined( _MSC_VER )
-#define S_SIZE_T_WP64BUG(v)  S_SIZE_T( static_cast<UINT32>( v ) )
-#else
-#define S_SIZE_T_WP64BUG(v)  S_SIZE_T( v )
-#endif
-
  #endif // SAFEMATH_H_

src/inc/securitywrapper.h

@@ -12,7 +12,9 @@
 #ifndef _SECURITY_WRAPPER_H
 #define _SECURITY_WRAPPER_H
 
-// This file should not even be included on Rotor.
+#ifdef FEATURE_PAL
+#error This file should not be included on non-Windows platforms.
+#endif
 
 //-----------------------------------------------------------------------------
 // Wrapper around a PSID.
@@ -60,8 +62,6 @@ class SidBuffer
     BYTE * m_pBuffer;
 };
 
-#ifndef FEATURE_PAL
-
 //-----------------------------------------------------------------------------
 // Access Control List.
 //-----------------------------------------------------------------------------
@@ -99,13 +99,5 @@ class Win32SecurityDescriptor
     PSECURITY_DESCRIPTOR m_pDesc;
 };
 
-#endif // FEATURE_PAL
-
-//-----------------------------------------------------------------------------
-// Check if the handle owner belongs to either the process specified by the pid 
-// or the current process. This lets us know if the handle is spoofed.
-//-----------------------------------------------------------------------------
-bool IsHandleSpoofed(HANDLE handle, DWORD pid);
-
 
 #endif // _SECURITY_WRAPPER_H

src/inc/switches.h

@@ -145,16 +145,6 @@
 
 #endif // _DEBUG
 
-
-
-#if defined(PROFILING_SUPPORTED)
-// On desktop CLR builds, the profiling API uses the event log for end-user-friendly
-// diagnostic messages.  CoreCLR on Windows ouputs debug strings for diagnostic messages.
-// Rotor builds have no access to event log message resources, though, so they simply 
-// display popup dialogs for now.
-#define FEATURE_PROFAPI_EVENT_LOGGING
-#endif // defined(PROFILING_SUPPORTED)
-
 // MUST NEVER CHECK IN WITH THIS ENABLED.
 // This is just for convenience in doing performance investigations in a checked-out enlistment.
 // #define FEATURE_ENABLE_NO_RANGE_CHECKS

src/pal/inc/rt/palrt.h

@@ -151,60 +151,6 @@ inline void *__cdecl operator new(size_t, void *_P)
 
 #include <pal_assert.h>
 
-#if defined(_DEBUG)
-#define ROTOR_PAL_CTOR_TEST_BODY(TESTNAME)                              \
-    class TESTNAME ## _CTOR_TEST {                                      \
-    public:                                                             \
-        class HelperClass {                                             \
-        public:                                                         \
-            HelperClass(const char *String) {                           \
-                _ASSERTE (m_s == NULL);                                 \
-                m_s = String;                                           \
-            }                                                           \
-                                                                        \
-            void Validate (const char *String) {                        \
-                _ASSERTE (m_s);                                         \
-                _ASSERTE (m_s == String);                               \
-                _ASSERTE (!strncmp (                                    \
-                              m_s,                                      \
-                              String,                                   \
-                              1000));                                   \
-            }                                                           \
-                                                                        \
-        private:                                                        \
-            const char *m_s;                                            \
-        };                                                              \
-                                                                        \
-        TESTNAME ## _CTOR_TEST() {                                      \
-            _ASSERTE (m_This == NULL);                                  \
-            m_This = this;                                              \
-        }                                                               \
-                                                                        \
-        void Validate () {                                              \
-            _ASSERTE (m_This == this);                                  \
-            m_String.Validate(#TESTNAME "_CTOR_TEST");                  \
-        }                                                               \
-                                                                        \
-    private:                                                            \
-        void              *m_This;                                      \
-        static HelperClass m_String;                                    \
-    };                                                                  \
-                                                                        \
-    static TESTNAME ## _CTOR_TEST                                       \
-      g_ ## TESTNAME ## _CTOR_TEST;                                     \
-    TESTNAME ## _CTOR_TEST::HelperClass                                 \
-      TESTNAME ## _CTOR_TEST::m_String(#TESTNAME "_CTOR_TEST");
-
-#define ROTOR_PAL_CTOR_TEST_RUN(TESTNAME)                               \
-    g_ ## TESTNAME ##_CTOR_TEST.Validate()
-
-#else // DEBUG
-
-#define ROTOR_PAL_CTOR_TEST_BODY(TESTNAME) 
-#define ROTOR_PAL_CTOR_TEST_RUN(TESTNAME)  do {} while (0)
-
-#endif // DEBUG
-
 #define NTAPI       __cdecl
 #define WINAPI      __cdecl
 #define CALLBACK    __cdecl

src/pal/inc/rt/vsassert.h

@@ -55,18 +55,18 @@ do {                                                            \
 #define VSAlloc(cb)          HeapAlloc(GetProcessHeap(), 0, cb)
 #define VSAllocZero(cb)      HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb)
 #define VSRealloc(pv, cb)    HeapReAlloc(GetProcessHeap(), 0, pv, cb)
-#define VSReallocZero(pv,cb) Rotors_pal_doesnt_have_vsrealloczero
+#define VSReallocZero(pv,cb) CoreCLR_pal_doesnt_have_vsrealloczero
 #define VSFree(pv)           HeapFree(GetProcessHeap(), 0, pv)
-#define VSSize(pv)           Rotors_pal_doesnt_have_heapsize
+#define VSSize(pv)           CoreCLR_pal_doesnt_have_heapsize
 
 #define VsDebAlloc(flags,cb)          VSAlloc(cb)
 #define VsDebRealloc(pv,flags,cb)     VSRealloc(pv,cb)
-#define VsDebSafeRealloc(pv,flags,cb) Rotors_pal_doenst_have_saferealloc
+#define VsDebSafeRealloc(pv,flags,cb) CoreCLR_pal_doenst_have_saferealloc
 #define VsDebFree(pv)                 VSFree(pv)
 #define VsDebHeapSize(heap, pv)       VSSize(pv)
 
-#define VsDebHeapCreate(flags, name)         Rotor_doesnt_have_heapcreate
-#define VsDebHeapDestroy(heap, fLeakCheck)   Rotor_doesnt_have_heapdestroy
+#define VsDebHeapCreate(flags, name)         CoreCLR_doesnt_have_heapcreate
+#define VsDebHeapDestroy(heap, fLeakCheck)   CoreCLR_doesnt_have_heapdestroy
 
 #define VsDebugAllocInternal(hheap,dwFlags,cb,pszFile,uLine,dwInst,pszExtra) \
     HeapAlloc(GetProcessHeap(), dwFlags, cb)

src/pal/prebuilt/inc/mscoree.h

@@ -263,7 +263,6 @@ DEPRECATED_CLR_STDAPI CorBindToRuntimeByCfg(IStream* pCfgStream, DWORD reserved,
 DEPRECATED_CLR_STDAPI CorBindToRuntime(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv);
 DEPRECATED_CLR_STDAPI CorBindToCurrentRuntime(LPCWSTR pwszFileName, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv);
 DEPRECATED_CLR_STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject);
-DECLARE_DEPRECATED void STDMETHODCALLTYPE CorMarkThreadInThreadPool();
 DEPRECATED_CLR_STDAPI RunDll32ShimW(HWND hwnd, HINSTANCE hinst, LPCWSTR lpszCmdLine, int nCmdShow);
 DEPRECATED_CLR_STDAPI LoadLibraryShim(LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE *phModDll);
 DEPRECATED_CLR_STDAPI CallFunctionShim(LPCWSTR szDllName, LPCSTR szFunctionName, LPVOID lpvArgument1, LPVOID lpvArgument2, LPCWSTR szVersion, LPVOID pvReserved);