Ignore enum CA warnings and scope the osutil deprecation suppression.

Also, fix project reference so the .vcx project system understands it.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj
index 2cf99d13..b84fd80f 100644
--- a/src/dutil/dutil.vcxproj
+++ b/src/dutil/dutil.vcxproj
@@ -83,10 +83,7 @@
     <ClCompile Include="memutil.cpp" />
     <ClCompile Include="metautil.cpp" />
     <ClCompile Include="monutil.cpp" />
-    <ClCompile Include="osutil.cpp">
-      <!-- turn off deprecation warning -->
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
+    <ClCompile Include="osutil.cpp" />
     <ClCompile Include="path2utl.cpp" />
     <ClCompile Include="pathutil.cpp" />
     <ClCompile Include="perfutil.cpp" />
diff --git a/src/dutil/osutil.cpp b/src/dutil/osutil.cpp
index 38b32eb3..8834cd30 100644
--- a/src/dutil/osutil.cpp
+++ b/src/dutil/osutil.cpp
@@ -22,7 +22,14 @@ extern "C" void DAPI OsGetVersion(
     if (OS_VERSION_UNKNOWN == vOsVersion)
     {
         ovi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
+
+#pragma warning (push)
+#pragma warning(suppress: 4996) // deprecated
+#pragma warning (push)
+#pragma warning(suppress: 28159)// deprecated, use other function instead
         ::GetVersionExW(reinterpret_cast<OSVERSIONINFOW*>(&ovi)); // only fails if version info size is set incorrectly.
+#pragma warning (pop)
+#pragma warning (pop)
 
         vdwOsServicePack = static_cast<DWORD>(ovi.wServicePackMajor) << 16 | ovi.wServicePackMinor;
         if (4 == ovi.dwMajorVersion)