[PATCH 0/2] MR6988: winebth.sys: Minor fixes

[Vibhav Pant (＠vibhavp)]

* winebth.sys: Use the correct byte-ordering for setting the radio's address property.

* winebth.sys: Set the Information field in the IRP's STATUS_BLOCK after handling IOCTL_BTH_GET_LOCAL_INFO.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6988

[PATCH 1/2] winebth.sys: Set the Information field in the IRP's STATUS_BLOCK after handling IOCTL_BTH_GET_LOCAL_INFO.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/winebth.sys/winebth.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winebth.sys/winebth.c b/dlls/winebth.sys/winebth.c
index 65dd6d8b152..913ff503530 100644
--- a/dlls/winebth.sys/winebth.c
+++ b/dlls/winebth.sys/winebth.c
@@ -129,6 +129,7 @@ static NTSTATUS WINAPI dispatch_bluetooth( DEVICE_OBJECT *device, IRP *irp )
             info->radioInfo.mfg = ext->props.manufacturer;
         LeaveCriticalSection( &ext->props_cs );
 
+        irp->IoStatus.Information = sizeof( *info );
         status = STATUS_SUCCESS;
         break;
     }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/6988

[PATCH 2/2] winebth.sys: Use the correct byte-ordering for setting the radio's address property.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/winebth.sys/winebth.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/winebth.sys/winebth.c b/dlls/winebth.sys/winebth.c
index 913ff503530..5ba846e6459 100644
--- a/dlls/winebth.sys/winebth.c
+++ b/dlls/winebth.sys/winebth.c
@@ -467,14 +467,9 @@ static void bluetooth_radio_set_properties( DEVICE_OBJECT *obj,
 {
     if (mask & WINEBLUETOOTH_RADIO_PROPERTY_ADDRESS)
     {
-        union
-        {
-            UINT64 uint;
-            BYTE addr[8];
-        } radio_addr = {0};
-        memcpy( &radio_addr.addr[2], props->address.rgBytes, sizeof( props->address.rgBytes ) );
+        BTH_ADDR addr = RtlUlonglongByteSwap( props->address.ullLong );
         IoSetDevicePropertyData( obj, &DEVPKEY_BluetoothRadio_Address, LOCALE_NEUTRAL, 0,
-                                 DEVPROP_TYPE_UINT64, sizeof( radio_addr ), &radio_addr );
+                                 DEVPROP_TYPE_UINT64, sizeof( addr ), &addr );
     }
     if (mask & WINEBLUETOOTH_RADIO_PROPERTY_MANUFACTURER)
     {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6988

[PATCH 2/2] winebth.sys: Use the correct byte-ordering for setting the radio's address property.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=150321

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000016100DC, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032