Skip to content

Commit 7514473

Browse files
committed
libbind9, libdns, libisc, libisccfg and liblwres all compile and link. They are successfully making it into bootcd as well. All have been tested on Windows with a compiled ISC nslookup and work. Next is nslookup.
Happy Halloween! svn path=/branches/nslookup/; revision=43894
1 parent 46534b6 commit 7514473

File tree

10 files changed

+49
-4
lines changed

10 files changed

+49
-4
lines changed

boot/bootdata/packages/reactos.dff

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ dll\3rdparty\mesa32\mesa32.dll 1
129129
dll\3rdparty\libjpeg\libjpeg.dll 1
130130
dll\3rdparty\libxslt\libxslt.dll 1
131131
dll\3rdparty\dxtn\dxtn.dll 1 optional
132+
dll\3rdparty\isc\libisc.dll 1
133+
dll\3rdparty\dns\libdns.dll 1
134+
dll\3rdparty\isccfg\libisccfg.dll 1
135+
dll\3rdparty\lwres\liblwres.dll 1
136+
dll\3rdparty\bind9\libbind9.dll 1
132137

133138
dll\cpl\access\access.cpl 1
134139
dll\cpl\appwiz\appwiz.cpl 1

dll/3rdparty/3rdparty.rbuild

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@
44
<directory name="isc">
55
<xi:include href="isc/isc.rbuild" />
66
</directory>
7+
<directory name="dns">
8+
<xi:include href="dns/dns.rbuild" />
9+
</directory>
10+
<directory name="isccfg">
11+
<xi:include href="isccfg/isccfg.rbuild" />
12+
</directory>
13+
<directory name="lwres">
14+
<xi:include href="lwres/lwres.rbuild" />
15+
</directory>
16+
<directory name="bind9">
17+
<xi:include href="bind9/bind9.rbuild" />
18+
</directory>
719
<directory name="mesa32">
820
<xi:include href="mesa32/mesa32.rbuild" />
921
</directory>

dll/3rdparty/bind9/bind9.rbuild

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@
1414
<define name="LIBBIND9_EXPORTS" />
1515
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
1616
<define name="ISC_PLATFORM_USEGCCASM" />
17+
<library>isc</library>
18+
<library>dns</library>
19+
<library>isccfg</library>
20+
<library>ws2_32</library>
1721
<file>check.c</file>
1822
<file>getaddresses.c</file>
23+
<importlibrary definition="win32/libbind9.def" />
1924
<directory name="win32">
2025
<file>DLLMain.c</file>
2126
<file>version.c</file>

dll/3rdparty/dns/dns.rbuild

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
<define name="LIBDNS_EXPORTS" />
1313
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
1414
<define name="ISC_PLATFORM_USEGCCASM" />
15+
<library>ntdll</library>
16+
<library>kernel32</library>
17+
<library>user32</library>
18+
<library>advapi32</library>
19+
<library>uuid</library>
20+
<library>ws2_32</library>
21+
<library>msvcrt40</library>
22+
<library>isc</library>
23+
<importlibrary definition="win32/libdns.def" />
1524
<directory name="win32">
1625
<file>DLLMain.c</file>
1726
<file>version.c</file>

dll/3rdparty/dns/win32/libdns.def

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@ dns_resolver_whenshutdown
553553
dns_result_register
554554
dns_result_torcode
555555
dns_result_totext
556+
dns_rootname
556557
dns_rootns_create
557558
dns_sdb_putnamedrr
558559
dns_sdb_putrdata
@@ -600,6 +601,12 @@ dns_tkey_processgssresponse
600601
dns_tkey_processquery
601602
dns_tkeyctx_create
602603
dns_tkeyctx_destroy
604+
dns_tsig_hmacmd5_name
605+
dns_tsig_hmacsha1_name
606+
dns_tsig_hmacsha224_name
607+
dns_tsig_hmacsha256_name
608+
dns_tsig_hmacsha384_name
609+
dns_tsig_hmacsha512_name
603610
dns_tsig_sign
604611
dns_tsig_verify
605612
dns_tsigkey_attach

dll/3rdparty/isc/win32/libisc.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,7 @@ syslog
541541
EXPORTS
542542

543543
isc_assertion_failed DATA
544+
isc_categories DATA
544545
isc_commandline_argument DATA
545546
isc_commandline_errprint DATA
546547
isc_commandline_index DATA

dll/3rdparty/isc/win32/win32os.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ isc_win32os_versioncheck(unsigned int major, unsigned int minor,
9898

9999
/* Exact */
100100
return (0);
101-
}
101+
}

dll/3rdparty/isccfg/isccfg.rbuild

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
<define name="USE_MD5" />
1515
<define name="LIBISCCFG_EXPORTS" />
1616
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
17-
<define name="ISC_PLATFORM_USEGCCASM" />
17+
<library>isc</library>
18+
<library>dns</library>
1819
<file>aclconf.c</file>
1920
<file>log.c</file>
2021
<file>namedconf.c</file>
2122
<file>parser.c</file>
23+
<importlibrary definition="win32/libisccfg.def" />
2224
<directory name="win32">
2325
<file>DLLMain.c</file>
2426
<file>version.c</file>

dll/3rdparty/lwres/lwres.rbuild

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
<define name="LIBLWRES_EXPORTS" />
1515
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
1616
<define name="ISC_PLATFORM_USEGCCASM" />
17+
<library>isc</library>
18+
<library>ws2_32</library>
19+
<library>msvcrt40</library>
20+
<library>advapi32</library>
21+
<library>iphlpapi</library>
1722
<file>context.c</file>
1823
<file>gai_strerror.c</file>
1924
<file>getaddrinfo.c</file>
@@ -32,6 +37,7 @@
3237
<file>lwres_grbn.c</file>
3338
<file>lwres_noop.c</file>
3439
<file>lwresutil.c</file>
40+
<importlibrary definition="win32/liblwres.def" />
3541
<directory name="win32">
3642
<file>lwconfig.c</file>
3743
<file>DLLMain.c</file>

dll/3rdparty/lwres/win32/include/lwres/netdb.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
/*
3232
* Define if <netdb.h> does not declare struct addrinfo.
3333
*/
34-
#ifndef __REACTOS__
3534
#define ISC_LWRES_NEEDADDRINFO 1
36-
#endif
3735

3836
#ifdef ISC_LWRES_NEEDADDRINFO
3937
struct addrinfo {

0 commit comments

Comments
 (0)