dotnet · AaronRobinsonMSFT · May 26, 2025 · May 26, 2025 · May 26, 2025 · May 26, 2025
diff --git a/src/coreclr/debug/di/module.cpp b/src/coreclr/debug/di/module.cpp
@@ -2443,7 +2443,7 @@ HRESULT CordbModule::CreateReaderForInMemorySymbols(REFIID riid, void** ppObj)
         {
 #ifndef TARGET_UNIX
             // PDB format - use diasymreader.dll with COM activation
-            InlineSString<_MAX_PATH> ssBuf;
+            InlineSString<MAX_PATH> ssBuf;
             IfFailThrow(GetClrModuleDirectory(ssBuf));
             IfFailThrow(FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS,
                                                ssBuf.GetUnicode(),

diff --git a/src/coreclr/dlls/mscordac/mscordac_unixexports.src b/src/coreclr/dlls/mscordac/mscordac_unixexports.src
@@ -82,7 +82,6 @@ nativeStringResourceTable_mscorrc
 #FreeEnvironmentStringsW
 #FreeLibrary
 #FileTimeToSystemTime
-#GetACP
 #GetCurrentProcess
 #GetCurrentProcessId
 #GetCurrentThreadId

diff --git a/src/coreclr/ilasm/assembler.h b/src/coreclr/ilasm/assembler.h
@@ -34,7 +34,7 @@
 #define MAX_SIGNATURE_LENGTH        256       // unused
 #define MAX_LABEL_SIZE              256       //64
 #define MAX_CALL_SIG_SIZE           32        // unused
-#define MAX_SCOPE_LENGTH            _MAX_PATH // follow the RegMeta::SetModuleProps limitation
+#define MAX_SCOPE_LENGTH            MAX_PATH  // follow the RegMeta::SetModuleProps limitation
 
 #define MAX_NAMESPACE_LENGTH        1024      //256    //64
 #define MAX_MEMBER_NAME_LENGTH      1024      //256    //64

diff --git a/src/coreclr/inc/sstring.h b/src/coreclr/inc/sstring.h
@@ -647,8 +647,6 @@ class EMPTY_BASES_DECL SString : private SBuffer
 
     static const BYTE s_EmptyBuffer[2];
 
-    static UINT s_ACP;
-
     SPTR_DECL(SString,s_Empty);
 
     COUNT_T GetRawCount() const;

diff --git a/src/coreclr/md/compiler/regmeta_vm.cpp b/src/coreclr/md/compiler/regmeta_vm.cpp
@@ -157,7 +157,7 @@ RegMeta::ResolveTypeRef(
     HRESULT hr;
 
     TypeRefRec * pTypeRefRec;
-    WCHAR        wzNameSpace[_MAX_PATH];
+    WCHAR        wzNameSpace[MAX_PATH];
     CMiniMdRW *  pMiniMd = NULL;
 
     LOCKREAD();

diff --git a/src/coreclr/pal/inc/pal.h b/src/coreclr/pal/inc/pal.h
@@ -100,7 +100,6 @@ extern bool g_arm64_atomics_present;
 /******************* ABI-specific glue *******************************/
 
 #define MAX_PATH 260
-#define _MAX_PATH 260
 #define _MAX_DRIVE  3   /* max. length of drive component */
 #define _MAX_DIR    256 /* max. length of path component */
 #define _MAX_FNAME  256 /* max. length of file name component */
@@ -111,9 +110,7 @@ extern bool g_arm64_atomics_present;
 #define MAX_PATH_FNAME MAX_PATH
 #define MAX_LONGPATH   1024  /* max. length of full pathname */
 
-#define MAXSHORT      0x7fff
 #define MAXLONG       0x7fffffff
-#define MAXCHAR       0x7f
 #define MAXDWORD      0xffffffff
 
 //  Sorting IDs.
@@ -419,7 +416,6 @@ PAL_PerfJitDump_Finish();
 #define MB_OKCANCEL             0x00000001L
 #define MB_ABORTRETRYIGNORE     0x00000002L
 
-#define MB_ICONQUESTION         0x00000020L
 #define MB_ICONEXCLAMATION      0x00000030L
 
 #define MB_TASKMODAL            0x00002000L
@@ -2914,11 +2910,6 @@ FlushInstructionCache(
 #define MAX_LEADBYTES         12
 #define MAX_DEFAULTCHAR       2
 
-PALIMPORT
-UINT
-PALAPI
-GetACP(void);
-
 typedef struct _cpinfo {
     UINT MaxCharSize;
     BYTE DefaultChar[MAX_DEFAULTCHAR];
@@ -3900,29 +3891,6 @@ PALIMPORT DLLEXPORT int __cdecl _putenv(const char *);
 #define ERANGE          34
 #endif
 
-/****************PAL Perf functions for PInvoke*********************/
-#if PAL_PERF
-PALIMPORT
-VOID
-PALAPI
-PAL_EnableProcessProfile();
-
-PALIMPORT
-VOID
-PALAPI
-PAL_DisableProcessProfile();
-
-PALIMPORT
-BOOL
-PALAPI
-PAL_IsProcessProfileEnabled();
-
-PALIMPORT
-INT64
-PALAPI
-PAL_GetCpuTickCount();
-#endif // PAL_PERF
-
 /******************* PAL functions for exceptions *******/
 
 #ifdef __cplusplus

diff --git a/src/coreclr/pal/src/cruntime/wchar.cpp b/src/coreclr/pal/src/cruntime/wchar.cpp
@@ -958,7 +958,7 @@ _wfopen(
     const wchar_16 *fileName,
     const wchar_16 *mode)
 {
-    CHAR mbFileName[ _MAX_PATH ];
+    CHAR mbFileName[ MAX_PATH ];
     CHAR mbMode[ 10 ];
     FILE * filePtr = NULL;
 

diff --git a/src/coreclr/pal/src/include/pal/palinternal.h b/src/coreclr/pal/src/include/pal/palinternal.h
@@ -157,10 +157,6 @@ function_name() to call the system's implementation
    the header */
 #include <type_traits>
 
-#ifdef PAL_PERF
-#include "pal_perf.h"
-#endif
-
 #ifdef __record_type_class
 #undef __record_type_class
 #endif

diff --git a/src/coreclr/pal/src/include/pal/perftrace.h b/src/coreclr/pal/src/include/pal/perftrace.h
@@ -24,45 +24,10 @@ Overview of PAL Performance utilities
 #ifndef _PAL_PERFTRACE_H_
 #define _PAL_PERFTRACE_H_
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-
-#if PAL_PERF
-#define PERF_ENTRY(x)  \
-	ULONGLONG pal_perf_start_tick = 0;\
-    PERFLogFunctionEntry( PAL_PERF_##x, &pal_perf_start_tick )
-#define PERF_EXIT(x) \
-	PERFLogFunctionExit( PAL_PERF_##x, &pal_perf_start_tick )
-#define PERF_ENTRY_ONLY(x)  \
-	PERFNoLatencyProfileEntry( PAL_PERF_##x )
-
-BOOL PERFInitialize(LPWSTR command_line, LPWSTR exe_path) ;
-void PERFTerminate( );
-BOOL PERFAllocThreadInfo( );
-void PERFLogFunctionExit(unsigned int pal_api_id, ULONGLONG *pal_perf_start_tick);
-void PERFLogFunctionEntry(unsigned int pal_api_id, ULONGLONG *pal_perf_start_tick);
-void PERFEnableThreadProfile(BOOL isInternal);
-void PERFDisableThreadProfile(BOOL isInternal);
-void PERFEnableProcessProfile( );
-void PERFDisableProcessProfile( );
-BOOL PERFIsProcessProfileEnabled( );
-void PERFNoLatencyProfileEntry(unsigned int pal_api_id );
-void PERFCalibrate(const char* msg);
-
-#else  /* PAL_PERF */
-
 #define PERF_ENTRY(x)
 #define PERF_ENTRY_ONLY(x)
 #define PERF_EXIT(x)
 
-#endif /* PAL_PERF */
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #endif /* _PAL_PERFTRACE_H_ */
 
 

diff --git a/src/coreclr/pal/src/init/pal.cpp b/src/coreclr/pal/src/init/pal.cpp
@@ -538,17 +538,6 @@ Initialize(
         // InitializeProcessCommandLine took ownership of this memory.
         command_line = nullptr;
 
-#ifdef PAL_PERF
-        // Initialize the Profiling structure
-        if(FALSE == PERFInitialize(command_line, exe_path))
-        {
-            ERROR("Performance profiling initial failed\n");
-            palError = ERROR_PALINIT_PERF;
-            goto CLEANUP2;
-        }
-        PERFAllocThreadInfo();
-#endif
-
         if (!LOADSetExeName(exe_path))
         {
             ERROR("Unable to set exe name\n");
@@ -681,15 +670,6 @@ Initialize(
     ERROR("PAL_Initialize failed\n");
     SetLastError(palError);
 done:
-#ifdef PAL_PERF
-    if( retval == 0)
-    {
-         PERFEnableProcessProfile();
-         PERFEnableThreadProfile(FALSE);
-         PERFCalibrate("Overhead of PERF entry/exit");
-    }
-#endif
-
     InternalLeaveCriticalSection(pThread, init_critsec);
 
     if (fFirstTimeInit && 0 == retval)

diff --git a/src/coreclr/pal/src/locale/unicode.cpp b/src/coreclr/pal/src/locale/unicode.cpp
@@ -40,31 +40,6 @@ PALAPI
 GetConsoleOutputCP(
        VOID)
 {
-    UINT nRet = 0;
-    PERF_ENTRY(GetConsoleOutputCP);
-    ENTRY("GetConsoleOutputCP()\n");
-    nRet = GetACP();
-    LOGEXIT("GetConsoleOutputCP returns UINT %d \n", nRet );
-    PERF_EXIT(GetConsoleOutputCP);
-    return nRet;
-}
-
-/*++
-Function:
-GetACP
-
-See MSDN doc.
---*/
-UINT
-PALAPI
-GetACP(VOID)
-{
-    PERF_ENTRY(GetACP);
-    ENTRY("GetACP(VOID)\n");
-
-    LOGEXIT("GetACP returning UINT %d\n", CP_UTF8);
-    PERF_EXIT(GetACP);
-
     return CP_UTF8;
 }