Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: fzipi

.github/workflows/test-ci-windows.yml

@@ -235,7 +235,7 @@ jobs:
 
         # Check VC++ redistributables
         $vc142x64 = (Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" -Name "Installed" -ErrorAction SilentlyContinue).Installed
-        $vc142x86 = (Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" -Name "Installed" -ErrorAction SilentlyContinue).Installed
+        $vc142x86 = (Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" -Name "Installed" -ErrorAction SilentlyContinue).Installed
         Write-Host "VC++ 2019 x64 installed: $vc142x64"
         Write-Host "VC++ 2019 x86 installed: $vc142x86"
 

apache2/Makefile.win

@@ -10,7 +10,7 @@
 LIBS = $(APACHE)\lib\libhttpd.lib \
        $(APACHE)\lib\libapr-1.lib \
        $(APACHE)\lib\libaprutil-1.lib \
-       $(PCRE)\pcre.lib \
+       $(PCRE)\pcre2-8.lib \
        $(CURL)\libcurl.lib \
        $(LIBXML2)\win32\bin.msvc\libxml2.lib \
        Ws2_32.lib \

iis/dependencies/build_pcre.bat

@@ -23,7 +23,7 @@ copy /y "%WORK_DIR%\pcre2\pcre2-8.lib" "%OUTPUT_DIR%"
 @if not exist "%WORK_DIR%\pcre2\include" mkdir "%WORK_DIR%\pcre2\include"
 xcopy /y "%WORK_DIR%\pcre2\src\pcre2*.h" "%WORK_DIR%\pcre2\include\" >nul 2>&1
 copy /y "%WORK_DIR%\pcre2\pcre2.h" "%WORK_DIR%\pcre2\include\" >nul 2>&1
-echo "a"
+@echo PCRE2 build and deployment completed successfully.
 @exit /B 0
 
 :file_not_found_bin

iis/installer.wxs

@@ -122,7 +122,7 @@
             <![CDATA[Installed OR VC142X64INSTALLED]]>
         </Condition>
         <Condition Message="This application requires Microsoft Visual C++ 2019 Redistributable (x86) for 32-bit support. Please download and install from: https://aka.ms/vs/17/release/vc_redist.x86.exe">
-            <![CDATA[Installed OR VC142X86INSTALLED]]>
+            <![CDATA[Installed OR (&ModSec32 <> 3) OR VC142X86INSTALLED]]>
         </Condition>
         <?else?>
         <Condition Message="This application requires Microsoft Visual C++ 2019 Redistributable (x86). Please download and install from: https://aka.ms/vs/17/release/vc_redist.x86.exe">

iis/wix/list_dependencies.bat

@@ -46,30 +46,30 @@ pause
 :LOOP_FILE
 SET /a log_file=%RANDOM%+100000
 SET log_file=%TEMP%\ModSecurityIIS-dependencies-%log_file:~-5%.TXT
-IF EXIST %log_file% GOTO LOOP_FILE
+IF EXIST "%log_file%" GOTO LOOP_FILE
 
 echo Saving logs at: %log_file%
 echo.
 
 REM Log prerequisite checks to file
-echo ================================================ >> %log_file%
-echo Visual C++ 2019 Redistributable Check >> %log_file%
-echo ================================================ >> %log_file%
+echo ================================================ >> "%log_file%"
+echo Visual C++ 2019 Redistributable Check >> "%log_file%"
+echo ================================================ >> "%log_file%"
 
 reg query "HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" /v Installed 2>nul | find "0x1" >nul
 if %errorlevel% equ 0 (
-    echo [OK] Visual C++ 2019 Redistributable (x64) is installed >> %log_file%
+    echo [OK] Visual C++ 2019 Redistributable (x64) is installed >> "%log_file%"
 ) else (
-    echo [MISSING] Visual C++ 2019 Redistributable (x64) is NOT installed >> %log_file%
-    echo          Download from: https://aka.ms/vs/17/release/vc_redist.x64.exe >> %log_file%
+    echo [MISSING] Visual C++ 2019 Redistributable (x64) is NOT installed >> "%log_file%"
+    echo          Download from: https://aka.ms/vs/17/release/vc_redist.x64.exe >> "%log_file%"
 )
 
 reg query "HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" /v Installed 2>nul | find "0x1" >nul
 if %errorlevel% equ 0 (
-    echo [OK] Visual C++ 2019 Redistributable (x86) is installed >> %log_file%
+    echo [OK] Visual C++ 2019 Redistributable (x86) is installed >> "%log_file%"
 ) else (
-    echo [MISSING] Visual C++ 2019 Redistributable (x86) is NOT installed >> %log_file%
-    echo          Download from: https://aka.ms/vs/17/release/vc_redist.x86.exe >> %log_file%
+    echo [MISSING] Visual C++ 2019 Redistributable (x86) is NOT installed >> "%log_file%"
+    echo          Download from: https://aka.ms/vs/17/release/vc_redist.x86.exe >> "%log_file%"
 )
 echo. >> %log_file%