Skip to content

Remove localization support for native resource #122025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 4 commits into from
Nov 28, 2025
Merged

Remove localization support for native resource #122025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
780e42b
Delete mscorrc lookup
huoyaoyuan Nov 27, 2025
2be12eb
Delete locale lookup
huoyaoyuan Nov 27, 2025
329f271
Remvoe locale acquisition
huoyaoyuan Nov 27, 2025
978669b
Remove current culture acquisition
huoyaoyuan Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/coreclr/inc/clrnt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
#define STATUS_LONGJUMP ((NTSTATUS)0x80000026L)
#endif

#ifndef LOCALE_NAME_MAX_LENGTH
#define LOCALE_NAME_MAX_LENGTH 85
#endif // !LOCALE_NAME_MAX_LENGTH

#ifndef IMAGE_FILE_MACHINE_RISCV64
#define IMAGE_FILE_MACHINE_RISCV64 0x5064 // RISCV64
#endif // !IMAGE_FILE_MACHINE_RISCV64
Expand Down
127 changes: 5 additions & 122 deletions src/coreclr/inc/utilcode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,30 +342,6 @@ inline HRESULT OutOfMemory()
}
#endif

//*****************************************************************************
// Handle accessing localizable resource strings
//*****************************************************************************
typedef LPCWSTR LocaleID;
typedef WCHAR LocaleIDValue[LOCALE_NAME_MAX_LENGTH];

// Notes about the culture callbacks:
// - The language we're operating in can change at *runtime*!
// - A process may operate in *multiple* languages.
// (ex: Each thread may have it's own language)
// - If we don't care what language we're in (or have no way of knowing),
// then return a 0-length name and UICULTUREID_DONTCARE for the culture ID.
// - GetCultureName() and the GetCultureId() must be in sync (refer to the
// same language).
// - We have two functions separate functions for better performance.
// - The name is used to resolve a directory for MsCorRC.dll.
// - The id is used as a key to map to a dll hinstance.

// Callback to obtain both the culture name and the culture's parent culture name
typedef HRESULT (*FPGETTHREADUICULTURENAMES)(__inout StringArrayList* pCultureNames);
const LPCWSTR UICULTUREID_DONTCARE = NULL;

typedef int (*FPGETTHREADUICULTUREID)(LocaleIDValue*);

HMODULE CLRLoadLibrary(LPCWSTR lpLibFileName);

HMODULE CLRLoadLibraryEx(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
Expand All @@ -375,19 +351,6 @@ BOOL CLRFreeLibrary(HMODULE hModule);
// Load a string using the resources for the current module.
STDAPI UtilLoadStringRC(UINT iResourceID, _Out_writes_ (iMax) LPWSTR szBuffer, int iMax, int bQuiet=FALSE);

// 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).
void SetResourceCultureCallbacks(
FPGETTHREADUICULTURENAMES fpGetThreadUICultureNames,
FPGETTHREADUICULTUREID fpGetThreadUICultureId
);

void GetResourceCultureCallbacks(
FPGETTHREADUICULTURENAMES* fpGetThreadUICultureNames,
FPGETTHREADUICULTUREID* fpGetThreadUICultureId
);

//*****************************************************************************
// Use this class by privately deriving from noncopyable to disallow copying of
// your class.
Expand All @@ -414,7 +377,6 @@ typedef HINSTANCE HRESOURCEDLL;

class CCulturedHInstance
{
LocaleIDValue m_LangId;
HRESOURCEDLL m_hInst;
BOOL m_fMissing;

Expand All @@ -426,15 +388,6 @@ class CCulturedHInstance
m_fMissing = FALSE;
}

BOOL HasID(LocaleID id)
{
_ASSERTE(m_hInst != NULL || m_fMissing);
if (id == UICULTUREID_DONTCARE)
return FALSE;

return u16_strcmp(id, m_LangId) == 0;
}

HRESOURCEDLL GetLibraryHandle()
{
return m_hInst;
Expand All @@ -450,42 +403,23 @@ class CCulturedHInstance
return m_fMissing;
}

void SetMissing(LocaleID id)
void SetMissing()
{
_ASSERTE(m_hInst == NULL);
SetId(id);
m_fMissing = TRUE;
}

void Set(LocaleID id, HRESOURCEDLL hInst)
void Set(HRESOURCEDLL hInst)
{
_ASSERTE(m_hInst == NULL);
_ASSERTE(m_fMissing == FALSE);
SetId(id);
m_hInst = hInst;
}
private:
void SetId(LocaleID id)
{
if (id != UICULTUREID_DONTCARE)
{
wcsncpy_s(m_LangId, ARRAY_SIZE(m_LangId), id, ARRAY_SIZE(m_LangId));
m_LangId[STRING_LENGTH(m_LangId)] = W('\0');
}
else
{
m_LangId[0] = W('\0');
}
}
};

#ifndef DACCESS_COMPILE
void AddThreadPreferredUILanguages(StringArrayList* pArray);
#endif
//*****************************************************************************
// CCompRC manages string Resource access for CLR. This includes loading
// the MsCorRC.dll for resources as well allowing each thread to use a
// a different localized version.
// the MsCorRC.dll for resources. No localization is supported.
//*****************************************************************************
class CCompRC
{
Expand Down Expand Up @@ -515,11 +449,6 @@ class CCompRC
{
// This constructor will be fired up on startup. Make sure it doesn't
// do anything besides zero-out out values.
m_fpGetThreadUICultureId = NULL;
m_fpGetThreadUICultureNames = NULL;

m_pHash = NULL;
m_nHashSize = 0;
m_csMap = NULL;
m_pResourceFile = NULL;
}// CCompRC
Expand All @@ -528,49 +457,14 @@ class CCompRC
void Destroy();

HRESULT LoadString(ResourceCategory eCategory, UINT iResourceID, _Out_writes_ (iMax) LPWSTR szBuffer, int iMax , int *pcwchUsed=NULL);
HRESULT LoadString(ResourceCategory eCategory, LocaleID langId, UINT iResourceID, _Out_writes_ (iMax) LPWSTR szBuffer, int iMax, int *pcwchUsed);

void SetResourceCultureCallbacks(
FPGETTHREADUICULTURENAMES fpGetThreadUICultureNames,
FPGETTHREADUICULTUREID fpGetThreadUICultureId
);

void GetResourceCultureCallbacks(
FPGETTHREADUICULTURENAMES* fpGetThreadUICultureNames,
FPGETTHREADUICULTUREID* fpGetThreadUICultureId
);

// Get the default resource location (mscorrc.dll)
static CCompRC* GetDefaultResourceDll();

static void GetDefaultCallbacks(
FPGETTHREADUICULTURENAMES* fpGetThreadUICultureNames,
FPGETTHREADUICULTUREID* fpGetThreadUICultureId)
{
WRAPPER_NO_CONTRACT;
m_DefaultResourceDll.GetResourceCultureCallbacks(
fpGetThreadUICultureNames,
fpGetThreadUICultureId);
}

static void SetDefaultCallbacks(
FPGETTHREADUICULTURENAMES fpGetThreadUICultureNames,
FPGETTHREADUICULTUREID fpGetThreadUICultureId)
{
WRAPPER_NO_CONTRACT;
// Either both are NULL or neither are NULL
_ASSERTE((fpGetThreadUICultureNames != NULL) ==
(fpGetThreadUICultureId != NULL));

m_DefaultResourceDll.SetResourceCultureCallbacks(
fpGetThreadUICultureNames,
fpGetThreadUICultureId);
}

private:
// String resources packaged as PE files only exist on Windows
#ifdef HOST_WINDOWS
HRESULT GetLibrary(LocaleID langId, HRESOURCEDLL* phInst);
HRESULT GetLibrary(HRESOURCEDLL* phInst);
#ifndef DACCESS_COMPILE
HRESULT LoadLibraryHelper(HRESOURCEDLL *pHInst,
SString& rcPath);
Expand All @@ -585,23 +479,12 @@ class CCompRC
static CCompRC m_DefaultResourceDll;
static LPCWSTR m_pDefaultResource;

// We must map between a thread's int and a dll instance.
// Since we only expect 1 language almost all of the time, we'll special case
// that and then use a variable size map for everything else.
// Use a singleton since we don't support localization any more.
CCulturedHInstance m_Primary;
CCulturedHInstance * m_pHash;
int m_nHashSize;

CRITSEC_COOKIE m_csMap;

LPCWSTR m_pResourceFile;

// Main accessors for hash
HRESOURCEDLL LookupNode(LocaleID langId, BOOL &fMissing);
HRESULT AddMapNode(LocaleID langId, HRESOURCEDLL hInst, BOOL fMissing = FALSE);

FPGETTHREADUICULTUREID m_fpGetThreadUICultureId;
FPGETTHREADUICULTURENAMES m_fpGetThreadUICultureNames;
};

HRESULT UtilLoadResourceString(CCompRC::ResourceCategory eCategory, UINT iResourceID, _Out_writes_ (iMax) LPWSTR szBuffer, int iMax);
Expand Down
8 changes: 0 additions & 8 deletions src/coreclr/pal/inc/rt/palrt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,14 +557,6 @@ typedef unsigned int ALG_ID;
#define LCMAP_LOWERCASE 0x00000100
#define LCMAP_UPPERCASE 0x00000200

// 8 characters for language
// 8 characters for region
// 64 characters for suffix (script)
// 2 characters for '-' separators
// 2 characters for prefix like "i-" or "x-"
// 1 null termination
#define LOCALE_NAME_MAX_LENGTH 85


#ifdef __cplusplus
/*
Expand Down
Loading
Loading