Module: wine Branch: master Commit: a1c8232b33b2fced53b577908a27823a69820f91 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1c8232b33b2fced53b577908a27823...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 16 10:48:14 2022 +0100
include: Remove custom/undocumented language identifiers.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/tests/font.c | 6 +++--- dlls/gdiplus/font.c | 6 +++--- dlls/win32u/freetype.c | 6 +++--- dlls/win32u/opentype.c | 6 +++--- include/winnt.rh | 32 -------------------------------- 5 files changed, 12 insertions(+), 44 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86c34a0deaa..608749e0446 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3687,8 +3687,8 @@ static const LANGID mac_langid_table[] = 0, /* TT_MAC_LANGID_RUANDA */ 0, /* TT_MAC_LANGID_RUNDI */ 0, /* TT_MAC_LANGID_CHEWA */ - MAKELANGID(LANG_MALAGASY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAGASY */ - MAKELANGID(LANG_ESPERANTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESPERANTO */ + 0, /* TT_MAC_LANGID_MALAGASY */ + 0, /* TT_MAC_LANGID_ESPERANTO */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 95-111 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 112-127 */ MAKELANGID(LANG_WELSH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_WELSH */ @@ -3708,7 +3708,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BRETON */ MAKELANGID(LANG_INUKTITUT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INUKTITUT */ MAKELANGID(LANG_SCOTTISH_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SCOTTISH_GAELIC */ - MAKELANGID(LANG_MANX_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MANX_GAELIC */ + 0, /* TT_MAC_LANGID_MANX_GAELIC */ MAKELANGID(LANG_IRISH,SUBLANG_IRISH_IRELAND), /* TT_MAC_LANGID_IRISH_GAELIC */ 0, /* TT_MAC_LANGID_TONGAN */ 0, /* TT_MAC_LANGID_GREEK_POLYTONIC */ diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 57849733a9c..03678623606 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1279,8 +1279,8 @@ static const LANGID mac_langid_table[] = 0, /* TT_MAC_LANGID_RUANDA */ 0, /* TT_MAC_LANGID_RUNDI */ 0, /* TT_MAC_LANGID_CHEWA */ - MAKELANGID(LANG_MALAGASY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAGASY */ - MAKELANGID(LANG_ESPERANTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESPERANTO */ + 0, /* TT_MAC_LANGID_MALAGASY */ + 0, /* TT_MAC_LANGID_ESPERANTO */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 95-111 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 112-127 */ MAKELANGID(LANG_WELSH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_WELSH */ @@ -1300,7 +1300,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BRETON */ MAKELANGID(LANG_INUKTITUT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INUKTITUT */ MAKELANGID(LANG_SCOTTISH_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SCOTTISH_GAELIC */ - MAKELANGID(LANG_MANX_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MANX_GAELIC */ + 0, /* TT_MAC_LANGID_MANX_GAELIC */ MAKELANGID(LANG_IRISH,SUBLANG_IRISH_IRELAND), /* TT_MAC_LANGID_IRISH_GAELIC */ 0, /* TT_MAC_LANGID_TONGAN */ 0, /* TT_MAC_LANGID_GREEK_POLYTONIC */ diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index d911039647b..d262c0ca1be 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -679,8 +679,8 @@ static const LANGID mac_langid_table[] = 0, /* TT_MAC_LANGID_RUANDA */ 0, /* TT_MAC_LANGID_RUNDI */ 0, /* TT_MAC_LANGID_CHEWA */ - MAKELANGID(LANG_MALAGASY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAGASY */ - MAKELANGID(LANG_ESPERANTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESPERANTO */ + 0, /* TT_MAC_LANGID_MALAGASY */ + 0, /* TT_MAC_LANGID_ESPERANTO */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 95-111 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 112-127 */ MAKELANGID(LANG_WELSH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_WELSH */ @@ -700,7 +700,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BRETON */ MAKELANGID(LANG_INUKTITUT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INUKTITUT */ MAKELANGID(LANG_SCOTTISH_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SCOTTISH_GAELIC */ - MAKELANGID(LANG_MANX_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MANX_GAELIC */ + 0, /* TT_MAC_LANGID_MANX_GAELIC */ MAKELANGID(LANG_IRISH,SUBLANG_IRISH_IRELAND), /* TT_MAC_LANGID_IRISH_GAELIC */ 0, /* TT_MAC_LANGID_TONGAN */ 0, /* TT_MAC_LANGID_GREEK_POLYTONIC */ diff --git a/dlls/win32u/opentype.c b/dlls/win32u/opentype.c index c206d6dae57..7a541ae4e4a 100644 --- a/dlls/win32u/opentype.c +++ b/dlls/win32u/opentype.c @@ -473,8 +473,8 @@ static const LANGID mac_langid_table[] = 0, 0, 0, - MAKELANGID(LANG_MALAGASY, SUBLANG_DEFAULT), - MAKELANGID(LANG_ESPERANTO, SUBLANG_DEFAULT), + 0, + 0, 0, 0, 0, @@ -525,7 +525,7 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_BRETON, SUBLANG_DEFAULT), MAKELANGID(LANG_INUKTITUT, SUBLANG_DEFAULT), MAKELANGID(LANG_SCOTTISH_GAELIC, SUBLANG_DEFAULT), - MAKELANGID(LANG_MANX_GAELIC, SUBLANG_DEFAULT), + 0, MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), 0, 0, diff --git a/include/winnt.rh b/include/winnt.rh index 786a38f326f..38cefd61c53 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -178,21 +178,6 @@ #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35
-/* These are documented by the MSDN but are missing from the Windows header */ -#define LANG_MALAGASY 0x8d - -/* FIXME: these are not defined anywhere */ -#define LANG_SUTU 0x30 -#define LANG_TSONGA 0x31 -#define LANG_VENDA 0x33 - -/* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ASTURIAN 0xa5 -#define LANG_ESPERANTO 0x8f -#define LANG_WALON 0x90 -#define LANG_CORNISH 0x92 -#define LANG_MANX_GAELIC 0x94 - /* Sublanguage definitions */ #define SUBLANG_NEUTRAL 0x00 /* language neutral */ #define SUBLANG_DEFAULT 0x01 /* user default */ @@ -441,23 +426,6 @@ #define SUBLANG_YORUBA_NIGERIA 0x01 #define SUBLANG_ZULU_SOUTH_AFRICA 0x01
-/* These are documented by the MSDN but are missing from the Windows header */ -#define SUBLANG_ENGLISH_IRELAND SUBLANG_ENGLISH_EIRE -#define SUBLANG_HAUSA_NIGERIA SUBLANG_HAUSA_NIGERIA_LATIN -#define SUBLANG_LAO_LAO_PDR SUBLANG_LAO_LAO -#define SUBLANG_PORTUGUESE_PORTUGAL SUBLANG_PORTUGUESE -#define SUBLANG_SWAHILI SUBLANG_SWAHILI_KENYA -#define SUBLANG_SWEDISH_SWEDEN SUBLANG_SWEDISH -#define SUBLANG_SYRIAC SUBLANG_SYRIAC_SYRIA - -/* FIXME: these are not defined anywhere */ -#define SUBLANG_DUTCH_SURINAM 0x03 -#define SUBLANG_ROMANIAN_MOLDAVIA 0x02 -#define SUBLANG_RUSSIAN_MOLDAVIA 0x02 -#define SUBLANG_LITHUANIAN_CLASSIC 0x02 -#define SUBLANG_MANX_GAELIC 0x01 - - /* * Sort definitions */