fixed merge issues

diff --git a/build/msvc_setenv_x64.cmd b/build/msvc_setenv_x64.cmd
index 5dc9f8c..66e16e4 100644 (file)
--- a/build/msvc_setenv_x64.cmd
+++ b/build/msvc_setenv_x64.cmd
@@ -8,7 +8,7 @@ rem set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\
 
 rem *** Windows 7 SDK with Visual Studio 2017 Compiler
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\bin\HostX64\x64;C:\SDK\Windows 7 SDK\Bin\x64;C:\SDK\Windows 7 SDK\Bin;%PATH%
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\ATLMFC\include;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
+set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\ATLMFC\include;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;C:\SDK\VSSSDK72\inc
 set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\ATLMFC\lib\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\lib\x64;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\ucrt\x64;C:\SDK\Windows 7 SDK\Lib\x64;C:\SDK\WINDDK\lib\wnet\amd64
 
 set LIBPATH=%LIB%

diff --git a/build/msvc_setenv_x86.cmd b/build/msvc_setenv_x86.cmd
index 1574330..96d36c8 100644 (file)
--- a/build/msvc_setenv_x86.cmd
+++ b/build/msvc_setenv_x86.cmd
@@ -8,7 +8,7 @@ rem set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib;C:\SDK\Wi
 
 rem *** Windows 7 SDK with Visual Studio 2017 Compiler
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\bin\HostX64\x86;C:\SDK\Windows 7 SDK\Bin;%PATH%
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\ATLMFC\include;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
+set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\ATLMFC\include;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;C:\SDK\VSSSDK72\inc
 set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\ATLMFC\lib\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\lib\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\ucrt\x86;C:\SDK\Windows 7 SDK\Lib;C:\SDK\WINDDK\lib\wnet\i386
 
 set LIBPATH=%LIB%

diff --git a/src/libnxlp/libnxlp.vcxproj b/src/libnxlp/libnxlp.vcxproj
index 321aa5d..3a56587 100644 (file)
--- a/src/libnxlp/libnxlp.vcxproj
+++ b/src/libnxlp/libnxlp.vcxproj
@@ -173,6 +173,8 @@
     <ClCompile Include="parser.cpp" />
     <ClCompile Include="rule.cpp" />
     <ClCompile Include="vss.cpp" />
+    <ClCompile Include="vss_srv2003.cpp" />
+    <ClCompile Include="vss_xp.cpp" />
     <ClCompile Include="wevt.cpp" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/libnxlp/libnxlp.vcxproj.filters b/src/libnxlp/libnxlp.vcxproj.filters
index 32b23fa..6018197 100644 (file)
--- a/src/libnxlp/libnxlp.vcxproj.filters
+++ b/src/libnxlp/libnxlp.vcxproj.filters
@@ -36,6 +36,12 @@
     <ClCompile Include="vss.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="vss_srv2003.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vss_xp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="libnxlp.h">

diff --git a/src/libnxlp/vss_srv2003.cpp b/src/libnxlp/vss_srv2003.cpp
index e14b3fb..50fb8a5 100644 (file)
--- a/src/libnxlp/vss_srv2003.cpp
+++ b/src/libnxlp/vss_srv2003.cpp
@@ -28,6 +28,8 @@
 #include <win2003/vsbackup.h>
 #include <comdef.h>
 
+#define DEBUG_TAG    _T("logwatch.vss")
+
 /**
  * Entry point
  */
@@ -39,9 +41,7 @@ extern HRESULT (STDAPICALLTYPE *__CreateVssBackupComponents)(IVssBackupComponent
 inline FileSnapshot *CreateFailure(HRESULT hr, IVssBackupComponents *bc, const TCHAR *format)
 {
    _com_error err(hr);
-   TCHAR buffer[8192];
-   _sntprintf(buffer, 8192, format, err.ErrorMessage(), hr);
-   nxlog_debug(3, _T("LogWatch: %s"), buffer);
+   nxlog_debug_tag(DEBUG_TAG, 3, format, err.ErrorMessage(), hr);
    if (bc != NULL)
       bc->Release();
    return NULL;
@@ -83,7 +83,7 @@ FileSnapshot *CreateSnapshotSrv2003(const TCHAR *path)
    TCHAR device[64];
    _tcslcpy(device, path, std::min(static_cast<size_t>(64), len + 1));
    _tcslcat(device, _T("\\"), 64);
-   nxlog_debug(7, _T("LogWatch: Adding device %s to VSS snapshot"), device);
+   nxlog_debug_tag(DEBUG_TAG, 7, _T("LogWatch: Adding device %s to VSS snapshot"), device);
 
    VSS_ID snapshotId;
    hr = bc->AddToSnapshotSet(device, GUID_NULL, &snapshotId);
@@ -105,7 +105,7 @@ FileSnapshot *CreateSnapshotSrv2003(const TCHAR *path)
    if (FAILED(hr))
       return CreateFailure(hr, bc, _T("Call to IVssBackupComponents::GetSnapshotProperties failed (%s) HRESULT=0x%08X"));
 
-   nxlog_debug(7, _T("LogWatch: Created VSS snapshot %s"), prop.m_pwszSnapshotDeviceObject);
+   nxlog_debug_tag(DEBUG_TAG, 7, _T("LogWatch: Created VSS snapshot %s"), prop.m_pwszSnapshotDeviceObject);
    String sname(prop.m_pwszSnapshotDeviceObject);
    sname.append(s);
 

diff --git a/src/libnxlp/vss_xp.cpp b/src/libnxlp/vss_xp.cpp
index f654965..99677fc 100644 (file)
--- a/src/libnxlp/vss_xp.cpp
+++ b/src/libnxlp/vss_xp.cpp
@@ -28,6 +28,8 @@
 #include <winxp/vsbackup.h>
 #include <comdef.h>
 
+#define DEBUG_TAG    _T("logwatch.vss")
+
 /**
  * Entry point
  */
@@ -39,9 +41,7 @@ extern HRESULT (STDAPICALLTYPE *__CreateVssBackupComponents)(IVssBackupComponent
 inline FileSnapshot *CreateFailure(HRESULT hr, IVssBackupComponents *bc, const TCHAR *format)
 {
    _com_error err(hr);
-   TCHAR buffer[8192];
-   _sntprintf(buffer, 8192, format, err.ErrorMessage(), hr);
-   nxlog_debug(3, _T("LogWatch: %s"), buffer);
+   nxlog_debug_tag(DEBUG_TAG, 3, format, err.ErrorMessage(), hr);
    if (bc != NULL)
       bc->Release();
    return NULL;
@@ -83,7 +83,7 @@ FileSnapshot *CreateSnapshotXP(const TCHAR *path)
    TCHAR device[64];
    _tcslcpy(device, path, std::min(static_cast<size_t>(64), len + 1));
    _tcslcat(device, _T("\\"), 64);
-   nxlog_debug(7, _T("LogWatch: Adding device %s to VSS snapshot"), device);
+   nxlog_debug_tag(DEBUG_TAG, 7, _T("LogWatch: Adding device %s to VSS snapshot"), device);
 
    VSS_ID snapshotId;
    hr = bc->AddToSnapshotSet(device, GUID_NULL, &snapshotId);
@@ -105,7 +105,7 @@ FileSnapshot *CreateSnapshotXP(const TCHAR *path)
    if (FAILED(hr))
       return CreateFailure(hr, bc, _T("Call to IVssBackupComponents::GetSnapshotProperties failed (%s) HRESULT=0x%08X"));
 
-   nxlog_debug(7, _T("LogWatch: Created VSS snapshot %s"), prop.m_pwszSnapshotDeviceObject);
+   nxlog_debug_tag(DEBUG_TAG, 7, _T("LogWatch: Created VSS snapshot %s"), prop.m_pwszSnapshotDeviceObject);
    String sname(prop.m_pwszSnapshotDeviceObject);
    sname.append(s);