Commit 343aeac7 authored by Francis Dupont's avatar Francis Dupont

Updated WIN32 files (rt40877)

parent de4c1814
......@@ -294,6 +294,10 @@ SOURCE=..\include\named\query.h
# End Source File
# Begin Source File
SOURCE=..\include\named\seccomp.h
# End Source File
# Begin Source File
SOURCE=..\include\named\server.h
# End Source File
# Begin Source File
......
......@@ -177,6 +177,9 @@
<ClInclude Include="..\include\named\query.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\named\seccomp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\named\server.h">
<Filter>Header Files</Filter>
</ClInclude>
......
......@@ -156,6 +156,7 @@
<ClInclude Include="..\include\named\main.h" />
<ClInclude Include="..\include\named\notify.h" />
<ClInclude Include="..\include\named\query.h" />
<ClInclude Include="..\include\named\seccomp.h" />
<ClInclude Include="..\include\named\server.h" />
<ClInclude Include="..\include\named\sortlist.h" />
<ClInclude Include="..\include\named\statschannel.h" />
......
......@@ -358,14 +358,14 @@ typedef __int64 off_t;
/* HMAC_*() return ints */
@HMAC_RETURN_INT@
/* Use AES for Source Identity Token generation */
@AES_SIT@
/* Use AES for Client Cookie generation */
@AES_CC@
/* Use HMAC-SHA1 for Source Identity Token generation */
@HMAC_SHA1_SIT@
/* Use HMAC-SHA1 for Client Cookie generation */
@HMAC_SHA1_CC@
/* Use HMAC-SHA256 for Source Identity Token generation */
@HMAC_SHA256_SIT@
/* Use HMAC-SHA256 for Client Cookie generation */
@HMAC_SHA256_CC@
/* Define to 1 if you have the `readline' function. */
@HAVE_READLINE@
......@@ -382,6 +382,9 @@ typedef __int64 off_t;
/* Build with GeoIP Country IPv6 support */
@HAVE_GEOIP_V6@
/* Define if zlib was found */
@HAVE_ZLIB@
/* Define to enable rpz-nsdname rules. */
@ENABLE_RPZ_NSDNAME@
......
......@@ -118,6 +118,10 @@ SOURCE=..\include\bind9\check.h
# End Source File
# Begin Source File
SOURCE=..\include\bind9\getaddresses.h
# End Source File
# Begin Source File
SOURCE=..\include\bind9\version.h
# End Source File
# End Group
......
......@@ -38,5 +38,8 @@
<ClInclude Include="..\include\bind9\getaddresses.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\bind9\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -115,6 +115,7 @@
<ItemGroup>
<ClInclude Include="..\include\bind9\check.h" />
<ClInclude Include="..\include\bind9\getaddresses.h" />
<ClInclude Include="..\include\bind9\version.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
......@@ -17,6 +17,12 @@
#include <config.h>
#if HAVE_DLFCN_H
#include <dlfcn.h>
#elif _WIN32
#include <windows.h>
#endif
#include <isc/buffer.h>
#include <isc/mem.h>
#include <isc/mutex.h>
......@@ -35,10 +41,6 @@
#include <string.h>
#if HAVE_DLFCN_H
#include <dlfcn.h>
#endif
#define CHECK(op) \
do { result = (op); \
if (result != ISC_R_SUCCESS) goto cleanup; \
......@@ -213,7 +215,122 @@ unload_library(dyndb_implementation_t **impp) {
*impp = NULL;
}
#else /* HAVE_DLFCN_H */
#elif _WIN32
static isc_result_t
load_symbol(HMODULE handle, const char *filename,
const char *symbol_name, void **symbolp)
{
void *symbol;
REQUIRE(handle != NULL);
REQUIRE(symbolp != NULL && *symbolp == NULL);
symbol = GetProcAddress(handle, symbol_name);
if (symbol == NULL) {
int errstatus = GetLastError();
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
"failed to lookup symbol %s in "
"dyndb module '%s': %d",
symbol_name, filename, errstatus);
return (ISC_R_FAILURE);
}
*symbolp = symbol;
return (ISC_R_SUCCESS);
}
static isc_result_t
load_library(isc_mem_t *mctx, const char *filename, const char *instname,
dyndb_implementation_t **impp)
{
isc_result_t result;
HMODULE handle;
dyndb_implementation_t *imp = NULL;
dns_dyndb_register_t *register_func = NULL;
dns_dyndb_destroy_t *destroy_func = NULL;
dns_dyndb_version_t *version_func = NULL;
int version;
REQUIRE(impp != NULL && *impp == NULL);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DYNDB, ISC_LOG_INFO,
"loading DynDB instance '%s' driver '%s'",
instname, filename);
handle = LoadLibraryA(filename);
if (handle == NULL)
CHECK(ISC_R_FAILURE);
CHECK(load_symbol(handle, filename, "dyndb_version",
(void **)&version_func));
version = version_func(NULL);
if (version < (DNS_DYNDB_VERSION - DNS_DYNDB_AGE) ||
version > DNS_DYNDB_VERSION)
{
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
"driver API version mismatch: %d/%d",
version, DNS_DYNDB_VERSION);
CHECK(ISC_R_FAILURE);
}
CHECK(load_symbol(handle, filename, "dyndb_init",
(void **)&register_func));
CHECK(load_symbol(handle, filename, "dyndb_destroy",
(void **)&destroy_func));
imp = isc_mem_get(mctx, sizeof(dyndb_implementation_t));
if (imp == NULL)
CHECK(ISC_R_NOMEMORY);
imp->mctx = NULL;
isc_mem_attach(mctx, &imp->mctx);
imp->handle = handle;
imp->register_func = register_func;
imp->destroy_func = destroy_func;
imp->name = isc_mem_strdup(mctx, instname);
if (imp->name == NULL)
CHECK(ISC_R_NOMEMORY);
imp->inst = NULL;
INIT_LINK(imp, link);
*impp = imp;
imp = NULL;
cleanup:
if (result != ISC_R_SUCCESS)
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
"failed to dynamically load instance '%s' "
"driver '%s': %d (%s)", instname, filename,
GetLastError(), isc_result_totext(result));
if (imp != NULL)
isc_mem_putanddetach(&imp->mctx, imp, sizeof(dyndb_implementation_t));
if (result != ISC_R_SUCCESS && handle != NULL)
FreeLibrary(handle);
return (result);
}
static void
unload_library(dyndb_implementation_t **impp) {
dyndb_implementation_t *imp;
REQUIRE(impp != NULL && *impp != NULL);
imp = *impp;
isc_mem_free(imp->mctx, imp->name);
isc_mem_putanddetach(&imp->mctx, imp, sizeof(dyndb_implementation_t));
*impp = NULL;
}
#else /* HAVE_DLFCN_H || _WIN32 */
static isc_result_t
load_library(isc_mem_t *mctx, const char *filename, const char *instname,
dyndb_implementation_t **impp)
......
......@@ -107,7 +107,7 @@ dns_dyndb_load(const char *libname, const char *name, const char *parameters,
/*%
* Load a dyndb module.
*
* This loads a dyndb module using dlopen(), calls its register
* This loads a dyndb module using dlopen() or equivalent, calls its register
* function (see dns_dyndb_register_t above), and if successful, adds
* the instance handle to a list of dyndb instances so it can be cleaned
* up later.
......
......@@ -99,9 +99,9 @@ dns_cache_getcleaninginterval
dns_cache_getname
dns_cache_getstats
dns_cache_load
@IF JSON
@IF NOTYET
dns_cache_renderjson
@END JSON
@END NOTYET
@IF LIBXML2
dns_cache_renderxml
@END LIBXML2
......@@ -330,7 +330,7 @@ dns_dyndb_load
dns_dyndb_cleanup
dns_dyndb_createctx
dns_dyndb_destroyctx
@IF DNSTAP
@IF NOTYET
dns_dt_create
dns_dt_setidentity
dns_dt_setversion
......@@ -344,7 +344,7 @@ dns_dtdata_free
dns_dt_open
dns_dt_getframe
dns_dt_close
@END DNSTAP
@END NOTYET
dns_ecdb_register
dns_ecdb_unregister
dns_fwdtable_add
......
......@@ -182,6 +182,10 @@ SOURCE=..\include\dns\dnssec.h
# End Source File
# Begin Source File
SOURCE=..\include\dns\dnstap.h
# End Source File
# Begin Source File
SOURCE=..\include\dns\ds.h
# End Source File
# Begin Source File
......@@ -194,6 +198,10 @@ SOURCE=..\include\dns\ecdb.h
# End Source File
# Begin Source File
SOURCE=..\include\dns\edns.h
# End Source File
# Begin Source File
SOURCE=..\include\dns\enumclass.h
# End Source File
# Begin Source File
......@@ -316,6 +324,10 @@ SOURCE=..\rbtdb64.h
# End Source File
# Begin Source File
SOURCE=..\rdatalist_p.h
# End Source File
# Begin Source File
SOURCE=..\include\dns\rcode.h
# End Source File
# Begin Source File
......
......@@ -344,6 +344,9 @@
<ClInclude Include="..\rbtdb64.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\rdatalist_p.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\dns\acache.h">
<Filter>Library Header Files</Filter>
</ClInclude>
......@@ -404,6 +407,9 @@
<ClInclude Include="..\include\dns\dnssec.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\dns\dnstap.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\dns\ds.h">
<Filter>Library Header Files</Filter>
</ClInclude>
......@@ -416,6 +422,9 @@
<ClInclude Include="..\include\dns\ecdb.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\dns\edns.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\dns\enumclass.h">
<Filter>Library Header Files</Filter>
</ClInclude>
......
......@@ -246,10 +246,12 @@
<ClInclude Include="..\include\dns\dlz.h" />
<ClInclude Include="..\include\dns\dns64.h" />
<ClInclude Include="..\include\dns\dnssec.h" />
<ClInclude Include="..\include\dns\dnstap.h" />
<ClInclude Include="..\include\dns\ds.h" />
<ClInclude Include="..\include\dns\dsdigest.h" />
<ClInclude Include="..\include\dns\dyndb.h" />
<ClInclude Include="..\include\dns\ecdb.h" />
<ClInclude Include="..\include\dns\edns.h" />
<ClInclude Include="..\include\dns\enumclass.h" />
<ClInclude Include="..\include\dns\enumtype.h" />
<ClInclude Include="..\include\dns\events.h" />
......@@ -326,6 +328,7 @@
<ClInclude Include="..\include\dst\result.h" />
<ClInclude Include="..\rbtdb.h" />
<ClInclude Include="..\rbtdb64.h" />
<ClInclude Include="..\rdatalist_p.h" />
<ClInclude Include="..\spnego.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
......@@ -62,5 +62,8 @@
<ClInclude Include="..\include\irs\types.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\irs\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -123,6 +123,7 @@
<ClInclude Include="..\include\irs\platform.h" />
<ClInclude Include="..\include\irs\resconf.h" />
<ClInclude Include="..\include\irs\types.h" />
<ClInclude Include="..\include\irs\version.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
......@@ -402,9 +402,9 @@ isc_mem_ondestroy
isc_mem_printallactive
isc_mem_references
isc_mem_register
@IF JSON
@IF NOTYET
isc_mem_renderjson
@END JSON
@END NOTYET
@IF LIBXML2
isc_mem_renderxml
@END LIBXML2
......@@ -657,9 +657,9 @@ isc_taskmgr_createinctx
isc_taskmgr_destroy
isc_taskmgr_excltask
isc_taskmgr_mode
@IF JSON
@IF NOTYET
isc_taskmgr_renderjson
@END JSON
@END NOTYET
@IF LIBXML2
isc_taskmgr_renderxml
@END LIBXML2
......
......@@ -44,9 +44,9 @@ RSC=rc.exe
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "BIND9" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
@IF PKCS11
# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
@ELSE PKCS11
# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
@END PKCS11
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
......@@ -57,7 +57,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libisc.dll"
# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ @ZLIB_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libisc.dll"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "libisc - @PLATFORM@ Debug"
......@@ -75,9 +75,9 @@ LINK32=link.exe
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /GZ /c
@IF PKCS11
# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
@ELSE PKCS11
# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
@END PKCS11
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
......@@ -88,7 +88,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libisc.dll" /pdbtype:sept
# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ @ZLIB_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libisc.dll" /pdbtype:sept
!ENDIF
......@@ -411,7 +411,7 @@ SOURCE=..\include\isc\mem.h
# End Source File
# Begin Source File
SOURCE=.\include\isc\meminfo.h
SOURCE=..\include\isc\meminfo.h
# End Source File
# Begin Source File
......@@ -571,7 +571,11 @@ SOURCE=..\include\isc\socket.h
# End Source File
# Begin Source File
SOURCE=.\include\isc\stats.h
SOURCE=.\include\isc\stat.h
# End Source File
# Begin Source File
SOURCE=..\include\isc\stats.h
# End Source File
# Begin Source File
......
......@@ -216,9 +216,9 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@IF PKCS11
CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../dns/win32/include" /I "../../dns/include" @LIBXML2_INC@ @OPENSSL_INC@ /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../dns/win32/include" /I "../../dns/include" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
@ELSE PKCS11
CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" @LIBXML2_INC@ @OPENSSL_INC@ /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
@END PKCS11
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
......@@ -226,7 +226,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) @OPENSSL_LIB@ /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib"
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) @OPENSSL_LIB@ @ZLIB_LIB@ /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib"
DEF_FILE= \
".\libisc.def"
LINK32_OBJS= \
......@@ -535,9 +535,9 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@IF PKCS11
CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../dns/win32/include" /I "../../dns/include" @LIBXML2_INC@ @OPENSSL_INC@ /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../dns/win32/include" /I "../../dns/include" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
@ELSE PKCS11
CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" @LIBXML2_INC@ @OPENSSL_INC@ /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" @LIBXML2_INC@ @OPENSSL_INC@ @ZLIB_INC@ /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
@END PKCS11
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
......@@ -644,7 +644,7 @@ BSC32_SBRS= \
<<
LINK32=link.exe
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) @OPENSSL_LIB@ /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) @OPENSSL_LIB@ @ZLIB_LIB@ /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept
DEF_FILE= \
".\libisc.def"
LINK32_OBJS= \
......
......@@ -142,6 +142,9 @@
<ClInclude Include="..\include\isc\mem.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isc\meminfo.h">
<Filter>Win32 Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isc\msgcat.h">
<Filter>Library Header Files</Filter>
</ClInclude>
......@@ -229,6 +232,9 @@
<ClInclude Include="..\include\isc\socket.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isc\stats.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isc\stdio.h">
<Filter>Library Header Files</Filter>
</ClInclude>
......@@ -309,9 +315,6 @@
<ClInclude Include="include\isc\keyboard.h">
<Filter>Win32 Header Files</Filter>
</ClInclude>
<ClInclude Include="include\isc\meminfo.h">
<Filter>Win32 Header Files</Filter>
</ClInclude>
<ClInclude Include="include\isc\mutex.h">
<Filter>Win32 Header Files</Filter>
</ClInclude>
......
......@@ -55,10 +55,10 @@
<Optimization>Disabled</Optimization>
@IF PKCS11
<PreprocessorDefinitions>BIND9;@CRYPTO@@PK11_LIB_LOCATION@WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@ZLIB_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ELSE PKCS11
<PreprocessorDefinitions>BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@include;..\include;win32;..\..\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@ZLIB_INC@include;..\include;win32;..\..\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@END PKCS11
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
......@@ -71,7 +71,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>@LIBXML2_LIB@@OPENSSL_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>@LIBXML2_LIB@@OPENSSL_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
</Link>
......@@ -121,6 +121,12 @@ copy @IDN_DLL@ ..\Build\Debug\
copy @ICONV_DLL@ ..\Build\Debug\
@END IDNKIT
@IF ZLIB
echo Copying the zlib DLL.
copy @ZLIB_DLL@ ..\Build\Debug\
@END ZLIB
echo Copying Visual C x86 Redistributable Installer.
copy /Y @VCREDIST_PATH@ ..\Build\Debug\
......@@ -143,10 +149,10 @@ copy InstallFiles ..\Build\Debug\
<IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
@IF PKCS11
<PreprocessorDefinitions>BIND9;@CRYPTO@@PK11_LIB_LOCATION@WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@ZLIB_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ELSE PKCS11
<PreprocessorDefinitions>BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@include;..\include;win32;..\..\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@ZLIB_INC@include;..\include;win32;..\..\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@END PKCS11
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<WholeProgramOptimization>false</WholeProgramOptimization>
......@@ -162,7 +168,7 @@ copy InstallFiles ..\Build\Debug\
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>@LIBXML2_LIB@@OPENSSL_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>@LIBXML2_LIB@@OPENSSL_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
......@@ -262,6 +268,12 @@ copy @IDN_DLL@ ..\Build\Release\
copy @ICONV_DLL@ ..\Build\Release\
@END IDNKIT
@IF ZLIB
echo Copying the zlib DLL.
copy @ZLIB_DLL@ ..\Build\Release\
@END ZLIB
echo Copying Visual C x86 Redistributable Installer.
copy /Y @VCREDIST_PATH@ ..\Build\Release\
......@@ -319,6 +331,7 @@ copy InstallFiles ..\Build\Release\
<ClInclude Include="..\include\isc\magic.h" />
<ClInclude Include="..\include\isc\md5.h" />
<ClInclude Include="..\include\isc\mem.h" />
<ClInclude Include="..\include\isc\meminfo.h" />
<ClInclude Include="..\include\isc\msgcat.h" />
<ClInclude Include="..\include\isc\msgs.h" />
<ClInclude Include="..\include\isc\mutexblock.h" />
......@@ -348,6 +361,7 @@ copy InstallFiles ..\Build\Release\
<ClInclude Include="..\include\isc\sha2.h" />
<ClInclude Include="..\include\isc\sockaddr.h" />
<ClInclude Include="..\include\isc\socket.h" />
<ClInclude Include="..\include\isc\stats.h" />
<ClInclude Include="..\include\isc\stdio.h" />
<ClInclude Include="..\include\isc\stdlib.h" />
<ClInclude Include="..\include\isc\string.h" />
......@@ -382,7 +396,6 @@ copy InstallFiles ..\Build\Release\
<ClInclude Include="include\isc\int.h" />
<ClInclude Include="include\isc\ipv6.h" />
<ClInclude Include="include\isc\keyboard.h" />
<ClInclude Include="include\isc\meminfo.h" />
<ClInclude Include="include\isc\mutex.h" />
<ClInclude Include="include\isc\net.h" />
<ClInclude Include="include\isc\netdb.h" />
......
......@@ -184,6 +184,10 @@ SOURCE=..\include\isccc\types.h
SOURCE=..\include\isccc\util.h
# End Source File
# Begin Source File
SOURCE=..\include\isccc\version.h
# End Source File
# End Group
# Begin Group "Resource Files"
......
......@@ -86,5 +86,8 @@
<ClInclude Include="..\include\isccc\util.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isccc\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -131,6 +131,7 @@
<ClInclude Include="..\include\isccc\symtype.h" />
<ClInclude Include="..\include\isccc\types.h" />
<ClInclude Include="..\include\isccc\util.h" />
<ClInclude Include="..\include\isccc\version.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />