From e620d054bbb654f947c95684b5bcef8273ee1166 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Thu, 8 Jan 2015 18:04:09 -0800 Subject: [PATCH] It's not Win9x Changed the two IsWin9x() functions to always return false. Eventually we'll want to roll this up, removing the Win9x branch of the code that called these. --- diskimg/DIUtil.cpp | 12 +----------- util/Util.cpp | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/diskimg/DIUtil.cpp b/diskimg/DIUtil.cpp index 9d1038b..eae7d3e 100644 --- a/diskimg/DIUtil.cpp +++ b/diskimg/DIUtil.cpp @@ -345,16 +345,6 @@ DIError DiskImgLib::LastErrorToDIError(void) */ bool DiskImgLib::IsWin9x(void) { - OSVERSIONINFO osvers; - BOOL result; - - osvers.dwOSVersionInfoSize = sizeof(osvers); - result = ::GetVersionEx(&osvers); - assert(result != FALSE); - - if (osvers.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) - return true; - else - return false; + return false; } #endif diff --git a/util/Util.cpp b/util/Util.cpp index baf7360..9b9b0cd 100644 --- a/util/Util.cpp +++ b/util/Util.cpp @@ -406,17 +406,7 @@ void ShowFailureMsg(CWnd* pWnd, int msgId, int titleStrID) bool IsWin9x(void) { - OSVERSIONINFO osvers; - BOOL result; - - osvers.dwOSVersionInfoSize = sizeof(osvers); - result = ::GetVersionEx(&osvers); - assert(result != FALSE); - - if (osvers.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) - return true; - else - return false; + return false; } void CheckedLoadString(CString* pString, UINT nID)