8370420: HostLocaleProviderAdapter_md.c from libjava can use GetLocaleInfoEx, GetCalendarInfoEx, EnumCalendarInfoExEx directly

[justin-curtis-lu]

This PR cleans up some native code for Windows i18n functions. These particular calls are designed to run on Windows Vista and later. Since Vista (and older) are not supported Windows platforms, the calls no longer need to be checked if they are supported and can be called directly.

Reference to docs: https://learn.microsoft.com/en-us/windows/win32/api/winnls/nf-winnls-getlocaleinfoex.

Minimum supported client: Windows Vista
Minimum supported server: Windows Server 2008

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8370420: HostLocaleProviderAdapter_md.c from libjava can use GetLocaleInfoEx, GetCalendarInfoEx, EnumCalendarInfoExEx directly (Enhancement - P4)

Reviewers

• Brian Burkhalter (@bplb - Reviewer) Review applies to 0ccf212a
• Naoto Sato (@naotoj - Reviewer)
• Matthias Baesken (@MBaesken - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/28119/head:pull/28119
$ git checkout pull/28119

Update a local copy of the PR:
$ git checkout pull/28119
$ git pull https://git.openjdk.org/jdk.git pull/28119/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28119

View PR using the GUI difftool:
$ git pr show -t 28119

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28119.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back jlu! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@justin-curtis-lu This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8370420: HostLocaleProviderAdapter_md.c from libjava can use GetLocaleInfoEx, GetCalendarInfoEx, EnumCalendarInfoExEx directly

Reviewed-by: naoto, mbaesken, bpb

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[openjdk]

@justin-curtis-lu The following labels will be automatically applied to this pull request:

• core-libs
• i18n

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 02: Full - Incremental (e6d45424)
• 01: Full - Incremental (e18a5744)
• 00: Full (0ccf212a)

[bplb]

Looks all right to me.

[naotoj]

I think we can clean it further, as we don't need to call Win32 through their function pointers. Specifically,

typedef int (WINAPI *PGLIE)(const jchar *, LCTYPE, LPWSTR, int);
typedef int (WINAPI *PGCIE)(const jchar *, CALID, LPCWSTR, CALTYPE, LPWSTR, int, LPDWORD);
typedef int (WINAPI *PECIEE)(CALINFO_ENUMPROCEXEX, const jchar *, CALID, LPCWSTR, CALTYPE, LPARAM);
PGLIE pGetLocaleInfoEx;
PGCIE pGetCalendarInfoEx;
PECIEE pEnumCalendarInfoExEx;
BOOL initialized = FALSE;

and it's init code can all go away, IIUC

[MBaesken]

I think we can clean it further, as we don't need to call Win32 through their function pointers. Specifically,

typedef int (WINAPI *PGLIE)(const jchar *, LCTYPE, LPWSTR, int);
typedef int (WINAPI *PGCIE)(const jchar *, CALID, LPCWSTR, CALTYPE, LPWSTR, int, LPDWORD);
typedef int (WINAPI *PECIEE)(CALINFO_ENUMPROCEXEX, const jchar *, CALID, LPCWSTR, CALTYPE, LPARAM);
PGLIE pGetLocaleInfoEx;
PGCIE pGetCalendarInfoEx;
PECIEE pEnumCalendarInfoExEx;
BOOL initialized = FALSE;

and it's init code can all go away, IIUC

Yes the GetProcAddress stuff should be removed too, see

jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c

Line 189 in c1476fc

pGetLocaleInfoEx = (PGLIE)GetProcAddress(

[naotoj]

LGTM

[justin-curtis-lu]

Thank you all for the reviews and suggestions.
/integrate

[openjdk]

Going to push as commit 0026967.
Since your change was applied there have been 17 commits pushed to the master branch:

• c272aca: 8371091: Improve the exception message of NullPointerException thrown by the methods in the default implementation of HttpRequest.Builder
• 1f08a3e: 8355342: File.getCanonicalPath on Java 24 resolves paths on network drives to UNC format
• 1321186: 8367943: PipedOutputStream write(0, 0) successful after close()
• ... and 14 more: https://git.openjdk.org/jdk/compare/1357be98fc7aeb73655ed1a31d0b6fa7a7213c3e...master

Your commit was automatically rebased without conflicts.

[openjdk]

@justin-curtis-lu Pushed as commit 0026967.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.