From beb08eb751fa8e1f72042f263316ab5e5ddb596d Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Wed, 10 Nov 2021 00:54:13 -0500
Subject: New upstream version 2.4.0+dfsg.

---
 src/lib/arch/Arch.cpp                         |  4 +-
 src/lib/arch/Arch.h                           |  4 +-
 src/lib/arch/ArchConsoleStd.cpp               |  6 +-
 src/lib/arch/ArchConsoleStd.h                 |  4 +-
 src/lib/arch/ArchDaemonNone.cpp               |  4 +-
 src/lib/arch/ArchDaemonNone.h                 |  4 +-
 src/lib/arch/CMakeLists.txt                   |  4 +-
 src/lib/arch/IArchConsole.h                   |  4 +-
 src/lib/arch/IArchDaemon.h                    |  8 +--
 src/lib/arch/IArchLog.h                       |  4 +-
 src/lib/arch/IArchMultithread.h               | 30 ++++------
 src/lib/arch/IArchNetwork.h                   | 12 ++--
 src/lib/arch/IArchSleep.h                     |  4 +-
 src/lib/arch/IArchString.cpp                  |  4 +-
 src/lib/arch/IArchString.h                    | 14 +----
 src/lib/arch/IArchSystem.h                    |  4 +-
 src/lib/arch/IArchTaskBar.h                   |  4 +-
 src/lib/arch/IArchTaskBarReceiver.h           |  4 +-
 src/lib/arch/IArchTime.h                      |  4 +-
 src/lib/arch/XArch.h                          |  6 +-
 src/lib/arch/multibyte.h                      |  4 +-
 src/lib/arch/unix/ArchConsoleUnix.cpp         |  4 +-
 src/lib/arch/unix/ArchConsoleUnix.h           |  4 +-
 src/lib/arch/unix/ArchDaemonUnix.cpp          | 20 +++----
 src/lib/arch/unix/ArchDaemonUnix.h            |  4 +-
 src/lib/arch/unix/ArchInternetUnix.cpp        |  8 +--
 src/lib/arch/unix/ArchLogUnix.cpp             |  4 +-
 src/lib/arch/unix/ArchLogUnix.h               |  4 +-
 src/lib/arch/unix/ArchMultithreadPosix.cpp    | 35 +++---------
 src/lib/arch/unix/ArchMultithreadPosix.h      |  7 +--
 src/lib/arch/unix/ArchNetworkBSD.cpp          |  4 +-
 src/lib/arch/unix/ArchNetworkBSD.h            |  4 +-
 src/lib/arch/unix/ArchSleepUnix.cpp           |  4 +-
 src/lib/arch/unix/ArchSleepUnix.h             |  4 +-
 src/lib/arch/unix/ArchStringUnix.cpp          |  5 +-
 src/lib/arch/unix/ArchStringUnix.h            |  4 +-
 src/lib/arch/unix/ArchSystemUnix.cpp          |  4 +-
 src/lib/arch/unix/ArchSystemUnix.h            |  4 +-
 src/lib/arch/unix/ArchTaskBarXWindows.cpp     |  4 +-
 src/lib/arch/unix/ArchTaskBarXWindows.h       |  4 +-
 src/lib/arch/unix/ArchTimeUnix.cpp            |  4 +-
 src/lib/arch/unix/ArchTimeUnix.h              |  4 +-
 src/lib/arch/unix/XArchUnix.cpp               |  4 +-
 src/lib/arch/unix/XArchUnix.h                 |  4 +-
 src/lib/arch/vsnprintf.h                      | 67 ----------------------
 src/lib/arch/win32/ArchConsoleWindows.cpp     |  4 +-
 src/lib/arch/win32/ArchConsoleWindows.h       |  4 +-
 src/lib/arch/win32/ArchDaemonWindows.cpp      | 10 ++--
 src/lib/arch/win32/ArchDaemonWindows.h        |  4 +-
 src/lib/arch/win32/ArchInternetWindows.cpp    |  8 +--
 src/lib/arch/win32/ArchLogWindows.cpp         |  4 +-
 src/lib/arch/win32/ArchLogWindows.h           |  4 +-
 src/lib/arch/win32/ArchMiscWindows.cpp        | 22 ++++----
 src/lib/arch/win32/ArchMiscWindows.h          |  6 +-
 src/lib/arch/win32/ArchMultithreadWindows.cpp | 33 ++---------
 src/lib/arch/win32/ArchMultithreadWindows.h   |  7 +--
 src/lib/arch/win32/ArchNetworkWinsock.cpp     |  4 +-
 src/lib/arch/win32/ArchNetworkWinsock.h       |  4 +-
 src/lib/arch/win32/ArchSleepWindows.cpp       |  6 +-
 src/lib/arch/win32/ArchSleepWindows.h         |  4 +-
 src/lib/arch/win32/ArchStringWindows.cpp      |  9 +--
 src/lib/arch/win32/ArchStringWindows.h        |  4 +-
 src/lib/arch/win32/ArchSystemWindows.cpp      |  4 +-
 src/lib/arch/win32/ArchSystemWindows.h        |  4 +-
 src/lib/arch/win32/ArchTaskBarWindows.cpp     | 15 ++---
 src/lib/arch/win32/ArchTaskBarWindows.h       |  7 +--
 src/lib/arch/win32/ArchTimeWindows.cpp        |  4 +-
 src/lib/arch/win32/ArchTimeWindows.h          |  4 +-
 src/lib/arch/win32/XArchWindows.cpp           | 80 +++++++++++++--------------
 src/lib/arch/win32/XArchWindows.h             |  4 +-
 70 files changed, 234 insertions(+), 375 deletions(-)
 delete mode 100644 src/lib/arch/vsnprintf.h

(limited to 'src/lib/arch')

diff --git a/src/lib/arch/Arch.cpp b/src/lib/arch/Arch.cpp
index 0a3b3e5..810b74f 100644
--- a/src/lib/arch/Arch.cpp
+++ b/src/lib/arch/Arch.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h
index 940a2e3..3b37617 100644
--- a/src/lib/arch/Arch.h
+++ b/src/lib/arch/Arch.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/ArchConsoleStd.cpp b/src/lib/arch/ArchConsoleStd.cpp
index f7f7691..2e188bb 100644
--- a/src/lib/arch/ArchConsoleStd.cpp
+++ b/src/lib/arch/ArchConsoleStd.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -30,4 +30,4 @@ ArchConsoleStd::writeConsole(ELevel level, const char* str)
         std::cout << str << std::endl;
 
     std::cout.flush();
-}
\ No newline at end of file
+}
diff --git a/src/lib/arch/ArchConsoleStd.h b/src/lib/arch/ArchConsoleStd.h
index 8560fad..1d306e7 100644
--- a/src/lib/arch/ArchConsoleStd.h
+++ b/src/lib/arch/ArchConsoleStd.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/ArchDaemonNone.cpp b/src/lib/arch/ArchDaemonNone.cpp
index 1222549..5cb4681 100644
--- a/src/lib/arch/ArchDaemonNone.cpp
+++ b/src/lib/arch/ArchDaemonNone.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/ArchDaemonNone.h b/src/lib/arch/ArchDaemonNone.h
index e02405f..425ae56 100644
--- a/src/lib/arch/ArchDaemonNone.h
+++ b/src/lib/arch/ArchDaemonNone.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/CMakeLists.txt b/src/lib/arch/CMakeLists.txt
index db92634..5ff7b51 100644
--- a/src/lib/arch/CMakeLists.txt
+++ b/src/lib/arch/CMakeLists.txt
@@ -1,11 +1,11 @@
 # barrier -- mouse and keyboard sharing utility
 # Copyright (C) 2012-2016 Symless Ltd.
 # Copyright (C) 2009 Nick Bolton
-# 
+#
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # found in the file LICENSE that should have accompanied this file.
-# 
+#
 # This package is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchConsole.h b/src/lib/arch/IArchConsole.h
index d115c50..41e3527 100644
--- a/src/lib/arch/IArchConsole.h
+++ b/src/lib/arch/IArchConsole.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h
index 23a34f2..6a4fb67 100644
--- a/src/lib/arch/IArchDaemon.h
+++ b/src/lib/arch/IArchDaemon.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -64,7 +64,7 @@ public:
     Installs the default daemon.
     */
     virtual void        installDaemon() = 0;
-    
+
     //! Uninstall daemon
     /*!
     Uninstalls the default daemon.
@@ -76,7 +76,7 @@ public:
     Daemonize.  Throw XArchDaemonFailed on error.  \c name is the name
     of the daemon.  Once daemonized, \c func is invoked and daemonize
     returns when and what it does.
-    
+
     Exactly what happens when daemonizing depends on the platform.
     <ul>
     <li>unix:
diff --git a/src/lib/arch/IArchLog.h b/src/lib/arch/IArchLog.h
index 165b1df..704ad47 100644
--- a/src/lib/arch/IArchLog.h
+++ b/src/lib/arch/IArchLog.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchMultithread.h b/src/lib/arch/IArchMultithread.h
index e8d358b..6a57694 100644
--- a/src/lib/arch/IArchMultithread.h
+++ b/src/lib/arch/IArchMultithread.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19,8 +19,9 @@
 #pragma once
 
 #include "common/IInterface.h"
+#include <functional>
 
-/*!      
+/*!
 \class ArchCondImpl
 \brief Internal condition variable data.
 An architecture dependent type holding the necessary data for a
@@ -28,35 +29,35 @@ condition variable.
 */
 class ArchCondImpl;
 
-/*!      
+/*!
 \var ArchCond
 \brief Opaque condition variable type.
 An opaque type representing a condition variable.
 */
 typedef ArchCondImpl* ArchCond;
 
-/*!      
+/*!
 \class ArchMutexImpl
 \brief Internal mutex data.
 An architecture dependent type holding the necessary data for a mutex.
 */
 class ArchMutexImpl;
 
-/*!      
+/*!
 \var ArchMutex
 \brief Opaque mutex type.
 An opaque type representing a mutex.
 */
 typedef ArchMutexImpl* ArchMutex;
 
-/*!      
+/*!
 \class ArchThreadImpl
 \brief Internal thread data.
 An architecture dependent type holding the necessary data for a thread.
 */
 class ArchThreadImpl;
 
-/*!      
+/*!
 \var ArchThread
 \brief Opaque thread type.
 An opaque type representing a thread.
@@ -71,7 +72,7 @@ barrier.  Each architecture must implement this interface.
 class IArchMultithread : public IInterface {
 public:
     //! Type of thread entry point
-    typedef void* (*ThreadFunc)(void*);
+    typedef void (*ThreadFunc)(void*);
     //! Type of thread identifier
     typedef unsigned int ThreadID;
     //! Types of signals
@@ -160,7 +161,7 @@ public:
     Creates and starts a new thread, using \c func as the entry point
     and passing it \c userData.  The thread is an opaque data type.
     */
-    virtual ArchThread    newThread(ThreadFunc func, void* userData) = 0;
+    virtual ArchThread newThread(const std::function<void()>& func) = 0;
 
     //! Get a reference to the calling thread
     /*!
@@ -235,15 +236,6 @@ public:
     */
     virtual bool        isExitedThread(ArchThread thread) = 0;
 
-    //! Returns the exit code of a thread
-    /*!
-    Waits indefinitely for \c thread to exit (if it hasn't yet) then
-    returns the thread's exit code.
-
-    (Cancellation point)
-    */
-    virtual void*        getResultOfThread(ArchThread thread) = 0;
-
     //! Returns an ID for a thread
     /*!
     Returns some ID number for \c thread.  This is for logging purposes.
diff --git a/src/lib/arch/IArchNetwork.h b/src/lib/arch/IArchNetwork.h
index b859506..7eae63e 100644
--- a/src/lib/arch/IArchNetwork.h
+++ b/src/lib/arch/IArchNetwork.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -24,21 +24,21 @@
 class ArchThreadImpl;
 typedef ArchThreadImpl* ArchThread;
 
-/*!      
+/*!
 \class ArchSocketImpl
 \brief Internal socket data.
 An architecture dependent type holding the necessary data for a socket.
 */
 class ArchSocketImpl;
 
-/*!      
+/*!
 \var ArchSocket
 \brief Opaque socket type.
 An opaque type representing a socket.
 */
 typedef ArchSocketImpl* ArchSocket;
 
-/*!      
+/*!
 \class ArchNetAddressImpl
 \brief Internal network address data.
 An architecture dependent type holding the necessary data for a network
@@ -46,7 +46,7 @@ address.
 */
 class ArchNetAddressImpl;
 
-/*!      
+/*!
 \var ArchNetAddress
 \brief Opaque network address type.
 An opaque type representing a network address.
diff --git a/src/lib/arch/IArchSleep.h b/src/lib/arch/IArchSleep.h
index 9999d0e..86c571f 100644
--- a/src/lib/arch/IArchSleep.h
+++ b/src/lib/arch/IArchSleep.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchString.cpp b/src/lib/arch/IArchString.cpp
index 0f7f300..b1118ec 100644
--- a/src/lib/arch/IArchString.cpp
+++ b/src/lib/arch/IArchString.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2011 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchString.h b/src/lib/arch/IArchString.h
index ea10b65..f1803d8 100644
--- a/src/lib/arch/IArchString.h
+++ b/src/lib/arch/IArchString.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -46,16 +46,6 @@ public:
     //! @name manipulators
     //@{
 
-    //! printf() to limited size buffer with va_list
-    /*!
-    This method is equivalent to vsprintf() except it will not write
-    more than \c n bytes to the buffer, returning -1 if the output
-    was truncated and the number of bytes written not including the
-    trailing NUL otherwise.
-    */
-    virtual int            vsnprintf(char* str,
-                            int size, const char* fmt, va_list ap);
-
     //! Convert multibyte string to wide character string
     virtual int            convStringMBToWC(wchar_t*,
                             const char*, UInt32 n, bool* errors);
diff --git a/src/lib/arch/IArchSystem.h b/src/lib/arch/IArchSystem.h
index 9446505..3e7aa98 100644
--- a/src/lib/arch/IArchSystem.h
+++ b/src/lib/arch/IArchSystem.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchTaskBar.h b/src/lib/arch/IArchTaskBar.h
index 85a32d8..fc5f0d0 100644
--- a/src/lib/arch/IArchTaskBar.h
+++ b/src/lib/arch/IArchTaskBar.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2003 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchTaskBarReceiver.h b/src/lib/arch/IArchTaskBarReceiver.h
index 997c8ae..b4f0d30 100644
--- a/src/lib/arch/IArchTaskBarReceiver.h
+++ b/src/lib/arch/IArchTaskBarReceiver.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2003 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/IArchTime.h b/src/lib/arch/IArchTime.h
index abb3cdd..297aab7 100644
--- a/src/lib/arch/IArchTime.h
+++ b/src/lib/arch/IArchTime.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h
index 8484d06..2fcf686 100644
--- a/src/lib/arch/XArch.h
+++ b/src/lib/arch/XArch.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -57,7 +57,7 @@ class XArchEval {
 public:
     XArchEval() { }
     virtual ~XArchEval() noexcept { }
-    
+
     virtual std::string    eval() const = 0;
 };
 
diff --git a/src/lib/arch/multibyte.h b/src/lib/arch/multibyte.h
index 4a4e0ec..7812e0b 100644
--- a/src/lib/arch/multibyte.h
+++ b/src/lib/arch/multibyte.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchConsoleUnix.cpp b/src/lib/arch/unix/ArchConsoleUnix.cpp
index 79a4634..d5e8e1d 100644
--- a/src/lib/arch/unix/ArchConsoleUnix.cpp
+++ b/src/lib/arch/unix/ArchConsoleUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchConsoleUnix.h b/src/lib/arch/unix/ArchConsoleUnix.h
index 8326ab5..136c606 100644
--- a/src/lib/arch/unix/ArchConsoleUnix.h
+++ b/src/lib/arch/unix/ArchConsoleUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchDaemonUnix.cpp b/src/lib/arch/unix/ArchDaemonUnix.cpp
index a03bf7a..f1ac1d5 100644
--- a/src/lib/arch/unix/ArchDaemonUnix.cpp
+++ b/src/lib/arch/unix/ArchDaemonUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -53,15 +53,15 @@ execSelfNonDaemonized()
 {
     extern char** NXArgv;
     char** selfArgv = NXArgv;
-    
+
     setenv("_BARRIER_DAEMONIZED", "", 1);
-    
+
     execvp(selfArgv[0], selfArgv);
     return 0;
 }
 
 bool alreadyDaemonized() {
-    return getenv("_BARRIER_DAEMONIZED") != NULL;
+    return std::getenv("_BARRIER_DAEMONIZED") != NULL;
 }
 
 #endif
@@ -73,7 +73,7 @@ ArchDaemonUnix::daemonize(const char* name, DaemonFunc func)
     if (alreadyDaemonized())
         return func(1, &name);
 #endif
-    
+
     // fork so shell thinks we're done and so we're not a process
     // group leader
     switch (fork()) {
@@ -92,7 +92,7 @@ ArchDaemonUnix::daemonize(const char* name, DaemonFunc func)
 
     // become leader of a new session
     setsid();
-    
+
 #ifndef __APPLE__
     // NB: don't run chdir on apple; causes strange behaviour.
     // chdir to root so we don't keep mounted filesystems points busy
@@ -115,18 +115,18 @@ ArchDaemonUnix::daemonize(const char* name, DaemonFunc func)
     // of standard I/O safely goes in the bit bucket.
     open("/dev/null", O_RDONLY);
     open("/dev/null", O_RDWR);
-    
+
     int dupErr = dup(1);
 
     if (dupErr < 0) {
         // NB: file logging actually isn't working at this point!
         LOG((CLOG_ERR "dup error: %i", dupErr));
     }
-    
+
 #ifdef __APPLE__
     return execSelfNonDaemonized();
 #endif
-    
+
     // invoke function
     return func(1, &name);
 }
diff --git a/src/lib/arch/unix/ArchDaemonUnix.h b/src/lib/arch/unix/ArchDaemonUnix.h
index 530159a..52a531e 100644
--- a/src/lib/arch/unix/ArchDaemonUnix.h
+++ b/src/lib/arch/unix/ArchDaemonUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchInternetUnix.cpp b/src/lib/arch/unix/ArchInternetUnix.cpp
index 76966dc..dcea2ae 100644
--- a/src/lib/arch/unix/ArchInternetUnix.cpp
+++ b/src/lib/arch/unix/ArchInternetUnix.cpp
@@ -94,16 +94,16 @@ std::string CurlFacade::get(const std::string& url)
     userAgent << "Barrier ";
     userAgent << kVersion;
     curl_easy_setopt(m_curl, CURLOPT_USERAGENT, userAgent.str().c_str());
-    
+
     std::string result;
     curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, &result);
-            
+
     CURLcode code = curl_easy_perform(m_curl);
     if (code != CURLE_OK) {
         LOG((CLOG_ERR "curl perform error: %s", curl_easy_strerror(code)));
         throw XArch("CURL perform failed.");
     }
-    
+
     return result;
 }
 
@@ -114,7 +114,7 @@ std::string CurlFacade::urlEncode(const std::string& url)
     if (resultCStr == NULL) {
         throw XArch("CURL escape failed.");
     }
-    
+
     std::string result(resultCStr);
     curl_free(resultCStr);
 
diff --git a/src/lib/arch/unix/ArchLogUnix.cpp b/src/lib/arch/unix/ArchLogUnix.cpp
index b1f9089..2389f48 100644
--- a/src/lib/arch/unix/ArchLogUnix.cpp
+++ b/src/lib/arch/unix/ArchLogUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchLogUnix.h b/src/lib/arch/unix/ArchLogUnix.h
index cdd733f..f37bab8 100644
--- a/src/lib/arch/unix/ArchLogUnix.h
+++ b/src/lib/arch/unix/ArchLogUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
index 4866edc..8400f9d 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -59,24 +59,19 @@ public:
     int                    m_refCount;
     IArchMultithread::ThreadID        m_id;
     pthread_t            m_thread;
-    IArchMultithread::ThreadFunc    m_func;
-    void*                m_userData;
+    std::function<void()> func_;;
     bool                m_cancel;
     bool                m_cancelling;
     bool                m_exited;
-    void*                m_result;
     void*                m_networkData;
 };
 
 ArchThreadImpl::ArchThreadImpl() :
     m_refCount(1),
     m_id(0),
-    m_func(NULL),
-    m_userData(NULL),
     m_cancel(false),
     m_cancelling(false),
     m_exited(false),
-    m_result(NULL),
     m_networkData(NULL)
 {
     // do nothing
@@ -319,11 +314,8 @@ ArchMultithreadPosix::unlockMutex(ArchMutex mutex)
     }
 }
 
-ArchThread
-ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
+ArchThread ArchMultithreadPosix::newThread(const std::function<void()>& func)
 {
-    assert(func != NULL);
-
     // initialize signal handler.  we do this here instead of the
     // constructor so we can avoid daemonizing (using fork())
     // when there are multiple threads.  clients can safely
@@ -341,8 +333,7 @@ ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
 
     // create thread impl for new thread
     ArchThreadImpl* thread = new ArchThreadImpl;
-    thread->m_func          = func;
-    thread->m_userData      = data;
+    thread->func_ = func;
 
     // create the thread.  pthread_create() on RedHat 7.2 smp fails
     // if passed a NULL attr so use a default attr.
@@ -389,7 +380,7 @@ ArchMultithreadPosix::closeThread(ArchThread thread)
     // decrement ref count and clean up thread if no more references
     if (--thread->m_refCount == 0) {
         // detach from thread (unless it's the main thread)
-        if (thread->m_func != NULL) {
+        if (thread->func_) {
             pthread_detach(thread->m_thread);
         }
 
@@ -526,13 +517,6 @@ ArchMultithreadPosix::isExitedThread(ArchThread thread)
     return thread->m_exited;
 }
 
-void*
-ArchMultithreadPosix::getResultOfThread(ArchThread thread)
-{
-    std::lock_guard<std::mutex> lock(m_threadMutex);
-    return thread->m_result;
-}
-
 IArchMultithread::ThreadID
 ArchMultithreadPosix::getIDOfThread(ArchThread thread)
 {
@@ -549,7 +533,7 @@ ArchMultithreadPosix::setSignalHandler(
 }
 
 void
-ArchMultithreadPosix::raiseSignal(ESignal signal) 
+ArchMultithreadPosix::raiseSignal(ESignal signal)
 {
     std::lock_guard<std::mutex> lock(m_threadMutex);
     if (m_signalFunc[signal] != NULL) {
@@ -699,10 +683,8 @@ ArchMultithreadPosix::doThreadFunc(ArchThread thread)
         std::lock_guard<std::mutex> lock(m_threadMutex);
     }
 
-    void* result = NULL;
     try {
-        // go
-        result = (*thread->m_func)(thread->m_userData);
+        thread->func_();
     }
 
     catch (XThreadCancel&) {
@@ -721,7 +703,6 @@ ArchMultithreadPosix::doThreadFunc(ArchThread thread)
     // thread has exited
     {
         std::lock_guard<std::mutex> lock(m_threadMutex);
-        thread->m_result = result;
         thread->m_exited = true;
     }
 
diff --git a/src/lib/arch/unix/ArchMultithreadPosix.h b/src/lib/arch/unix/ArchMultithreadPosix.h
index 4bd879f..798147a 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.h
+++ b/src/lib/arch/unix/ArchMultithreadPosix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -67,7 +67,7 @@ public:
     virtual void        closeMutex(ArchMutex);
     virtual void        lockMutex(ArchMutex);
     virtual void        unlockMutex(ArchMutex);
-    virtual ArchThread    newThread(ThreadFunc, void*);
+    virtual ArchThread newThread(const std::function<void()>& func);
     virtual ArchThread    newCurrentThread();
     virtual ArchThread    copyThread(ArchThread);
     virtual void        closeThread(ArchThread);
@@ -77,7 +77,6 @@ public:
     virtual bool        wait(ArchThread, double timeout);
     virtual bool        isSameThread(ArchThread, ArchThread);
     virtual bool        isExitedThread(ArchThread);
-    virtual void*        getResultOfThread(ArchThread);
     virtual ThreadID    getIDOfThread(ArchThread);
     virtual void        setSignalHandler(ESignal, SignalFunc, void*);
     virtual void        raiseSignal(ESignal);
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index 496c988..5507bfe 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchNetworkBSD.h b/src/lib/arch/unix/ArchNetworkBSD.h
index 3f5679a..e3f11d5 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.h
+++ b/src/lib/arch/unix/ArchNetworkBSD.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchSleepUnix.cpp b/src/lib/arch/unix/ArchSleepUnix.cpp
index 48e2600..1f91c34 100644
--- a/src/lib/arch/unix/ArchSleepUnix.cpp
+++ b/src/lib/arch/unix/ArchSleepUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchSleepUnix.h b/src/lib/arch/unix/ArchSleepUnix.h
index 3e307a5..d2cdbca 100644
--- a/src/lib/arch/unix/ArchSleepUnix.h
+++ b/src/lib/arch/unix/ArchSleepUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchStringUnix.cpp b/src/lib/arch/unix/ArchStringUnix.cpp
index 591c826..dbb91c1 100644
--- a/src/lib/arch/unix/ArchStringUnix.cpp
+++ b/src/lib/arch/unix/ArchStringUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -25,7 +25,6 @@
 //
 
 #include "arch/multibyte.h"
-#include "arch/vsnprintf.h"
 
 ArchStringUnix::ArchStringUnix()
 {
diff --git a/src/lib/arch/unix/ArchStringUnix.h b/src/lib/arch/unix/ArchStringUnix.h
index f7d0035..551f497 100644
--- a/src/lib/arch/unix/ArchStringUnix.h
+++ b/src/lib/arch/unix/ArchStringUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchSystemUnix.cpp b/src/lib/arch/unix/ArchSystemUnix.cpp
index f51e47f..f956998 100644
--- a/src/lib/arch/unix/ArchSystemUnix.cpp
+++ b/src/lib/arch/unix/ArchSystemUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchSystemUnix.h b/src/lib/arch/unix/ArchSystemUnix.h
index aa9c564..f3c2ad6 100644
--- a/src/lib/arch/unix/ArchSystemUnix.h
+++ b/src/lib/arch/unix/ArchSystemUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchTaskBarXWindows.cpp b/src/lib/arch/unix/ArchTaskBarXWindows.cpp
index c3577ad..522c7fd 100644
--- a/src/lib/arch/unix/ArchTaskBarXWindows.cpp
+++ b/src/lib/arch/unix/ArchTaskBarXWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2003 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchTaskBarXWindows.h b/src/lib/arch/unix/ArchTaskBarXWindows.h
index f2c8977..5b60a08 100644
--- a/src/lib/arch/unix/ArchTaskBarXWindows.h
+++ b/src/lib/arch/unix/ArchTaskBarXWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2003 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchTimeUnix.cpp b/src/lib/arch/unix/ArchTimeUnix.cpp
index 24685aa..665a7eb 100644
--- a/src/lib/arch/unix/ArchTimeUnix.cpp
+++ b/src/lib/arch/unix/ArchTimeUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/ArchTimeUnix.h b/src/lib/arch/unix/ArchTimeUnix.h
index 3c5c0f8..c6a7dc6 100644
--- a/src/lib/arch/unix/ArchTimeUnix.h
+++ b/src/lib/arch/unix/ArchTimeUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/XArchUnix.cpp b/src/lib/arch/unix/XArchUnix.cpp
index fc7ff65..db2006d 100644
--- a/src/lib/arch/unix/XArchUnix.cpp
+++ b/src/lib/arch/unix/XArchUnix.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/unix/XArchUnix.h b/src/lib/arch/unix/XArchUnix.h
index 93d6d62..be2e689 100644
--- a/src/lib/arch/unix/XArchUnix.h
+++ b/src/lib/arch/unix/XArchUnix.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/vsnprintf.h b/src/lib/arch/vsnprintf.h
deleted file mode 100644
index 5a4e3dc..0000000
--- a/src/lib/arch/vsnprintf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * barrier -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2002 Chris Schoeneman
- * 
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- * 
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "arch/IArchString.h"
-
-#if HAVE_VSNPRINTF
-
-#if !defined(ARCH_VSNPRINTF)
-#    define ARCH_VSNPRINTF vsnprintf
-#endif
-
-int
-IArchString::vsnprintf(char* str, int size, const char* fmt, va_list ap)
-{
-    int n = ::ARCH_VSNPRINTF(str, size, fmt, ap);
-    if (n > size) {
-        n = -1;
-    }
-    return n;
-}
-
-#elif SYSAPI_UNIX // !HAVE_VSNPRINTF
-
-#include <stdio.h>
-
-int
-IArchString::vsnprintf(char* str, int size, const char* fmt, va_list ap)
-{
-    static FILE* bitbucket = fopen("/dev/null", "w");
-    if (bitbucket == NULL) {
-        // uh oh
-        if (size > 0) {
-            str[0] = '\0';
-        }
-        return 0;
-    }
-    else {
-        // count the characters using the bitbucket
-        int n = vfprintf(bitbucket, fmt, ap);
-        if (n + 1 <= size) {
-            // it'll fit so print it into str
-            vsprintf(str, fmt, ap);
-        }
-        return n;
-    }
-}
-
-#else // !HAVE_VSNPRINTF && !SYSAPI_UNIX
-
-#error vsnprintf not implemented
-
-#endif // !HAVE_VSNPRINTF
diff --git a/src/lib/arch/win32/ArchConsoleWindows.cpp b/src/lib/arch/win32/ArchConsoleWindows.cpp
index 4514555..2c61eb7 100644
--- a/src/lib/arch/win32/ArchConsoleWindows.cpp
+++ b/src/lib/arch/win32/ArchConsoleWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchConsoleWindows.h b/src/lib/arch/win32/ArchConsoleWindows.h
index f1f0cc9..a6c6d68 100644
--- a/src/lib/arch/win32/ArchConsoleWindows.h
+++ b/src/lib/arch/win32/ArchConsoleWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp
index efcf235..df0a4ce 100644
--- a/src/lib/arch/win32/ArchDaemonWindows.cpp
+++ b/src/lib/arch/win32/ArchDaemonWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -441,7 +441,7 @@ ArchDaemonWindows::serviceMain(DWORD argc, LPTSTR* argvIn)
     // create synchronization objects
     m_serviceMutex        = ARCH->newMutex();
     m_serviceCondVar      = ARCH->newCondVar();
-    
+
     // register our service handler function
     m_statusHandle = RegisterServiceCtrlHandler(argv[0],
                                 &ArchDaemonWindows::serviceHandlerEntry);
@@ -667,7 +667,7 @@ ArchDaemonWindows::stop(const char* name)
     // ask the service to stop, asynchronously
     SERVICE_STATUS ss;
     if (!ControlService(service, SERVICE_CONTROL_STOP, &ss)) {
-        DWORD dwErrCode = GetLastError(); 
+        DWORD dwErrCode = GetLastError();
         if (dwErrCode != ERROR_SERVICE_NOT_ACTIVE) {
             throw XArchDaemonFailed(new XArchEvalWindows());
         }
@@ -681,7 +681,7 @@ ArchDaemonWindows::installDaemon()
     if (!isDaemonInstalled(DEFAULT_DAEMON_NAME)) {
         char path[MAX_PATH];
         GetModuleFileName(ArchMiscWindows::instanceWin32(), path, MAX_PATH);
-        
+
         // wrap in quotes so a malicious user can't start \Program.exe as admin.
         std::stringstream ss;
         ss << '"';
diff --git a/src/lib/arch/win32/ArchDaemonWindows.h b/src/lib/arch/win32/ArchDaemonWindows.h
index 2db9792..7813f09 100644
--- a/src/lib/arch/win32/ArchDaemonWindows.h
+++ b/src/lib/arch/win32/ArchDaemonWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchInternetWindows.cpp b/src/lib/arch/win32/ArchInternetWindows.cpp
index 8a28fde..fb75e7d 100644
--- a/src/lib/arch/win32/ArchInternetWindows.cpp
+++ b/src/lib/arch/win32/ArchInternetWindows.cpp
@@ -72,7 +72,7 @@ std::string ArchInternetWindows::urlEncode(const std::string& url)
 
     std::string result(buffer);
 
-    // the win32 url encoding funcitons are pretty useless (to us) and only
+    // the win32 url encoding functions are pretty useless (to us) and only
     // escape "unsafe" chars, but not + or =, so we need to replace these
     // manually (and probably many other chars).
     barrier::string::findReplaceAll(result, "+", "%2B");
@@ -121,12 +121,12 @@ std::string WinINetRequest::send()
     openSession();
     connect();
     openRequest();
-    
+
     std::string headers("Content-Type: text/html");
     if (!HttpSendRequest(m_request, headers.c_str(), (DWORD)headers.length(), NULL, NULL)) {
         throw XArch(new XArchEvalWindows());
     }
-    
+
     std::stringstream result;
     CHAR buffer[1025];
     DWORD read = 0;
@@ -170,7 +170,7 @@ WinINetRequest::connect()
         INTERNET_SERVICE_HTTP,
         NULL,
         NULL);
-    
+
     if (m_connect == NULL) {
         throw XArch(new XArchEvalWindows());
     }
diff --git a/src/lib/arch/win32/ArchLogWindows.cpp b/src/lib/arch/win32/ArchLogWindows.cpp
index bc17abf..1b8855a 100644
--- a/src/lib/arch/win32/ArchLogWindows.cpp
+++ b/src/lib/arch/win32/ArchLogWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchLogWindows.h b/src/lib/arch/win32/ArchLogWindows.h
index 3a997f1..efc466f 100644
--- a/src/lib/arch/win32/ArchLogWindows.h
+++ b/src/lib/arch/win32/ArchLogWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp
index 2c022b1..ab16daa 100644
--- a/src/lib/arch/win32/ArchMiscWindows.cpp
+++ b/src/lib/arch/win32/ArchMiscWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -429,7 +429,7 @@ ArchMiscWindows::wakeupDisplay()
 }
 
 bool
-ArchMiscWindows::wasLaunchedAsService() 
+ArchMiscWindows::wasLaunchedAsService()
 {
     std::string name;
     if (!getParentProcessName(name)) {
@@ -441,9 +441,9 @@ ArchMiscWindows::wasLaunchedAsService()
 }
 
 bool ArchMiscWindows::getParentProcessName(std::string &name)
-{    
+{
     PROCESSENTRY32 parentEntry;
-    if (!getParentProcessEntry(parentEntry)){
+    if (!getParentProcessEntry(parentEntry)) {
         LOG((CLOG_ERR "could not get entry for parent process"));
         return false;
     }
@@ -452,14 +452,14 @@ bool ArchMiscWindows::getParentProcessName(std::string &name)
     return true;
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 ArchMiscWindows::getSelfProcessEntry(PROCESSENTRY32& entry)
 {
     // get entry from current PID
     return getProcessEntry(entry, GetCurrentProcessId());
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 ArchMiscWindows::getParentProcessEntry(PROCESSENTRY32& entry)
 {
     // get the current process, so we can get parent PID
@@ -472,24 +472,24 @@ ArchMiscWindows::getParentProcessEntry(PROCESSENTRY32& entry)
     return getProcessEntry(entry, selfEntry.th32ParentProcessID);
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 ArchMiscWindows::getProcessEntry(PROCESSENTRY32& entry, DWORD processID)
 {
     // first we need to take a snapshot of the running processes
     HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
     if (snapshot == INVALID_HANDLE_VALUE) {
-        LOG((CLOG_ERR "could not get process snapshot (error: %i)", 
+        LOG((CLOG_ERR "could not get process snapshot (error: %i)",
             GetLastError()));
         return FALSE;
     }
 
     entry.dwSize = sizeof(PROCESSENTRY32);
 
-    // get the first process, and if we can't do that then it's 
+    // get the first process, and if we can't do that then it's
     // unlikely we can go any further
     BOOL gotEntry = Process32First(snapshot, &entry);
     if (!gotEntry) {
-        LOG((CLOG_ERR "could not get first process entry (error: %i)", 
+        LOG((CLOG_ERR "could not get first process entry (error: %i)",
             GetLastError()));
         return FALSE;
     }
diff --git a/src/lib/arch/win32/ArchMiscWindows.h b/src/lib/arch/win32/ArchMiscWindows.h
index 91cd8f5..d5373a0 100644
--- a/src/lib/arch/win32/ArchMiscWindows.h
+++ b/src/lib/arch/win32/ArchMiscWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -167,7 +167,7 @@ public:
     static HINSTANCE instanceWin32();
 
     static void setInstanceWin32(HINSTANCE instance);
-    
+
     static BOOL WINAPI getProcessEntry(PROCESSENTRY32& entry, DWORD processID);
     static BOOL WINAPI getSelfProcessEntry(PROCESSENTRY32& entry);
     static BOOL WINAPI getParentProcessEntry(PROCESSENTRY32& entry);
diff --git a/src/lib/arch/win32/ArchMultithreadWindows.cpp b/src/lib/arch/win32/ArchMultithreadWindows.cpp
index d3fd059..43a7374 100644
--- a/src/lib/arch/win32/ArchMultithreadWindows.cpp
+++ b/src/lib/arch/win32/ArchMultithreadWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -49,12 +49,10 @@ public:
     int                    m_refCount;
     HANDLE                m_thread;
     DWORD                m_id;
-    IArchMultithread::ThreadFunc    m_func;
-    void*                m_userData;
+    std::function<void()> func_;
     HANDLE                m_cancel;
     bool                m_cancelling;
     HANDLE                m_exit;
-    void*                m_result;
     void*                m_networkData;
 };
 
@@ -62,10 +60,7 @@ ArchThreadImpl::ArchThreadImpl() :
     m_refCount(1),
     m_thread(NULL),
     m_id(0),
-    m_func(NULL),
-    m_userData(NULL),
     m_cancelling(false),
-    m_result(NULL),
     m_networkData(NULL)
 {
     m_exit   = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -292,15 +287,13 @@ ArchMultithreadWindows::unlockMutex(ArchMutex mutex)
     LeaveCriticalSection(&mutex->m_mutex);
 }
 
-ArchThread
-ArchMultithreadWindows::newThread(ThreadFunc func, void* data)
+ArchThread ArchMultithreadWindows::newThread(const std::function<void()>& func)
 {
     lockMutex(m_threadMutex);
 
     // create thread impl for new thread
     ArchThreadImpl* thread = new ArchThreadImpl;
-    thread->m_func          = func;
-    thread->m_userData      = data;
+    thread->func_ = func;
 
     // create thread
     unsigned int id = 0;
@@ -523,15 +516,6 @@ ArchMultithreadWindows::isExitedThread(ArchThread thread)
     return (WaitForSingleObject(thread->m_exit, 0) == WAIT_OBJECT_0);
 }
 
-void*
-ArchMultithreadWindows::getResultOfThread(ArchThread thread)
-{
-    lockMutex(m_threadMutex);
-    void* result = thread->m_result;
-    unlockMutex(m_threadMutex);
-    return result;
-}
-
 IArchMultithread::ThreadID
 ArchMultithreadWindows::getIDOfThread(ArchThread thread)
 {
@@ -678,10 +662,8 @@ ArchMultithreadWindows::doThreadFunc(ArchThread thread)
     lockMutex(m_threadMutex);
     unlockMutex(m_threadMutex);
 
-    void* result = NULL;
     try {
-        // go
-        result = (*thread->m_func)(thread->m_userData);
+        thread->func_();
     }
 
     catch (XThreadCancel&) {
@@ -695,9 +677,6 @@ ArchMultithreadWindows::doThreadFunc(ArchThread thread)
     }
 
     // thread has exited
-    lockMutex(m_threadMutex);
-    thread->m_result = result;
-    unlockMutex(m_threadMutex);
     SetEvent(thread->m_exit);
 
     // done with thread
diff --git a/src/lib/arch/win32/ArchMultithreadWindows.h b/src/lib/arch/win32/ArchMultithreadWindows.h
index 99aa640..31a2b30 100644
--- a/src/lib/arch/win32/ArchMultithreadWindows.h
+++ b/src/lib/arch/win32/ArchMultithreadWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -73,7 +73,7 @@ public:
     virtual void        closeMutex(ArchMutex);
     virtual void        lockMutex(ArchMutex);
     virtual void        unlockMutex(ArchMutex);
-    virtual ArchThread    newThread(ThreadFunc, void*);
+    virtual ArchThread newThread(const std::function<void()>& func);
     virtual ArchThread    newCurrentThread();
     virtual ArchThread    copyThread(ArchThread);
     virtual void        closeThread(ArchThread);
@@ -83,7 +83,6 @@ public:
     virtual bool        wait(ArchThread, double timeout);
     virtual bool        isSameThread(ArchThread, ArchThread);
     virtual bool        isExitedThread(ArchThread);
-    virtual void*        getResultOfThread(ArchThread);
     virtual ThreadID    getIDOfThread(ArchThread);
     virtual void        setSignalHandler(ESignal, SignalFunc, void*);
     virtual void        raiseSignal(ESignal);
diff --git a/src/lib/arch/win32/ArchNetworkWinsock.cpp b/src/lib/arch/win32/ArchNetworkWinsock.cpp
index 4bc61d8..2d444fd 100644
--- a/src/lib/arch/win32/ArchNetworkWinsock.cpp
+++ b/src/lib/arch/win32/ArchNetworkWinsock.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchNetworkWinsock.h b/src/lib/arch/win32/ArchNetworkWinsock.h
index 0b01671..7f65795 100644
--- a/src/lib/arch/win32/ArchNetworkWinsock.h
+++ b/src/lib/arch/win32/ArchNetworkWinsock.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchSleepWindows.cpp b/src/lib/arch/win32/ArchSleepWindows.cpp
index 69648a7..0395031 100644
--- a/src/lib/arch/win32/ArchSleepWindows.cpp
+++ b/src/lib/arch/win32/ArchSleepWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -57,5 +57,5 @@ ArchSleepWindows::sleep(double timeout)
     else {
         Sleep((DWORD)(1000.0 * timeout));
     }
-    ARCH->testCancelThread();    
+    ARCH->testCancelThread();
 }
diff --git a/src/lib/arch/win32/ArchSleepWindows.h b/src/lib/arch/win32/ArchSleepWindows.h
index d673caf..da89cea 100644
--- a/src/lib/arch/win32/ArchSleepWindows.h
+++ b/src/lib/arch/win32/ArchSleepWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchStringWindows.cpp b/src/lib/arch/win32/ArchStringWindows.cpp
index deaf536..0033659 100644
--- a/src/lib/arch/win32/ArchStringWindows.cpp
+++ b/src/lib/arch/win32/ArchStringWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -26,11 +26,6 @@
 // ArchStringWindows
 //
 
-#include "arch/multibyte.h"
-#define HAVE_VSNPRINTF 1
-#define ARCH_VSNPRINTF _vsnprintf
-#include "arch/vsnprintf.h"
-
 ArchStringWindows::ArchStringWindows()
 {
 }
diff --git a/src/lib/arch/win32/ArchStringWindows.h b/src/lib/arch/win32/ArchStringWindows.h
index 23812dc..b2869b4 100644
--- a/src/lib/arch/win32/ArchStringWindows.h
+++ b/src/lib/arch/win32/ArchStringWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchSystemWindows.cpp b/src/lib/arch/win32/ArchSystemWindows.cpp
index cf3b066..badcf28 100644
--- a/src/lib/arch/win32/ArchSystemWindows.cpp
+++ b/src/lib/arch/win32/ArchSystemWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchSystemWindows.h b/src/lib/arch/win32/ArchSystemWindows.h
index 3d45ee6..835560d 100644
--- a/src/lib/arch/win32/ArchSystemWindows.h
+++ b/src/lib/arch/win32/ArchSystemWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchTaskBarWindows.cpp b/src/lib/arch/win32/ArchTaskBarWindows.cpp
index 731dc59..bf71b74 100644
--- a/src/lib/arch/win32/ArchTaskBarWindows.cpp
+++ b/src/lib/arch/win32/ArchTaskBarWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2003 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -88,7 +88,7 @@ ArchTaskBarWindows::init()
     // create a window on the current desktop with the current
     // thread then the current thread won't be able to switch
     // desktops if it needs to.
-    m_thread      = ARCH->newThread(&ArchTaskBarWindows::threadEntry, this);
+    m_thread = ARCH->newThread([this]() { threadMainLoop(); });
 
     // wait for child thread
     while (!m_ready) {
@@ -501,14 +501,7 @@ ArchTaskBarWindows::threadMainLoop()
     UnregisterClass(className, instanceWin32());
 }
 
-void*
-ArchTaskBarWindows::threadEntry(void* self)
-{
-    static_cast<ArchTaskBarWindows*>(self)->threadMainLoop();
-    return NULL;
-}
-
 HINSTANCE ArchTaskBarWindows::instanceWin32()
 {
     return ArchMiscWindows::instanceWin32();
-}
\ No newline at end of file
+}
diff --git a/src/lib/arch/win32/ArchTaskBarWindows.h b/src/lib/arch/win32/ArchTaskBarWindows.h
index 0edddf8..2b8b7ad 100644
--- a/src/lib/arch/win32/ArchTaskBarWindows.h
+++ b/src/lib/arch/win32/ArchTaskBarWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2003 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -36,7 +36,7 @@ public:
 
     virtual void init();
 
-    //! Add a dialog window 
+    //! Add a dialog window
     /*!
     Tell the task bar event loop about a dialog.  Win32 annoyingly
     requires messages destined for modeless dialog boxes to be
@@ -84,7 +84,6 @@ private:
     static LRESULT CALLBACK
                         staticWndProc(HWND, UINT, WPARAM, LPARAM);
     void                threadMainLoop();
-    static void*        threadEntry(void*);
 
     HINSTANCE            instanceWin32();
 
diff --git a/src/lib/arch/win32/ArchTimeWindows.cpp b/src/lib/arch/win32/ArchTimeWindows.cpp
index 568a483..eae0c15 100644
--- a/src/lib/arch/win32/ArchTimeWindows.cpp
+++ b/src/lib/arch/win32/ArchTimeWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/ArchTimeWindows.h b/src/lib/arch/win32/ArchTimeWindows.h
index 42351a1..c695e79 100644
--- a/src/lib/arch/win32/ArchTimeWindows.h
+++ b/src/lib/arch/win32/ArchTimeWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/lib/arch/win32/XArchWindows.cpp b/src/lib/arch/win32/XArchWindows.cpp
index e116eda..eb3c151 100644
--- a/src/lib/arch/win32/XArchWindows.cpp
+++ b/src/lib/arch/win32/XArchWindows.cpp
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -57,58 +57,58 @@ XArchEvalWinsock::eval() const noexcept
     // may not look up network error messages correctly.  we'll have
     // to do it ourself.
     static const struct { int m_code; const char* m_msg; } s_netErrorCodes[] = {
-        /* 10004 */{WSAEINTR,            "The (blocking) call was canceled via WSACancelBlockingCall"},
-        /* 10009 */{WSAEBADF,            "Bad file handle"},
-        /* 10013 */{WSAEACCES,            "The requested address is a broadcast address, but the appropriate flag was not set"},
-        /* 10014 */{WSAEFAULT,            "WSAEFAULT"},
-        /* 10022 */{WSAEINVAL,            "WSAEINVAL"},
-        /* 10024 */{WSAEMFILE,            "No more file descriptors available"},
-        /* 10035 */{WSAEWOULDBLOCK,        "Socket is marked as non-blocking and no connections are present or the receive operation would block"},
-        /* 10036 */{WSAEINPROGRESS,        "A blocking Windows Sockets operation is in progress"},
+        /* 10004 */{WSAEINTR,           "The (blocking) call was canceled via WSACancelBlockingCall"},
+        /* 10009 */{WSAEBADF,           "Bad file handle"},
+        /* 10013 */{WSAEACCES,          "The requested address is a broadcast address, but the appropriate flag was not set"},
+        /* 10014 */{WSAEFAULT,          "WSAEFAULT"},
+        /* 10022 */{WSAEINVAL,          "WSAEINVAL"},
+        /* 10024 */{WSAEMFILE,          "No more file descriptors available"},
+        /* 10035 */{WSAEWOULDBLOCK,     "Socket is marked as non-blocking and no connections are present or the receive operation would block"},
+        /* 10036 */{WSAEINPROGRESS,     "A blocking Windows Sockets operation is in progress"},
         /* 10037 */{WSAEALREADY,        "The asynchronous routine being canceled has already completed"},
         /* 10038 */{WSAENOTSOCK,        "At least on descriptor is not a socket"},
         /* 10039 */{WSAEDESTADDRREQ,    "A destination address is required"},
         /* 10040 */{WSAEMSGSIZE,        "The datagram was too large to fit into the specified buffer and was truncated"},
-        /* 10041 */{WSAEPROTOTYPE,        "The specified protocol is the wrong type for this socket"},
-        /* 10042 */{WSAENOPROTOOPT,        "The option is unknown or unsupported"},
-        /* 10043 */{WSAEPROTONOSUPPORT,"The specified protocol is not supported"},
-        /* 10044 */{WSAESOCKTNOSUPPORT,"The specified socket type is not supported by this address family"},
-        /* 10045 */{WSAEOPNOTSUPP,        "The referenced socket is not a type that supports that operation"},
+        /* 10041 */{WSAEPROTOTYPE,      "The specified protocol is the wrong type for this socket"},
+        /* 10042 */{WSAENOPROTOOPT,     "The option is unknown or unsupported"},
+        /* 10043 */{WSAEPROTONOSUPPORT, "The specified protocol is not supported"},
+        /* 10044 */{WSAESOCKTNOSUPPORT, "The specified socket type is not supported by this address family"},
+        /* 10045 */{WSAEOPNOTSUPP,      "The referenced socket is not a type that supports that operation"},
         /* 10046 */{WSAEPFNOSUPPORT,    "BSD: Protocol family not supported"},
         /* 10047 */{WSAEAFNOSUPPORT,    "The specified address family is not supported"},
-        /* 10048 */{WSAEADDRINUSE,        "The specified address is already in use"},
-        /* 10049 */{WSAEADDRNOTAVAIL,    "The specified address is not available from the local machine"},
+        /* 10048 */{WSAEADDRINUSE,      "The specified address is already in use"},
+        /* 10049 */{WSAEADDRNOTAVAIL,   "The specified address is not available from the local machine"},
         /* 10050 */{WSAENETDOWN,        "The Windows Sockets implementation has detected that the network subsystem has failed"},
-        /* 10051 */{WSAENETUNREACH,        "The network can't be reached from this host at this time"},
-        /* 10052 */{WSAENETRESET,        "The connection must be reset because the Windows Sockets implementation dropped it"},
+        /* 10051 */{WSAENETUNREACH,     "The network can't be reached from this host at this time"},
+        /* 10052 */{WSAENETRESET,       "The connection must be reset because the Windows Sockets implementation dropped it"},
         /* 10053 */{WSAECONNABORTED,    "The virtual circuit was aborted due to timeout or other failure"},
-        /* 10054 */{WSAECONNRESET,        "The virtual circuit was reset by the remote side"},
-        /* 10055 */{WSAENOBUFS,            "No buffer space is available or a buffer deadlock has occured. The socket cannot be created"},
-        /* 10056 */{WSAEISCONN,            "The socket is already connected"},
+        /* 10054 */{WSAECONNRESET,      "The virtual circuit was reset by the remote side"},
+        /* 10055 */{WSAENOBUFS,         "No buffer space is available or a buffer deadlock has occurred. The socket cannot be created"},
+        /* 10056 */{WSAEISCONN,         "The socket is already connected"},
         /* 10057 */{WSAENOTCONN,        "The socket is not connected"},
-        /* 10058 */{WSAESHUTDOWN,        "The socket has been shutdown"},
+        /* 10058 */{WSAESHUTDOWN,       "The socket has been shutdown"},
         /* 10059 */{WSAETOOMANYREFS,    "BSD: Too many references"},
-        /* 10060 */{WSAETIMEDOUT,        "Attempt to connect timed out without establishing a connection"},
+        /* 10060 */{WSAETIMEDOUT,       "Attempt to connect timed out without establishing a connection"},
         /* 10061 */{WSAECONNREFUSED,    "Connection was refused"},
-        /* 10062 */{WSAELOOP,            "Undocumented WinSock error code used in BSD"},
+        /* 10062 */{WSAELOOP,           "Undocumented WinSock error code used in BSD"},
         /* 10063 */{WSAENAMETOOLONG,    "Undocumented WinSock error code used in BSD"},
-        /* 10064 */{WSAEHOSTDOWN,        "Undocumented WinSock error code used in BSD"},
+        /* 10064 */{WSAEHOSTDOWN,       "Undocumented WinSock error code used in BSD"},
         /* 10065 */{WSAEHOSTUNREACH,    "No route to host"},
-        /* 10066 */{WSAENOTEMPTY,        "Undocumented WinSock error code"},
+        /* 10066 */{WSAENOTEMPTY,       "Undocumented WinSock error code"},
         /* 10067 */{WSAEPROCLIM,        "Undocumented WinSock error code"},
-        /* 10068 */{WSAEUSERS,            "Undocumented WinSock error code"},
-        /* 10069 */{WSAEDQUOT,            "Undocumented WinSock error code"},
-        /* 10070 */{WSAESTALE,            "Undocumented WinSock error code"},
-        /* 10071 */{WSAEREMOTE,            "Undocumented WinSock error code"},
-        /* 10091 */{WSASYSNOTREADY,        "Underlying network subsytem is not ready for network communication"},
-        /* 10092 */{WSAVERNOTSUPPORTED,    "The version of WinSock API support requested is not provided in this implementation"},
-        /* 10093 */{WSANOTINITIALISED,    "WinSock subsystem not properly initialized"},
-        /* 10101 */{WSAEDISCON,            "Virtual circuit has gracefully terminated connection"},
-        /* 11001 */{WSAHOST_NOT_FOUND,    "The specified host is unknown"},
-        /* 11002 */{WSATRY_AGAIN,        "A temporary error occurred on an authoritative name server"},
-        /* 11003 */{WSANO_RECOVERY,        "A non-recoverable name server error occurred"},
-        /* 11004 */{WSANO_DATA,            "The requested name is valid but does not have an IP address"},
-        /* end   */{0,                    NULL}
+        /* 10068 */{WSAEUSERS,          "Undocumented WinSock error code"},
+        /* 10069 */{WSAEDQUOT,          "Undocumented WinSock error code"},
+        /* 10070 */{WSAESTALE,          "Undocumented WinSock error code"},
+        /* 10071 */{WSAEREMOTE,         "Undocumented WinSock error code"},
+        /* 10091 */{WSASYSNOTREADY,     "Underlying network subsystem is not ready for network communication"},
+        /* 10092 */{WSAVERNOTSUPPORTED, "The version of WinSock API support requested is not provided in this implementation"},
+        /* 10093 */{WSANOTINITIALISED,  "WinSock subsystem not properly initialized"},
+        /* 10101 */{WSAEDISCON,         "Virtual circuit has gracefully terminated connection"},
+        /* 11001 */{WSAHOST_NOT_FOUND,  "The specified host is unknown"},
+        /* 11002 */{WSATRY_AGAIN,       "A temporary error occurred on an authoritative name server"},
+        /* 11003 */{WSANO_RECOVERY,     "A non-recoverable name server error occurred"},
+        /* 11004 */{WSANO_DATA,         "The requested name is valid but does not have an IP address"},
+        /* end   */{0,                  NULL}
     };
 
     for (unsigned int i = 0; s_netErrorCodes[i].m_code != 0; ++i) {
diff --git a/src/lib/arch/win32/XArchWindows.h b/src/lib/arch/win32/XArchWindows.h
index 4fb2a23..5ac71f2 100644
--- a/src/lib/arch/win32/XArchWindows.h
+++ b/src/lib/arch/win32/XArchWindows.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- 
cgit v1.2.3