5.14

4 files changed, 9 insertions, 51 deletions

diff --git a/lib/ShadowCopy/Shadow_Server2003.vcxproj b/lib/ShadowCopy/Shadow_Server2003.vcxproj
index 50a3a830..4622c246 100644
--- a/lib/ShadowCopy/Shadow_Server2003.vcxproj
+++ b/lib/ShadowCopy/Shadow_Server2003.vcxproj
@@ -227,20 +227,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\zen\debug_memory_leaks.cpp" />
-    <ClCompile Include="dll_main.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
-    </ClCompile>
     <ClCompile Include="shadow.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/lib/ShadowCopy/Shadow_Windows7.vcxproj b/lib/ShadowCopy/Shadow_Windows7.vcxproj
index aa32253b..c735371b 100644
--- a/lib/ShadowCopy/Shadow_Windows7.vcxproj
+++ b/lib/ShadowCopy/Shadow_Windows7.vcxproj
@@ -227,20 +227,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\zen\debug_memory_leaks.cpp" />
-    <ClCompile Include="dll_main.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
-    </ClCompile>
     <ClCompile Include="shadow.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/lib/ShadowCopy/Shadow_XP.vcxproj b/lib/ShadowCopy/Shadow_XP.vcxproj
index 70b792ec..a5d07786 100644
--- a/lib/ShadowCopy/Shadow_XP.vcxproj
+++ b/lib/ShadowCopy/Shadow_XP.vcxproj
@@ -228,20 +228,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\zen\debug_memory_leaks.cpp" />
-    <ClCompile Include="dll_main.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
-    </ClCompile>
     <ClCompile Include="shadow.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/lib/ShadowCopy/shadow.cpp b/lib/ShadowCopy/shadow.cpp
index 65387f3b..4f6881ad 100644
--- a/lib/ShadowCopy/shadow.cpp
+++ b/lib/ShadowCopy/shadow.cpp
@@ -88,25 +88,25 @@ shadow::ShadowData createShadowCopy(const wchar_t* volumeName) //throw ComError
         }
     }
 
-    ZEN_CHECK_COM(backupComp->InitializeForBackup()); //throw ComError
-    ZEN_CHECK_COM(backupComp->SetBackupState(false, false, VSS_BT_FULL)); //throw ComError
+    ZEN_COM_CHECK(backupComp->InitializeForBackup()); //throw ComError
+    ZEN_COM_CHECK(backupComp->SetBackupState(false, false, VSS_BT_FULL)); //throw ComError
 
     auto waitForComFuture = [](IVssAsync& fut)
     {
-        ZEN_CHECK_COM(fut.Wait());
+        ZEN_COM_CHECK(fut.Wait());
 
         HRESULT hr = S_OK;
-        ZEN_CHECK_COM(fut.QueryStatus(&hr, nullptr)); //check if the async operation succeeded...
+        ZEN_COM_CHECK(fut.QueryStatus(&hr, nullptr)); //check if the async operation succeeded...
         if (FAILED(hr))
             throw ComError(L"Error calling \"fut->QueryStatus\".", hr);
     };
 
     ComPtr<IVssAsync> gatherAsync;
-    ZEN_CHECK_COM(backupComp->GatherWriterMetadata(gatherAsync.init()));
+    ZEN_COM_CHECK(backupComp->GatherWriterMetadata(gatherAsync.init()));
     waitForComFuture(*gatherAsync); //failure can happen if XP-version of VSS is used on Windows Vista (which needs at least VSS-Server2003 build)
 
     VSS_ID snapshotSetId = {};
-    ZEN_CHECK_COM(backupComp->StartSnapshotSet(&snapshotSetId));
+    ZEN_COM_CHECK(backupComp->StartSnapshotSet(&snapshotSetId));
     ScopeGuard guardSnapShot = makeGuard([&] { backupComp->AbortBackup(); });
     //Quote: "This method must be called if a backup operation terminates after the creation of a
     //shadow copy set with "StartSnapshotSet" and before "DoSnapshotSet" returns."
@@ -127,16 +127,16 @@ shadow::ShadowData createShadowCopy(const wchar_t* volumeName) //throw ComError
     }
 
     ComPtr<IVssAsync> prepareAsync;
-    ZEN_CHECK_COM(backupComp->PrepareForBackup(prepareAsync.init()));
+    ZEN_COM_CHECK(backupComp->PrepareForBackup(prepareAsync.init()));
     waitForComFuture(*prepareAsync);
 
     ComPtr<IVssAsync> snapshotAsync;
-    ZEN_CHECK_COM(backupComp->DoSnapshotSet(snapshotAsync.init()));
+    ZEN_COM_CHECK(backupComp->DoSnapshotSet(snapshotAsync.init()));
     guardSnapShot.dismiss();
     waitForComFuture(*snapshotAsync);
 
     VSS_SNAPSHOT_PROP props = {};
-    ZEN_CHECK_COM(backupComp->GetSnapshotProperties(SnapShotId, &props));
+    ZEN_COM_CHECK(backupComp->GetSnapshotProperties(SnapShotId, &props));
     ZEN_ON_SCOPE_EXIT(::VssFreeSnapshotProperties(&props));
 
     //finally: write volume name of newly created shadow copy