Add WlanApi module #1697

eranl · 2025-10-18T22:24:56Z

This is a partial mapping of WlanApi.h.

matthiasblaesing

Thank you, I made a first pass. Please have a look at the inline comments.

matthiasblaesing · 2025-10-19T19:08:28Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+    }
+
+    int WlanOpenHandle(int dwClientVersion, Pointer pReserved, IntByReference pdwNegotiatedVersion,
+                       PointerByReference phClientHandle);


Suggested change

PointerByReference phClientHandle);

HANDLEByReference phClientHandle);

matthiasblaesing · 2025-10-19T19:13:41Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+        @Override
+        protected List<String> getFieldOrder() {
+            return Arrays.asList("dwNumberOfItems", "dwIndex", "InterfaceInfo");
+        }


Please use @FieldOrder annotation. See https://github.com/eranl/jna/blob/4073685fec63fb1418ed42d5c0cf4037251f96aa/contrib/platform/src/com/sun/jna/platform/win32/WinCrypt.java#L51-L104 for an example. Applies to all structures.

matthiasblaesing · 2025-10-19T19:16:00Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

@@ -0,0 +1,188 @@
+package com.sun.jna.platform.win32;


The license header is missing (see for example

jna/contrib/platform/src/com/sun/jna/platform/win32/Crypt32.java

Lines 1 to 23 in dc44b98

/* Copyright (c) 2010 Daniel Doubrovkine, All Rights Reserved

*

* The contents of this file is dual-licensed under 2

* alternative Open Source/Free licenses: LGPL 2.1 or later and

* Apache License 2.0. (starting with JNA version 4.0.0).

*

* You can freely decide which license you want to apply to

* the project.

*

* You may obtain a copy of the LGPL License at:

*

* http://www.gnu.org/licenses/licenses.html

*

* A copy is also included in the downloadable source code package

* containing JNA, in file "LGPL2.1".

*

* You may obtain a copy of the Apache License at:

*

* http://www.apache.org/licenses/

*

* A copy is also included in the downloadable source code package

* containing JNA, in file "AL2.0".

*/

)

matthiasblaesing · 2025-10-19T19:18:38Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+    class WLAN_INTERFACE_INFO extends Structure {
+        public GUID InterfaceGuid;
+        public char[] strInterfaceDescription = new char[WLAN_MAX_NAME_LENGTH];
+        public int isState; // WLAN_INTERFACE_STATE


Please make this javadoc, then people might see this in IDE help. I.e.:

/** * See {@link WLAN_INTERFACE_STATE} for possible values */ public int isState;

This applies to other similar constructs in here.

matthiasblaesing · 2025-10-19T19:25:42Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+            return Arrays.asList("dwNumberOfItems", "dwIndex", "InterfaceInfo");
+        }
+
+        public void read() {


Missing @Override

matthiasblaesing · 2025-10-19T19:26:26Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+        public int wlanConnectionMode; // WLAN_CONNECTION_MODE
+        public char[] strProfileName = new char[WLAN_MAX_NAME_LENGTH];
+        public WLAN_ASSOCIATION_ATTRIBUTES wlanAssociationAttributes;
+        // Other fields omitted


This will break hard, if there is ever a use in an array or embedded inside another structure.

Is it acceptable to just add a warning about this in the doc, or should I complete these structures?

If necessary I can live with a warning, on the other hand here is a single field missing which is admittedly a structure itself, but that is also not that big.

Completed structures.

matthiasblaesing · 2025-10-19T19:30:51Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+    class HANDLE extends WinNT.HANDLE {
+        public HANDLE() {
+        }
+
+        public HANDLE(Pointer p) {
+            super(p);
+        }
+    }
+
+    class GUID extends Guid.GUID {}


These redefinitions are not necessary and should not be here.

matthiasblaesing

Thanks for the update. I checked the type definitions against MSDN and the headers are a bit convoluted. I see:

Definitions from Wlantypes.h (or Windot11.h, see blow):
- DOT11_SSID_MAX_LENGTH
- DOT11_AUTH_ALGORITHM
- DOT11_CIPHER_ALGORITHM
- DOT11_BSS_TYPE (it is defined in Wlantypes.h, MSDN says you should include windot11.h ...)
- DOT11_SSID (it is defined in Wlantypes.h, MSDN says you should include windot11.h ...)
Definitions from Windot11.h:
- DOT11_MAC_ADDRESS
- DOT11_PHY_TYPE

I think moving the referenced types to Windot11.java might be the cleanest solution.

For the type mapping of WLAN_SECURITY_ATTRIBUTES, please ensure, that a correct typemapper is active. boolean is not well defined. In Windows it is BOOL (32bit), but people would like to have boolean be a C bool, which is one byte (commonly). Use the com.sun.jna.win32.W32APITypeMapper.UNICODE mapper.

matthiasblaesing · 2025-11-13T21:26:14Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+        int DOT11_AUTH_ALGO_WPA_PSK = 4;
+        int DOT11_AUTH_ALGO_WPA_NONE = 5;               // used in NatSTA only
+        int DOT11_AUTH_ALGO_RSNA = 6;
+        int DOT11_AUTH_ALGO_RSNA_PSK = 7;


Suggested change

int DOT11_AUTH_ALGO_RSNA_PSK = 7;

int DOT11_AUTH_ALGO_RSNA_PSK = 7;

int DOT11_AUTH_ALGO_WPA3 = 8;

int DOT11_AUTH_ALGO_WPA3_ENT_192 = DOT11_AUTH_ALGO_WPA3;

int DOT11_AUTH_ALGO_WPA3_SAE = 9;

int DOT11_AUTH_ALGO_OWE = 10;

int DOT11_AUTH_ALGO_WPA3_ENT = 11;

matthiasblaesing · 2025-11-13T21:26:45Z

contrib/platform/src/com/sun/jna/platform/win32/WlanApi.java

+        int DOT11_CIPHER_ALGO_WEP40 = 0x01;
+        int DOT11_CIPHER_ALGO_TKIP = 0x02;
+        int DOT11_CIPHER_ALGO_CCMP = 0x04;
+        int DOT11_CIPHER_ALGO_WEP104 = 0x05;


Suggested change

int DOT11_CIPHER_ALGO_WEP104 = 0x05;

int DOT11_CIPHER_ALGO_WEP104 = 0x05;

int DOT11_CIPHER_ALGO_BIP = 0x06;

int DOT11_CIPHER_ALGO_GCMP = 0x08;

int DOT11_CIPHER_ALGO_GCMP_256 = 0x09;

int DOT11_CIPHER_ALGO_CCMP_256 = 0x0a;

int DOT11_CIPHER_ALGO_BIP_GMAC_128 = 0x0b;

int DOT11_CIPHER_ALGO_BIP_GMAC_256 = 0x0c;

int DOT11_CIPHER_ALGO_BIP_CMAC_256 = 0x0d;

Add WlanApi module

4073685

matthiasblaesing requested changes Oct 19, 2025

View reviewed changes

Address comments

7f39622

eranl requested a review from matthiasblaesing November 2, 2025 23:57

matthiasblaesing reviewed Nov 13, 2025

View reviewed changes

	PointerByReference phClientHandle);
	HANDLEByReference phClientHandle);

	/* Copyright (c) 2010 Daniel Doubrovkine, All Rights Reserved
	*
	* The contents of this file is dual-licensed under 2
	* alternative Open Source/Free licenses: LGPL 2.1 or later and
	* Apache License 2.0. (starting with JNA version 4.0.0).
	*
	* You can freely decide which license you want to apply to
	* the project.
	*
	* You may obtain a copy of the LGPL License at:
	*
	* http://www.gnu.org/licenses/licenses.html
	*
	* A copy is also included in the downloadable source code package
	* containing JNA, in file "LGPL2.1".
	*
	* You may obtain a copy of the Apache License at:
	*
	* http://www.apache.org/licenses/
	*
	* A copy is also included in the downloadable source code package
	* containing JNA, in file "AL2.0".
	*/

-        int DOT11_AUTH_ALGO_RSNA_PSK = 7;
+        int DOT11_AUTH_ALGO_RSNA_PSK = 7;
+        int DOT11_AUTH_ALGO_WPA3 = 8;
+        int DOT11_AUTH_ALGO_WPA3_ENT_192 = DOT11_AUTH_ALGO_WPA3;
+        int DOT11_AUTH_ALGO_WPA3_SAE = 9;
+        int DOT11_AUTH_ALGO_OWE = 10;
+        int DOT11_AUTH_ALGO_WPA3_ENT = 11;

-        int DOT11_CIPHER_ALGO_WEP104 = 0x05;
+        int DOT11_CIPHER_ALGO_WEP104 = 0x05;
+        int DOT11_CIPHER_ALGO_BIP = 0x06;
+        int DOT11_CIPHER_ALGO_GCMP = 0x08;
+        int DOT11_CIPHER_ALGO_GCMP_256 = 0x09;
+        int DOT11_CIPHER_ALGO_CCMP_256 = 0x0a;
+        int DOT11_CIPHER_ALGO_BIP_GMAC_128 = 0x0b;
+        int DOT11_CIPHER_ALGO_BIP_GMAC_256 = 0x0c;
+        int DOT11_CIPHER_ALGO_BIP_CMAC_256 = 0x0d;

Add WlanApi module #1697

Are you sure you want to change the base?

Add WlanApi module #1697

Conversation

eranl commented Oct 18, 2025

Uh oh!

matthiasblaesing left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

matthiasblaesing left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants