Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[lsuggs] 43894: 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!

by lsuggs＠svn.reactos.org

Author: lsuggs Date: Sun Nov 1 06:44:49 2009 New Revision: 43894 URL: http://svn.reactos.org/svn/reactos?rev=43894&view=rev Log: 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! Modified: branches/nslookup/boot/bootdata/packages/reactos.dff branches/nslookup/dll/3rdparty/3rdparty.rbuild branches/nslookup/dll/3rdparty/bind9/bind9.rbuild branches/nslookup/dll/3rdparty/dns/dns.rbuild branches/nslookup/dll/3rdparty/dns/win32/libdns.def branches/nslookup/dll/3rdparty/isc/win32/libisc.def branches/nslookup/dll/3rdparty/isc/win32/win32os.c branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild branches/nslookup/dll/3rdparty/lwres/lwres.rbuild branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h Modified: branches/nslookup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/nslookup/boot/bootdata/packages… ============================================================================== --- branches/nslookup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/nslookup/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -129,6 +129,11 @@ dll\3rdparty\libjpeg\libjpeg.dll 1 dll\3rdparty\libxslt\libxslt.dll 1 dll\3rdparty\dxtn\dxtn.dll 1 optional +dll\3rdparty\isc\libisc.dll 1 +dll\3rdparty\dns\libdns.dll 1 +dll\3rdparty\isccfg\libisccfg.dll 1 +dll\3rdparty\lwres\liblwres.dll 1 +dll\3rdparty\bind9\libbind9.dll 1 dll\cpl\access\access.cpl 1 dll\cpl\appwiz\appwiz.cpl 1 Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/3rdparty.… ============================================================================== --- branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -3,6 +3,18 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="isc"> <xi:include href="isc/isc.rbuild" /> + </directory> + <directory name="dns"> + <xi:include href="dns/dns.rbuild" /> + </directory> + <directory name="isccfg"> + <xi:include href="isccfg/isccfg.rbuild" /> + </directory> + <directory name="lwres"> + <xi:include href="lwres/lwres.rbuild" /> + </directory> + <directory name="bind9"> + <xi:include href="bind9/bind9.rbuild" /> </directory> <directory name="mesa32"> <xi:include href="mesa32/mesa32.rbuild" /> Modified: branches/nslookup/dll/3rdparty/bind9/bind9.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/bind9/bin… ============================================================================== --- branches/nslookup/dll/3rdparty/bind9/bind9.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/bind9/bind9.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -14,8 +14,13 @@ <define name="LIBBIND9_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> <define name="ISC_PLATFORM_USEGCCASM" /> + <library>isc</library> + <library>dns</library> + <library>isccfg</library> + <library>ws2_32</library> <file>check.c</file> <file>getaddresses.c</file> + <importlibrary definition="win32/libbind9.def" /> <directory name="win32"> <file>DLLMain.c</file> <file>version.c</file> Modified: branches/nslookup/dll/3rdparty/dns/dns.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/dns.r… ============================================================================== --- branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -12,6 +12,15 @@ <define name="LIBDNS_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> <define name="ISC_PLATFORM_USEGCCASM" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>uuid</library> + <library>ws2_32</library> + <library>msvcrt40</library> + <library>isc</library> + <importlibrary definition="win32/libdns.def" /> <directory name="win32"> <file>DLLMain.c</file> <file>version.c</file> Modified: branches/nslookup/dll/3rdparty/dns/win32/libdns.def URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/dns/win32/libdns.def [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/dns/win32/libdns.def [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -553,6 +553,7 @@ dns_result_register dns_result_torcode dns_result_totext +dns_rootname dns_rootns_create dns_sdb_putnamedrr dns_sdb_putrdata @@ -600,6 +601,12 @@ dns_tkey_processquery dns_tkeyctx_create dns_tkeyctx_destroy +dns_tsig_hmacmd5_name +dns_tsig_hmacsha1_name +dns_tsig_hmacsha224_name +dns_tsig_hmacsha256_name +dns_tsig_hmacsha384_name +dns_tsig_hmacsha512_name dns_tsig_sign dns_tsig_verify dns_tsigkey_attach Modified: branches/nslookup/dll/3rdparty/isc/win32/libisc.def URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/libisc.def [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/libisc.def [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -541,6 +541,7 @@ EXPORTS isc_assertion_failed DATA +isc_categories DATA isc_commandline_argument DATA isc_commandline_errprint DATA isc_commandline_index DATA Modified: branches/nslookup/dll/3rdparty/isc/win32/win32os.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/win32os.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/win32os.c [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -98,4 +98,4 @@ /* Exact */ return (0); -} +} Modified: branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isccfg/is… ============================================================================== --- branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -14,11 +14,13 @@ <define name="USE_MD5" /> <define name="LIBISCCFG_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> - <define name="ISC_PLATFORM_USEGCCASM" /> + <library>isc</library> + <library>dns</library> <file>aclconf.c</file> <file>log.c</file> <file>namedconf.c</file> <file>parser.c</file> + <importlibrary definition="win32/libisccfg.def" /> <directory name="win32"> <file>DLLMain.c</file> <file>version.c</file> Modified: branches/nslookup/dll/3rdparty/lwres/lwres.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/lwr… ============================================================================== --- branches/nslookup/dll/3rdparty/lwres/lwres.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/lwres/lwres.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -14,6 +14,11 @@ <define name="LIBLWRES_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> <define name="ISC_PLATFORM_USEGCCASM" /> + <library>isc</library> + <library>ws2_32</library> + <library>msvcrt40</library> + <library>advapi32</library> + <library>iphlpapi</library> <file>context.c</file> <file>gai_strerror.c</file> <file>getaddrinfo.c</file> @@ -32,6 +37,7 @@ <file>lwres_grbn.c</file> <file>lwres_noop.c</file> <file>lwresutil.c</file> + <importlibrary definition="win32/liblwres.def" /> <directory name="win32"> <file>lwconfig.c</file> <file>DLLMain.c</file> Modified: branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/win… ============================================================================== --- branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -31,9 +31,7 @@ /* * Define if <netdb.h> does not declare struct addrinfo. */ -#ifndef __REACTOS__ #define ISC_LWRES_NEEDADDRINFO 1 -#endif #ifdef ISC_LWRES_NEEDADDRINFO struct addrinfo {

14 years, 11 months

[lsuggs] 43893: Oops, forgot this one.

by lsuggs＠svn.reactos.org

Author: lsuggs Date: Sun Nov 1 04:32:03 2009 New Revision: 43893 URL: http://svn.reactos.org/svn/reactos?rev=43893&view=rev Log: Oops, forgot this one. Modified: branches/nslookup/include/psdk/mswsock.h Modified: branches/nslookup/include/psdk/mswsock.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/include/psdk/mswsock.h… ============================================================================== --- branches/nslookup/include/psdk/mswsock.h [iso-8859-1] (original) +++ branches/nslookup/include/psdk/mswsock.h [iso-8859-1] Sun Nov 1 04:32:03 2009 @@ -30,6 +30,7 @@ #define SO_MAXDG 0x7009 #define SO_MAXPATHDG 0x700A #define SO_UPDATE_ACCEPT_CONTEXT 0x700B +#define SO_UPDATE_CONNECT_CONTEXT 0x7010 #define SO_CONNECT_TIME 0x700C #define TCP_BSDURGENT 0x7000 @@ -55,10 +56,12 @@ #define WSAID_ACCEPTEX { 0xB5367DF0, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } #define WSAID_TRANSMITFILE { 0xB5367DF1, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } #define WSAID_GETACCEPTEXSOCKADDRS { 0xB5367DF2, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } +#define WSAID_CONNECTEX { 0x25A207B9, 0xDDF3, 0x4660, { 0x8E, 0xE9, 0x76, 0xE5, 0x8C, 0x74, 0x06, 0x3E } } typedef BOOL (PASCAL *LPFN_TRANSMITFILE)(SOCKET,HANDLE,DWORD,DWORD,LPOVERLAPPED,LPTRANSMIT_FILE_BUFFERS,DWORD); typedef BOOL (PASCAL *LPFN_ACCEPTEX)(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPPED); typedef VOID (PASCAL *LPFN_GETACCEPTEXSOCKADDRS)(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT); +typedef BOOL (PASCAL *LPFN_CONNECTEX)(SOCKET,const struct sockaddr FAR*,int,PVOID,DWORD,LPDWORD,LPOVERLAPPED ); #ifdef _WINSOCK2_H /* These require the winsock2 interface. */

14 years, 11 months

[ahill] 43892: [browseui] - The global class instance _AtlComModule needs to be constructed with placement new also

by ahill＠svn.reactos.org

Author: ahill Date: Sun Nov 1 03:26:24 2009 New Revision: 43892 URL: http://svn.reactos.org/svn/reactos?rev=43892&view=rev Log: [browseui] - The global class instance _AtlComModule needs to be constructed with placement new also Modified: trunk/reactos/dll/win32/browseui/browseui.cpp Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sun Nov 1 03:26:24 2009 @@ -77,6 +77,7 @@ new (&gModule) CBrowseUIModule; new (&gWinModule) CAtlWinModule; new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; if (dwReason == DLL_PROCESS_ATTACH) {

14 years, 11 months

[lsuggs] 43891: libisc will now compile and link

by lsuggs＠svn.reactos.org

Author: lsuggs Date: Sun Nov 1 03:17:33 2009 New Revision: 43891 URL: http://svn.reactos.org/svn/reactos?rev=43891&view=rev Log: libisc will now compile and link Modified: branches/nslookup/dll/3rdparty/isc/include/config.h branches/nslookup/dll/3rdparty/isc/isc.rbuild branches/nslookup/dll/3rdparty/isc/sha2.c branches/nslookup/dll/3rdparty/isc/win32/condition.c branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h branches/nslookup/dll/3rdparty/isc/win32/socket.c Modified: branches/nslookup/dll/3rdparty/isc/include/config.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -195,8 +195,10 @@ #define getcwd _getcwd #endif +#ifndef __REACTOS__ #define utime _utime #define utimbuf _utimbuf +#endif /* #define EAFNOSUPPORT EINVAL */ #ifndef __REACTOS__ Modified: branches/nslookup/dll/3rdparty/isc/isc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/isc.r… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -1,6 +1,7 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="isc" type="win32dll" installbase="system32" installname="libisc.dll" allowwarnings="true"> + <include base="ReactOS">dll/3rdparty/isc</include> <include base="ReactOS">dll/3rdparty/isc/include</include> <include base="ReactOS">dll/3rdparty/isc/win32</include> <include base="ReactOS">dll/3rdparty/isc/win32/include</include> @@ -8,6 +9,14 @@ <include base="ReactOS">dll/3rdparty/isccfg/include</include> <define name="WIN32" /> <define name="LIBISC_EXPORTS" /> + <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>uuid</library> + <library>ws2_32</library> + <library>msvcrt40</library> <file>assertions.c</file> <file>base32.c</file> <file>base64.c</file> @@ -17,7 +26,6 @@ <file>commandline.c</file> <file>error.c</file> <file>event.c</file> - <file>fsaccess.c</file> <file>hash.c</file> <file>heap.c</file> <file>hex.c</file> @@ -59,6 +67,7 @@ <file>task.c</file> <file>taskpool.c</file> <file>timer.c</file> + <importlibrary definition="win32/libisc.def" /> <directory name="nls"> <file>msgcat.c</file> </directory> Modified: branches/nslookup/dll/3rdparty/isc/sha2.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/sha2.… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/sha2.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/sha2.c [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -259,70 +259,70 @@ #ifdef WIN32 /* Hash constant words K for SHA-384 and SHA-512: */ static const isc_uint64_t K512[80] = { - 0x428a2f98d728ae22UL, 0x7137449123ef65cdUL, - 0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL, - 0x3956c25bf348b538UL, 0x59f111f1b605d019UL, - 0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL, - 0xd807aa98a3030242UL, 0x12835b0145706fbeUL, - 0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL, - 0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL, - 0x9bdc06a725c71235UL, 0xc19bf174cf692694UL, - 0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL, - 0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL, - 0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL, - 0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL, - 0x983e5152ee66dfabUL, 0xa831c66d2db43210UL, - 0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL, - 0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL, - 0x06ca6351e003826fUL, 0x142929670a0e6e70UL, - 0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL, - 0x4d2c6dfc5ac42aedUL, 0x53380d139d95b3dfUL, - 0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL, - 0x81c2c92e47edaee6UL, 0x92722c851482353bUL, - 0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL, - 0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL, - 0xd192e819d6ef5218UL, 0xd69906245565a910UL, - 0xf40e35855771202aUL, 0x106aa07032bbd1b8UL, - 0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL, - 0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL, - 0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL, - 0x5b9cca4f7763e373UL, 0x682e6ff3d6b2b8a3UL, - 0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL, - 0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL, - 0x90befffa23631e28UL, 0xa4506cebde82bde9UL, - 0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL, - 0xca273eceea26619cUL, 0xd186b8c721c0c207UL, - 0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL, - 0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL, - 0x113f9804bef90daeUL, 0x1b710b35131c471bUL, - 0x28db77f523047d84UL, 0x32caab7b40c72493UL, - 0x3c9ebe0a15c9bebcUL, 0x431d67c49c100d4cUL, - 0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL, - 0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL + 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, + 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, + 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, + 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, + 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, + 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, + 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, + 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, + 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, + 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, + 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, + 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, + 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, + 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, + 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, + 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, + 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, + 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, + 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, + 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, + 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, + 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, + 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, + 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, + 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, + 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, + 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, + 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, + 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, + 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, + 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, + 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, + 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, + 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, + 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, + 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, + 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, + 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, + 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, + 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL }; /* Initial hash value H for SHA-384: */ static const isc_uint64_t sha384_initial_hash_value[8] = { - 0xcbbb9d5dc1059ed8UL, - 0x629a292a367cd507UL, - 0x9159015a3070dd17UL, - 0x152fecd8f70e5939UL, - 0x67332667ffc00b31UL, - 0x8eb44a8768581511UL, - 0xdb0c2e0d64f98fa7UL, - 0x47b5481dbefa4fa4UL + 0xcbbb9d5dc1059ed8ULL, + 0x629a292a367cd507ULL, + 0x9159015a3070dd17ULL, + 0x152fecd8f70e5939ULL, + 0x67332667ffc00b31ULL, + 0x8eb44a8768581511ULL, + 0xdb0c2e0d64f98fa7ULL, + 0x47b5481dbefa4fa4ULL }; /* Initial hash value H for SHA-512: */ static const isc_uint64_t sha512_initial_hash_value[8] = { - 0x6a09e667f3bcc908U, - 0xbb67ae8584caa73bUL, - 0x3c6ef372fe94f82bUL, - 0xa54ff53a5f1d36f1UL, - 0x510e527fade682d1UL, - 0x9b05688c2b3e6c1fUL, - 0x1f83d9abfb41bd6bUL, - 0x5be0cd19137e2179UL + 0x6a09e667f3bcc908ULL, + 0xbb67ae8584caa73bULL, + 0x3c6ef372fe94f82bULL, + 0xa54ff53a5f1d36f1ULL, + 0x510e527fade682d1ULL, + 0x9b05688c2b3e6c1fULL, + 0x1f83d9abfb41bd6bULL, + 0x5be0cd19137e2179ULL }; #else /* Hash constant words K for SHA-384 and SHA-512: */ Modified: branches/nslookup/dll/3rdparty/isc/win32/condition.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/condition.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/condition.c [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -249,10 +249,18 @@ } microseconds = isc_time_microdiff(t, &now); + +#ifdef __GNUC__ + if (microseconds > 0xFFFFFFFFull * 1000) + milliseconds = 0xFFFFFFFF; + else + milliseconds = (DWORD)(microseconds / 1000); +#else if (microseconds > 0xFFFFFFFFi64 * 1000) milliseconds = 0xFFFFFFFF; else milliseconds = (DWORD)(microseconds / 1000); +#endif return (wait(cond, mutex, milliseconds)); } Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -84,6 +84,7 @@ /* * IPv4 compatible */ +#ifndef IN6_IS_ADDR_V4COMPAT #define IN6_IS_ADDR_V4COMPAT(a) (\ *((u_long *)((a)->s6_addr) ) == 0 && \ *((u_long *)((a)->s6_addr) + 1) == 0 && \ @@ -91,20 +92,25 @@ *((u_long *)((a)->s6_addr) + 3) != 0 && \ *((u_long *)((a)->s6_addr) + 3) != htonl(1) \ ) +#endif /* * Mapped */ +#ifndef IN6_IS_ADDR_V4MAPPED #define IN6_IS_ADDR_V4MAPPED(a) (\ *((u_long *)((a)->s6_addr) ) == 0 && \ *((u_long *)((a)->s6_addr) + 1) == 0 && \ *((u_long *)((a)->s6_addr) + 2) == htonl(0x0000ffff)) +#endif /* * Multicast */ +#ifndef IN6_IS_ADDR_MULTICAST #define IN6_IS_ADDR_MULTICAST(a) \ ((a)->s6_addr[0] == 0xffU) +#endif /* * Unicast link / site local. Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -97,11 +97,8 @@ #include <isc/lang.h> #include <isc/types.h> -#ifndef __REACTOS__ #include <ws2tcpip.h> -#endif - -#include <isc/ipv6.h> +#include "ipv6.h" /* * This is here because named client, interfacemgr.c, etc. use the name as @@ -120,16 +117,16 @@ }; #endif -#ifndef __REACTOS__ +/*#ifndef __REACTOS__ #if _MSC_VER < 1300 -#endif +#endif*/ #define in6addr_any isc_in6addr_any #define in6addr_loopback isc_in6addr_loopback -#ifndef __REACTOS__ -#endif -#endif +/*#ifndef __REACTOS__ +#endif +#endif*/ /* * Ensure type in_port_t is defined. Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -30,35 +30,35 @@ */ /* check handle for NULL and INVALID_HANDLE */ -inline BOOL IsValidHandle( HANDLE hHandle) { +static inline BOOL IsValidHandle( HANDLE hHandle) { return ((hHandle != NULL) && (hHandle != INVALID_HANDLE_VALUE)); } /* validate wait return codes... */ -inline BOOL WaitSucceeded( DWORD dwWaitResult, DWORD dwHandleCount) { +static inline BOOL WaitSucceeded( DWORD dwWaitResult, DWORD dwHandleCount) { return ((dwWaitResult >= WAIT_OBJECT_0) && (dwWaitResult < WAIT_OBJECT_0 + dwHandleCount)); } -inline BOOL WaitAbandoned( DWORD dwWaitResult, DWORD dwHandleCount) { +static inline BOOL WaitAbandoned( DWORD dwWaitResult, DWORD dwHandleCount) { return ((dwWaitResult >= WAIT_ABANDONED_0) && (dwWaitResult < WAIT_ABANDONED_0 + dwHandleCount)); } -inline BOOL WaitTimeout( DWORD dwWaitResult) { +static inline BOOL WaitTimeout( DWORD dwWaitResult) { return (dwWaitResult == WAIT_TIMEOUT); } -inline BOOL WaitFailed( DWORD dwWaitResult) { +static inline BOOL WaitFailed( DWORD dwWaitResult) { return (dwWaitResult == WAIT_FAILED); } /* compute object indices for waits... */ -inline DWORD WaitSucceededIndex( DWORD dwWaitResult) { +static inline DWORD WaitSucceededIndex( DWORD dwWaitResult) { return (dwWaitResult - WAIT_OBJECT_0); } -inline DWORD WaitAbandonedIndex( DWORD dwWaitResult) { +static inline DWORD WaitAbandonedIndex( DWORD dwWaitResult) { return (dwWaitResult - WAIT_ABANDONED_0); } Modified: branches/nslookup/dll/3rdparty/isc/win32/socket.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/socket.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/socket.c [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -424,7 +424,7 @@ socket_log(int lineno, isc_socket_t *sock, isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, int level, isc_msgcat_t *msgcat, int msgset, int message, - const char *fmt, ...) ISC_FORMAT_PRINTF(9, 10); + const char *fmt, ...) ISC_FORMAT_PRINTF(10, 11); /* This function will add an entry to the I/O completion port * that will signal the I/O thread to exit (gracefully)

14 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2009