Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add GetParent to c.s.j.p.win32.User32 #1354

Merged
merged 1 commit into from
Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Features
* [#1338](https://github.com/java-native-access/jna/pull/1338): Add `RegNotifyChangeKeyValue` to `c.s.j.p.win32.Advapi32` - [@Dani-Hub](https://github.com/Dani-Hub).
* [#1340](https://github.com/java-native-access/jna/issues/1340): Added `CM_Get_DevNode_Registry_Property` to `c.s.j.p.win32.Cfgmgr32` and corresponding util in `c.s.j.p.win32.Cfgmgr32Util` - [@dbwiddis](https://github.com/dbwiddis).
* [#1352](https://github.com/java-native-access/jna/pull/1352): Add `BringWindowToTop` to `c.s.j.p.win32.User32` - [@kahgoh](https://github.com/kahgoh).
* [#1354](https://github.com/java-native-access/jna/pull/1352): Add `GetParent` to `c.s.j.p.win32.User32` - [@kahgoh](https://github.com/kahgoh).

Bug Fixes
---------
Expand Down
24 changes: 24 additions & 0 deletions contrib/platform/src/com/sun/jna/platform/win32/User32.java
Original file line number Diff line number Diff line change
Expand Up @@ -2274,6 +2274,30 @@ LRESULT SendMessageTimeout(HWND hWnd, int msg, WPARAM wParam, LPARAM lParam,
*/
HWND GetAncestor(HWND hwnd, int gaFlags);

/**
* Retrieves a handle to the specified window's parent or owner.
*
* To retrieve a handle to a specified ancestor, use the GetAncestor function.
*
* @param hwnd
* A handle to the window whose parent window handle is to be retrieved.
* @return Type: HWND<br />
* If the window is a child window, the return value is a handle to the
* parent window. If the window is a top-level window with the WS_POPUP style,
* the return value is a handle to the owner window.
*
* If the function fails, the return value is NULL. To get extended error
* information, call GetLastError.
*
* This function typically fails for one of the following reasons:
* <ul>
* <li>The window is a top-level window that is unowned or does not have
* the WS_POPUP style
* <li>The owner window has WS_POPUP style
* </ul>
*/
HWND GetParent(HWND hwnd);

/**
* Retrieves the position of the mouse cursor, in screen coordinates.
*
Expand Down
30 changes: 30 additions & 0 deletions contrib/platform/test/com/sun/jna/platform/win32/User32Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import com.sun.jna.platform.win32.WinUser.MONITORINFOEX;

import javax.swing.JFrame;
import javax.swing.JWindow;

/**
* @author dblock[at]dblock[dot]org
Expand Down Expand Up @@ -377,6 +378,35 @@ public void testGetAncestor() {
assertNull("GetAncestor result should be null", result);
}

@Test
public void testGetParent() {
HWND desktopWindow = User32.INSTANCE.GetDesktopWindow();
assertNotNull("Failed to get desktop window HWND", desktopWindow);

HWND result = User32.INSTANCE.GetParent(desktopWindow);
assertNull("GetParent result should be null", result);

final JFrame parent = new JFrame("Parent");
final JWindow child = new JWindow(parent);

try {
parent.setVisible(true);
child.setVisible(true);

HWND parentHwnd = new HWND();
parentHwnd.setPointer(Native.getComponentPointer(parent));

HWND childHwnd = new HWND();
childHwnd.setPointer(Native.getComponentPointer(child));

result = User32.INSTANCE.GetParent(childHwnd);
assertEquals("GetParent of child should be parent", parentHwnd, result);
} finally {
child.dispose();
parent.dispose();
}
}

@Test
public void testGetCursorPos() {
POINT cursorPos = new POINT();
Expand Down