commit fc08bee5afdb07830d6c6fb28359a020a5c305c5
author Pierre Ossman <ossman@cendio.se> Tue Jan 12 12:32:15 2016 +0100
committer Pierre Ossman <ossman@cendio.se> Tue Jan 12 12:32:15 2016 +0100
tree e2009681235886e7c9e6669f0939b679815fcfab
parent 4ab1e5d4b5ebaac0c410eedcc76865736aaa6ae4

Remove legacy Windows code

We have lots of code that deals with Windows versions that we no
longer support anyway. Clean out all of this old cruft.

win/winvnc/VNCServerService.cxx

diff --git a/win/winvnc/VNCServerService.cxx b/win/winvnc/VNCServerService.cxx
index 0357677..5656de0 100644
--- a/win/winvnc/VNCServerService.cxx
+++ b/win/winvnc/VNCServerService.cxx
@@ -19,9 +19,9 @@
 // -=- WinVNC Version 4.0 Service-Mode implementation
 
 #include <winvnc/VNCServerService.h>
-#include <rfb_win32/OSVersion.h>
 #include <rfb_win32/TsSessions.h>
 #include <rfb_win32/ModuleFileName.h>
+#include <windows.h>
 #include <wtsapi32.h>
 #include <tlhelp32.h>
 
@@ -31,19 +31,25 @@
 
 const TCHAR* winvnc::VNCServerService::Name = _T("TigerVNC");
 
+// SendSAS is not available until Windows 7, and missing from MinGW
+static HMODULE sasLibrary = NULL;
+typedef void WINAPI (*SendSAS_proto)(BOOL AsUser);
+static SendSAS_proto _SendSAS = NULL;
+
 VNCServerService::VNCServerService()
   : Service(Name)
-  , SendSas(_T("sas.dll"), "SendSAS")
   , stopServiceEvent(CreateEvent(0, FALSE, FALSE, 0))
   , sessionEvent(CreateEvent(0, FALSE, FALSE, "Global\\SessionEventTigerVNC"))
   , sessionEventCad(CreateEvent(0, FALSE, FALSE, "Global\\SessionEventTigerVNCCad")) {
+  if (sasLibrary == NULL) {
+    sasLibrary = LoadLibrary("sas.dll");
+    if (sasLibrary != NULL)
+      _SendSAS = (SendSAS_proto)GetProcAddress(sasLibrary, "SendSAS");
+  }
   // - Set the service-mode logging defaults
   //   These will be overridden by the Log option in the
   //   registry, if present.
-  if (osVersion.isPlatformNT)
-    logParams.setParam("*:EventLog:0,Connections:EventLog:100");
-  else
-    logParams.setParam("*:file:0,Connections:file:100");
+  logParams.setParam("*:EventLog:0,Connections:EventLog:100");
 }
 
 
@@ -136,8 +142,8 @@
 
         //cad request
         case WAIT_OBJECT_0 + 1:
-            if (SendSas.isValid())
-                (*SendSas)(FALSE);
+            if (_SendSAS != NULL)
+                _SendSAS(FALSE);
             break; 
 
         case WAIT_TIMEOUT:

win/winvnc/VNCServerService.h

diff --git a/win/winvnc/VNCServerService.h b/win/winvnc/VNCServerService.h
index a55a729..8cb82c2 100644
--- a/win/winvnc/VNCServerService.h
+++ b/win/winvnc/VNCServerService.h
@@ -21,7 +21,6 @@
 
 #include <winvnc/VNCServerWin32.h>
 #include <rfb_win32/Service.h>
-#include <rfb_win32/DynamicFn.h>
 
 namespace winvnc {
 
@@ -34,7 +33,6 @@
 
     static const TCHAR* Name;
   protected:
-    rfb::win32::DynamicFn<void (WINAPI *)(BOOL)> SendSas;
     rfb::win32::Handle stopServiceEvent;
     rfb::win32::Handle sessionEvent;
     rfb::win32::Handle sessionEventCad;