Hans Leidekker : dnsapi: Perform a wide character string comparison if the character set is unknown.
Alexandre Julliard
julliard at winehq.org
Fri Jan 10 14:44:51 CST 2014
Module: wine
Branch: stable
Commit: 1a417c3c3c2c031d25588076cd784aae334a2d2c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a417c3c3c2c031d25588076cd784aae334a2d2c
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Oct 14 15:56:30 2013 +0200
dnsapi: Perform a wide character string comparison if the character set is unknown.
(cherry picked from commit 98c64a4be3350b977ae63ee72d54b5528940c9cc)
---
dlls/dnsapi/record.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
index 3316f05..7882b22 100644
--- a/dlls/dnsapi/record.c
+++ b/dlls/dnsapi/record.c
@@ -131,12 +131,15 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 )
TRACE( "(%p,%p)\n", r1, r2 );
- if (r1->wType != r2->wType ||
- r1->wDataLength != r2->wDataLength ||
- r1->Flags.DW != r2->Flags.DW ||
- r1->dwReserved != r2->dwReserved) return FALSE;
-
- wide = r1->Flags.S.CharSet == DnsCharSetUnicode;
+ if (r1->wType != r2->wType ||
+ r1->wDataLength != r2->wDataLength ||
+ r1->Flags.S.Section != r2->Flags.S.Section ||
+ r1->Flags.S.Delete != r2->Flags.S.Delete ||
+ r1->Flags.S.Unused != r2->Flags.S.Unused ||
+ r1->Flags.S.Reserved != r2->Flags.S.Reserved ||
+ r1->dwReserved != r2->dwReserved) return FALSE;
+
+ wide = (r1->Flags.S.CharSet == DnsCharSetUnicode || r1->Flags.S.CharSet == DnsCharSetUnknown);
if (dns_strcmpX( r1->pName, r2->pName, wide )) return FALSE;
switch (r1->wType)
More information about the wine-cvs
mailing list