Delete FEATURE_USE_LCID (#24767)

Never defined and obsolete

2 files changed, 1 insertions, 104 deletions

diff --git a/src/inc/cor.h b/src/inc/cor.h
index 85ef14d8cb..034801b05f 100644
--- a/src/inc/cor.h
+++ b/src/inc/cor.h
@@ -20,17 +20,6 @@
 
 //*****************************************************************************
 
-#if defined(_MSC_VER) && !defined(USE_DEPRECATED_CLR_API_WITHOUT_WARNING)
-#define DEPRECATED_CLR_API_MESG "This API has been deprecated. Refer to http://go.microsoft.com/fwlink/?LinkId=143720 for more details."
-#define DECLARE_DEPRECATED __declspec(deprecated(DEPRECATED_CLR_API_MESG))
-#define DEPRECATED_CLR_STDAPI EXTERN_C DECLARE_DEPRECATED HRESULT STDAPICALLTYPE
-#define DEPRECATED_CLR_STDAPI_(type) EXTERN_C DECLARE_DEPRECATED type STDAPICALLTYPE
-#else // _MSC_VER && !USE_DEPRECATED_CLR_API_WITHOUT_WARNING
-#define DECLARE_DEPRECATED
-#define DEPRECATED_CLR_STDAPI STDAPI
-#define DEPRECATED_CLR_STDAPI_(type) STDAPI_(type)
-#endif // _MSC_VER && !USE_DEPRECATED_CLR_API_WITHOUT_WARNING
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -145,32 +134,6 @@ typedef UNALIGNED void const *UVCP_CONSTANT;
 #define INVALID_TASK_ID         0x0 
 #define MAX_CONNECTION_NAME     MAX_PATH
 
-//*****************************************************************************
-//*****************************************************************************
-//
-// D L L   P U B L I C   E N T R Y    P O I N T   D E C L A R A T I O N S
-//
-//*****************************************************************************
-//*****************************************************************************
-
-BOOL STDMETHODCALLTYPE _CorDllMain(HINSTANCE hInst, DWORD dwReason, LPVOID lpReserved);
-__int32 STDMETHODCALLTYPE _CorExeMain();
-__int32 STDMETHODCALLTYPE _CorExeMainInternal();
-__int32 STDMETHODCALLTYPE _CorExeMain2( // Executable exit code.
-    PBYTE   pUnmappedPE,                // -> memory mapped code
-    DWORD   cUnmappedPE,                // Size of memory mapped code
-    _In_ LPWSTR  pImageNameIn,          // -> Executable Name
-    _In_ LPWSTR  pLoadersFileName,      // -> Loaders Name
-    _In_ LPWSTR  pCmdLine);             // -> Command Line
-
-STDAPI _CorValidateImage(PVOID *ImageBase, LPCWSTR FileName);
-STDAPI_(VOID) _CorImageUnloading(PVOID ImageBase);
-
-DEPRECATED_CLR_STDAPI          CoInitializeEE(DWORD fFlags);
-DEPRECATED_CLR_STDAPI_(void)   CoUninitializeEE(BOOL fFlags);
-DEPRECATED_CLR_STDAPI_(void)   CoEEShutDownCOM(void);
-
-
 
 #define MAIN_CLR_MODULE_NAME_W        W("coreclr")
 #define MAIN_CLR_MODULE_NAME_A         "coreclr"
@@ -179,21 +142,11 @@ DEPRECATED_CLR_STDAPI_(void)   CoEEShutDownCOM(void);
 #define MAIN_CLR_DLL_NAME_A           MAKEDLLNAME_A(MAIN_CLR_MODULE_NAME_A)
 
 
-
 #define MSCOREE_SHIM_W               MAIN_CLR_DLL_NAME_W
 #define MSCOREE_SHIM_A               MAIN_CLR_DLL_NAME_A
 
 #define SWITCHOUT_HANDLE_VALUE ((HANDLE)(LONG_PTR)-2)
 
-
-//
-// CoInitializeCor flags.
-//
-typedef enum tagCOINITCOR
-{
-    COINITCOR_DEFAULT       = 0x0           // Default initialization mode. 
-} COINITICOR;
-
 //
 // CoInitializeEE flags.
 //
@@ -204,15 +157,6 @@ typedef enum tagCOINITEE
     COINITEE_MAIN           = 0x2           // Initialize prior to entering the main routine 
 } COINITIEE;
 
-//
-// CoInitializeEE flags.
-//
-typedef enum tagCOUNINITEE
-{
-    COUNINITEE_DEFAULT      = 0x0,          // Default uninitialization mode.
-    COUNINITEE_DLL          = 0x1           // Uninitialization mode for unloading DLL. 
-} COUNINITIEE;
-
 //*****************************************************************************
 //*****************************************************************************
 //
@@ -229,18 +173,6 @@ typedef enum tagCOUNINITEE
 
 //*****************************************************************************
 //*****************************************************************************
-//
-// D L L   P U B L I C   E N T R Y    P O I N T   D E C L A R A T I O N S
-//
-//*****************************************************************************
-//*****************************************************************************
-
-DEPRECATED_CLR_STDAPI          CoInitializeCor(DWORD fFlags);
-DEPRECATED_CLR_STDAPI_(void)   CoUninitializeCor(void);
-
-//
-//*****************************************************************************
-//*****************************************************************************
 
 // CLSID_Cor: {bee00000-ee77-11d0-a015-00c04fbbb884}
 EXTERN_GUID(CLSID_Cor, 0xbee00010, 0xee77, 0x11d0, 0xa0, 0x15, 0x00, 0xc0, 0x4f, 0xbb, 0xb8, 0x84);
@@ -2494,10 +2426,5 @@ inline ULONG CorSigUncompressPointer(   // return number of bytes of that compre
 
 #endif  // __cplusplus
 
-#undef DEPRECATED_CLR_STDAPI_
-#undef DEPRECATED_CLR_STDAPI
-#undef DECLARE_DEPRECATED
-#undef DEPRECATED_CLR_API_MESG
-
 #endif // _COR_H_
 // EOF =======================================================================
diff --git a/src/inc/utilcode.h b/src/inc/utilcode.h
index 17c8b14afc..8e866a00a7 100644
--- a/src/inc/utilcode.h
+++ b/src/inc/utilcode.h
@@ -531,16 +531,8 @@ inline HRESULT OutOfMemory()
 //*****************************************************************************
 // Handle accessing localizable resource strings
 //*****************************************************************************
-// NOTE: Should use locale names as much as possible.  LCIDs don't support
-// custom cultures on Vista+.
-// TODO: This should always use the names
-#ifdef FEATURE_USE_LCID    
-typedef LCID LocaleID;
-typedef LCID LocaleIDValue;
-#else
 typedef LPCWSTR LocaleID;
 typedef WCHAR LocaleIDValue[LOCALE_NAME_MAX_LENGTH];
-#endif
 
 // Notes about the culture callbacks:
 // - The language we're operating in can change at *runtime*!
@@ -556,12 +548,7 @@ typedef WCHAR LocaleIDValue[LOCALE_NAME_MAX_LENGTH];
 
 // Callback to obtain both the culture name and the culture's parent culture name
 typedef HRESULT (*FPGETTHREADUICULTURENAMES)(__inout StringArrayList* pCultureNames);
-#ifdef FEATURE_USE_LCID
-// Callback to return the culture ID.
-const LCID UICULTUREID_DONTCARE = (LCID)-1;
-#else
 const LPCWSTR UICULTUREID_DONTCARE = NULL;
-#endif
 
 typedef int (*FPGETTHREADUICULTUREID)(LocaleIDValue*);
 
@@ -571,18 +558,9 @@ HMODULE CLRLoadLibraryEx(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
 
 BOOL CLRFreeLibrary(HMODULE hModule);
 
-// Prevent people from using LoadStringRC & LoadStringRCEx from inside the product since it
-// causes issues with having the wrong version picked up inside the shim.
-#define LoadStringRC __error("From inside the CLR, use UtilLoadStringRC; LoadStringRC is only meant to be exported.")
-#define LoadStringRCEx __error("From inside the CLR, use UtilLoadStringRCEx; LoadStringRC is only meant to be exported.")
-
 // Load a string using the resources for the current module.
 STDAPI UtilLoadStringRC(UINT iResouceID, __out_ecount (iMax) LPWSTR szBuffer, int iMax, int bQuiet=FALSE);
 
-#ifdef FEATURE_USE_LCID
-STDAPI UtilLoadStringRCEx(LCID lcid, UINT iResourceID, __out_ecount (iMax) LPWSTR szBuffer, int iMax, int bQuiet, int *pcwchUsed);
-#endif
-
 // Specify callbacks so that UtilLoadStringRC can find out which language we're in.
 // If no callbacks specified (or both parameters are NULL), we default to the
 // resource dll in the root (which is probably english).
@@ -647,12 +625,8 @@ public:
         _ASSERTE(m_hInst != NULL || m_fMissing);
         if (id == UICULTUREID_DONTCARE)
             return FALSE;
-        
-#ifdef FEATURE_USE_LCID
-        return id == m_LangId;
-#else
+
         return wcscmp(id, m_LangId) == 0;
-#endif
     }
     
     HRESOURCEDLL GetLibraryHandle()
@@ -687,9 +661,6 @@ public:
   private:
     void SetId(LocaleID id)
     {
-#ifdef FEATURE_USE_LCID
-        m_LangId = id;
-#else
         if (id != UICULTUREID_DONTCARE)
         {
             wcsncpy_s(m_LangId, NumItems(m_LangId), id, NumItems(m_LangId));
@@ -699,7 +670,6 @@ public:
         {
             m_LangId[0] = W('\0');
         }
-#endif
     }
  };