RFR: JDK-8311113: Remove invalid pointer cast and clean up setLabel() in awt_MenuItem.cpp [v4]
Sergey Bylokhov
serb at openjdk.org
Thu Sep 14 01:54:40 UTC 2023
On Fri, 1 Sep 2023 00:04:18 GMT, Harshitha Onkar <honkar at openjdk.org> wrote:
>> In awt_MenuItem.cpp (712,22): ` mii.dwTypeData = (LPTSTR)(*sb)` produces invalid pointer cast warning when complied on clang and moreover this is a no-op.
>>
>> `mii.dwTypeData` is used only when **MIIM_STRING** flag is set in the fMask (as per [Docs](https://learn.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-menuiteminfoa)), which is not the case in JDK [Ln#705](https://github.com/openjdk/jdk/blob/e56d3bc2dab3d32453b6eda66e8434953c436084/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp#L706). Hence the assignment ` mii.dwTypeData = (LPTSTR)(*sb)` is not required and so is the label parameter. Additionally necessary cleanup is done at the following places -
>>
>> - WMenuItemPeer.java - to the native function call
>> - awt_MenuItem.cpp - `WMenuItemPeer__1setLabel() ,_SetLabel(), SetLabel()`
>> - awt_MenuItem.h
>>
>> Added a test which checks setLabel() functionality on Menu, MenuItem and PopupMenu.
>
> Harshitha Onkar has updated the pull request incrementally with one additional commit since the last revision:
>
> review changes
Looks fine if the a11y things works fine, we probably can check for a possible cleanups in other places we use ownerdraw logic.
-------------
Marked as reviewed by serb (Reviewer).
PR Review: https://git.openjdk.org/jdk/pull/15276#pullrequestreview-1625692568
More information about the client-libs-dev
mailing list