comment out non-working functions

FunkyFr3sh · May 4, 2024 · 2cbd9bb · 2cbd9bb
1 parent 64c4b73
commit 2cbd9bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cnc-ddraw.vcxproj b/cnc-ddraw.vcxproj
@@ -106,6 +106,7 @@
     <ClInclude Include="inc\config.h" />
     <ClInclude Include="inc\ddsurface.h" />
     <ClInclude Include="inc\version.h" />
+    <ClInclude Include="inc\versionhelpers.h" />
     <ClInclude Include="inc\wglext.h" />
     <ClInclude Include="inc\winapi_hooks.h" />
     <ClInclude Include="inc\wndproc.h" />

diff --git a/cnc-ddraw.vcxproj.filters b/cnc-ddraw.vcxproj.filters
@@ -275,9 +275,12 @@
     <ClInclude Include="inc\ini.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="inc\versionhelpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="ddraw.rc">
+    <ResourceCompile Include="res.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>

diff --git a/inc/versionhelpers.h b/inc/versionhelpers.h
@@ -76,7 +76,7 @@ VERSIONHELPERAPI IsWindows7SP1OrGreater(void) {
 VERSIONHELPERAPI IsWindows8OrGreater(void) {
     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0);
 }
-
+/* Those can't be used without manifest so we comment them out to ensure they're not being used by accident
 VERSIONHELPERAPI IsWindows8Point1OrGreater(void) {
     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINBLUE), LOBYTE(_WIN32_WINNT_WINBLUE), 0);
 }
@@ -88,7 +88,7 @@ VERSIONHELPERAPI IsWindowsThresholdOrGreater(void) {
 VERSIONHELPERAPI IsWindows10OrGreater(void) {
     return IsWindowsThresholdOrGreater();
 }
-
+*/
 VERSIONHELPERAPI IsWindowsServer(void) {
     OSVERSIONINFOEXW vi = {sizeof(vi),0,0,0,0,{0},0,0,0,VER_NT_WORKSTATION};
     return !VerifyVersionInfoW(&vi, VER_PRODUCT_TYPE, VerSetConditionMask(0, VER_PRODUCT_TYPE, VER_EQUAL));