From 789d253e3d0792c177476cb899933aa08415f20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 8 Apr 2020 10:58:45 +0200 Subject: [PATCH 01/12] Set WarningLevel to Level1 for Release, treat warnings as errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our vcxproj files set the WarningLevel to Level3, which is too verbose for a code that needs to be portable. That basically leads to ignoring all the errors that MSVC produces. This commits downgrades the WarningLevel to Level1 and enables treating warnings as errors for Release builds. For the Debug builds the WarningLevel got upgraded to Level4, and treating warnings as errors is explicitly disabled. We should eventually make the code clean of all MSVC warnings, but it's a long way to go for Level4, so it's more reasonable to start at Level1. For reference[1], these are the warning levels as described by MSVC documentation: * /W0 suppresses all warnings. It's equivalent to /w. * /W1 displays level 1 (severe) warnings. /W1 is the default setting in the command-line compiler. * /W2 displays level 1 and level 2 (significant) warnings. * /W3 displays level 1, level 2, and level 3 (production quality) warnings. /W3 is the default setting in the IDE. * /W4 displays level 1, level 2, and level 3 warnings, and all level 4 (informational) warnings that aren't off by default. We recommend that you use this option to provide lint-like warnings. For a new project, it may be best to use /W4 in all compilations. This option helps ensure the fewest possible hard-to-find code defects. * /Wall displays all warnings displayed by /W4 and all other warnings that /W4 doesn't include — for example, warnings that are off by default. * /WX treats all compiler warnings as errors. For a new project, it may be best to use /WX in all compilations; resolving all warnings ensures the fewest possible hard-to-find code defects. 1. https://docs.microsoft.com/en-us/cpp/build/reference/compiler-option-warning-level?view=vs-2019 --- bin/check/win32/checkconf.vcxproj.in | 6 ++++-- bin/check/win32/checktool.vcxproj.in | 6 ++++-- bin/check/win32/checkzone.vcxproj.in | 6 ++++-- bin/confgen/win32/confgentool.vcxproj.in | 6 ++++-- bin/confgen/win32/ddnsconfgen.vcxproj.in | 6 ++++-- bin/confgen/win32/rndcconfgen.vcxproj.in | 6 ++++-- bin/delv/win32/delv.vcxproj.in | 6 ++++-- bin/dig/win32/dig.vcxproj.in | 6 ++++-- bin/dig/win32/dighost.vcxproj.in | 6 ++++-- bin/dig/win32/host.vcxproj.in | 6 ++++-- bin/dig/win32/nslookup.vcxproj.in | 6 ++++-- bin/dnssec/win32/cds.vcxproj.in | 6 ++++-- bin/dnssec/win32/dnssectool.vcxproj.in | 6 ++++-- bin/dnssec/win32/dsfromkey.vcxproj.in | 6 ++++-- bin/dnssec/win32/importkey.vcxproj.in | 6 ++++-- bin/dnssec/win32/keyfromlabel.vcxproj.in | 6 ++++-- bin/dnssec/win32/keygen.vcxproj.in | 6 ++++-- bin/dnssec/win32/revoke.vcxproj.in | 6 ++++-- bin/dnssec/win32/settime.vcxproj.in | 6 ++++-- bin/dnssec/win32/signzone.vcxproj.in | 6 ++++-- bin/dnssec/win32/verify.vcxproj.in | 6 ++++-- bin/named/win32/named.vcxproj.in | 6 ++++-- bin/nsupdate/win32/nsupdate.vcxproj.in | 6 ++++-- bin/pkcs11/win32/pk11destroy.vcxproj.in | 6 ++++-- bin/pkcs11/win32/pk11keygen.vcxproj.in | 6 ++++-- bin/pkcs11/win32/pk11list.vcxproj.in | 6 ++++-- bin/pkcs11/win32/pk11tokens.vcxproj.in | 6 ++++-- bin/rndc/win32/rndc.vcxproj.in | 6 ++++-- bin/rndc/win32/rndcutil.vcxproj.in | 6 ++++-- bin/tests/system/win32/bigkey.vcxproj.in | 6 ++++-- bin/tests/system/win32/feature-test.vcxproj.in | 6 ++++-- bin/tests/system/win32/gencheck.vcxproj.in | 6 ++++-- bin/tests/system/win32/keycreate.vcxproj.in | 6 ++++-- bin/tests/system/win32/keydelete.vcxproj.in | 6 ++++-- bin/tests/system/win32/pipequeries.vcxproj.in | 6 ++++-- bin/tests/win32/backtrace_test.vcxproj.in | 6 ++++-- bin/tests/win32/inter_test.vcxproj.in | 6 ++++-- bin/tests/win32/makejournal.vcxproj.in | 6 ++++-- bin/tests/win32/rwlock_test.vcxproj.in | 6 ++++-- bin/tests/win32/shutdown_test.vcxproj.in | 6 ++++-- bin/tests/win32/sock_test.vcxproj.in | 6 ++++-- bin/tests/win32/task_test.vcxproj.in | 6 ++++-- bin/tests/win32/timer_test.vcxproj.in | 6 ++++-- bin/tools/win32/arpaname.vcxproj.in | 6 ++++-- bin/tools/win32/journalprint.vcxproj.in | 6 ++++-- bin/tools/win32/mdig.vcxproj.in | 6 ++++-- bin/tools/win32/nsec3hash.vcxproj.in | 6 ++++-- bin/tools/win32/rrchecker.vcxproj.in | 6 ++++-- bin/win32/BINDInstall/BINDInstall.vcxproj.in | 6 ++++-- doc/xsl/graphics/caution.eps | 4 ++-- doc/xsl/graphics/important.eps | 4 ++-- doc/xsl/graphics/note.eps | 4 ++-- doc/xsl/graphics/tip.eps | 4 ++-- doc/xsl/graphics/warning.eps | 4 ++-- lib/bind9/win32/libbind9.vcxproj.in | 6 ++++-- lib/dns/win32/gen.vcxproj.in | 6 ++++-- lib/dns/win32/libdns.vcxproj.in | 6 ++++-- lib/irs/win32/libirs.vcxproj.in | 6 ++++-- lib/isc/win32/libisc.vcxproj.in | 6 ++++-- lib/isccc/win32/libisccc.vcxproj.in | 6 ++++-- lib/isccfg/win32/libisccfg.vcxproj.in | 6 ++++-- lib/ns/win32/libns.vcxproj.in | 6 ++++-- lib/samples/win32/async.vcxproj.in | 6 ++++-- lib/samples/win32/gai.vcxproj.in | 6 ++++-- lib/samples/win32/nsprobe.vcxproj.in | 6 ++++-- lib/samples/win32/request.vcxproj.in | 6 ++++-- lib/samples/win32/resolve.vcxproj.in | 6 ++++-- lib/samples/win32/update.vcxproj.in | 6 ++++-- lib/win32/bindevt/bindevt.vcxproj.in | 6 ++++-- 69 files changed, 266 insertions(+), 138 deletions(-) diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in index 2c24c07225..b986d0d0c0 100644 --- a/bin/check/win32/checkconf.vcxproj.in +++ b/bin/check/win32/checkconf.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/check/win32/checktool.vcxproj.in b/bin/check/win32/checktool.vcxproj.in index f7763895fa..46b07e5c7a 100644 --- a/bin/check/win32/checktool.vcxproj.in +++ b/bin/check/win32/checktool.vcxproj.in @@ -59,7 +59,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -78,7 +79,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in index 4c4c162547..128b5d499c 100644 --- a/bin/check/win32/checkzone.vcxproj.in +++ b/bin/check/win32/checkzone.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -85,7 +86,8 @@ copy /Y named-checkzone.ilk named-compilezone.ilk - Level3 + Level1 + true MaxSpeed diff --git a/bin/confgen/win32/confgentool.vcxproj.in b/bin/confgen/win32/confgentool.vcxproj.in index af0357388b..3942c21f01 100644 --- a/bin/confgen/win32/confgentool.vcxproj.in +++ b/bin/confgen/win32/confgentool.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -74,7 +75,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.in b/bin/confgen/win32/ddnsconfgen.vcxproj.in index 20b8a38e34..f0ecac5d22 100644 --- a/bin/confgen/win32/ddnsconfgen.vcxproj.in +++ b/bin/confgen/win32/ddnsconfgen.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -85,7 +86,8 @@ copy /Y ddns-confgen.ilk tsig-keygen.ilk - Level3 + Level1 + true MaxSpeed diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.in b/bin/confgen/win32/rndcconfgen.vcxproj.in index 7e098d736b..42dc331a18 100644 --- a/bin/confgen/win32/rndcconfgen.vcxproj.in +++ b/bin/confgen/win32/rndcconfgen.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in index df9171e998..3c95ea868b 100644 --- a/bin/delv/win32/delv.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index 235fa727fb..5c40caa1ad 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in index 086dcf61e6..9644a5a129 100644 --- a/bin/dig/win32/dighost.vcxproj.in +++ b/bin/dig/win32/dighost.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -75,7 +76,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index 5736993d9c..1066a3783b 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index 3d048c9f19..7b3b9d5185 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/cds.vcxproj.in b/bin/dnssec/win32/cds.vcxproj.in index f17ee3c962..d5859e1409 100644 --- a/bin/dnssec/win32/cds.vcxproj.in +++ b/bin/dnssec/win32/cds.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/dnssectool.vcxproj.in b/bin/dnssec/win32/dnssectool.vcxproj.in index a2c1c165d9..d3582eb070 100644 --- a/bin/dnssec/win32/dnssectool.vcxproj.in +++ b/bin/dnssec/win32/dnssectool.vcxproj.in @@ -62,7 +62,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -82,7 +83,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in index ea4229f794..0276644086 100644 --- a/bin/dnssec/win32/dsfromkey.vcxproj.in +++ b/bin/dnssec/win32/dsfromkey.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -92,7 +93,8 @@ set PYTHONPATH=. - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in index 32a9c3ad3b..0942047b14 100644 --- a/bin/dnssec/win32/importkey.vcxproj.in +++ b/bin/dnssec/win32/importkey.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in index cda58e3435..60b4188bde 100644 --- a/bin/dnssec/win32/keyfromlabel.vcxproj.in +++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in index ddef528081..409a28cbfb 100644 --- a/bin/dnssec/win32/keygen.vcxproj.in +++ b/bin/dnssec/win32/keygen.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in index bf82c95368..a68147ea02 100644 --- a/bin/dnssec/win32/revoke.vcxproj.in +++ b/bin/dnssec/win32/revoke.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in index 365b2e87a0..10fffc193f 100644 --- a/bin/dnssec/win32/settime.vcxproj.in +++ b/bin/dnssec/win32/settime.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in index 02e87af940..d5d48bac70 100644 --- a/bin/dnssec/win32/signzone.vcxproj.in +++ b/bin/dnssec/win32/signzone.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in index 25d79359c7..e0d94ac1a6 100644 --- a/bin/dnssec/win32/verify.vcxproj.in +++ b/bin/dnssec/win32/verify.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index 242301a553..ccac4fb65e 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;@USE_GSSAPI@BUILDER="Visual Studio";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index d1048e458a..f770d474f4 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;@USE_GSSAPI@USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in index 043f8d07d2..09eed4c0d9 100644 --- a/bin/pkcs11/win32/pk11destroy.vcxproj.in +++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in index 058ee31d0b..ed170d3a2e 100644 --- a/bin/pkcs11/win32/pk11keygen.vcxproj.in +++ b/bin/pkcs11/win32/pk11keygen.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in index d30351866b..823b522a12 100644 --- a/bin/pkcs11/win32/pk11list.vcxproj.in +++ b/bin/pkcs11/win32/pk11list.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in index bb0921c451..b4066a9b20 100644 --- a/bin/pkcs11/win32/pk11tokens.vcxproj.in +++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in index c65363f193..5692a1edd8 100644 --- a/bin/rndc/win32/rndc.vcxproj.in +++ b/bin/rndc/win32/rndc.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/rndc/win32/rndcutil.vcxproj.in b/bin/rndc/win32/rndcutil.vcxproj.in index 85bceb06bc..2927652a0a 100644 --- a/bin/rndc/win32/rndcutil.vcxproj.in +++ b/bin/rndc/win32/rndcutil.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -75,7 +76,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/system/win32/bigkey.vcxproj.in b/bin/tests/system/win32/bigkey.vcxproj.in index 6587173d29..07262199fc 100644 --- a/bin/tests/system/win32/bigkey.vcxproj.in +++ b/bin/tests/system/win32/bigkey.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/system/win32/feature-test.vcxproj.in b/bin/tests/system/win32/feature-test.vcxproj.in index 3efed6512f..5568b1556a 100644 --- a/bin/tests/system/win32/feature-test.vcxproj.in +++ b/bin/tests/system/win32/feature-test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/system/win32/gencheck.vcxproj.in b/bin/tests/system/win32/gencheck.vcxproj.in index e6b05a4409..a304d7de39 100644 --- a/bin/tests/system/win32/gencheck.vcxproj.in +++ b/bin/tests/system/win32/gencheck.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/system/win32/keycreate.vcxproj.in b/bin/tests/system/win32/keycreate.vcxproj.in index 870b848566..1409912902 100644 --- a/bin/tests/system/win32/keycreate.vcxproj.in +++ b/bin/tests/system/win32/keycreate.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/system/win32/keydelete.vcxproj.in b/bin/tests/system/win32/keydelete.vcxproj.in index c4df0bf324..ef955cc8f4 100644 --- a/bin/tests/system/win32/keydelete.vcxproj.in +++ b/bin/tests/system/win32/keydelete.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/system/win32/pipequeries.vcxproj.in b/bin/tests/system/win32/pipequeries.vcxproj.in index d5ec974ea3..1099b20cfc 100644 --- a/bin/tests/system/win32/pipequeries.vcxproj.in +++ b/bin/tests/system/win32/pipequeries.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/backtrace_test.vcxproj.in b/bin/tests/win32/backtrace_test.vcxproj.in index 0b0736ab34..547195f5de 100644 --- a/bin/tests/win32/backtrace_test.vcxproj.in +++ b/bin/tests/win32/backtrace_test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/inter_test.vcxproj.in b/bin/tests/win32/inter_test.vcxproj.in index c63a56d846..ab7c917846 100644 --- a/bin/tests/win32/inter_test.vcxproj.in +++ b/bin/tests/win32/inter_test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/makejournal.vcxproj.in b/bin/tests/win32/makejournal.vcxproj.in index 8481cd2cb8..7f7c793577 100644 --- a/bin/tests/win32/makejournal.vcxproj.in +++ b/bin/tests/win32/makejournal.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/rwlock_test.vcxproj.in b/bin/tests/win32/rwlock_test.vcxproj.in index 0f926c9e78..8f6c33fa5a 100644 --- a/bin/tests/win32/rwlock_test.vcxproj.in +++ b/bin/tests/win32/rwlock_test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/shutdown_test.vcxproj.in b/bin/tests/win32/shutdown_test.vcxproj.in index 0cf3fdbd03..8ddbe28f7a 100644 --- a/bin/tests/win32/shutdown_test.vcxproj.in +++ b/bin/tests/win32/shutdown_test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/sock_test.vcxproj.in b/bin/tests/win32/sock_test.vcxproj.in index 7354efa541..0b0ef84809 100644 --- a/bin/tests/win32/sock_test.vcxproj.in +++ b/bin/tests/win32/sock_test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/task_test.vcxproj.in b/bin/tests/win32/task_test.vcxproj.in index 16547dd612..a439cb208b 100644 --- a/bin/tests/win32/task_test.vcxproj.in +++ b/bin/tests/win32/task_test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/timer_test.vcxproj.in b/bin/tests/win32/timer_test.vcxproj.in index 66bb3957a1..336d7bc17b 100644 --- a/bin/tests/win32/timer_test.vcxproj.in +++ b/bin/tests/win32/timer_test.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in index b141ccdb2a..d745a01fc8 100644 --- a/bin/tools/win32/arpaname.vcxproj.in +++ b/bin/tools/win32/arpaname.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\..\config.h @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in index 0c0a86f5f0..f8750295c8 100644 --- a/bin/tools/win32/journalprint.vcxproj.in +++ b/bin/tools/win32/journalprint.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in index 4c366fbd17..48aa578417 100644 --- a/bin/tools/win32/mdig.vcxproj.in +++ b/bin/tools/win32/mdig.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in index 1840de335b..aea2cc9c6d 100644 --- a/bin/tools/win32/nsec3hash.vcxproj.in +++ b/bin/tools/win32/nsec3hash.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/rrchecker.vcxproj.in b/bin/tools/win32/rrchecker.vcxproj.in index fd68747139..437f630c63 100644 --- a/bin/tools/win32/rrchecker.vcxproj.in +++ b/bin/tools/win32/rrchecker.vcxproj.in @@ -56,7 +56,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in index 2b901d9847..b7f5e6829a 100644 --- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in +++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in @@ -56,7 +56,8 @@ MultiThreadedDebug Use - Level3 + Level4 + false Disabled WIN32;@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;%(PreprocessorDefinitions) ..\..\..;..\include;..\..\..\include;..\..\named\win32\include;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) @@ -83,7 +84,8 @@ MultiThreaded - Level3 + Level1 + true Use MaxSpeed true diff --git a/doc/xsl/graphics/caution.eps b/doc/xsl/graphics/caution.eps index c9473b7272..ff3c2c4c4c 100644 --- a/doc/xsl/graphics/caution.eps +++ b/doc/xsl/graphics/caution.eps @@ -82,8 +82,8 @@ readbinarystring } if pop exch pop } bdf -/_NXLevel2 defed { -_NXLevel2 not { +/_NXLevel1 defed { +_NXLevel1 not { /colorimage where { userdict eq { /_rci false def diff --git a/doc/xsl/graphics/important.eps b/doc/xsl/graphics/important.eps index c9473b7272..ff3c2c4c4c 100644 --- a/doc/xsl/graphics/important.eps +++ b/doc/xsl/graphics/important.eps @@ -82,8 +82,8 @@ readbinarystring } if pop exch pop } bdf -/_NXLevel2 defed { -_NXLevel2 not { +/_NXLevel1 defed { +_NXLevel1 not { /colorimage where { userdict eq { /_rci false def diff --git a/doc/xsl/graphics/note.eps b/doc/xsl/graphics/note.eps index 39be23fa77..f5df521781 100644 --- a/doc/xsl/graphics/note.eps +++ b/doc/xsl/graphics/note.eps @@ -82,8 +82,8 @@ readbinarystring } if pop exch pop } bdf -/_NXLevel2 defed { -_NXLevel2 not { +/_NXLevel1 defed { +_NXLevel1 not { /colorimage where { userdict eq { /_rci false def diff --git a/doc/xsl/graphics/tip.eps b/doc/xsl/graphics/tip.eps index a28ad883eb..0edd2ef792 100644 --- a/doc/xsl/graphics/tip.eps +++ b/doc/xsl/graphics/tip.eps @@ -82,8 +82,8 @@ readbinarystring } if pop exch pop } bdf -/_NXLevel2 defed { -_NXLevel2 not { +/_NXLevel1 defed { +_NXLevel1 not { /colorimage where { userdict eq { /_rci false def diff --git a/doc/xsl/graphics/warning.eps b/doc/xsl/graphics/warning.eps index c9473b7272..ff3c2c4c4c 100644 --- a/doc/xsl/graphics/warning.eps +++ b/doc/xsl/graphics/warning.eps @@ -82,8 +82,8 @@ readbinarystring } if pop exch pop } bdf -/_NXLevel2 defed { -_NXLevel2 not { +/_NXLevel1 defed { +_NXLevel1 not { /colorimage where { userdict eq { /_rci false def diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in index 32875b3f1b..3b66ac650d 100644 --- a/lib/bind9/win32/libbind9.vcxproj.in +++ b/lib/bind9/win32/libbind9.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/dns/win32/gen.vcxproj.in b/lib/dns/win32/gen.vcxproj.in index 67c06d0ef5..33a8a1e6f7 100644 --- a/lib/dns/win32/gen.vcxproj.in +++ b/lib/dns/win32/gen.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) .\;..\..\..\;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;%(AdditionalIncludeDirectories) @@ -83,7 +84,8 @@ gen -s . > code.h - Level3 + Level1 + true MaxSpeed diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index 89019d8912..f355697301 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled BIND9;WIN32;@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index c09f981db0..5a23edcf80 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBIRS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index 5267abfe4d..985ff4a744 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled @IF PKCS11 BIND9;@PK11_LIB_LOCATION@WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) @@ -142,7 +143,8 @@ copy InstallFiles ..\Build\Debug\ - Level3 + Level1 + true MaxSpeed diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in index fbcab6713d..799dec4f1b 100644 --- a/lib/isccc/win32/libisccc.vcxproj.in +++ b/lib/isccc/win32/libisccc.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in index 584341f82f..8d4b5c402a 100644 --- a/lib/isccfg/win32/libisccfg.vcxproj.in +++ b/lib/isccfg/win32/libisccfg.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in index f7836b086b..f9245762da 100644 --- a/lib/ns/win32/libns.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -53,7 +53,8 @@ - Level3 + Level4 + false Disabled WIN32;@USE_GSSAPI@_DEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) ..\..\..\config.h @@ -78,7 +79,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/async.vcxproj.in b/lib/samples/win32/async.vcxproj.in index 366833df13..a3398dda10 100644 --- a/lib/samples/win32/async.vcxproj.in +++ b/lib/samples/win32/async.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/gai.vcxproj.in b/lib/samples/win32/gai.vcxproj.in index 249bab36a3..b823593ee3 100644 --- a/lib/samples/win32/gai.vcxproj.in +++ b/lib/samples/win32/gai.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/nsprobe.vcxproj.in b/lib/samples/win32/nsprobe.vcxproj.in index 06807bd41b..98da82223e 100644 --- a/lib/samples/win32/nsprobe.vcxproj.in +++ b/lib/samples/win32/nsprobe.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/request.vcxproj.in b/lib/samples/win32/request.vcxproj.in index 997e14dd4e..85bbc178b4 100644 --- a/lib/samples/win32/request.vcxproj.in +++ b/lib/samples/win32/request.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/resolve.vcxproj.in b/lib/samples/win32/resolve.vcxproj.in index 71fca3d46d..061375a0a3 100644 --- a/lib/samples/win32/resolve.vcxproj.in +++ b/lib/samples/win32/resolve.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/update.vcxproj.in b/lib/samples/win32/update.vcxproj.in index ba06e293b1..d0218e0a04 100644 --- a/lib/samples/win32/update.vcxproj.in +++ b/lib/samples/win32/update.vcxproj.in @@ -54,7 +54,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/win32/bindevt/bindevt.vcxproj.in b/lib/win32/bindevt/bindevt.vcxproj.in index 38891ecd88..858bb2fb6d 100644 --- a/lib/win32/bindevt/bindevt.vcxproj.in +++ b/lib/win32/bindevt/bindevt.vcxproj.in @@ -58,7 +58,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;BINDEVT_EXPORTS;%(PreprocessorDefinitions) ..\include;..\..\..\include;%(AdditionalIncludeDirectories) @@ -85,7 +86,8 @@ - Level3 + Level1 + true MaxSpeed From 948a23e6bb343e63dd6ad852e141650da323846c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 8 Apr 2020 15:43:02 +0200 Subject: [PATCH 02/12] Don't return from void function --- lib/isc/win32/thread.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/isc/win32/thread.c b/lib/isc/win32/thread.c index 5e55bb60f6..12b9770846 100644 --- a/lib/isc/win32/thread.c +++ b/lib/isc/win32/thread.c @@ -49,8 +49,6 @@ isc_thread_join(isc_thread_t thread, isc_threadresult_t *rp) { GetLastError()); } (void)CloseHandle(thread); - - return (ISC_R_SUCCESS); } void From 6f3c201ff439a0433624d77445753331f2c64f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 8 Apr 2020 15:46:33 +0200 Subject: [PATCH 03/12] append_file() should return void as it doesn't return anything and we don't check for return value --- lib/isc/glob.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/isc/glob.c b/lib/isc/glob.c index 3eb2a7ed46..559815525b 100644 --- a/lib/isc/glob.c +++ b/lib/isc/glob.c @@ -22,16 +22,15 @@ #if HAVE_GLOB_H #include -#elif defined(_WIN32) || defined(_WIN64) +#elif defined(_WIN32) #include #define WIN32_LEAN_AND_MEAN 1 #include #include -#define GLOB_WIN_IMPL 1 -#define GLOB_ERR 0x0004 /* Return on error. */ -#define GLOB_NOSPACE (-1) -#define GLOB_NOMATCH (-3) +#define GLOB_ERR 0x0004 /* Return on error. */ +#define GLOB_NOSPACE (-1) +#define GLOB_NOMATCH (-3) /* custom glob implementation for windows */ static int @@ -73,7 +72,7 @@ isc_globfree(glob_t *pglob) { globfree(pglob); } -#ifdef GLOB_WIN_IMPL +#if defined(_WIN32) typedef struct file_path file_path_t; @@ -102,7 +101,7 @@ map_error(DWORD win_err_code) { /* add file in directory dir, that matches glob expression * provided in function glob(), to the linked list fl */ -static int +static void append_file(isc_mem_t *mctx, file_list_t *fl, const char *dir, const char *file, size_t full_path_len) { file_path_t *fp = isc_mem_get(mctx, sizeof(file_path_t)); @@ -242,4 +241,4 @@ globfree(glob_t *pglob) { pglob->mctx = NULL; } -#endif /* GLOB_WIN_IMPL */ +#endif /* defined(_WIN32) */ From b1f66d1e13b407161974579957a49debf815e9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 8 Apr 2020 15:42:47 +0200 Subject: [PATCH 04/12] Disable MSVC C4133 when using stdatomic.h win32 shim --- lib/isc/win32/include/isc/stdatomic.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h index 15cf9b6f0b..8eacb011a9 100644 --- a/lib/isc/win32/include/isc/stdatomic.h +++ b/lib/isc/win32/include/isc/stdatomic.h @@ -18,6 +18,8 @@ #include #include +#pragma warning(disable : 4133) + #define InterlockedExchangeAdd8 _InterlockedExchangeAdd8 #define InterlockedCompareExchange8 _InterlockedCompareExchange8 From 70318943fe141999a7b732796256f04bdbef7467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 11:56:08 +0200 Subject: [PATCH 05/12] Remove the Windows build job dependency on autoreconf job --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94c2b6153e..8b2caed234 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -230,9 +230,7 @@ stages: x64' - 'Set-Item -path "Env:CL" -value "/MP$([Math]::Truncate($BUILD_PARALLEL_JOBS/2))"' - '& msbuild.exe /maxCpuCount:2 /t:Build /p:Configuration=$VSCONF bind9.sln' - needs: - - job: autoreconf - artifacts: false + needs: [] artifacts: untracked: true expire_in: "1 day" From 54168d55c0a44da65c61b588f40ccbdf79cc914a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 12:27:23 +0200 Subject: [PATCH 06/12] Fix invalid cast in win32 stdatomic.h shim The InterlockedOr8() and InterlockedAnd8() first argument was cast to (atomic_int_fast8_t) instead of (atomic_int_fast8_t *), this was reported by MSVC as: warning C4024: '_InterlockedOr8': different types for formal and actual parameter 1 warning C4024: '_InterlockedAnd8': different types for formal and actual parameter 1 --- lib/isc/win32/include/isc/stdatomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h index 8eacb011a9..0fccf4600c 100644 --- a/lib/isc/win32/include/isc/stdatomic.h +++ b/lib/isc/win32/include/isc/stdatomic.h @@ -244,7 +244,7 @@ atomic_add_abort() { atomic_fetch_sub_explicit(obj, arg, memory_order_seq_cst) #define atomic_fetch_and_explicit8(obj, arg, order) \ - InterlockedAnd8((atomic_int_fast8_t)obj, arg) + InterlockedAnd8((atomic_int_fast8_t *)obj, arg) #define atomic_fetch_and_explicit32(obj, arg, order) \ (order == memory_order_relaxed \ @@ -299,7 +299,7 @@ atomic_and_abort() { atomic_fetch_and_explicit(obj, arg, memory_order_seq_cst) #define atomic_fetch_or_explicit8(obj, arg, order) \ - InterlockedOr8((atomic_int_fast8_t)obj, arg) + InterlockedOr8((atomic_int_fast8_t *)obj, arg) #define atomic_fetch_or_explicit32(obj, arg, order) \ (order == memory_order_relaxed \ From 063e05491b9f9ea72c8324ea3ff5bb6e0d59642f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 12:28:53 +0200 Subject: [PATCH 07/12] Disable C4090 MSVC warning MSVC documentation states: "This warning can be caused when a pointer to a const or volatile item is assigned to a pointer not declared as pointing to const or volatile." Unfortunately, this happens when we dynamically allocate and deallocate block of atomic variables using isc_mem_get and isc_mem_put. Couple of examples: lib\isc\hp.c(134): warning C4090: 'function': different 'volatile' qualifiers [C:\builds\isc-projects\bind9\lib\isc\win32\libisc.vcxproj] lib\isc\hp.c(144): warning C4090: 'function': different 'volatile' qualifiers [C:\builds\isc-projects\bind9\lib\isc\win32\libisc.vcxproj] lib\isc\stats.c(55): warning C4090: 'function': different 'volatile' qualifiers [C:\builds\isc-projects\bind9\lib\isc\win32\libisc.vcxproj] lib\isc\stats.c(87): warning C4090: 'function': different 'volatile' qualifiers [C:\builds\isc-projects\bind9\lib\isc\win32\libisc.vcxproj] --- lib/isc/win32/include/isc/stdatomic.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h index 0fccf4600c..eb22a80665 100644 --- a/lib/isc/win32/include/isc/stdatomic.h +++ b/lib/isc/win32/include/isc/stdatomic.h @@ -19,6 +19,7 @@ #include #pragma warning(disable : 4133) +#pragma warning(disable : 4090) #define InterlockedExchangeAdd8 _InterlockedExchangeAdd8 #define InterlockedCompareExchange8 _InterlockedCompareExchange8 From 60c632ab91dc8f817e1641c9e3317b8933ab5af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 12:36:12 +0200 Subject: [PATCH 08/12] Workaround MSVC warning C4477 Due to a way the stdatomic.h shim is implemented on Windows, the MSVC always things that the outside type is the largest - atomic_(u)int_fast64_t. This can lead to false positives as this one: lib\dns\adb.c(3678): warning C4477: 'fprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 2 has type 'unsigned __int64' We workaround the issue by loading the value in a scoped local variable with correct type first. --- lib/dns/adb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 5d0a5d6dcf..a2800226d1 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -3675,8 +3675,9 @@ dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry, bool debug, } if (adb != NULL && adb->quota != 0 && adb->atr_freq != 0) { + uint_fast32_t quota = atomic_load_relaxed(&entry->quota); fprintf(f, " [atr %0.2f] [quota %" PRIuFAST32 "]", entry->atr, - atomic_load_relaxed(&entry->quota)); + quota); } fprintf(f, "\n"); From 4ffe7255853b8332bb585d96a25efb9e56bdcfa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 12:50:28 +0200 Subject: [PATCH 09/12] Fix the discrepancy between cfg_pluginlist_foreach declaration and definition There was a missing indirection for the pluginlist_cb_t *callback in the declaration of the cfg_pluginlist_foreach function. Reported by MSVC as: lib\isccfg\parser.c(4057): warning C4028: formal parameter 4 different from declaration --- lib/isccfg/include/isccfg/cfg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h index 3123a9b39f..eda5b46a69 100644 --- a/lib/isccfg/include/isccfg/cfg.h +++ b/lib/isccfg/include/isccfg/cfg.h @@ -597,7 +597,7 @@ typedef isc_result_t(pluginlist_cb_t)(const cfg_obj_t *config, isc_result_t cfg_pluginlist_foreach(const cfg_obj_t *config, const cfg_obj_t *list, - isc_log_t *lctx, pluginlist_cb_t callback, + isc_log_t *lctx, pluginlist_cb_t *callback, void *callback_data); /*%< * For every "plugin" stanza present in 'list' (which in turn is a part of From b6c2012d9334bd6372fcc9a6b3f8c8e0d45aec76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 12:55:21 +0200 Subject: [PATCH 10/12] Disable MSB8028 warning All our MSVS Project files share the same intermediate directory. We know that this doesn't cause any problems, so we can just disable the detection in the project files. Example of the warning: warning MSB8028: The intermediate directory (.\Release\) contains files shared from another project (dnssectool.vcxproj). This can lead to incorrect clean and rebuild behavior. --- bin/check/win32/checkconf.vcxproj.in | 2 ++ bin/check/win32/checktool.vcxproj.in | 2 ++ bin/check/win32/checkzone.vcxproj.in | 2 ++ bin/confgen/win32/confgentool.vcxproj.in | 2 ++ bin/confgen/win32/ddnsconfgen.vcxproj.in | 2 ++ bin/confgen/win32/rndcconfgen.vcxproj.in | 2 ++ bin/delv/win32/delv.vcxproj.in | 2 ++ bin/dig/win32/dig.vcxproj.in | 2 ++ bin/dig/win32/dighost.vcxproj.in | 2 ++ bin/dig/win32/host.vcxproj.in | 2 ++ bin/dig/win32/nslookup.vcxproj.in | 2 ++ bin/dnssec/win32/cds.vcxproj.in | 2 ++ bin/dnssec/win32/dnssectool.vcxproj.in | 2 ++ bin/dnssec/win32/dsfromkey.vcxproj.in | 2 ++ bin/dnssec/win32/importkey.vcxproj.in | 2 ++ bin/dnssec/win32/keyfromlabel.vcxproj.in | 2 ++ bin/dnssec/win32/keygen.vcxproj.in | 2 ++ bin/dnssec/win32/revoke.vcxproj.in | 2 ++ bin/dnssec/win32/settime.vcxproj.in | 2 ++ bin/dnssec/win32/signzone.vcxproj.in | 2 ++ bin/dnssec/win32/verify.vcxproj.in | 2 ++ bin/named/win32/named.vcxproj.in | 2 ++ bin/nsupdate/win32/nsupdate.vcxproj.in | 2 ++ bin/pkcs11/win32/pk11destroy.vcxproj.in | 2 ++ bin/pkcs11/win32/pk11keygen.vcxproj.in | 2 ++ bin/pkcs11/win32/pk11list.vcxproj.in | 2 ++ bin/pkcs11/win32/pk11tokens.vcxproj.in | 2 ++ bin/rndc/win32/rndc.vcxproj.in | 2 ++ bin/rndc/win32/rndcutil.vcxproj.in | 2 ++ bin/tests/system/win32/bigkey.vcxproj.in | 2 ++ bin/tests/system/win32/feature-test.vcxproj.in | 2 ++ bin/tests/system/win32/gencheck.vcxproj.in | 2 ++ bin/tests/system/win32/keycreate.vcxproj.in | 2 ++ bin/tests/system/win32/keydelete.vcxproj.in | 2 ++ bin/tests/system/win32/pipequeries.vcxproj.in | 2 ++ bin/tests/win32/backtrace_test.vcxproj.in | 2 ++ bin/tests/win32/inter_test.vcxproj.in | 2 ++ bin/tests/win32/makejournal.vcxproj.in | 2 ++ bin/tests/win32/rwlock_test.vcxproj.in | 2 ++ bin/tests/win32/shutdown_test.vcxproj.in | 2 ++ bin/tests/win32/sock_test.vcxproj.in | 2 ++ bin/tests/win32/task_test.vcxproj.in | 2 ++ bin/tests/win32/timer_test.vcxproj.in | 2 ++ bin/tools/win32/arpaname.vcxproj.in | 2 ++ bin/tools/win32/journalprint.vcxproj.in | 2 ++ bin/tools/win32/mdig.vcxproj.in | 2 ++ bin/tools/win32/nsec3hash.vcxproj.in | 2 ++ bin/tools/win32/rrchecker.vcxproj.in | 2 ++ bin/win32/BINDInstall/BINDInstall.vcxproj.in | 2 ++ lib/bind9/win32/libbind9.vcxproj.in | 2 ++ lib/dns/win32/gen.vcxproj.in | 2 ++ lib/dns/win32/libdns.vcxproj.in | 2 ++ lib/irs/win32/libirs.vcxproj.in | 2 ++ lib/isc/win32/libisc.vcxproj.in | 2 ++ lib/isccc/win32/libisccc.vcxproj.in | 2 ++ lib/isccfg/win32/libisccfg.vcxproj.in | 2 ++ lib/ns/win32/libns.vcxproj.in | 2 ++ lib/samples/win32/async.vcxproj.in | 2 ++ lib/samples/win32/gai.vcxproj.in | 2 ++ lib/samples/win32/nsprobe.vcxproj.in | 2 ++ lib/samples/win32/request.vcxproj.in | 2 ++ lib/samples/win32/resolve.vcxproj.in | 2 ++ lib/samples/win32/update.vcxproj.in | 2 ++ lib/win32/bindevt/bindevt.vcxproj.in | 2 ++ 64 files changed, 128 insertions(+) diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in index b986d0d0c0..d1b2522c65 100644 --- a/bin/check/win32/checkconf.vcxproj.in +++ b/bin/check/win32/checkconf.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) diff --git a/bin/check/win32/checktool.vcxproj.in b/bin/check/win32/checktool.vcxproj.in index 46b07e5c7a..26c84230c7 100644 --- a/bin/check/win32/checktool.vcxproj.in +++ b/bin/check/win32/checktool.vcxproj.in @@ -48,12 +48,14 @@ .\$(Configuration)\ + None .\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in index 128b5d499c..5f4882b8a3 100644 --- a/bin/check/win32/checkzone.vcxproj.in +++ b/bin/check/win32/checkzone.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) diff --git a/bin/confgen/win32/confgentool.vcxproj.in b/bin/confgen/win32/confgentool.vcxproj.in index 3942c21f01..26e4461758 100644 --- a/bin/confgen/win32/confgentool.vcxproj.in +++ b/bin/confgen/win32/confgentool.vcxproj.in @@ -44,11 +44,13 @@ true .\$(Configuration)\ .\$(Configuration)\ + None false .\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.in b/bin/confgen/win32/ddnsconfgen.vcxproj.in index f0ecac5d22..c634322dea 100644 --- a/bin/confgen/win32/ddnsconfgen.vcxproj.in +++ b/bin/confgen/win32/ddnsconfgen.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None ddns-confgen false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None ddns-confgen diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.in b/bin/confgen/win32/rndcconfgen.vcxproj.in index 42dc331a18..6e7eefdbed 100644 --- a/bin/confgen/win32/rndcconfgen.vcxproj.in +++ b/bin/confgen/win32/rndcconfgen.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None rndc-confgen false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None rndc-confgen diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in index 3c95ea868b..c110759b40 100644 --- a/bin/delv/win32/delv.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index 5c40caa1ad..c4db20b820 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in index 9644a5a129..1ed120c0e6 100644 --- a/bin/dig/win32/dighost.vcxproj.in +++ b/bin/dig/win32/dighost.vcxproj.in @@ -44,11 +44,13 @@ true .\$(Configuration)\ .\$(Configuration)\ + None false .\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index 1066a3783b..545cb716b2 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index 7b3b9d5185..e441ba396c 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/dnssec/win32/cds.vcxproj.in b/bin/dnssec/win32/cds.vcxproj.in index d5859e1409..71388051e9 100644 --- a/bin/dnssec/win32/cds.vcxproj.in +++ b/bin/dnssec/win32/cds.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/dnssectool.vcxproj.in b/bin/dnssec/win32/dnssectool.vcxproj.in index d3582eb070..be87bca0a2 100644 --- a/bin/dnssec/win32/dnssectool.vcxproj.in +++ b/bin/dnssec/win32/dnssectool.vcxproj.in @@ -51,12 +51,14 @@ .\$(Configuration)\ + None .\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in index 0276644086..801982a301 100644 --- a/bin/dnssec/win32/dsfromkey.vcxproj.in +++ b/bin/dnssec/win32/dsfromkey.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in index 0942047b14..13bc303e61 100644 --- a/bin/dnssec/win32/importkey.vcxproj.in +++ b/bin/dnssec/win32/importkey.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in index 60b4188bde..ee32a3567e 100644 --- a/bin/dnssec/win32/keyfromlabel.vcxproj.in +++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in index 409a28cbfb..d84c4d3795 100644 --- a/bin/dnssec/win32/keygen.vcxproj.in +++ b/bin/dnssec/win32/keygen.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in index a68147ea02..dcbd5a07f7 100644 --- a/bin/dnssec/win32/revoke.vcxproj.in +++ b/bin/dnssec/win32/revoke.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in index 10fffc193f..148f28cc3c 100644 --- a/bin/dnssec/win32/settime.vcxproj.in +++ b/bin/dnssec/win32/settime.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in index d5d48bac70..2014f5757d 100644 --- a/bin/dnssec/win32/signzone.vcxproj.in +++ b/bin/dnssec/win32/signzone.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in index e0d94ac1a6..eeb9c1afce 100644 --- a/bin/dnssec/win32/verify.vcxproj.in +++ b/bin/dnssec/win32/verify.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index ccac4fb65e..a4f3575da6 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index f770d474f4..38921aaa75 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in index 09eed4c0d9..7ef65ca360 100644 --- a/bin/pkcs11/win32/pk11destroy.vcxproj.in +++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-destroy false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-destroy diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in index ed170d3a2e..89504a2b10 100644 --- a/bin/pkcs11/win32/pk11keygen.vcxproj.in +++ b/bin/pkcs11/win32/pk11keygen.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-keygen false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-keygen diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in index 823b522a12..f297b2a66b 100644 --- a/bin/pkcs11/win32/pk11list.vcxproj.in +++ b/bin/pkcs11/win32/pk11list.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-list false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-list diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in index b4066a9b20..f224d0ccd8 100644 --- a/bin/pkcs11/win32/pk11tokens.vcxproj.in +++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-tokens false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-tokens diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in index 5692a1edd8..d646cf273e 100644 --- a/bin/rndc/win32/rndc.vcxproj.in +++ b/bin/rndc/win32/rndc.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/rndc/win32/rndcutil.vcxproj.in b/bin/rndc/win32/rndcutil.vcxproj.in index 2927652a0a..fad1472171 100644 --- a/bin/rndc/win32/rndcutil.vcxproj.in +++ b/bin/rndc/win32/rndcutil.vcxproj.in @@ -44,12 +44,14 @@ true .\$(Configuration)\ .\$(Configuration)\ + None util false .\$(Configuration)\ .\$(Configuration)\ + None util diff --git a/bin/tests/system/win32/bigkey.vcxproj.in b/bin/tests/system/win32/bigkey.vcxproj.in index 07262199fc..1738e987d5 100644 --- a/bin/tests/system/win32/bigkey.vcxproj.in +++ b/bin/tests/system/win32/bigkey.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/system/win32/feature-test.vcxproj.in b/bin/tests/system/win32/feature-test.vcxproj.in index 5568b1556a..fce69da012 100644 --- a/bin/tests/system/win32/feature-test.vcxproj.in +++ b/bin/tests/system/win32/feature-test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/system/win32/gencheck.vcxproj.in b/bin/tests/system/win32/gencheck.vcxproj.in index a304d7de39..fc702fe963 100644 --- a/bin/tests/system/win32/gencheck.vcxproj.in +++ b/bin/tests/system/win32/gencheck.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/system/win32/keycreate.vcxproj.in b/bin/tests/system/win32/keycreate.vcxproj.in index 1409912902..5066c3a9e0 100644 --- a/bin/tests/system/win32/keycreate.vcxproj.in +++ b/bin/tests/system/win32/keycreate.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/system/win32/keydelete.vcxproj.in b/bin/tests/system/win32/keydelete.vcxproj.in index ef955cc8f4..b86bf7fa06 100644 --- a/bin/tests/system/win32/keydelete.vcxproj.in +++ b/bin/tests/system/win32/keydelete.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/system/win32/pipequeries.vcxproj.in b/bin/tests/system/win32/pipequeries.vcxproj.in index 1099b20cfc..7385f5a72a 100644 --- a/bin/tests/system/win32/pipequeries.vcxproj.in +++ b/bin/tests/system/win32/pipequeries.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/backtrace_test.vcxproj.in b/bin/tests/win32/backtrace_test.vcxproj.in index 547195f5de..2f13f5e502 100644 --- a/bin/tests/win32/backtrace_test.vcxproj.in +++ b/bin/tests/win32/backtrace_test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/inter_test.vcxproj.in b/bin/tests/win32/inter_test.vcxproj.in index ab7c917846..dc092d8494 100644 --- a/bin/tests/win32/inter_test.vcxproj.in +++ b/bin/tests/win32/inter_test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/makejournal.vcxproj.in b/bin/tests/win32/makejournal.vcxproj.in index 7f7c793577..3b1c2cf4c8 100644 --- a/bin/tests/win32/makejournal.vcxproj.in +++ b/bin/tests/win32/makejournal.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/rwlock_test.vcxproj.in b/bin/tests/win32/rwlock_test.vcxproj.in index 8f6c33fa5a..369b9f8267 100644 --- a/bin/tests/win32/rwlock_test.vcxproj.in +++ b/bin/tests/win32/rwlock_test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/shutdown_test.vcxproj.in b/bin/tests/win32/shutdown_test.vcxproj.in index 8ddbe28f7a..a880966c60 100644 --- a/bin/tests/win32/shutdown_test.vcxproj.in +++ b/bin/tests/win32/shutdown_test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/sock_test.vcxproj.in b/bin/tests/win32/sock_test.vcxproj.in index 0b0ef84809..e02c53cb42 100644 --- a/bin/tests/win32/sock_test.vcxproj.in +++ b/bin/tests/win32/sock_test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/task_test.vcxproj.in b/bin/tests/win32/task_test.vcxproj.in index a439cb208b..cce5a16a5e 100644 --- a/bin/tests/win32/task_test.vcxproj.in +++ b/bin/tests/win32/task_test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tests/win32/timer_test.vcxproj.in b/bin/tests/win32/timer_test.vcxproj.in index 336d7bc17b..8e92457b30 100644 --- a/bin/tests/win32/timer_test.vcxproj.in +++ b/bin/tests/win32/timer_test.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in index d745a01fc8..5558f1cdeb 100644 --- a/bin/tools/win32/arpaname.vcxproj.in +++ b/bin/tools/win32/arpaname.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in index f8750295c8..a6989f181c 100644 --- a/bin/tools/win32/journalprint.vcxproj.in +++ b/bin/tools/win32/journalprint.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in index 48aa578417..9aa5a37559 100644 --- a/bin/tools/win32/mdig.vcxproj.in +++ b/bin/tools/win32/mdig.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in index aea2cc9c6d..fa4361147c 100644 --- a/bin/tools/win32/nsec3hash.vcxproj.in +++ b/bin/tools/win32/nsec3hash.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/bin/tools/win32/rrchecker.vcxproj.in b/bin/tools/win32/rrchecker.vcxproj.in index 437f630c63..0bc1f2ab50 100644 --- a/bin/tools/win32/rrchecker.vcxproj.in +++ b/bin/tools/win32/rrchecker.vcxproj.in @@ -44,12 +44,14 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in index b7f5e6829a..66c3d2691c 100644 --- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in +++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in @@ -46,11 +46,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in index 3b66ac650d..4fd23e197d 100644 --- a/lib/bind9/win32/libbind9.vcxproj.in +++ b/lib/bind9/win32/libbind9.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/dns/win32/gen.vcxproj.in b/lib/dns/win32/gen.vcxproj.in index 33a8a1e6f7..ea3adc30c0 100644 --- a/lib/dns/win32/gen.vcxproj.in +++ b/lib/dns/win32/gen.vcxproj.in @@ -44,11 +44,13 @@ true ..\ .\$(Configuration)\ + None false ..\ .\$(Configuration)\ + None diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index f355697301..3a5cd719c0 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index 5a23edcf80..7ca472a6c7 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index 985ff4a744..0aa9733b27 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in index 799dec4f1b..98f1305afa 100644 --- a/lib/isccc/win32/libisccc.vcxproj.in +++ b/lib/isccc/win32/libisccc.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in index 8d4b5c402a..8f2b38c973 100644 --- a/lib/isccfg/win32/libisccfg.vcxproj.in +++ b/lib/isccfg/win32/libisccfg.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in index f9245762da..c7728e7a3d 100644 --- a/lib/ns/win32/libns.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -43,11 +43,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/samples/win32/async.vcxproj.in b/lib/samples/win32/async.vcxproj.in index a3398dda10..9f82e16150 100644 --- a/lib/samples/win32/async.vcxproj.in +++ b/lib/samples/win32/async.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/samples/win32/gai.vcxproj.in b/lib/samples/win32/gai.vcxproj.in index b823593ee3..25e6c95c11 100644 --- a/lib/samples/win32/gai.vcxproj.in +++ b/lib/samples/win32/gai.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/samples/win32/nsprobe.vcxproj.in b/lib/samples/win32/nsprobe.vcxproj.in index 98da82223e..b83d043563 100644 --- a/lib/samples/win32/nsprobe.vcxproj.in +++ b/lib/samples/win32/nsprobe.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/samples/win32/request.vcxproj.in b/lib/samples/win32/request.vcxproj.in index 85bbc178b4..b2fe8d6d87 100644 --- a/lib/samples/win32/request.vcxproj.in +++ b/lib/samples/win32/request.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/samples/win32/resolve.vcxproj.in b/lib/samples/win32/resolve.vcxproj.in index 061375a0a3..078f2af9f7 100644 --- a/lib/samples/win32/resolve.vcxproj.in +++ b/lib/samples/win32/resolve.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/samples/win32/update.vcxproj.in b/lib/samples/win32/update.vcxproj.in index d0218e0a04..307496c4b0 100644 --- a/lib/samples/win32/update.vcxproj.in +++ b/lib/samples/win32/update.vcxproj.in @@ -44,11 +44,13 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None diff --git a/lib/win32/bindevt/bindevt.vcxproj.in b/lib/win32/bindevt/bindevt.vcxproj.in index 858bb2fb6d..78113e4248 100644 --- a/lib/win32/bindevt/bindevt.vcxproj.in +++ b/lib/win32/bindevt/bindevt.vcxproj.in @@ -44,6 +44,7 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None ResourceCompile true @@ -51,6 +52,7 @@ false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None ResourceCompile true From e3076c4caa388c94ab3972dd157698bbe4e57d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 13:50:39 +0200 Subject: [PATCH 11/12] Align the irs_getnameinfo() declaration and definition on Windows --- lib/irs/getnameinfo.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c index a102db5443..2a8363fe0e 100644 --- a/lib/irs/getnameinfo.c +++ b/lib/irs/getnameinfo.c @@ -137,9 +137,15 @@ static struct afd { goto cleanup; \ } while (0) +#ifdef _WIN32 +int +getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, + DWORD hostlen, char *serv, DWORD servlen, int flags) { +#else int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, int flags) { +#endif struct afd *afd = NULL; struct servent *sp; unsigned short port = 0; From 9b0e85cbd573d6cc9683ff7808306f2dbc0fdf0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Apr 2020 14:44:42 +0200 Subject: [PATCH 12/12] Don't escape spaces in CONFIGARGS, use double backslash with all whitespace --- win32utils/Configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32utils/Configure b/win32utils/Configure index daad52f047..9fcf6e512d 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -640,8 +640,9 @@ getversion(); sub appargs { my $arg = $_[0]; - # escape backslashes, spaces and double quotes - $arg =~ s/([\\ "])/\\$1/g; + # escape backslashes and double quotes + $arg =~ s/([\\"])/\\$1/g; + $arg =~ s/([\s])/\\\\$1/g; if (defined($configdefh{"CONFIGARGS"})) { $configdefh{"CONFIGARGS"} .= " " . $arg; } else {