Merge pull request #3438 from A13501350/v2/master

fix: add event message resources to ModSecurityIIS.dll and resolve "Invalid function" errors (#3408)

Author: airween

iis/Makefile.win

@@ -85,6 +85,8 @@ OBJS4 = libinjection_html5.obj \
 	libinjection_sqli.obj \
 	libinjection_xss.obj
 
+OBJS5 = ModSecurityIISMessage.res
+
 all: $(DLL)
 
 dll: $(DLL)
@@ -101,12 +103,21 @@ $(OBJS2): ..\standalone\$*.c
 .cpp.obj:
         $(CC) $(CFLAGS) -c $< -Fo$@
 
-$(DLL): $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
-        $(LINK) $(LDFLAGS) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(LIBS)
+$(DLL): $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)
+        $(LINK) $(LDFLAGS) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(LIBS)
         IF EXIST $(DLL).manifest $(MT) -manifest $(DLL).manifest -outputresource:$(DLL);#1
 
+$(OBJS5): ModSecurityIISMessage.rc
+        rc /r ModSecurityIISMessage.rc
+
+ModSecurityIISMessage.rc: ModSecurityIISMessage.mc
+        mc -U ModSecurityIISMessage.mc
+
 clean:
 	del /f *.obj
 	del /f *.dll
 	del /f *.exp
 	del /f *.lib
+	del /f *.rc
+	del /f *.bin
+	del /f *.res

iis/ModSecurityIISMessage.mc

@@ -0,0 +1,5 @@
+MessageId=0x1
+Language=English
+%1
+.
+

iis/installer.wxs

@@ -402,6 +402,9 @@
 					Source="Release\amd64\zlib1.dll" />
 				<File Id="_64_FUZZY" Name="fuzzy.dll"
 					Source="Release\amd64\fuzzy.dll" />
+                <util:EventSource Name="ModSecurity" Log="Application" 
+                    EventMessageFile="[inetsrv64]ModSecurityIIS.dll" 
+                    KeyPath="yes" />
 			</Component> </DirectoryRef> <DirectoryRef
 			Id="inetsrv32"> <Component Id="ModSec32" DiskId="1"
 				Guid="514A81F0-2413-42EF-B19F-E2613125ECE7"
@@ -480,6 +483,9 @@
 					Source="Release\x86\zlib1.dll" /> <File
 					Id="_32_FUZZY" Name="fuzzy.dll"
 					Source="Release\x86\fuzzy.dll" />
+                <util:EventSource Name="ModSecurity" Log="Application" 
+                    EventMessageFile="[inetsrv32]ModSecurityIIS.dll" 
+                    KeyPath="yes" />
 			</Component> </DirectoryRef> <DirectoryRef
 			Id="SystemFolderConfigSchema32"> <Component
 				Id="ConfigSchema32"