[PATCH 1/7] dlls/bluetoothapis/tests: Fix potential test failure from memcmp'ing uninitialized bytes.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/bluetoothapis/tests/sdp.c | 38 +++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/dlls/bluetoothapis/tests/sdp.c b/dlls/bluetoothapis/tests/sdp.c
index 6f3bba8360f..9b6028c0a2f 100644
--- a/dlls/bluetoothapis/tests/sdp.c
+++ b/dlls/bluetoothapis/tests/sdp.c
@@ -33,6 +33,42 @@ static const char *debugstr_SDP_ELEMENT_DATA( const SDP_ELEMENT_DATA *data )
                              data->data.uint128.LowPart, data->data.uint128.HighPart );
 }

+/* Returns the exact number of bytes we need to compare to test equality between the 'data' fields of two
+ * SDP_ELEMENT_DATA. */
+static SIZE_T sdp_type_size( SDP_TYPE type, SDP_SPECIFICTYPE st )
+{
+
+    switch (type)
+    {
+    case SDP_TYPE_NIL:
+        return 0;
+    case SDP_TYPE_BOOLEAN:
+        return sizeof( UCHAR );
+    case SDP_TYPE_INT:
+    case SDP_TYPE_UINT:
+#define XX(st) case SDP_ST_UINT ##st: case SDP_ST_INT ##st: return (st)/8
+        switch (st)
+        {
+        XX( 16 );
+        XX( 32 );
+        XX( 64 );
+        default: XX( 128 );
+        }
+    case SDP_TYPE_UUID:
+#undef XX
+#define XX(st) case SDP_ST_UUID ##st: return (st)/8
+        switch (st)
+        {
+        XX( 16 );
+        XX( 32 );
+        default: XX( 128 );
+        }
+#undef XX
+    default:
+        return sizeof( BYTE * ) + sizeof( ULONG );
+    }
+}
+
 static void test_BluetoothSdpGetElementData( BYTE *stream, SIZE_T size, DWORD error,
                                              const SDP_ELEMENT_DATA *sdp_data )
 {
@@ -47,7 +83,7 @@ static void test_BluetoothSdpGetElementData( BYTE *stream, SIZE_T size, DWORD er
         ok( result.specificType == sdp_data->specificType,
             "%#x != %#x.\n", sdp_data->specificType,
             result.specificType );
-        ok( !memcmp( &sdp_data->data, &result.data, sizeof( result.data ) ),
+        ok( !memcmp( &sdp_data->data, &result.data, sdp_type_size( result.type, result.specificType ) ),
             "%s != %s.\n", debugstr_SDP_ELEMENT_DATA( sdp_data ),
             debugstr_SDP_ELEMENT_DATA( &result ) );
     }