8289770: Remove Windows version macro from ShellFolder2.cpp

[aivanov-jdk]

This clean-up PR removes unused Windows version macro from ShellFolder2.cpp.

IS_WINVISTA was not used at all.

IS_WINXP guarded support for icons with alpha channel. It is now safe to assume Java runs on a Windows version later than Windows XP. Java launchers specify 6.0 as the minimum OS version which corresponds to Windows Vista.

---

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-8289770: Remove Windows version macro from ShellFolder2.cpp (Bug - P4)

Reviewers

• Julian Waters (@TheShermanTanker - Committer)
• Tejesh R (@TejeshR13 - Committer)
• Sergey Bylokhov (@mrserb - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18736

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back aivanov! 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]

@aivanov-jdk 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:

8289770: Remove Windows version macro from ShellFolder2.cpp

Reviewed-by: jwaters, tr, serb

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 101 new commits pushed to the master branch:

• 003e86f: 8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
• 706b421: 8330467: NoClassDefFoundError when lambda is in a hidden class
• fe0227e: 8311098: Change comment in verificationType.hpp to refer to _sym
• 0646284: 8317376: Minor improvements to the 'this' escape analyzer
• 4895a15: 8319516: AIX System::loadLibrary needs support to load a shared library from an archive object
• fd331ff: 8325469: Freeze/Thaw code can crash in the presence of OSR frames
• 9fd7802: 8325494: C2: Broken graph after not skipping CastII node anymore for Assertion Predicates after JDK-8309902
• 192ec38: 8329595: spurious variable "might not have been initialized" on static final field
• 03e8417: 8329948: Remove string template feature
• ff3e76f: 8330053: JFR: Use LocalDateTime instead ZonedDateTime
• ... and 91 more: https://git.openjdk.org/jdk/compare/279ed0ddd505fb3052b818f755b4b220ed5557e6...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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]

@aivanov-jdk The following label will be automatically applied to this pull request:

• client

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

[mlbridge]

Webrevs

• 00: Full (8fa9d06d)

[TejeshR13]

Can you update JBS title and description regarding "support for icons with alpha channel" too. These updates are visible only in PR and not in JBS.

[aivanov-jdk]

Can you update JBS title and description regarding "support for icons with alpha channel" too. These updates are visible only in PR and not in JBS.

Updated the JBS subject.

Added a comment with break-up of macro usages.

[mrserb]

there are exactly the same macro in awt.h which are mostly unused except "IS_WIN8"

[aivanov-jdk]

There's a separate bug for removing the macro from awt.h:

JDK-8289772: Remove obsolete Windows version macros: IS_WIN2000, IS_WINXP, IS_WINVISTA

Why am I taking ShellFolder2.cpp separately? The comment in the ShellFolder2.cpp file suggest these are copies from awt.h. This makes ShellFolder2.cpp isolated from any other usage. Removing the macro cleans up a single file, easy to do, easy to review.

Removing the macro from awt.h is not as simple, some macro are used in the code. For example, IS_WIN8 is used in awt_Toolkit.cpp to determine whether touch keyboard handling is enabled.

jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

Line 669 in 58911cc

tk.m_isWin8OrLater = IS_WIN8;

Then IS_WINVISTA is used in the code which determines whether DWM is available; IS_WINXP is used in many places to determine menu bar colors, to handle subclassing default Windows controls. Removing the macro will make the code cleaner but it requires modifying the code. Eventually, the task may be broken into smaller pieces.

The usage of IS_WIN8 could be replaced with IsWindows8OrGreater which is part of Version Helper functions and is the recommended method to determine the version of the Windows OS.

[aivanov-jdk]

/integrate

[openjdk]

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

• 6158da5: 8330108: Increase CipherInputStream buffer size
• a92ad03: 8329995: Restricted access to /proc can cause JFR initialization to crash
• fcb4a8b: 8330578: The VM creates instance of abstract class VirtualMachineError
• 3bd6982: 8326150: Typo in the documentation for jdk.jshell
• d9d926d: 8330145: Serial: Refactor SerialHeap::scan_evacuated_objs
• 1a6da3d: 8330822: Remove ModRefBarrierSet::write_ref_array_work
• 281f9bd: 8330735: RISC-V: No need to move sp to tmp register in set_last_Java_frame
• daa5a4b: 8330802: Desugar switch in Locale::createLocale
• 8961077: 8309259: Reduce calls to MethodHandles.lookup() in jdk.internal.net.http.Stream
• 574ba14: 8330862: GCBarrierIRExample fails when a different GC is selected via the command line
• ... and 150 more: https://git.openjdk.org/jdk/compare/279ed0ddd505fb3052b818f755b4b220ed5557e6...master

Your commit was automatically rebased without conflicts.

[openjdk]

@aivanov-jdk Pushed as commit 3d5eeac.

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