stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8238203: Return value of GetUserDefaultUILanguage() should be handled as LANGID

Browse Source 
Reviewed-by: naoto
This commit is contained in:
Yasumasa Suenaga 2020-02-02 18:35:28 +01:00
parent 319d6976a5
commit 1cd5eac5c3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java.base/windows/native/libjava/java_props_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -641,7 +641,8 @@ GetJavaProperties(JNIEnv* env)
*/ */
LCID userDefaultLCID = GetUserDefaultLCID(); LCID userDefaultLCID = GetUserDefaultLCID();
LCID systemDefaultLCID = GetSystemDefaultLCID(); LCID systemDefaultLCID = GetSystemDefaultLCID();
LCID userDefaultUILang = GetUserDefaultUILanguage(); LANGID userDefaultUILang = GetUserDefaultUILanguage();
LCID userDefaultUILCID = MAKELCID(userDefaultUILang, SORTIDFROMLCID(userDefaultLCID));
{ {
char * display_encoding; char * display_encoding;
@ -655,8 +656,8 @@ GetJavaProperties(JNIEnv* env)
// for the UI Language, if the "language" portion of those // for the UI Language, if the "language" portion of those
// two locales are the same. // two locales are the same.
if (PRIMARYLANGID(LANGIDFROMLCID(userDefaultLCID)) == if (PRIMARYLANGID(LANGIDFROMLCID(userDefaultLCID)) ==
PRIMARYLANGID(LANGIDFROMLCID(userDefaultUILang))) { PRIMARYLANGID(userDefaultUILang)) {
userDefaultUILang = userDefaultLCID; userDefaultUILCID = userDefaultLCID;
} }
SetupI18nProps(userDefaultLCID, SetupI18nProps(userDefaultLCID,
@ -665,7 +666,7 @@ GetJavaProperties(JNIEnv* env)
&sprops.format_country, &sprops.format_country,
&sprops.format_variant, &sprops.format_variant,
&sprops.encoding); &sprops.encoding);
SetupI18nProps(userDefaultUILang, SetupI18nProps(userDefaultUILCID,
&sprops.display_language, &sprops.display_language,
&sprops.display_script, &sprops.display_script,
&sprops.display_country, &sprops.display_country,