Update upstream source from tag 'upstream/2.4.0+dfsg'

Update to upstream version '2.4.0+dfsg'
with Debian dir 4b6668cc08c7b0e56b1e1f7b4e89ecdb316182a0

11 files changed, 70 insertions, 44 deletions

diff --git a/src/cmd/barriers/CMakeLists.txt b/src/cmd/barriers/CMakeLists.txt
index 912421f..c9fa750 100644
--- a/src/cmd/barriers/CMakeLists.txt
+++ b/src/cmd/barriers/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
@@ -21,16 +21,7 @@ set(sources
 if (WIN32)
     file(GLOB arch_headers "MSWindows*.h")
     file(GLOB arch_sources "MSWindows*.cpp")
-    list(APPEND sources
-        resource.h
-        barriers.ico
-        barriers.rc
-        tb_error.ico
-        tb_idle.ico
-        tb_run.ico
-        tb_wait.ico
-        barriers.exe.manifest
-    )
+    list(APPEND sources barriers.rc)
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")
     file(GLOB arch_sources "OSX*.cpp")
@@ -55,5 +46,3 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     install (TARGETS barriers DESTINATION bin)
 endif()
-
-
diff --git a/src/cmd/barriers/MSWindowsServerTaskBarReceiver.cpp b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.cpp
index a221dac..c86048a 100644
--- a/src/cmd/barriers/MSWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.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/cmd/barriers/MSWindowsServerTaskBarReceiver.h b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.h
index a308ab4..c79a2b2 100644
--- a/src/cmd/barriers/MSWindowsServerTaskBarReceiver.h
+++ b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.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/cmd/barriers/OSXServerTaskBarReceiver.cpp b/src/cmd/barriers/OSXServerTaskBarReceiver.cpp
index bbe8fd1..5fb525a 100644
--- a/src/cmd/barriers/OSXServerTaskBarReceiver.cpp
+++ b/src/cmd/barriers/OSXServerTaskBarReceiver.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/cmd/barriers/OSXServerTaskBarReceiver.h b/src/cmd/barriers/OSXServerTaskBarReceiver.h
index ab6928f..1ad4501 100644
--- a/src/cmd/barriers/OSXServerTaskBarReceiver.h
+++ b/src/cmd/barriers/OSXServerTaskBarReceiver.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/cmd/barriers/XWindowsServerTaskBarReceiver.cpp b/src/cmd/barriers/XWindowsServerTaskBarReceiver.cpp
index 7f525c5..6dfcdaa 100644
--- a/src/cmd/barriers/XWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/barriers/XWindowsServerTaskBarReceiver.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/cmd/barriers/XWindowsServerTaskBarReceiver.h b/src/cmd/barriers/XWindowsServerTaskBarReceiver.h
index 549a62f..ce56a3b 100644
--- a/src/cmd/barriers/XWindowsServerTaskBarReceiver.h
+++ b/src/cmd/barriers/XWindowsServerTaskBarReceiver.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/cmd/barriers/barriers.cpp b/src/cmd/barriers/barriers.cpp
index 21c4d80..169c5d3 100644
--- a/src/cmd/barriers/barriers.cpp
+++ b/src/cmd/barriers/barriers.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
@@ -32,7 +32,7 @@
 #endif
 
 int
-main(int argc, char** argv) 
+main(int argc, char** argv)
 {
 #if SYSAPI_WIN32
     // record window instance for tray icon, etc
@@ -45,7 +45,7 @@ main(int argc, char** argv)
     */
     setenv("OS_ACTIVITY_DT_MODE", "NO", true);
 #endif
-    
+
     Arch arch;
     arch.init();
 
diff --git a/src/cmd/barriers/barriers.exe.manifest b/src/cmd/barriers/barriers.exe.manifest
deleted file mode 100644
index 7309fde..0000000
--- a/src/cmd/barriers/barriers.exe.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application></assembly>
\ No newline at end of file
diff --git a/src/cmd/barriers/barriers.rc b/src/cmd/barriers/barriers.rc
index c4d263c..f9d8af1 100644
--- a/src/cmd/barriers/barriers.rc
+++ b/src/cmd/barriers/barriers.rc
@@ -16,10 +16,8 @@
 // English (U.S.) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 #pragma code_page(1252)

-#endif //_WIN32

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

@@ -27,18 +25,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE 

+1 TEXTINCLUDE

 BEGIN

     "resource.h\0"

 END

 

-2 TEXTINCLUDE 

+2 TEXTINCLUDE

 BEGIN

     "#include <winresrc.h>\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE 

+3 TEXTINCLUDE

 BEGIN

     "\r\n"

     "\0"

@@ -49,23 +47,64 @@ END
 

 /////////////////////////////////////////////////////////////////////////////

 //

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION BARRIER_VERSION_MAJOR, BARRIER_VERSION_MINOR, BARRIER_VERSION_PATCH, BARRIER_BUILD_NUMBER

+ PRODUCTVERSION BARRIER_VERSION_MAJOR, BARRIER_VERSION_MINOR, BARRIER_VERSION_PATCH, BARRIER_BUILD_NUMBER

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS VOS_NT_WINDOWS32

+ FILETYPE VFT_APP

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", "Debauchee Open Source Group"

+            VALUE "CompanyWeb", "https://github.com/debauchee/barrier/"

+            VALUE "FileVersion", BARRIER_VERSION

+            VALUE "LegalCopyright", "Copyright (C) 2018 Debauchee Open Source Group\nCopyright (C) 2012-2016 Symless Ltd.\nCopyright (C) 2008-2014 Nick Bolton\nCopyright (C) 2002-2014 Chris Schoeneman"

+            VALUE "ProductName", "Barrier"

+            VALUE "ProductVersion", BARRIER_VERSION

+            VALUE "OriginalFilename", "barriers.exe"

+            VALUE "FileDescription", "Open source KVM software server"

+            VALUE "InternalName", "barriers"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

 // Icon

 //

 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_BARRIER             ICON                    "barriers.ico"

-IDI_TASKBAR_NOT_RUNNING ICON                    "tb_idle.ico"

-IDI_TASKBAR_NOT_WORKING ICON                    "tb_error.ico"

+IDI_BARRIER               ICON                    "barriers.ico"

+IDI_TASKBAR_NOT_RUNNING   ICON                    "tb_idle.ico"

+IDI_TASKBAR_NOT_WORKING   ICON                    "tb_error.ico"

 IDI_TASKBAR_NOT_CONNECTED ICON                    "tb_wait.ico"

-IDI_TASKBAR_CONNECTED   ICON                    "tb_run.ico"

+IDI_TASKBAR_CONNECTED     ICON                    "tb_run.ico"

+

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Menu

 //

 

-IDR_TASKBAR MENU 

+IDR_TASKBAR MENU

 BEGIN

     POPUP "Barrier"

     BEGIN

@@ -110,7 +149,7 @@ END
 // String Table

 //

 

-STRINGTABLE 

+STRINGTABLE

 BEGIN

     IDS_FAILED              "Barrier is about to quit with errors or warnings.  Please check the log then click OK."

     IDS_INIT_FAILED         "Barrier failed to initialize: %{1}"

diff --git a/src/cmd/barriers/resource.h b/src/cmd/barriers/resource.h
index 9594db1..3ee57e7 100644
--- a/src/cmd/barriers/resource.h
+++ b/src/cmd/barriers/resource.h
@@ -31,7 +31,7 @@
 #define ID_BARRIER_RESETSERVER          40017
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        109