Address review: use HANDLEByReference and UNICODE_OPTIONS

Author: dbwiddis

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

@@ -29,7 +29,7 @@
 import com.sun.jna.Union;
 import com.sun.jna.platform.win32.WinBase.SYSTEMTIME;
 import com.sun.jna.platform.win32.WinNT.HANDLE;
-import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.platform.win32.WinNT.HANDLEByReference;
 import com.sun.jna.win32.StdCallLibrary;
 import com.sun.jna.win32.W32APIOptions;
 
@@ -41,7 +41,7 @@
 public interface BluetoothApis extends StdCallLibrary {
 
     /** Instance of BluetoothApis. */
-    BluetoothApis INSTANCE = Native.load("BluetoothApis", BluetoothApis.class, W32APIOptions.DEFAULT_OPTIONS);
+    BluetoothApis INSTANCE = Native.load("BluetoothApis", BluetoothApis.class, W32APIOptions.UNICODE_OPTIONS);
 
     /** Maximum Bluetooth device name length. */
     int BLUETOOTH_MAX_NAME_SIZE = 248;
@@ -202,7 +202,7 @@ public BLUETOOTH_RADIO_INFO() {
      * @see <a href=
      *      "https://learn.microsoft.com/en-us/windows/win32/api/bluetoothapis/nf-bluetoothapis-bluetoothfindfirstradio">BluetoothFindFirstRadio</a>
      */
-    HANDLE BluetoothFindFirstRadio(BLUETOOTH_FIND_RADIO_PARAMS pbtfrp, PointerByReference phRadio);
+    HANDLE BluetoothFindFirstRadio(BLUETOOTH_FIND_RADIO_PARAMS pbtfrp, HANDLEByReference phRadio);
 
     /**
      * Finds the next installed Bluetooth radio.
@@ -213,7 +213,7 @@ public BLUETOOTH_RADIO_INFO() {
      * @see <a href=
      *      "https://learn.microsoft.com/en-us/windows/win32/api/bluetoothapis/nf-bluetoothapis-bluetoothfindnextradio">BluetoothFindNextRadio</a>
      */
-    boolean BluetoothFindNextRadio(HANDLE hFind, PointerByReference phRadio);
+    boolean BluetoothFindNextRadio(HANDLE hFind, HANDLEByReference phRadio);
 
     /**
      * Closes the enumeration handle for Bluetooth radios.

contrib/platform/test/com/sun/jna/platform/win32/BluetoothApisTest.java

@@ -33,7 +33,7 @@
 import com.sun.jna.platform.win32.BluetoothApis.BLUETOOTH_FIND_RADIO_PARAMS;
 import com.sun.jna.platform.win32.BluetoothApis.BLUETOOTH_RADIO_INFO;
 import com.sun.jna.platform.win32.WinNT.HANDLE;
-import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.platform.win32.WinNT.HANDLEByReference;
 
 /**
  * Tests for {@link BluetoothApis}.
@@ -58,13 +58,13 @@ public void testStructureSizes() {
     @Test
     public void testBluetoothFindFirstRadio() {
         BLUETOOTH_FIND_RADIO_PARAMS radioParams = new BLUETOOTH_FIND_RADIO_PARAMS();
-        PointerByReference phRadio = new PointerByReference();
+        HANDLEByReference phRadio = new HANDLEByReference();
 
         // This may return null if no Bluetooth radio is present, which is acceptable
         HANDLE hFind = BluetoothApis.INSTANCE.BluetoothFindFirstRadio(radioParams, phRadio);
         if (hFind != null) {
             try {
-                HANDLE hRadio = new HANDLE(phRadio.getValue());
+                HANDLE hRadio = phRadio.getValue();
                 try {
                     assertNotNull("Radio handle should not be null", hRadio);