[cpp-log4shib] branch master updated: Turn on MSVC conformance mode.
Scott Cantor
cantor.2 at osu.edu
Mon May 21 21:44:48 EDT 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=b8e811748cf60c204f8cb145374e279e5702563c
The following commit(s) were added to refs/heads/master by this push:
new b8e8117 Turn on MSVC conformance mode.
b8e8117 is described below
commit b8e811748cf60c204f8cb145374e279e5702563c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 21 21:44:19 2018 -0400
Turn on MSVC conformance mode.
---
include/log4shib/NTEventLogAppender.hh | 4 ++--
msvc15/log4shib/log4shib.vcxproj | 4 ++++
msvc15/log4shibDLL/log4shibDLL.vcxproj | 4 ++++
msvc15/sscpp706/sscpp706.VCXPROJ | 4 ++++
msvc15/testCategory/testCategory.vcxproj | 4 ++++
msvc15/testMain/testMain.vcxproj | 4 ++++
msvc15/testNDC/testNDC.vcxproj | 4 ++++
msvc15/testNTEventLog/testNTEventLog.vcxproj | 4 ++++
msvc15/testPattern/testPattern.vcxproj | 4 ++++
src/NTEventLogAppender.cpp | 4 ++--
src/Win32DebugAppender.cpp | 1 +
tests/testNTEventLog.cpp | 4 +---
12 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/include/log4shib/NTEventLogAppender.hh b/include/log4shib/NTEventLogAppender.hh
index 4a18114..906bf3f 100644
--- a/include/log4shib/NTEventLogAppender.hh
+++ b/include/log4shib/NTEventLogAppender.hh
@@ -72,8 +72,8 @@ namespace log4shib {
WORD getCategory(Priority::Value priority);
WORD getType(Priority::Value priority);
HKEY regGetKey(TCHAR *subkey, DWORD *disposition);
- void regSetString(HKEY hkey, TCHAR *name, TCHAR *value);
- void regSetDword(HKEY hkey, TCHAR *name, DWORD value);
+ void regSetString(HKEY hkey, const TCHAR *name, const TCHAR *value);
+ void regSetDword(HKEY hkey, const TCHAR *name, DWORD value);
void addRegistryInfo(const char *source);
virtual void open();
diff --git a/msvc15/log4shib/log4shib.vcxproj b/msvc15/log4shib/log4shib.vcxproj
index 1b2f50c..ee8c8be 100644
--- a/msvc15/log4shib/log4shib.vcxproj
+++ b/msvc15/log4shib/log4shib.vcxproj
@@ -95,6 +95,7 @@
<BrowseInformation>true</BrowseInformation>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -119,6 +120,7 @@
<BrowseInformation>true</BrowseInformation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -139,6 +141,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -164,6 +167,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/msvc15/log4shibDLL/log4shibDLL.vcxproj b/msvc15/log4shibDLL/log4shibDLL.vcxproj
index 978d4b0..26454ff 100644
--- a/msvc15/log4shibDLL/log4shibDLL.vcxproj
+++ b/msvc15/log4shibDLL/log4shibDLL.vcxproj
@@ -109,6 +109,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -144,6 +145,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -175,6 +177,7 @@
<PreprocessorDefinitions>LOG4SHIB_HAVE_INT64_T;NDEBUG;WIN32;_WINDOWS;_USRDLL;LOG4SHIB_HAS_DLL;LOG4SHIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -205,6 +208,7 @@
<PreprocessorDefinitions>LOG4SHIB_HAVE_INT64_T;NDEBUG;WIN32;_WINDOWS;_USRDLL;LOG4SHIB_HAS_DLL;LOG4SHIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/msvc15/sscpp706/sscpp706.VCXPROJ b/msvc15/sscpp706/sscpp706.VCXPROJ
index 3f4a75b..670c4c6 100644
--- a/msvc15/sscpp706/sscpp706.VCXPROJ
+++ b/msvc15/sscpp706/sscpp706.VCXPROJ
@@ -101,6 +101,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,6 +130,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -159,6 +161,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,6 +194,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/msvc15/testCategory/testCategory.vcxproj b/msvc15/testCategory/testCategory.vcxproj
index 1c18586..98df79f 100644
--- a/msvc15/testCategory/testCategory.vcxproj
+++ b/msvc15/testCategory/testCategory.vcxproj
@@ -104,6 +104,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -136,6 +137,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -164,6 +166,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -192,6 +195,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/msvc15/testMain/testMain.vcxproj b/msvc15/testMain/testMain.vcxproj
index 8df287a..daabd36 100644
--- a/msvc15/testMain/testMain.vcxproj
+++ b/msvc15/testMain/testMain.vcxproj
@@ -101,6 +101,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,6 +130,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -159,6 +161,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,6 +194,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/msvc15/testNDC/testNDC.vcxproj b/msvc15/testNDC/testNDC.vcxproj
index f559771..f1bfbec 100644
--- a/msvc15/testNDC/testNDC.vcxproj
+++ b/msvc15/testNDC/testNDC.vcxproj
@@ -101,6 +101,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,6 +130,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -159,6 +161,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,6 +194,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/msvc15/testNTEventLog/testNTEventLog.vcxproj b/msvc15/testNTEventLog/testNTEventLog.vcxproj
index 228c87b..39e88c4 100644
--- a/msvc15/testNTEventLog/testNTEventLog.vcxproj
+++ b/msvc15/testNTEventLog/testNTEventLog.vcxproj
@@ -105,6 +105,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -138,6 +139,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -166,6 +168,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -194,6 +197,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/msvc15/testPattern/testPattern.vcxproj b/msvc15/testPattern/testPattern.vcxproj
index 34102bd..3bb68d1 100644
--- a/msvc15/testPattern/testPattern.vcxproj
+++ b/msvc15/testPattern/testPattern.vcxproj
@@ -105,6 +105,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -138,6 +139,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -166,6 +168,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -194,6 +197,7 @@
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <ConformanceMode>true</ConformanceMode>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/src/NTEventLogAppender.cpp b/src/NTEventLogAppender.cpp
index 59dd9b4..cd53494 100644
--- a/src/NTEventLogAppender.cpp
+++ b/src/NTEventLogAppender.cpp
@@ -102,11 +102,11 @@ namespace log4shib {
return hkey;
}
- void NTEventLogAppender::regSetString(HKEY hkey, TCHAR *name, TCHAR *value) {
+ void NTEventLogAppender::regSetString(HKEY hkey, const TCHAR *name, const TCHAR *value) {
RegSetValueEx(hkey, name, 0, REG_SZ, (LPBYTE)value, lstrlen(value));
}
- void NTEventLogAppender::regSetDword(HKEY hkey, TCHAR *name, DWORD value) {
+ void NTEventLogAppender::regSetDword(HKEY hkey, const TCHAR *name, DWORD value) {
RegSetValueEx(hkey, name, 0, REG_DWORD, (LPBYTE)&value, sizeof(DWORD));
}
diff --git a/src/Win32DebugAppender.cpp b/src/Win32DebugAppender.cpp
index 8e9f1fb..5cc9d7f 100644
--- a/src/Win32DebugAppender.cpp
+++ b/src/Win32DebugAppender.cpp
@@ -13,6 +13,7 @@
# include <io.h>
#endif
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winbase.h>
diff --git a/tests/testNTEventLog.cpp b/tests/testNTEventLog.cpp
index fd9ffd7..1a31122 100644
--- a/tests/testNTEventLog.cpp
+++ b/tests/testNTEventLog.cpp
@@ -2,10 +2,8 @@
//
#include "log4shib/Portability.hh"
+#include "log4shib/NTEventLogAppender.hh"
-#ifdef WIN32
-#include <windows.h>
-#endif
#ifdef LOG4SHIB_HAVE_UNISTD_H
#include <unistd.h>
#endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list