From 25caa8565d7d10f4c254bca5bb9efa05a77542ad Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 25 Jan 2012 13:33:39 +0000 Subject: [PATCH] hw/xwin: Remove some redundant OS version reporting Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winclipboardunicode.c | 4 +--- hw/xwin/winengine.c | 14 -------------- hw/xwin/winprocarg.c | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c index ba86915a4..a297bf2e9 100644 --- a/hw/xwin/winclipboardunicode.c +++ b/hw/xwin/winclipboardunicode.c @@ -44,7 +44,7 @@ winClipboardDetectUnicodeSupport (void) { Bool fReturn = FALSE; OSVERSIONINFO osvi = {0}; - + /* Get operating system version information */ osvi.dwOSVersionInfoSize = sizeof (osvi); GetVersionEx (&osvi); @@ -54,13 +54,11 @@ winClipboardDetectUnicodeSupport (void) { case VER_PLATFORM_WIN32_NT: /* Unicode supported on NT only */ - ErrorF ("DetectUnicodeSupport - Windows NT/2000/XP\n"); fReturn = TRUE; break; case VER_PLATFORM_WIN32_WINDOWS: /* Unicode is not supported on non-NT */ - ErrorF ("DetectUnicodeSupport - Windows 95/98/Me\n"); fReturn = FALSE; break; } diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index 752c4fe68..bf5187bcd 100644 --- a/hw/xwin/winengine.c +++ b/hw/xwin/winengine.c @@ -68,20 +68,6 @@ winDetectSupportedEngines (void) osvi.dwOSVersionInfoSize = sizeof (osvi); GetVersionEx (&osvi); - /* Branch on platform ID */ - switch (osvi.dwPlatformId) - { - case VER_PLATFORM_WIN32_NT: - /* Engine 4 is supported on NT only */ - winErrorFVerb (2, "winDetectSupportedEngines - Windows NT/2000/XP\n"); - break; - - case VER_PLATFORM_WIN32_WINDOWS: - /* Engine 4 is supported on NT only */ - winErrorFVerb (2, "winDetectSupportedEngines - Windows 95/98/Me\n"); - break; - } - /* Do we have DirectDraw? */ if (g_hmodDirectDraw != NULL) { diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 2b6949ed1..6553e72f8 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -1209,7 +1209,7 @@ winLogCommandLine (int argc, char *argv[]) /* - * winLogVersionInfo - Log Cygwin/X version information + * winLogVersionInfo - Log version information */ void