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" diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in index 2c24c07225..d1b2522c65 100644 --- a/bin/check/win32/checkconf.vcxproj.in +++ b/bin/check/win32/checkconf.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/check/win32/checktool.vcxproj.in b/bin/check/win32/checktool.vcxproj.in index f7763895fa..26c84230c7 100644 --- a/bin/check/win32/checktool.vcxproj.in +++ b/bin/check/win32/checktool.vcxproj.in @@ -48,18 +48,21 @@ .\$(Configuration)\ + None .\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -78,7 +81,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in index 4c4c162547..5f4882b8a3 100644 --- a/bin/check/win32/checkzone.vcxproj.in +++ b/bin/check/win32/checkzone.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -85,7 +88,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..26e4461758 100644 --- a/bin/confgen/win32/confgentool.vcxproj.in +++ b/bin/confgen/win32/confgentool.vcxproj.in @@ -44,17 +44,20 @@ true .\$(Configuration)\ .\$(Configuration)\ + None false .\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -74,7 +77,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.in b/bin/confgen/win32/ddnsconfgen.vcxproj.in index 20b8a38e34..c634322dea 100644 --- a/bin/confgen/win32/ddnsconfgen.vcxproj.in +++ b/bin/confgen/win32/ddnsconfgen.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None ddns-confgen false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None ddns-confgen - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -85,7 +88,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..6e7eefdbed 100644 --- a/bin/confgen/win32/rndcconfgen.vcxproj.in +++ b/bin/confgen/win32/rndcconfgen.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None rndc-confgen false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None rndc-confgen - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in index df9171e998..c110759b40 100644 --- a/bin/delv/win32/delv.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index 235fa727fb..c4db20b820 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in index 086dcf61e6..1ed120c0e6 100644 --- a/bin/dig/win32/dighost.vcxproj.in +++ b/bin/dig/win32/dighost.vcxproj.in @@ -44,17 +44,20 @@ true .\$(Configuration)\ .\$(Configuration)\ + None false .\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -75,7 +78,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index 5736993d9c..545cb716b2 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index 3d048c9f19..e441ba396c 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/cds.vcxproj.in b/bin/dnssec/win32/cds.vcxproj.in index f17ee3c962..71388051e9 100644 --- a/bin/dnssec/win32/cds.vcxproj.in +++ b/bin/dnssec/win32/cds.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/dnssectool.vcxproj.in b/bin/dnssec/win32/dnssectool.vcxproj.in index a2c1c165d9..be87bca0a2 100644 --- a/bin/dnssec/win32/dnssectool.vcxproj.in +++ b/bin/dnssec/win32/dnssectool.vcxproj.in @@ -51,18 +51,21 @@ .\$(Configuration)\ + None .\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -82,7 +85,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in index ea4229f794..801982a301 100644 --- a/bin/dnssec/win32/dsfromkey.vcxproj.in +++ b/bin/dnssec/win32/dsfromkey.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -92,7 +95,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..13bc303e61 100644 --- a/bin/dnssec/win32/importkey.vcxproj.in +++ b/bin/dnssec/win32/importkey.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in index cda58e3435..ee32a3567e 100644 --- a/bin/dnssec/win32/keyfromlabel.vcxproj.in +++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in index ddef528081..d84c4d3795 100644 --- a/bin/dnssec/win32/keygen.vcxproj.in +++ b/bin/dnssec/win32/keygen.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in index bf82c95368..dcbd5a07f7 100644 --- a/bin/dnssec/win32/revoke.vcxproj.in +++ b/bin/dnssec/win32/revoke.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in index 365b2e87a0..148f28cc3c 100644 --- a/bin/dnssec/win32/settime.vcxproj.in +++ b/bin/dnssec/win32/settime.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in index 02e87af940..2014f5757d 100644 --- a/bin/dnssec/win32/signzone.vcxproj.in +++ b/bin/dnssec/win32/signzone.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in index 25d79359c7..eeb9c1afce 100644 --- a/bin/dnssec/win32/verify.vcxproj.in +++ b/bin/dnssec/win32/verify.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None dnssec-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index 242301a553..a4f3575da6 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;@USE_GSSAPI@BUILDER="Visual Studio";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index d1048e458a..38921aaa75 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;@USE_GSSAPI@USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in index 043f8d07d2..7ef65ca360 100644 --- a/bin/pkcs11/win32/pk11destroy.vcxproj.in +++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-destroy false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-destroy - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in index 058ee31d0b..89504a2b10 100644 --- a/bin/pkcs11/win32/pk11keygen.vcxproj.in +++ b/bin/pkcs11/win32/pk11keygen.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-keygen false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-keygen - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in index d30351866b..f297b2a66b 100644 --- a/bin/pkcs11/win32/pk11list.vcxproj.in +++ b/bin/pkcs11/win32/pk11list.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-list false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-list - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in index bb0921c451..f224d0ccd8 100644 --- a/bin/pkcs11/win32/pk11tokens.vcxproj.in +++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-tokens false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None pkcs11-tokens - Level3 + Level4 + false Disabled WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in index c65363f193..d646cf273e 100644 --- a/bin/rndc/win32/rndc.vcxproj.in +++ b/bin/rndc/win32/rndc.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/rndc/win32/rndcutil.vcxproj.in b/bin/rndc/win32/rndcutil.vcxproj.in index 85bceb06bc..fad1472171 100644 --- a/bin/rndc/win32/rndcutil.vcxproj.in +++ b/bin/rndc/win32/rndcutil.vcxproj.in @@ -44,19 +44,22 @@ true .\$(Configuration)\ .\$(Configuration)\ + None util false .\$(Configuration)\ .\$(Configuration)\ + None util - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -75,7 +78,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..1738e987d5 100644 --- a/bin/tests/system/win32/bigkey.vcxproj.in +++ b/bin/tests/system/win32/bigkey.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..fce69da012 100644 --- a/bin/tests/system/win32/feature-test.vcxproj.in +++ b/bin/tests/system/win32/feature-test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..fc702fe963 100644 --- a/bin/tests/system/win32/gencheck.vcxproj.in +++ b/bin/tests/system/win32/gencheck.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..5066c3a9e0 100644 --- a/bin/tests/system/win32/keycreate.vcxproj.in +++ b/bin/tests/system/win32/keycreate.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..b86bf7fa06 100644 --- a/bin/tests/system/win32/keydelete.vcxproj.in +++ b/bin/tests/system/win32/keydelete.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..7385f5a72a 100644 --- a/bin/tests/system/win32/pipequeries.vcxproj.in +++ b/bin/tests/system/win32/pipequeries.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..2f13f5e502 100644 --- a/bin/tests/win32/backtrace_test.vcxproj.in +++ b/bin/tests/win32/backtrace_test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..dc092d8494 100644 --- a/bin/tests/win32/inter_test.vcxproj.in +++ b/bin/tests/win32/inter_test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tests/win32/makejournal.vcxproj.in b/bin/tests/win32/makejournal.vcxproj.in index 8481cd2cb8..3b1c2cf4c8 100644 --- a/bin/tests/win32/makejournal.vcxproj.in +++ b/bin/tests/win32/makejournal.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..369b9f8267 100644 --- a/bin/tests/win32/rwlock_test.vcxproj.in +++ b/bin/tests/win32/rwlock_test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..a880966c60 100644 --- a/bin/tests/win32/shutdown_test.vcxproj.in +++ b/bin/tests/win32/shutdown_test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..e02c53cb42 100644 --- a/bin/tests/win32/sock_test.vcxproj.in +++ b/bin/tests/win32/sock_test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..cce5a16a5e 100644 --- a/bin/tests/win32/task_test.vcxproj.in +++ b/bin/tests/win32/task_test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,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..8e92457b30 100644 --- a/bin/tests/win32/timer_test.vcxproj.in +++ b/bin/tests/win32/timer_test.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in index b141ccdb2a..5558f1cdeb 100644 --- a/bin/tools/win32/arpaname.vcxproj.in +++ b/bin/tools/win32/arpaname.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\..\config.h @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in index 0c0a86f5f0..a6989f181c 100644 --- a/bin/tools/win32/journalprint.vcxproj.in +++ b/bin/tools/win32/journalprint.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in index 4c366fbd17..9aa5a37559 100644 --- a/bin/tools/win32/mdig.vcxproj.in +++ b/bin/tools/win32/mdig.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in index 1840de335b..fa4361147c 100644 --- a/bin/tools/win32/nsec3hash.vcxproj.in +++ b/bin/tools/win32/nsec3hash.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/tools/win32/rrchecker.vcxproj.in b/bin/tools/win32/rrchecker.vcxproj.in index fd68747139..0bc1f2ab50 100644 --- a/bin/tools/win32/rrchecker.vcxproj.in +++ b/bin/tools/win32/rrchecker.vcxproj.in @@ -44,19 +44,22 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None named-$(ProjectName) - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in index 2b901d9847..66c3d2691c 100644 --- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in +++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in @@ -46,17 +46,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None 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 +86,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..4fd23e197d 100644 --- a/lib/bind9/win32/libbind9.vcxproj.in +++ b/lib/bind9/win32/libbind9.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed 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"); diff --git a/lib/dns/win32/gen.vcxproj.in b/lib/dns/win32/gen.vcxproj.in index 67c06d0ef5..ea3adc30c0 100644 --- a/lib/dns/win32/gen.vcxproj.in +++ b/lib/dns/win32/gen.vcxproj.in @@ -44,17 +44,20 @@ true ..\ .\$(Configuration)\ + None false ..\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) .\;..\..\..\;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;%(AdditionalIncludeDirectories) @@ -83,7 +86,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..3a5cd719c0 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled BIND9;WIN32;@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed 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; diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index c09f981db0..7ca472a6c7 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBIRS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed 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) */ diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h index 15cf9b6f0b..eb22a80665 100644 --- a/lib/isc/win32/include/isc/stdatomic.h +++ b/lib/isc/win32/include/isc/stdatomic.h @@ -18,6 +18,9 @@ #include #include +#pragma warning(disable : 4133) +#pragma warning(disable : 4090) + #define InterlockedExchangeAdd8 _InterlockedExchangeAdd8 #define InterlockedCompareExchange8 _InterlockedCompareExchange8 @@ -242,7 +245,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 \ @@ -297,7 +300,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 \ diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index 5267abfe4d..0aa9733b27 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled @IF PKCS11 BIND9;@PK11_LIB_LOCATION@WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) @@ -142,7 +145,8 @@ copy InstallFiles ..\Build\Debug\ - Level3 + Level1 + true MaxSpeed 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 diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in index fbcab6713d..98f1305afa 100644 --- a/lib/isccc/win32/libisccc.vcxproj.in +++ b/lib/isccc/win32/libisccc.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed 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 diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in index 584341f82f..8f2b38c973 100644 --- a/lib/isccfg/win32/libisccfg.vcxproj.in +++ b/lib/isccfg/win32/libisccfg.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h @@ -79,7 +82,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in index f7836b086b..c7728e7a3d 100644 --- a/lib/ns/win32/libns.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -43,17 +43,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;@USE_GSSAPI@_DEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) ..\..\..\config.h @@ -78,7 +81,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/async.vcxproj.in b/lib/samples/win32/async.vcxproj.in index 366833df13..9f82e16150 100644 --- a/lib/samples/win32/async.vcxproj.in +++ b/lib/samples/win32/async.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/gai.vcxproj.in b/lib/samples/win32/gai.vcxproj.in index 249bab36a3..25e6c95c11 100644 --- a/lib/samples/win32/gai.vcxproj.in +++ b/lib/samples/win32/gai.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/nsprobe.vcxproj.in b/lib/samples/win32/nsprobe.vcxproj.in index 06807bd41b..b83d043563 100644 --- a/lib/samples/win32/nsprobe.vcxproj.in +++ b/lib/samples/win32/nsprobe.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/request.vcxproj.in b/lib/samples/win32/request.vcxproj.in index 997e14dd4e..b2fe8d6d87 100644 --- a/lib/samples/win32/request.vcxproj.in +++ b/lib/samples/win32/request.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/resolve.vcxproj.in b/lib/samples/win32/resolve.vcxproj.in index 71fca3d46d..078f2af9f7 100644 --- a/lib/samples/win32/resolve.vcxproj.in +++ b/lib/samples/win32/resolve.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/samples/win32/update.vcxproj.in b/lib/samples/win32/update.vcxproj.in index ba06e293b1..307496c4b0 100644 --- a/lib/samples/win32/update.vcxproj.in +++ b/lib/samples/win32/update.vcxproj.in @@ -44,17 +44,20 @@ true ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None false ..\..\..\Build\$(Configuration)\ .\$(Configuration)\ + None - Level3 + Level4 + false Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true @@ -77,7 +80,8 @@ - Level3 + Level1 + true MaxSpeed diff --git a/lib/win32/bindevt/bindevt.vcxproj.in b/lib/win32/bindevt/bindevt.vcxproj.in index 38891ecd88..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 @@ -58,7 +60,8 @@ - Level3 + Level4 + false Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;BINDEVT_EXPORTS;%(PreprocessorDefinitions) ..\include;..\..\..\include;%(AdditionalIncludeDirectories) @@ -85,7 +88,8 @@ - Level3 + Level1 + true MaxSpeed 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 {