Hans Leidekker : dnsapi/tests: Compile with -D__WINESRC__.
Alexandre Julliard
julliard at winehq.org
Mon Oct 14 12:39:30 CDT 2013
Module: wine
Branch: master
Commit: 2b5888cc9652e6a4dcb7e48f87495549e9e60013
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5888cc9652e6a4dcb7e48f87495549e9e60013
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Oct 14 15:56:54 2013 +0200
dnsapi/tests: Compile with -D__WINESRC__.
---
dlls/dnsapi/tests/Makefile.in | 1 -
dlls/dnsapi/tests/record.c | 20 ++++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in
index 18a4398..8702a9d 100644
--- a/dlls/dnsapi/tests/Makefile.in
+++ b/dlls/dnsapi/tests/Makefile.in
@@ -1,6 +1,5 @@
TESTDLL = dnsapi.dll
IMPORTS = dnsapi
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \
name.c \
diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
index 4e97d85..8d7b497 100644
--- a/dlls/dnsapi/tests/record.c
+++ b/dlls/dnsapi/tests/record.c
@@ -28,12 +28,12 @@
#include "wine/test.h"
-static char name1[] = "localhost";
-static char name2[] = "LOCALHOST";
+static WCHAR name1[] = {'l','o','c','a','l','h','o','s','t',0};
+static WCHAR name2[] = {'L','O','C','A','L','H','O','S','T',0};
-static DNS_RECORDA r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } };
-static DNS_RECORDA r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } };
-static DNS_RECORDA r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } };
+static DNS_RECORDW r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } };
+static DNS_RECORDW r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } };
+static DNS_RECORDW r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } };
static void test_DnsRecordCompare( void )
{
@@ -43,10 +43,10 @@ static void test_DnsRecordCompare( void )
ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" );
r2.Flags.S.CharSet = DnsCharSetUnicode;
- ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" );
+ ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" );
r2.Flags.S.CharSet = DnsCharSetAnsi;
- ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" );
+ ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" );
r1.Flags.S.CharSet = DnsCharSetAnsi;
ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" );
@@ -60,8 +60,8 @@ static void test_DnsRecordCompare( void )
static void test_DnsRecordSetCompare( void )
{
- DNS_RECORD *diff1;
- DNS_RECORD *diff2;
+ DNS_RECORDW *diff1;
+ DNS_RECORDW *diff2;
DNS_RRSET rr1, rr2;
r1.Flags.DW = 0x2019;
@@ -120,7 +120,7 @@ static void test_DnsRecordSetCompare( void )
static void test_DnsRecordSetDetach( void )
{
DNS_RRSET rr;
- DNS_RECORDA *r, *s;
+ DNS_RECORDW *r, *s;
DNS_RRSET_INIT( rr );
DNS_RRSET_ADD( rr, &r1 );
More information about the wine-cvs
mailing list