Dmitry Timoshkov : dnsapi: Set correct wDataLength for DNS_TYPE_SRV records.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0cc49f360a1b5d0e130d37446452f1752147a798
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0cc49f360a1b5d0e130d37446452f17...

Author: Dmitry Timoshkov 
Date:   Thu Jun  1 14:48:23 2023 +0300

dnsapi: Set correct wDataLength for DNS_TYPE_SRV records.

Signed-off-by: Dmitry Timoshkov

---

dlls/dnsapi/record.c       | 4 ++++
 dlls/dnsapi/tests/record.c | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
index cfd55a44852..1b4cbfeac0f 100644
--- a/dlls/dnsapi/record.c
+++ b/dlls/dnsapi/record.c
@@ -1046,6 +1046,10 @@ static DNS_STATUS extract_rdata( const BYTE *base, const BYTE *end, const BYTE *
         if (!get_name( base, end, pos, name )) return DNS_ERROR_BAD_PACKET;
         if (!(r->Data.SRV.pNameTarget = strdupX( name, in, out ))) return ERROR_NOT_ENOUGH_MEMORY;
         r->wDataLength = sizeof(DNS_SRV_DATAA);
+        if (out == DnsCharSetUnicode)
+            r->wDataLength += (wcslen( (const WCHAR *)r->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR);
+        else
+            r->wDataLength += strlen( r->Data.SRV.pNameTarget ) + 1;
         break;

case DNS_TYPE_HINFO:
diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
index 340d10f6024..d340c064554 100644
--- a/dlls/dnsapi/tests/record.c
+++ b/dlls/dnsapi/tests/record.c
@@ -230,7 +230,6 @@ static void test_DnsExtractRecordsFromMessage(void)
     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
     ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
-    todo_wine
     ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
     ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
     ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
@@ -250,7 +249,6 @@ static void test_DnsExtractRecordsFromMessage(void)
     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
     ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
-    todo_wine
     ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
     ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
     ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );