[PATCH v23 09/12] bluetoothapis: Implement BluetoothSdpEnumAttributes.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/bluetoothapis/sdp.c       | 55 ++++++++++++++++++++++++++++++++--
 dlls/bluetoothapis/tests/sdp.c | 19 +++++-------
 2 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/dlls/bluetoothapis/sdp.c b/dlls/bluetoothapis/sdp.c
index 06b1b957848..d375645ef67 100644
--- a/dlls/bluetoothapis/sdp.c
+++ b/dlls/bluetoothapis/sdp.c
@@ -326,7 +326,56 @@ DWORD WINAPI BluetoothSdpGetContainerElementData( BYTE *stream, ULONG stream_siz
 BOOL WINAPI BluetoothSdpEnumAttributes( BYTE *stream, ULONG stream_size,
                                         PFN_BLUETOOTH_ENUM_ATTRIBUTES_CALLBACK callback, void *param )
 {
-    FIXME( "(%p, %ld, %p, %p) stub!\n", stream, stream_size, callback, param );
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
+    SDP_ELEMENT_DATA data = {0};
+    DWORD result;
+    HBLUETOOTH_CONTAINER_ELEMENT cursor = NULL;
+
+    TRACE( "(%p, %ld, %p, %p)\n", stream, stream_size, callback, param );
+
+    if (stream == NULL || callback == NULL) return ERROR_INVALID_PARAMETER;
+
+    result = BluetoothSdpGetElementData( stream, stream_size, &data );
+    if (result != ERROR_SUCCESS)
+    {
+        SetLastError( ERROR_INVALID_DATA );
+        return FALSE;
+    }
+
+    switch (data.type)
+    {
+    case SDP_TYPE_SEQUENCE:
+    case SDP_TYPE_ALTERNATIVE:
+        break;
+    default:
+        SetLastError( ERROR_INVALID_DATA );
+        return FALSE;
+    }
+
+    for (;;)
+    {
+        SDP_ELEMENT_DATA attrid = {0};
+        SDP_ELEMENT_DATA attr = {0};
+        BYTE *raw_attr_stream;
+
+        result = BluetoothSdpGetContainerElementData( data.data.sequence.value,
+                                                      data.data.sequence.length, &cursor, &attrid );
+        if (result == ERROR_NO_MORE_ITEMS) return TRUE;
+        if (result || !SDP_ELEMENT_IS_ATTRID( &attrid ))
+        {
+            SetLastError( ERROR_INVALID_DATA );
+            return FALSE;
+        }
+
+        raw_attr_stream = cursor;
+        result = BluetoothSdpGetContainerElementData( data.data.sequence.value,
+                                                      data.data.sequence.length, &cursor, &attr );
+        if (result != ERROR_SUCCESS)
+        {
+            SetLastError( ERROR_INVALID_DATA );
+            return FALSE;
+        }
+        if (!callback( attrid.data.uint16, raw_attr_stream, ((BYTE *)cursor - raw_attr_stream),
+                       param ))
+            return TRUE;
+    }
 }
diff --git a/dlls/bluetoothapis/tests/sdp.c b/dlls/bluetoothapis/tests/sdp.c
index 99b0488715b..126cdf2c83d 100644
--- a/dlls/bluetoothapis/tests/sdp.c
+++ b/dlls/bluetoothapis/tests/sdp.c
@@ -402,16 +402,13 @@ static BOOL WINAPI enum_attr_callback( ULONG attr_id, BYTE *stream, ULONG stream
         SDP_ELEMENT_DATA data = {0};
         DWORD result;

-        todo_wine ok( attr_id == params->attrs_id[params->i],
-                      "Expected attribute id %lu, got %lu.\n", params->attrs_id[params->i],
-                      attr_id );
+        ok( attr_id == params->attrs_id[params->i], "Expected attribute id %lu, got %lu.\n",
+            params->attrs_id[params->i], attr_id );
         result = BluetoothSdpGetElementData( stream, stream_size, &data );
-        todo_wine ok( result == ERROR_SUCCESS, "BluetoothSdpGetElementData failed: %ld.\n",
-                      result );
-        todo_wine ok( !memcmp( &params->attrs[params->i], &data, sizeof( data ) ),
-                      "Expected %s, got %s.\n",
-                      debugstr_SDP_ELEMENT_DATA( &params->attrs[params->i] ),
-                      debugstr_SDP_ELEMENT_DATA( &data ) );
+        ok( result == ERROR_SUCCESS, "BluetoothSdpGetElementData failed: %ld.\n", result );
+        ok( !memcmp( &params->attrs[params->i], &data, sizeof( data ) ), "Expected %s, got %s.\n",
+            debugstr_SDP_ELEMENT_DATA( &params->attrs[params->i] ),
+            debugstr_SDP_ELEMENT_DATA( &data ) );

params->i++;
     }
@@ -441,8 +438,8 @@ static void test_BluetoothSdpEnumAttributes( void )
     SetLastError( 0xdeadbeef );
     ret = BluetoothSdpEnumAttributes( sdp_record_bytes, ARRAY_SIZE( sdp_record_bytes ), enum_attr_callback,
                                       &data );
-    todo_wine ok( ret, "BluetoothSdpEnumAttributes failed with %ld.\n", GetLastError() );
-    todo_wine ok( data.i == data.attrs_n, "%d != %d\n", (int)data.i, (int)data.attrs_n );
+    ok( ret, "BluetoothSdpEnumAttributes failed with %ld.\n", GetLastError() );
+    ok( data.i == data.attrs_n, "%d != %d\n", (int)data.i, (int)data.attrs_n );
 }

START_TEST( sdp )