Module: wine Branch: master Commit: bba33e539164d63347a1e772e3acef807ba63889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bba33e539164d63347a1e772e...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Dec 3 08:48:26 2019 +0100
ntdll: Get rid of __wine_init_codepages().
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/locale.c | 2 -- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/rtlstr.c | 9 --------- 3 files changed, 12 deletions(-)
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b062d7ef73..4d4b99660a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2314,7 +2314,6 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, */ void LOCALE_Init(void) { - extern void CDECL __wine_init_codepages( const union cptable *ansi_cp, const union cptable *oem_cp ); extern UINT CDECL __wine_get_unix_codepage(void);
UINT ansi_cp = 1252, oem_cp = 437, mac_cp = 10000, unix_cp; @@ -2332,7 +2331,6 @@ void LOCALE_Init(void) if (!(mac_cptable = wine_cp_get_table( mac_cp ))) mac_cptable = wine_cp_get_table( 10000 );
- __wine_init_codepages( ansi_cptable, oem_cptable ); unix_cp = __wine_get_unix_codepage(); if (unix_cp != CP_UTF8) unix_cptable = wine_cp_get_table( unix_cp );
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8dd2350c83..566f51c8d1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1567,7 +1567,6 @@ @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version
# Codepages -@ cdecl __wine_init_codepages(ptr ptr) @ cdecl __wine_get_unix_codepage()
# signal handling diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index cd84856bc8..8196dd7178 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -41,15 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #define GUID_STRING_LENGTH 38
-/************************************************************************** - * __wine_init_codepages (NTDLL.@) - * - * Set the code page once kernel32 is loaded. Should be done differently. - */ -void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable *oem ) -{ -} - /************************************************************************** * RtlInitAnsiString (NTDLL.@) *