[X2Go-Commits] nx-libs.git - build-main (branch) updated: nxcomp/3.4.0-6
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:22:17 CEST 2013
The branch, build-main has been updated
via 477961678194817aaf1aaf3602f1c91d288a539d (commit)
from 799bf672a3588f205bd18ef39d9908069e0cd6d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
nxcomp/ActionCache.cpp | 2 +-
nxcomp/ActionCache.h | 2 +-
nxcomp/ActionCacheCompat.h | 2 +-
nxcomp/Agent.cpp | 2 +-
nxcomp/Agent.h | 2 +-
nxcomp/Alpha.cpp | 3 +-
nxcomp/Alpha.h | 2 +-
nxcomp/Auth.cpp | 24 +++++++---
nxcomp/Auth.h | 2 +-
nxcomp/Bitmap.cpp | 2 +-
nxcomp/Bitmap.h | 2 +-
nxcomp/BlockCache.cpp | 2 +-
nxcomp/BlockCache.h | 2 +-
nxcomp/BlockCacheSet.cpp | 2 +-
nxcomp/BlockCacheSet.h | 2 +-
nxcomp/CHANGELOG | 23 ++++++++++
nxcomp/ChangeGC.cpp | 2 +-
nxcomp/ChangeGC.h | 2 +-
nxcomp/ChangeGCCompat.cpp | 2 +-
nxcomp/ChangeGCCompat.h | 2 +-
nxcomp/ChangeProperty.cpp | 2 +-
nxcomp/ChangeProperty.h | 2 +-
nxcomp/Channel.cpp | 6 +--
nxcomp/Channel.h | 6 +--
nxcomp/ChannelCache.cpp | 2 +-
nxcomp/ChannelCache.h | 2 +-
nxcomp/ChannelStore.h | 2 +-
nxcomp/CharCache.cpp | 2 +-
nxcomp/CharCache.h | 2 +-
nxcomp/Children.cpp | 21 +++++----
nxcomp/ClearArea.cpp | 2 +-
nxcomp/ClearArea.h | 2 +-
nxcomp/ClientCache.cpp | 2 +-
nxcomp/ClientCache.h | 2 +-
nxcomp/ClientChannel.cpp | 8 ++--
nxcomp/ClientChannel.h | 2 +-
nxcomp/ClientProxy.cpp | 2 +-
nxcomp/ClientProxy.h | 2 +-
nxcomp/ClientReadBuffer.cpp | 2 +-
nxcomp/ClientReadBuffer.h | 2 +-
nxcomp/ClientStore.cpp | 2 +-
nxcomp/ClientStore.h | 2 +-
nxcomp/Colormap.cpp | 3 +-
nxcomp/Colormap.h | 2 +-
nxcomp/ConfigureWindow.cpp | 2 +-
nxcomp/ConfigureWindow.h | 2 +-
nxcomp/Control.cpp | 2 +-
nxcomp/Control.h | 2 +-
nxcomp/CopyArea.cpp | 2 +-
nxcomp/CopyArea.h | 2 +-
nxcomp/CreateGC.cpp | 2 +-
nxcomp/CreateGC.h | 2 +-
nxcomp/CreatePixmap.cpp | 2 +-
nxcomp/CreatePixmap.h | 2 +-
nxcomp/CreatePixmapCompat.cpp | 2 +-
nxcomp/CreatePixmapCompat.h | 2 +-
nxcomp/DecodeBuffer.cpp | 2 +-
nxcomp/DecodeBuffer.h | 2 +-
nxcomp/EncodeBuffer.cpp | 2 +-
nxcomp/EncodeBuffer.h | 2 +-
nxcomp/FillPoly.cpp | 2 +-
nxcomp/FillPoly.h | 2 +-
nxcomp/Fork.cpp | 3 +-
nxcomp/Fork.h | 4 +-
nxcomp/FreeCache.h | 2 +-
nxcomp/GenericChannel.cpp | 2 +-
nxcomp/GenericChannel.h | 2 +-
nxcomp/GenericReadBuffer.cpp | 2 +-
nxcomp/GenericReadBuffer.h | 2 +-
nxcomp/GenericReply.cpp | 2 +-
nxcomp/GenericReply.h | 2 +-
nxcomp/GenericRequest.cpp | 2 +-
nxcomp/GenericRequest.h | 2 +-
nxcomp/GetImage.cpp | 2 +-
nxcomp/GetImage.h | 2 +-
nxcomp/GetImageReply.cpp | 2 +-
nxcomp/GetImageReply.h | 2 +-
nxcomp/GetProperty.cpp | 2 +-
nxcomp/GetProperty.h | 2 +-
nxcomp/GetPropertyReply.cpp | 2 +-
nxcomp/GetPropertyReply.h | 2 +-
nxcomp/ImageText16.cpp | 2 +-
nxcomp/ImageText16.h | 2 +-
nxcomp/ImageText8.cpp | 2 +-
nxcomp/ImageText8.h | 2 +-
nxcomp/IntCache.cpp | 2 +-
nxcomp/IntCache.h | 2 +-
nxcomp/InternAtom.cpp | 2 +-
nxcomp/InternAtom.h | 2 +-
nxcomp/Jpeg.cpp | 8 ++--
nxcomp/Jpeg.h | 2 +-
nxcomp/Keeper.cpp | 2 +-
nxcomp/Keeper.h | 2 +-
nxcomp/LICENSE | 2 +-
nxcomp/List.cpp | 2 +-
nxcomp/List.h | 2 +-
nxcomp/ListFontsReply.cpp | 2 +-
nxcomp/ListFontsReply.h | 2 +-
nxcomp/Loop.cpp | 32 +++++++-------
nxcomp/Makefile.in | 2 +-
nxcomp/Message.cpp | 2 +-
nxcomp/Message.h | 2 +-
nxcomp/Misc.cpp | 4 +-
nxcomp/Misc.h | 8 +++-
nxcomp/NX.h | 2 +-
nxcomp/NXalert.h | 2 +-
nxcomp/NXmitshm.h | 2 +-
nxcomp/NXpack.h | 2 +-
nxcomp/NXproto.h | 2 +-
nxcomp/NXrender.h | 2 +-
nxcomp/NXvars.h | 2 +-
nxcomp/OpcodeCache.h | 2 +-
nxcomp/OpcodeStore.cpp | 2 +-
nxcomp/OpcodeStore.h | 2 +-
nxcomp/Pack.c | 2 +-
nxcomp/Pgn.cpp | 23 ++++++++--
nxcomp/Pgn.h | 2 +-
nxcomp/Pipe.cpp | 5 ++-
nxcomp/Pipe.h | 8 ++--
nxcomp/PolyArc.cpp | 2 +-
nxcomp/PolyArc.h | 2 +-
nxcomp/PolyFillArc.cpp | 2 +-
nxcomp/PolyFillArc.h | 2 +-
nxcomp/PolyFillRectangle.cpp | 2 +-
nxcomp/PolyFillRectangle.h | 2 +-
nxcomp/PolyLine.cpp | 2 +-
nxcomp/PolyLine.h | 2 +-
nxcomp/PolyPoint.cpp | 2 +-
nxcomp/PolyPoint.h | 2 +-
nxcomp/PolySegment.cpp | 2 +-
nxcomp/PolySegment.h | 2 +-
nxcomp/PolyText16.cpp | 2 +-
nxcomp/PolyText16.h | 2 +-
nxcomp/PolyText8.cpp | 2 +-
nxcomp/PolyText8.h | 2 +-
nxcomp/PositionCacheCompat.cpp | 2 +-
nxcomp/PositionCacheCompat.h | 2 +-
nxcomp/Proxy.cpp | 4 +-
nxcomp/Proxy.h | 2 +-
nxcomp/ProxyReadBuffer.cpp | 2 +-
nxcomp/ProxyReadBuffer.h | 2 +-
nxcomp/PutImage.cpp | 2 +-
nxcomp/PutImage.h | 2 +-
nxcomp/PutPackedImage.cpp | 2 +-
nxcomp/PutPackedImage.h | 2 +-
nxcomp/QueryFontReply.cpp | 2 +-
nxcomp/QueryFontReply.h | 2 +-
nxcomp/ReadBuffer.cpp | 2 +-
nxcomp/ReadBuffer.h | 2 +-
nxcomp/RenderAddGlyphs.cpp | 2 +-
nxcomp/RenderAddGlyphs.h | 2 +-
nxcomp/RenderChangePicture.cpp | 2 +-
nxcomp/RenderChangePicture.h | 2 +-
nxcomp/RenderComposite.cpp | 2 +-
nxcomp/RenderComposite.h | 2 +-
nxcomp/RenderCompositeCompat.cpp | 2 +-
nxcomp/RenderCompositeCompat.h | 2 +-
nxcomp/RenderCompositeGlyphs.cpp | 2 +-
nxcomp/RenderCompositeGlyphs.h | 2 +-
nxcomp/RenderCompositeGlyphsCompat.cpp | 2 +-
nxcomp/RenderCompositeGlyphsCompat.h | 2 +-
nxcomp/RenderCreateGlyphSet.cpp | 2 +-
nxcomp/RenderCreateGlyphSet.h | 2 +-
nxcomp/RenderCreateGlyphSetCompat.cpp | 2 +-
nxcomp/RenderCreateGlyphSetCompat.h | 2 +-
nxcomp/RenderCreatePicture.cpp | 2 +-
nxcomp/RenderCreatePicture.h | 2 +-
nxcomp/RenderCreatePictureCompat.cpp | 2 +-
nxcomp/RenderCreatePictureCompat.h | 2 +-
nxcomp/RenderExtension.cpp | 2 +-
nxcomp/RenderExtension.h | 2 +-
nxcomp/RenderFillRectangles.cpp | 2 +-
nxcomp/RenderFillRectangles.h | 2 +-
nxcomp/RenderFreeGlyphSet.cpp | 2 +-
nxcomp/RenderFreeGlyphSet.h | 2 +-
nxcomp/RenderFreePicture.cpp | 2 +-
nxcomp/RenderFreePicture.h | 2 +-
nxcomp/RenderFreePictureCompat.cpp | 2 +-
nxcomp/RenderFreePictureCompat.h | 2 +-
nxcomp/RenderGenericRequest.cpp | 2 +-
nxcomp/RenderGenericRequest.h | 2 +-
nxcomp/RenderMinorExtensionHeaders.h | 2 +-
nxcomp/RenderMinorExtensionMethods.h | 2 +-
nxcomp/RenderMinorExtensionTags.h | 2 +-
nxcomp/RenderPictureClip.cpp | 2 +-
nxcomp/RenderPictureClip.h | 2 +-
nxcomp/RenderPictureClipCompat.cpp | 2 +-
nxcomp/RenderPictureClipCompat.h | 2 +-
nxcomp/RenderPictureFilter.cpp | 2 +-
nxcomp/RenderPictureFilter.h | 2 +-
nxcomp/RenderPictureTransform.cpp | 2 +-
nxcomp/RenderPictureTransform.h | 2 +-
nxcomp/RenderTrapezoids.cpp | 2 +-
nxcomp/RenderTrapezoids.h | 2 +-
nxcomp/RenderTriangles.cpp | 2 +-
nxcomp/RenderTriangles.h | 2 +-
nxcomp/Rgb.cpp | 2 +-
nxcomp/Rgb.h | 2 +-
nxcomp/Rle.cpp | 2 +-
nxcomp/Rle.h | 2 +-
nxcomp/SendEvent.cpp | 2 +-
nxcomp/SendEvent.h | 2 +-
nxcomp/SequenceQueue.cpp | 2 +-
nxcomp/SequenceQueue.h | 2 +-
nxcomp/ServerCache.cpp | 2 +-
nxcomp/ServerCache.h | 2 +-
nxcomp/ServerChannel.cpp | 4 +-
nxcomp/ServerChannel.h | 2 +-
nxcomp/ServerProxy.cpp | 2 +-
nxcomp/ServerProxy.h | 2 +-
nxcomp/ServerReadBuffer.cpp | 2 +-
nxcomp/ServerReadBuffer.h | 2 +-
nxcomp/ServerStore.cpp | 2 +-
nxcomp/ServerStore.h | 2 +-
nxcomp/SetClipRectangles.cpp | 2 +-
nxcomp/SetClipRectangles.h | 2 +-
nxcomp/SetUnpackAlpha.cpp | 2 +-
nxcomp/SetUnpackAlpha.h | 2 +-
nxcomp/SetUnpackAlphaCompat.cpp | 2 +-
nxcomp/SetUnpackAlphaCompat.h | 2 +-
nxcomp/SetUnpackColormap.cpp | 2 +-
nxcomp/SetUnpackColormap.h | 2 +-
nxcomp/SetUnpackColormapCompat.cpp | 2 +-
nxcomp/SetUnpackColormapCompat.h | 2 +-
nxcomp/SetUnpackGeometry.cpp | 2 +-
nxcomp/SetUnpackGeometry.h | 2 +-
nxcomp/ShapeExtension.cpp | 2 +-
nxcomp/ShapeExtension.h | 2 +-
nxcomp/Socket.cpp | 2 +-
nxcomp/Socket.h | 2 +-
nxcomp/Split.cpp | 2 +-
nxcomp/Split.h | 2 +-
nxcomp/StaticCompressor.cpp | 2 +-
nxcomp/StaticCompressor.h | 2 +-
nxcomp/Statistics.cpp | 2 +-
nxcomp/Statistics.h | 2 +-
nxcomp/TextCompressor.cpp | 2 +-
nxcomp/TextCompressor.h | 2 +-
nxcomp/Timestamp.cpp | 2 +-
nxcomp/Timestamp.h | 2 +-
nxcomp/TranslateCoords.cpp | 2 +-
nxcomp/TranslateCoords.h | 2 +-
nxcomp/Transport.cpp | 2 +-
nxcomp/Transport.h | 2 +-
nxcomp/Types.h | 2 +-
nxcomp/Unpack.cpp | 76 ++++++++++++++++++++++++++++++--
nxcomp/Unpack.h | 2 +-
nxcomp/Utils.cpp | 2 +-
nxcomp/Vars.c | 2 +-
nxcomp/WriteBuffer.cpp | 2 +-
nxcomp/WriteBuffer.h | 2 +-
nxcomp/XidCache.cpp | 2 +-
nxcomp/XidCache.h | 2 +-
nxcomp/Z.cpp | 2 +-
nxcomp/Z.h | 2 +-
nxcomp/configure | 6 +--
nxcomp/configure.in | 4 +-
257 files changed, 448 insertions(+), 305 deletions(-)
The diff of changes is:
diff --git a/nxcomp/ActionCache.cpp b/nxcomp/ActionCache.cpp
index e3bf295..79b6700 100644
--- a/nxcomp/ActionCache.cpp
+++ b/nxcomp/ActionCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ActionCache.h b/nxcomp/ActionCache.h
index 6ff374f..23265fc 100644
--- a/nxcomp/ActionCache.h
+++ b/nxcomp/ActionCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ActionCacheCompat.h b/nxcomp/ActionCacheCompat.h
index 2e563b0..8281db8 100644
--- a/nxcomp/ActionCacheCompat.h
+++ b/nxcomp/ActionCacheCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Agent.cpp b/nxcomp/Agent.cpp
index eca5db4..c0b729d 100644
--- a/nxcomp/Agent.cpp
+++ b/nxcomp/Agent.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h
index 8012e2d..fac5acd 100644
--- a/nxcomp/Agent.h
+++ b/nxcomp/Agent.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Alpha.cpp b/nxcomp/Alpha.cpp
index 85852bf..9311014 100644
--- a/nxcomp/Alpha.cpp
+++ b/nxcomp/Alpha.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -17,6 +17,7 @@
#include "Misc.h"
#include "Unpack.h"
+#include "Alpha.h"
#define PANIC
#define WARNING
diff --git a/nxcomp/Alpha.h b/nxcomp/Alpha.h
index 73912a5..80620e1 100644
--- a/nxcomp/Alpha.h
+++ b/nxcomp/Alpha.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
index f0f1a00..d8e9991 100644
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -268,7 +268,7 @@ int Auth::getCookie()
snprintf(line, DEFAULT_STRING_LIMIT, "%.200s", display_);
}
- char *parameters[256];
+ const char *parameters[256];
parameters[0] = command;
parameters[1] = command;
@@ -295,7 +295,7 @@ int Auth::getCookie()
// implementation.
//
- FILE *data = Popen(parameters, "r");
+ FILE *data = Popen((char *const *) parameters, "r");
int result = -1;
@@ -342,7 +342,21 @@ int Auth::getCookie()
<< "'.\n" << logofs_flush;
#endif
- if (sscanf(line, "%*s %*s %511s", realCookie_) != 1)
+ //
+ // Skip the hostname in the authority entry
+ // just in case it includes some white spaces.
+ //
+
+ char *cookie = NULL;
+
+ cookie = index(line, ':');
+
+ if (cookie == NULL)
+ {
+ cookie = line;
+ }
+
+ if (sscanf(cookie, "%*s %*s %511s", realCookie_) != 1)
{
#ifdef PANIC
*logofs << "Auth: PANIC! Failed to identify the cookie "
@@ -499,7 +513,7 @@ int Auth::checkCookie(unsigned char *buffer)
return -1;
}
- char *protoName = "MIT-MAGIC-COOKIE-1";
+ const char *protoName = "MIT-MAGIC-COOKIE-1";
int protoSize = strlen(protoName);
int matchedProtoSize;
diff --git a/nxcomp/Auth.h b/nxcomp/Auth.h
index 5dae8a6..aac1d1e 100644
--- a/nxcomp/Auth.h
+++ b/nxcomp/Auth.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Bitmap.cpp b/nxcomp/Bitmap.cpp
index 3349ca5..b5bad22 100644
--- a/nxcomp/Bitmap.cpp
+++ b/nxcomp/Bitmap.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Bitmap.h b/nxcomp/Bitmap.h
index 5b74e37..57a1b35 100644
--- a/nxcomp/Bitmap.h
+++ b/nxcomp/Bitmap.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/BlockCache.cpp b/nxcomp/BlockCache.cpp
index eaaba27..f885290 100644
--- a/nxcomp/BlockCache.cpp
+++ b/nxcomp/BlockCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/BlockCache.h b/nxcomp/BlockCache.h
index fe66dca..b9146ce 100644
--- a/nxcomp/BlockCache.h
+++ b/nxcomp/BlockCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/BlockCacheSet.cpp b/nxcomp/BlockCacheSet.cpp
index 03f1fa6..8959ba2 100644
--- a/nxcomp/BlockCacheSet.cpp
+++ b/nxcomp/BlockCacheSet.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/BlockCacheSet.h b/nxcomp/BlockCacheSet.h
index a5dde33..e27b180 100644
--- a/nxcomp/BlockCacheSet.h
+++ b/nxcomp/BlockCacheSet.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index 0c5a667..bedb2cc 100644
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -1,5 +1,28 @@
ChangeLog:
+nxcomp-3.4.0-6
+
+- Solved compilation problems on Solaris.
+
+nxcomp-3.4.0-5
+
+- Solved compilation problems on GCC 4.4.
+
+nxcomp-3.4.0-4
+
+- Added reference to fixed TR02H02325.
+
+nxcomp-3.4.0-3
+
+- Updated copyright to year 2010.
+
+nxcomp-3.4.0-2
+
+- Fixed TR03G02204. Changed the parsing of X authority entries in
+ order to handle the case where the hostname includes white spaces.
+
+- Fixed TR02H02325. Bug in PNG decompression on 16bpp displays.
+
nxcomp-3.4.0-1
- Opened the 3.4.0 branch based on nxcomp-3.3.0-4.
diff --git a/nxcomp/ChangeGC.cpp b/nxcomp/ChangeGC.cpp
index 56f0044..5746517 100644
--- a/nxcomp/ChangeGC.cpp
+++ b/nxcomp/ChangeGC.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ChangeGC.h b/nxcomp/ChangeGC.h
index d990e39..81b808d 100644
--- a/nxcomp/ChangeGC.h
+++ b/nxcomp/ChangeGC.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ChangeGCCompat.cpp b/nxcomp/ChangeGCCompat.cpp
index 479a262..ca29737 100644
--- a/nxcomp/ChangeGCCompat.cpp
+++ b/nxcomp/ChangeGCCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ChangeGCCompat.h b/nxcomp/ChangeGCCompat.h
index db244b0..3a7b0c0 100644
--- a/nxcomp/ChangeGCCompat.h
+++ b/nxcomp/ChangeGCCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ChangeProperty.cpp b/nxcomp/ChangeProperty.cpp
index 4ae70aa..0270d72 100644
--- a/nxcomp/ChangeProperty.cpp
+++ b/nxcomp/ChangeProperty.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ChangeProperty.h b/nxcomp/ChangeProperty.h
index 0634251..f941fce 100644
--- a/nxcomp/ChangeProperty.h
+++ b/nxcomp/ChangeProperty.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Channel.cpp b/nxcomp/Channel.cpp
index 4750630..71b556b 100644
--- a/nxcomp/Channel.cpp
+++ b/nxcomp/Channel.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -2037,10 +2037,10 @@ Split *Channel::handleSplitCommitRemove(int request, int resource, int position)
<< ".\n" << logofs_flush;
#endif
- if (control -> isProtoStep7() == 1 &&
+ if ((control -> isProtoStep7() == 1 &&
(resource != split -> getResource() ||
request != split -> getRequest() ||
- position != split -> getPosition()) ||
+ position != split -> getPosition())) ||
(request != split -> getRequest() ||
position != split -> getPosition()))
{
diff --git a/nxcomp/Channel.h b/nxcomp/Channel.h
index 44f6c91..68fe1d7 100644
--- a/nxcomp/Channel.h
+++ b/nxcomp/Channel.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -498,9 +498,9 @@ class Channel
int canCleanStore(MessageStore *store)
{
- return (store -> getSize() > 0 && (store -> getRemoteStorageSize() >
+ return ((store -> getSize() > 0 && (store -> getRemoteStorageSize() >
(control -> RemoteTotalStorageSize / 100 * store ->
- cacheLowerThreshold)) || (store -> getLocalStorageSize() >
+ cacheLowerThreshold))) || (store -> getLocalStorageSize() >
(control -> LocalTotalStorageSize / 100 * store ->
cacheLowerThreshold)));
}
diff --git a/nxcomp/ChannelCache.cpp b/nxcomp/ChannelCache.cpp
index cdf99fd..eaf8e42 100644
--- a/nxcomp/ChannelCache.cpp
+++ b/nxcomp/ChannelCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ChannelCache.h b/nxcomp/ChannelCache.h
index 95fd717..7b94893 100644
--- a/nxcomp/ChannelCache.h
+++ b/nxcomp/ChannelCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ChannelStore.h b/nxcomp/ChannelStore.h
index 9545330..3103fb3 100644
--- a/nxcomp/ChannelStore.h
+++ b/nxcomp/ChannelStore.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CharCache.cpp b/nxcomp/CharCache.cpp
index 80abb77..2803a1b 100644
--- a/nxcomp/CharCache.cpp
+++ b/nxcomp/CharCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CharCache.h b/nxcomp/CharCache.h
index 177237d..53710f1 100644
--- a/nxcomp/CharCache.h
+++ b/nxcomp/CharCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Children.cpp b/nxcomp/Children.cpp
index 7e824fb..a19b882 100644
--- a/nxcomp/Children.cpp
+++ b/nxcomp/Children.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -69,7 +69,8 @@ extern void InstallSignals();
extern char *GetClientPath();
-extern int CheckParent(char *name, char *type, int parent);
+extern int CheckParent(const char *name, const char *type,
+ int parent);
#ifdef __sun
extern char **environ;
@@ -81,19 +82,23 @@ extern char **environ;
// have been disabled in the main process.
//
-static void SystemCleanup(char *name);
+static void SystemCleanup(const char *name);
//
// Release all objects allocated in the
// heap.
-static void MemoryCleanup(char *name);
+static void MemoryCleanup(const char *name);
//
// Remove 'name' from the environment.
//
-static int UnsetEnv(char *name);
+static int UnsetEnv(const char *name);
+
+static int NXTransKeeperHandler(int signal);
+static void NXTransKeeperCheck();
+
//
// Start a nxclient process in dialog mode.
@@ -926,7 +931,7 @@ int NXTransKeeper(int caches, int images, const char *root)
exit(0);
}
-void SystemCleanup(char *name)
+void SystemCleanup(const char *name)
{
#ifdef TEST
*logofs << name << ": Performing system cleanup in process "
@@ -942,7 +947,7 @@ void SystemCleanup(char *name)
InstallSignals();
}
-void MemoryCleanup(char *name)
+void MemoryCleanup(const char *name)
{
#ifdef TEST
*logofs << name << ": Performing memory cleanup in process "
@@ -977,7 +982,7 @@ void MemoryCleanup(char *name)
EnableSignals();
}
-int UnsetEnv(char *name)
+int UnsetEnv(const char *name)
{
int result;
diff --git a/nxcomp/ClearArea.cpp b/nxcomp/ClearArea.cpp
index 55266e4..223a3b3 100644
--- a/nxcomp/ClearArea.cpp
+++ b/nxcomp/ClearArea.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClearArea.h b/nxcomp/ClearArea.h
index 3a936c9..039eea4 100644
--- a/nxcomp/ClearArea.h
+++ b/nxcomp/ClearArea.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientCache.cpp b/nxcomp/ClientCache.cpp
index 69b1868..2a82009 100644
--- a/nxcomp/ClientCache.cpp
+++ b/nxcomp/ClientCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientCache.h b/nxcomp/ClientCache.h
index 7c09c0a..6702e5b 100644
--- a/nxcomp/ClientCache.h
+++ b/nxcomp/ClientCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
index 2f967d7..31d6d12 100644
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/ClientChannel.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -5646,9 +5646,9 @@ int ClientChannel::handleSplitChecksum(EncodeBuffer &encodeBuffer, T_checksum ch
// persistent image cache is enabled.
//
- if (control -> ImageCacheEnableLoad == 1 ||
- control -> ImageCacheEnableSave == 1 &&
- enableLoad_ == 1 || enableSave_ == 1)
+ if ((control -> ImageCacheEnableLoad == 1 ||
+ control -> ImageCacheEnableSave == 1) &&
+ (enableLoad_ == 1 || enableSave_ == 1))
{
encodeBuffer.encodeBoolValue(1);
diff --git a/nxcomp/ClientChannel.h b/nxcomp/ClientChannel.h
index 6c907bf..9924bb2 100644
--- a/nxcomp/ClientChannel.h
+++ b/nxcomp/ClientChannel.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/ClientProxy.cpp
index a02dcad..ef63bb0 100644
--- a/nxcomp/ClientProxy.cpp
+++ b/nxcomp/ClientProxy.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientProxy.h b/nxcomp/ClientProxy.h
index 9cf473f..2b669ba 100644
--- a/nxcomp/ClientProxy.h
+++ b/nxcomp/ClientProxy.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientReadBuffer.cpp b/nxcomp/ClientReadBuffer.cpp
index 952534c..b32033b 100644
--- a/nxcomp/ClientReadBuffer.cpp
+++ b/nxcomp/ClientReadBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientReadBuffer.h b/nxcomp/ClientReadBuffer.h
index b4afa89..6dee630 100644
--- a/nxcomp/ClientReadBuffer.h
+++ b/nxcomp/ClientReadBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientStore.cpp b/nxcomp/ClientStore.cpp
index c5c7af6..be0e892 100644
--- a/nxcomp/ClientStore.cpp
+++ b/nxcomp/ClientStore.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ClientStore.h b/nxcomp/ClientStore.h
index e86078a..54a68a3 100644
--- a/nxcomp/ClientStore.h
+++ b/nxcomp/ClientStore.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Colormap.cpp b/nxcomp/Colormap.cpp
index 1e755be..5702bec 100644
--- a/nxcomp/Colormap.cpp
+++ b/nxcomp/Colormap.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -17,6 +17,7 @@
#include "Misc.h"
#include "Unpack.h"
+#include "Colormap.h"
#define PANIC
#define WARNING
diff --git a/nxcomp/Colormap.h b/nxcomp/Colormap.h
index 84a83a7..e0056f8 100644
--- a/nxcomp/Colormap.h
+++ b/nxcomp/Colormap.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ConfigureWindow.cpp b/nxcomp/ConfigureWindow.cpp
index 5956f48..995ab18 100644
--- a/nxcomp/ConfigureWindow.cpp
+++ b/nxcomp/ConfigureWindow.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ConfigureWindow.h b/nxcomp/ConfigureWindow.h
index 9d4189c..bb511b0 100644
--- a/nxcomp/ConfigureWindow.h
+++ b/nxcomp/ConfigureWindow.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
index 39dfaea..ce99567 100644
--- a/nxcomp/Control.cpp
+++ b/nxcomp/Control.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Control.h b/nxcomp/Control.h
index 5d0849a..c214775 100644
--- a/nxcomp/Control.h
+++ b/nxcomp/Control.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CopyArea.cpp b/nxcomp/CopyArea.cpp
index bd767f2..e384ce1 100644
--- a/nxcomp/CopyArea.cpp
+++ b/nxcomp/CopyArea.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CopyArea.h b/nxcomp/CopyArea.h
index 51421b2..a811f38 100644
--- a/nxcomp/CopyArea.h
+++ b/nxcomp/CopyArea.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CreateGC.cpp b/nxcomp/CreateGC.cpp
index ff2adea..f1c10e6 100644
--- a/nxcomp/CreateGC.cpp
+++ b/nxcomp/CreateGC.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CreateGC.h b/nxcomp/CreateGC.h
index 6f8e669..b77f13c 100644
--- a/nxcomp/CreateGC.h
+++ b/nxcomp/CreateGC.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CreatePixmap.cpp b/nxcomp/CreatePixmap.cpp
index 1497a37..4037867 100644
--- a/nxcomp/CreatePixmap.cpp
+++ b/nxcomp/CreatePixmap.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CreatePixmap.h b/nxcomp/CreatePixmap.h
index afe2b0f..1d742e4 100644
--- a/nxcomp/CreatePixmap.h
+++ b/nxcomp/CreatePixmap.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CreatePixmapCompat.cpp b/nxcomp/CreatePixmapCompat.cpp
index dd8f6b2..6ea346e 100644
--- a/nxcomp/CreatePixmapCompat.cpp
+++ b/nxcomp/CreatePixmapCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/CreatePixmapCompat.h b/nxcomp/CreatePixmapCompat.h
index 8235194..e8cf8d9 100644
--- a/nxcomp/CreatePixmapCompat.h
+++ b/nxcomp/CreatePixmapCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/DecodeBuffer.cpp b/nxcomp/DecodeBuffer.cpp
index 6e1bf7f..077bfdf 100644
--- a/nxcomp/DecodeBuffer.cpp
+++ b/nxcomp/DecodeBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/DecodeBuffer.h b/nxcomp/DecodeBuffer.h
index 3fdf689..9345f4e 100644
--- a/nxcomp/DecodeBuffer.h
+++ b/nxcomp/DecodeBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/EncodeBuffer.cpp
index 2c4d78c..466a1d7 100644
--- a/nxcomp/EncodeBuffer.cpp
+++ b/nxcomp/EncodeBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/EncodeBuffer.h b/nxcomp/EncodeBuffer.h
index 5225e5c..9f5ac53 100644
--- a/nxcomp/EncodeBuffer.h
+++ b/nxcomp/EncodeBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/FillPoly.cpp b/nxcomp/FillPoly.cpp
index 5a6dc04..37df377 100644
--- a/nxcomp/FillPoly.cpp
+++ b/nxcomp/FillPoly.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/FillPoly.h b/nxcomp/FillPoly.h
index 6edab93..f339684 100644
--- a/nxcomp/FillPoly.h
+++ b/nxcomp/FillPoly.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Fork.cpp b/nxcomp/Fork.cpp
index e1f91bd..48faa29 100644
--- a/nxcomp/Fork.cpp
+++ b/nxcomp/Fork.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -17,6 +17,7 @@
#include <unistd.h>
+#include "Fork.h"
#include "Misc.h"
#include "Timestamp.h"
diff --git a/nxcomp/Fork.h b/nxcomp/Fork.h
index d7de8e4..9df9f40 100644
--- a/nxcomp/Fork.h
+++ b/nxcomp/Fork.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -20,4 +20,4 @@
// often on Cygwin.
//
-int Fork();
+extern int Fork();
diff --git a/nxcomp/FreeCache.h b/nxcomp/FreeCache.h
index b59b8c8..01fa42c 100644
--- a/nxcomp/FreeCache.h
+++ b/nxcomp/FreeCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericChannel.cpp b/nxcomp/GenericChannel.cpp
index 9bb753d..641ad36 100644
--- a/nxcomp/GenericChannel.cpp
+++ b/nxcomp/GenericChannel.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericChannel.h b/nxcomp/GenericChannel.h
index 327346d..ba4f1e7 100644
--- a/nxcomp/GenericChannel.h
+++ b/nxcomp/GenericChannel.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericReadBuffer.cpp b/nxcomp/GenericReadBuffer.cpp
index 5ae9d69..b7b6d93 100644
--- a/nxcomp/GenericReadBuffer.cpp
+++ b/nxcomp/GenericReadBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericReadBuffer.h b/nxcomp/GenericReadBuffer.h
index a8be615..6b1fdd1 100644
--- a/nxcomp/GenericReadBuffer.h
+++ b/nxcomp/GenericReadBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericReply.cpp b/nxcomp/GenericReply.cpp
index 0275570..9daccc5 100644
--- a/nxcomp/GenericReply.cpp
+++ b/nxcomp/GenericReply.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericReply.h b/nxcomp/GenericReply.h
index 217833c..de97b86 100644
--- a/nxcomp/GenericReply.h
+++ b/nxcomp/GenericReply.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericRequest.cpp b/nxcomp/GenericRequest.cpp
index 9058b71..4007729 100644
--- a/nxcomp/GenericRequest.cpp
+++ b/nxcomp/GenericRequest.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GenericRequest.h b/nxcomp/GenericRequest.h
index 57617ea..3175fc2 100644
--- a/nxcomp/GenericRequest.h
+++ b/nxcomp/GenericRequest.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetImage.cpp b/nxcomp/GetImage.cpp
index 50e6c7d..6be574d 100644
--- a/nxcomp/GetImage.cpp
+++ b/nxcomp/GetImage.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetImage.h b/nxcomp/GetImage.h
index c00bad7..f48fb90 100644
--- a/nxcomp/GetImage.h
+++ b/nxcomp/GetImage.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetImageReply.cpp b/nxcomp/GetImageReply.cpp
index f83b2e8..d4bc21b 100644
--- a/nxcomp/GetImageReply.cpp
+++ b/nxcomp/GetImageReply.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetImageReply.h b/nxcomp/GetImageReply.h
index b5c8212..ee7b0bf 100644
--- a/nxcomp/GetImageReply.h
+++ b/nxcomp/GetImageReply.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetProperty.cpp b/nxcomp/GetProperty.cpp
index f91d3f4..d358f8a 100644
--- a/nxcomp/GetProperty.cpp
+++ b/nxcomp/GetProperty.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetProperty.h b/nxcomp/GetProperty.h
index bee84d0..a734253 100644
--- a/nxcomp/GetProperty.h
+++ b/nxcomp/GetProperty.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetPropertyReply.cpp b/nxcomp/GetPropertyReply.cpp
index b141b76..2231318 100644
--- a/nxcomp/GetPropertyReply.cpp
+++ b/nxcomp/GetPropertyReply.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/GetPropertyReply.h b/nxcomp/GetPropertyReply.h
index 3304618..0f6b195 100644
--- a/nxcomp/GetPropertyReply.h
+++ b/nxcomp/GetPropertyReply.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ImageText16.cpp b/nxcomp/ImageText16.cpp
index d453cf5..569fdbe 100644
--- a/nxcomp/ImageText16.cpp
+++ b/nxcomp/ImageText16.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ImageText16.h b/nxcomp/ImageText16.h
index 6eed5bd..0e116a4 100644
--- a/nxcomp/ImageText16.h
+++ b/nxcomp/ImageText16.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ImageText8.cpp b/nxcomp/ImageText8.cpp
index f46180a..1619776 100644
--- a/nxcomp/ImageText8.cpp
+++ b/nxcomp/ImageText8.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ImageText8.h b/nxcomp/ImageText8.h
index acc242e..c56502f 100644
--- a/nxcomp/ImageText8.h
+++ b/nxcomp/ImageText8.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/IntCache.cpp b/nxcomp/IntCache.cpp
index b3ad385..8262d56 100644
--- a/nxcomp/IntCache.cpp
+++ b/nxcomp/IntCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/IntCache.h b/nxcomp/IntCache.h
index 8106988..15cc8ea 100644
--- a/nxcomp/IntCache.h
+++ b/nxcomp/IntCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/InternAtom.cpp b/nxcomp/InternAtom.cpp
index e1af495..d90c8c0 100644
--- a/nxcomp/InternAtom.cpp
+++ b/nxcomp/InternAtom.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/InternAtom.h b/nxcomp/InternAtom.h
index 4b90f7e..f7f366d 100644
--- a/nxcomp/InternAtom.h
+++ b/nxcomp/InternAtom.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
index 70d4a95..b397322 100644
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -91,6 +91,8 @@ static int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
static int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
+void UnpackJpegErrorHandler(j_common_ptr cinfo);
+
//
// Colormap stuff.
//
@@ -142,8 +144,8 @@ int UnpackJpeg(T_geometry *geometry, unsigned char method, unsigned char *srcDat
// Check if data is coming from a failed unsplit.
//
- if (srcSize < 2 || srcData[0] == SPLIT_PATTERN &&
- srcData[1] == SPLIT_PATTERN)
+ if (srcSize < 2 || (srcData[0] == SPLIT_PATTERN &&
+ srcData[1] == SPLIT_PATTERN))
{
#ifdef WARNING
*logofs << "UnpackJpeg: WARNING! Skipping unpack of dummy data.\n"
diff --git a/nxcomp/Jpeg.h b/nxcomp/Jpeg.h
index fb15a67..f3743d0 100644
--- a/nxcomp/Jpeg.h
+++ b/nxcomp/Jpeg.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Keeper.cpp b/nxcomp/Keeper.cpp
index b02468d..fd9b79f 100644
--- a/nxcomp/Keeper.cpp
+++ b/nxcomp/Keeper.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Keeper.h b/nxcomp/Keeper.h
index 8256fcc..c357b21 100644
--- a/nxcomp/Keeper.h
+++ b/nxcomp/Keeper.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/LICENSE b/nxcomp/LICENSE
index 708f7a7..2b32034 100644
--- a/nxcomp/LICENSE
+++ b/nxcomp/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/.
+Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/.
NXCOMP library and NX extensions to X are copyright of NoMachine.
Redistribution and use of this software is allowed according to the
diff --git a/nxcomp/List.cpp b/nxcomp/List.cpp
index 858728d..1ba104b 100644
--- a/nxcomp/List.cpp
+++ b/nxcomp/List.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/List.h b/nxcomp/List.h
index 1045a75..b5e41ae 100644
--- a/nxcomp/List.h
+++ b/nxcomp/List.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ListFontsReply.cpp b/nxcomp/ListFontsReply.cpp
index 233f69c..5bace82 100644
--- a/nxcomp/ListFontsReply.cpp
+++ b/nxcomp/ListFontsReply.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ListFontsReply.h b/nxcomp/ListFontsReply.h
index b405994..078fd7e 100644
--- a/nxcomp/ListFontsReply.h
+++ b/nxcomp/ListFontsReply.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 18618d3..d5f5d03 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -354,7 +354,7 @@ static int HandleChild(int child);
static int CheckChild(int pid, int status);
static int WaitChild(int child, const char *label, int force);
-int CheckParent(char *name, char *type, int parent);
+int CheckParent(const char *name, const char *type, int parent);
void RegisterChild(int child);
@@ -1514,9 +1514,9 @@ int NXTransClose(int fd)
* end of the socket pair.
*/
- if (control != NULL && (agent != NULL &&
+ if (control != NULL && ((agent != NULL &&
(fd == agentFD[0] || fd == NX_FD_ANY)) ||
- (fd == proxyFD || fd == NX_FD_ANY))
+ (fd == proxyFD || fd == NX_FD_ANY)))
{
if (proxy != NULL)
{
@@ -1551,9 +1551,9 @@ int NXTransDestroy(int fd)
logofs = &cerr;
}
- if (control != NULL && (agent != NULL &&
+ if (control != NULL && ((agent != NULL &&
(fd == agentFD[0] || fd == NX_FD_ANY)) ||
- (fd == proxyFD || fd == NX_FD_ANY))
+ (fd == proxyFD || fd == NX_FD_ANY)))
{
//
// Shut down the X connections and
@@ -6396,7 +6396,7 @@ void RegisterChild(int child)
lastChild = child;
}
-int CheckParent(char *name, char *type, int parent)
+int CheckParent(const char *name, const char *type, int parent)
{
if (parent != getppid() || parent == 1)
{
@@ -9995,8 +9995,8 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
*selectedName = '\0';
- char *localPrefix;
- char *remotePrefix;
+ const char *localPrefix;
+ const char *remotePrefix;
if (control -> ProxyMode == proxy_client)
{
@@ -10979,7 +10979,7 @@ int ParsePackOption(const char *opt)
packMethod == PACK_LOSSLESS ||
packMethod == PACK_ADAPTIVE)
{
- char *dash = rindex(opt, '-');
+ const char *dash = rindex(opt, '-');
if (dash != NULL && strlen(dash) == 2 &&
*(dash + 1) >= '0' && *(dash + 1) <= '9')
@@ -13927,7 +13927,7 @@ void PrintProcessInfo()
<< "." << control -> LocalVersionMinor << "."
<< control -> LocalVersionPatch << "\n\n";
- cerr << "Copyright (C) 2001, 2007 NoMachine.\n"
+ cerr << "Copyright (C) 2001, 2010 NoMachine.\n"
<< "See http://www.nomachine.com/ for more information.\n\n";
}
@@ -14080,8 +14080,8 @@ void PrintConnectionInfo()
}
if (control -> ProxyMode == proxy_client &&
- useUnixSocket > 0 || useTcpSocket > 0 ||
- useAgentSocket > 0)
+ (useUnixSocket > 0 || useTcpSocket > 0 ||
+ useAgentSocket > 0))
{
cerr << "Info" << ": Listening to X11 connections "
<< "on display ':" << xPort << "'.\n";
@@ -15764,8 +15764,8 @@ static void handleAlertInLoop()
int replace = 1;
int local = 1;
- char *message;
- char *type;
+ const char *message;
+ const char *type;
switch (lastAlert.code)
{
@@ -16218,7 +16218,7 @@ static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
{
T_channel_type type = channel_none;
- char *label = NULL;
+ const char *label = NULL;
int domain = -1;
int fd = -1;
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 552c57f..434118b 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -1,6 +1,6 @@
############################################################################
# #
-# Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. #
+# Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. #
# #
# NXCOMP, NX protocol compression and NX extensions to this software #
# are copyright of NoMachine. Redistribution and use of the present #
diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp
index 0c17ca2..72d4fff 100644
--- a/nxcomp/Message.cpp
+++ b/nxcomp/Message.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Message.h b/nxcomp/Message.h
index 60b62b2..dcfff7c 100644
--- a/nxcomp/Message.h
+++ b/nxcomp/Message.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 9c0c1ca..2c72259 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -371,7 +371,7 @@ const char *GetUsageInfo()
static const char CopyrightInfo[] =
"\
-Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.\n\
+Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.\n\
\n\
NXCOMP, NX protocol compression and NX extensions to this software \n\
are copyright of NoMachine. Redistribution and use of the present\n\
diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h
index 251947d..2008317 100644
--- a/nxcomp/Misc.h
+++ b/nxcomp/Misc.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -24,6 +24,12 @@
#include <errno.h>
#include <string.h>
+#ifdef __sun
+
+#include <strings.h>
+
+#endif
+
using namespace std;
//
diff --git a/nxcomp/NX.h b/nxcomp/NX.h
index 7da1eec..d98af79 100644
--- a/nxcomp/NX.h
+++ b/nxcomp/NX.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/NXalert.h b/nxcomp/NXalert.h
index d7f328c..2f01a30 100644
--- a/nxcomp/NXalert.h
+++ b/nxcomp/NXalert.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/NXmitshm.h b/nxcomp/NXmitshm.h
index c5cf8ce..aa79ec8 100644
--- a/nxcomp/NXmitshm.h
+++ b/nxcomp/NXmitshm.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/NXpack.h b/nxcomp/NXpack.h
index e7a54f6..de1c0f0 100644
--- a/nxcomp/NXpack.h
+++ b/nxcomp/NXpack.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/NXproto.h b/nxcomp/NXproto.h
index 571ebd7..ce25cc4 100644
--- a/nxcomp/NXproto.h
+++ b/nxcomp/NXproto.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/NXrender.h b/nxcomp/NXrender.h
index 0514e41..bc359f2 100644
--- a/nxcomp/NXrender.h
+++ b/nxcomp/NXrender.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/NXvars.h b/nxcomp/NXvars.h
index 0199078..3bee6d3 100644
--- a/nxcomp/NXvars.h
+++ b/nxcomp/NXvars.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/OpcodeCache.h b/nxcomp/OpcodeCache.h
index af3950b..529f8ee 100644
--- a/nxcomp/OpcodeCache.h
+++ b/nxcomp/OpcodeCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/OpcodeStore.cpp b/nxcomp/OpcodeStore.cpp
index 2762ae7..9097448 100644
--- a/nxcomp/OpcodeStore.cpp
+++ b/nxcomp/OpcodeStore.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/OpcodeStore.h b/nxcomp/OpcodeStore.h
index 5d16c11..f6626df 100644
--- a/nxcomp/OpcodeStore.h
+++ b/nxcomp/OpcodeStore.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Pack.c b/nxcomp/Pack.c
index 81b7f32..59a54cf 100644
--- a/nxcomp/Pack.c
+++ b/nxcomp/Pack.c
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp
index 8145bba..a683734 100644
--- a/nxcomp/Pgn.cpp
+++ b/nxcomp/Pgn.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -104,8 +104,8 @@ int UnpackPng(T_geometry *geometry, unsigned char method, unsigned char *srcData
// Check if data is coming from a failed unsplit.
//
- if (srcSize < 2 || srcData[0] == SPLIT_PATTERN &&
- srcData[1] == SPLIT_PATTERN)
+ if (srcSize < 2 || (srcData[0] == SPLIT_PATTERN &&
+ srcData[1] == SPLIT_PATTERN))
{
#ifdef WARNING
*logofs << "UnpackPng: WARNING! Skipping unpack of dummy data.\n"
@@ -456,6 +456,23 @@ int DecompressPng16(unsigned char *compressedData, int compressedLen,
for (dx = 0; dx < w; dx++)
{
pixel = RGB24_TO_PIXEL(16, tmpBuf[dx*3], tmpBuf[dx*3+1], tmpBuf[dx*3+2]);
+
+ //
+ // Follow the server byte order when arranging data.
+ //
+
+ if (byteOrder == LSBFirst)
+ {
+ data[0] = (unsigned char) (pixel & 0xff);
+ data[1] = (unsigned char) ((pixel >> 8) & 0xff);
+ }
+ else
+ {
+ data[1] = (unsigned char) (pixel & 0xff);
+ data[0] = (unsigned char) ((pixel >> 8) & 0xff);
+ }
+
+ data += 2;
}
//
diff --git a/nxcomp/Pgn.h b/nxcomp/Pgn.h
index f9abc04..ddf9b75 100644
--- a/nxcomp/Pgn.h
+++ b/nxcomp/Pgn.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp
index 02e0b72..7238d0c 100644
--- a/nxcomp/Pipe.cpp
+++ b/nxcomp/Pipe.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -22,6 +22,7 @@
#include <sys/types.h>
#include <sys/wait.h>
+#include "Pipe.h"
#include "Misc.h"
#include "Fork.h"
@@ -36,6 +37,8 @@
extern void RegisterChild(int child);
+static int Psplit(const char *command, char *parameters[], int limit);
+
//
// These are slightly modified versions of popen(3) and pclose(3)
// that don't rely on a shell to be available on the system, so
diff --git a/nxcomp/Pipe.h b/nxcomp/Pipe.h
index 46343a2..b4563a9 100644
--- a/nxcomp/Pipe.h
+++ b/nxcomp/Pipe.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -21,7 +21,7 @@
// that they can also work on Windows.
//
-FILE *Popen(char * const parameters[], const char *type);
-FILE *Popen(const char *command, const char *type);
+extern FILE *Popen(char * const parameters[], const char *type);
+extern FILE *Popen(const char *command, const char *type);
-int Pclose(FILE *file);
+extern int Pclose(FILE *file);
diff --git a/nxcomp/PolyArc.cpp b/nxcomp/PolyArc.cpp
index c041540..e572fa4 100644
--- a/nxcomp/PolyArc.cpp
+++ b/nxcomp/PolyArc.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyArc.h b/nxcomp/PolyArc.h
index bafb2f8..50d2fd9 100644
--- a/nxcomp/PolyArc.h
+++ b/nxcomp/PolyArc.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyFillArc.cpp b/nxcomp/PolyFillArc.cpp
index 596ba33..2733eb6 100644
--- a/nxcomp/PolyFillArc.cpp
+++ b/nxcomp/PolyFillArc.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyFillArc.h b/nxcomp/PolyFillArc.h
index 729c9eb..721f5ac 100644
--- a/nxcomp/PolyFillArc.h
+++ b/nxcomp/PolyFillArc.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyFillRectangle.cpp b/nxcomp/PolyFillRectangle.cpp
index 8573b5b..e1e6b78 100644
--- a/nxcomp/PolyFillRectangle.cpp
+++ b/nxcomp/PolyFillRectangle.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyFillRectangle.h b/nxcomp/PolyFillRectangle.h
index 3e3e0e2..bf94c48 100644
--- a/nxcomp/PolyFillRectangle.h
+++ b/nxcomp/PolyFillRectangle.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyLine.cpp b/nxcomp/PolyLine.cpp
index b6d2ae2..4d285e0 100644
--- a/nxcomp/PolyLine.cpp
+++ b/nxcomp/PolyLine.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyLine.h b/nxcomp/PolyLine.h
index 44ccf50..39447e6 100644
--- a/nxcomp/PolyLine.h
+++ b/nxcomp/PolyLine.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyPoint.cpp b/nxcomp/PolyPoint.cpp
index 37fa85f..847300f 100644
--- a/nxcomp/PolyPoint.cpp
+++ b/nxcomp/PolyPoint.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyPoint.h b/nxcomp/PolyPoint.h
index 57a83af..e090ff9 100644
--- a/nxcomp/PolyPoint.h
+++ b/nxcomp/PolyPoint.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolySegment.cpp b/nxcomp/PolySegment.cpp
index e2b0999..e9259d9 100644
--- a/nxcomp/PolySegment.cpp
+++ b/nxcomp/PolySegment.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolySegment.h b/nxcomp/PolySegment.h
index e77dfdf..a748658 100644
--- a/nxcomp/PolySegment.h
+++ b/nxcomp/PolySegment.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyText16.cpp b/nxcomp/PolyText16.cpp
index ac72466..d90b093 100644
--- a/nxcomp/PolyText16.cpp
+++ b/nxcomp/PolyText16.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyText16.h b/nxcomp/PolyText16.h
index f3e6a8a..cda6cce 100644
--- a/nxcomp/PolyText16.h
+++ b/nxcomp/PolyText16.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyText8.cpp b/nxcomp/PolyText8.cpp
index 92962f5..1575272 100644
--- a/nxcomp/PolyText8.cpp
+++ b/nxcomp/PolyText8.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PolyText8.h b/nxcomp/PolyText8.h
index bd727e2..eac5aab 100644
--- a/nxcomp/PolyText8.h
+++ b/nxcomp/PolyText8.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PositionCacheCompat.cpp b/nxcomp/PositionCacheCompat.cpp
index 4331ba7..4a6a2cd 100644
--- a/nxcomp/PositionCacheCompat.cpp
+++ b/nxcomp/PositionCacheCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PositionCacheCompat.h b/nxcomp/PositionCacheCompat.h
index ae7e2be..983e453 100644
--- a/nxcomp/PositionCacheCompat.h
+++ b/nxcomp/PositionCacheCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index b1ce362..347dd5a 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -729,7 +729,7 @@ const char *Proxy::getComputerName()
// bind to localhost and then try the other IPs.
//
- char *hostname = NULL;
+ const char *hostname = NULL;
#ifdef __CYGWIN32__
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
index 8fd2b7d..3d6c62c 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ProxyReadBuffer.cpp b/nxcomp/ProxyReadBuffer.cpp
index 60e774c..b0de149 100644
--- a/nxcomp/ProxyReadBuffer.cpp
+++ b/nxcomp/ProxyReadBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ProxyReadBuffer.h b/nxcomp/ProxyReadBuffer.h
index 582b463..b87b215 100644
--- a/nxcomp/ProxyReadBuffer.h
+++ b/nxcomp/ProxyReadBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PutImage.cpp b/nxcomp/PutImage.cpp
index a7233a9..325a4aa 100644
--- a/nxcomp/PutImage.cpp
+++ b/nxcomp/PutImage.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PutImage.h b/nxcomp/PutImage.h
index fe5f3c8..e9535cb 100644
--- a/nxcomp/PutImage.h
+++ b/nxcomp/PutImage.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PutPackedImage.cpp b/nxcomp/PutPackedImage.cpp
index 95b0bad..eae16a1 100644
--- a/nxcomp/PutPackedImage.cpp
+++ b/nxcomp/PutPackedImage.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/PutPackedImage.h b/nxcomp/PutPackedImage.h
index 80ebdfa..5287a5b 100644
--- a/nxcomp/PutPackedImage.h
+++ b/nxcomp/PutPackedImage.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/QueryFontReply.cpp b/nxcomp/QueryFontReply.cpp
index 01fd473..2d42587 100644
--- a/nxcomp/QueryFontReply.cpp
+++ b/nxcomp/QueryFontReply.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/QueryFontReply.h b/nxcomp/QueryFontReply.h
index dac4fed..537da4e 100644
--- a/nxcomp/QueryFontReply.h
+++ b/nxcomp/QueryFontReply.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ReadBuffer.cpp b/nxcomp/ReadBuffer.cpp
index 360e3e7..13122e2 100644
--- a/nxcomp/ReadBuffer.cpp
+++ b/nxcomp/ReadBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ReadBuffer.h b/nxcomp/ReadBuffer.h
index 97579d9..2013012 100644
--- a/nxcomp/ReadBuffer.h
+++ b/nxcomp/ReadBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderAddGlyphs.cpp b/nxcomp/RenderAddGlyphs.cpp
index 6c8cc3c..1d53ec0 100644
--- a/nxcomp/RenderAddGlyphs.cpp
+++ b/nxcomp/RenderAddGlyphs.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderAddGlyphs.h b/nxcomp/RenderAddGlyphs.h
index b2e6239..918a70c 100644
--- a/nxcomp/RenderAddGlyphs.h
+++ b/nxcomp/RenderAddGlyphs.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderChangePicture.cpp b/nxcomp/RenderChangePicture.cpp
index 3972551..5dbe39d 100644
--- a/nxcomp/RenderChangePicture.cpp
+++ b/nxcomp/RenderChangePicture.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderChangePicture.h b/nxcomp/RenderChangePicture.h
index f7a635b..e6a89a6 100644
--- a/nxcomp/RenderChangePicture.h
+++ b/nxcomp/RenderChangePicture.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderComposite.cpp b/nxcomp/RenderComposite.cpp
index 9629b95..e3c121b 100644
--- a/nxcomp/RenderComposite.cpp
+++ b/nxcomp/RenderComposite.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderComposite.h b/nxcomp/RenderComposite.h
index 30b8203..91fa30a 100644
--- a/nxcomp/RenderComposite.h
+++ b/nxcomp/RenderComposite.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCompositeCompat.cpp b/nxcomp/RenderCompositeCompat.cpp
index ac14ce1..5a1eff2 100644
--- a/nxcomp/RenderCompositeCompat.cpp
+++ b/nxcomp/RenderCompositeCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCompositeCompat.h b/nxcomp/RenderCompositeCompat.h
index 29344bd..a26db35 100644
--- a/nxcomp/RenderCompositeCompat.h
+++ b/nxcomp/RenderCompositeCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCompositeGlyphs.cpp b/nxcomp/RenderCompositeGlyphs.cpp
index 302a26a..1135633 100644
--- a/nxcomp/RenderCompositeGlyphs.cpp
+++ b/nxcomp/RenderCompositeGlyphs.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCompositeGlyphs.h b/nxcomp/RenderCompositeGlyphs.h
index 8657bb9..527fd3d 100644
--- a/nxcomp/RenderCompositeGlyphs.h
+++ b/nxcomp/RenderCompositeGlyphs.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCompositeGlyphsCompat.cpp b/nxcomp/RenderCompositeGlyphsCompat.cpp
index 5a7daad..3fe10fa 100644
--- a/nxcomp/RenderCompositeGlyphsCompat.cpp
+++ b/nxcomp/RenderCompositeGlyphsCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCompositeGlyphsCompat.h b/nxcomp/RenderCompositeGlyphsCompat.h
index 729136e..7a00608 100644
--- a/nxcomp/RenderCompositeGlyphsCompat.h
+++ b/nxcomp/RenderCompositeGlyphsCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreateGlyphSet.cpp b/nxcomp/RenderCreateGlyphSet.cpp
index fc0bd57..b9da8d7 100644
--- a/nxcomp/RenderCreateGlyphSet.cpp
+++ b/nxcomp/RenderCreateGlyphSet.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreateGlyphSet.h b/nxcomp/RenderCreateGlyphSet.h
index c754b32..0f14ce0 100644
--- a/nxcomp/RenderCreateGlyphSet.h
+++ b/nxcomp/RenderCreateGlyphSet.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreateGlyphSetCompat.cpp b/nxcomp/RenderCreateGlyphSetCompat.cpp
index 30e87c7..49e9f74 100644
--- a/nxcomp/RenderCreateGlyphSetCompat.cpp
+++ b/nxcomp/RenderCreateGlyphSetCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreateGlyphSetCompat.h b/nxcomp/RenderCreateGlyphSetCompat.h
index 2c30c69..174313e 100644
--- a/nxcomp/RenderCreateGlyphSetCompat.h
+++ b/nxcomp/RenderCreateGlyphSetCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreatePicture.cpp b/nxcomp/RenderCreatePicture.cpp
index d117167..cb3d565 100644
--- a/nxcomp/RenderCreatePicture.cpp
+++ b/nxcomp/RenderCreatePicture.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreatePicture.h b/nxcomp/RenderCreatePicture.h
index 32545a5..35de9b8 100644
--- a/nxcomp/RenderCreatePicture.h
+++ b/nxcomp/RenderCreatePicture.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreatePictureCompat.cpp b/nxcomp/RenderCreatePictureCompat.cpp
index 6ba014e..fa4dcb4 100644
--- a/nxcomp/RenderCreatePictureCompat.cpp
+++ b/nxcomp/RenderCreatePictureCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderCreatePictureCompat.h b/nxcomp/RenderCreatePictureCompat.h
index 491f8ef..15c8c85 100644
--- a/nxcomp/RenderCreatePictureCompat.h
+++ b/nxcomp/RenderCreatePictureCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderExtension.cpp b/nxcomp/RenderExtension.cpp
index e3b1cb7..79c26e6 100644
--- a/nxcomp/RenderExtension.cpp
+++ b/nxcomp/RenderExtension.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderExtension.h b/nxcomp/RenderExtension.h
index a9c6180..275ef1c 100644
--- a/nxcomp/RenderExtension.h
+++ b/nxcomp/RenderExtension.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFillRectangles.cpp b/nxcomp/RenderFillRectangles.cpp
index d705d31..6f08d97 100644
--- a/nxcomp/RenderFillRectangles.cpp
+++ b/nxcomp/RenderFillRectangles.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFillRectangles.h b/nxcomp/RenderFillRectangles.h
index 3287300..1898559 100644
--- a/nxcomp/RenderFillRectangles.h
+++ b/nxcomp/RenderFillRectangles.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFreeGlyphSet.cpp b/nxcomp/RenderFreeGlyphSet.cpp
index a8b6164..50010e3 100644
--- a/nxcomp/RenderFreeGlyphSet.cpp
+++ b/nxcomp/RenderFreeGlyphSet.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFreeGlyphSet.h b/nxcomp/RenderFreeGlyphSet.h
index b6b830e..7233031 100644
--- a/nxcomp/RenderFreeGlyphSet.h
+++ b/nxcomp/RenderFreeGlyphSet.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFreePicture.cpp b/nxcomp/RenderFreePicture.cpp
index efb44f7..b1074f3 100644
--- a/nxcomp/RenderFreePicture.cpp
+++ b/nxcomp/RenderFreePicture.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFreePicture.h b/nxcomp/RenderFreePicture.h
index d46b55f..2329cb4 100644
--- a/nxcomp/RenderFreePicture.h
+++ b/nxcomp/RenderFreePicture.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFreePictureCompat.cpp b/nxcomp/RenderFreePictureCompat.cpp
index 5079c9c..fb4c7ac 100644
--- a/nxcomp/RenderFreePictureCompat.cpp
+++ b/nxcomp/RenderFreePictureCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderFreePictureCompat.h b/nxcomp/RenderFreePictureCompat.h
index c8ece85..32d613a 100644
--- a/nxcomp/RenderFreePictureCompat.h
+++ b/nxcomp/RenderFreePictureCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderGenericRequest.cpp b/nxcomp/RenderGenericRequest.cpp
index d45498c..4f979c1 100644
--- a/nxcomp/RenderGenericRequest.cpp
+++ b/nxcomp/RenderGenericRequest.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderGenericRequest.h b/nxcomp/RenderGenericRequest.h
index 5eef81c..8fa3acb 100644
--- a/nxcomp/RenderGenericRequest.h
+++ b/nxcomp/RenderGenericRequest.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderMinorExtensionHeaders.h b/nxcomp/RenderMinorExtensionHeaders.h
index 49354f2..dda0042 100644
--- a/nxcomp/RenderMinorExtensionHeaders.h
+++ b/nxcomp/RenderMinorExtensionHeaders.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderMinorExtensionMethods.h b/nxcomp/RenderMinorExtensionMethods.h
index cf40ee7..397f696 100644
--- a/nxcomp/RenderMinorExtensionMethods.h
+++ b/nxcomp/RenderMinorExtensionMethods.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderMinorExtensionTags.h b/nxcomp/RenderMinorExtensionTags.h
index 8b351db..1d61b10 100644
--- a/nxcomp/RenderMinorExtensionTags.h
+++ b/nxcomp/RenderMinorExtensionTags.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureClip.cpp b/nxcomp/RenderPictureClip.cpp
index 280691f..7428e72 100644
--- a/nxcomp/RenderPictureClip.cpp
+++ b/nxcomp/RenderPictureClip.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureClip.h b/nxcomp/RenderPictureClip.h
index bba35ac..35b320c 100644
--- a/nxcomp/RenderPictureClip.h
+++ b/nxcomp/RenderPictureClip.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureClipCompat.cpp b/nxcomp/RenderPictureClipCompat.cpp
index 551903a..67d8730 100644
--- a/nxcomp/RenderPictureClipCompat.cpp
+++ b/nxcomp/RenderPictureClipCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureClipCompat.h b/nxcomp/RenderPictureClipCompat.h
index e898bd5..05fc5cd 100644
--- a/nxcomp/RenderPictureClipCompat.h
+++ b/nxcomp/RenderPictureClipCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureFilter.cpp b/nxcomp/RenderPictureFilter.cpp
index 1d21887..b48fdca 100644
--- a/nxcomp/RenderPictureFilter.cpp
+++ b/nxcomp/RenderPictureFilter.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureFilter.h b/nxcomp/RenderPictureFilter.h
index 775cea5..cf6ad54 100644
--- a/nxcomp/RenderPictureFilter.h
+++ b/nxcomp/RenderPictureFilter.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureTransform.cpp b/nxcomp/RenderPictureTransform.cpp
index 7772959..048b73e 100644
--- a/nxcomp/RenderPictureTransform.cpp
+++ b/nxcomp/RenderPictureTransform.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderPictureTransform.h b/nxcomp/RenderPictureTransform.h
index ea78478..061b6a3 100644
--- a/nxcomp/RenderPictureTransform.h
+++ b/nxcomp/RenderPictureTransform.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderTrapezoids.cpp b/nxcomp/RenderTrapezoids.cpp
index 65b9842..32fcd01 100644
--- a/nxcomp/RenderTrapezoids.cpp
+++ b/nxcomp/RenderTrapezoids.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderTrapezoids.h b/nxcomp/RenderTrapezoids.h
index 3e147eb..3f32020 100644
--- a/nxcomp/RenderTrapezoids.h
+++ b/nxcomp/RenderTrapezoids.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderTriangles.cpp b/nxcomp/RenderTriangles.cpp
index 7c7024b..e98bf35 100644
--- a/nxcomp/RenderTriangles.cpp
+++ b/nxcomp/RenderTriangles.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/RenderTriangles.h b/nxcomp/RenderTriangles.h
index d2c79b4..6c4d105 100644
--- a/nxcomp/RenderTriangles.h
+++ b/nxcomp/RenderTriangles.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Rgb.cpp b/nxcomp/Rgb.cpp
index ee59302..ad2e2fd 100644
--- a/nxcomp/Rgb.cpp
+++ b/nxcomp/Rgb.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Rgb.h b/nxcomp/Rgb.h
index 78c655d..98ead38 100644
--- a/nxcomp/Rgb.h
+++ b/nxcomp/Rgb.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Rle.cpp b/nxcomp/Rle.cpp
index 22eac04..b7b1460 100644
--- a/nxcomp/Rle.cpp
+++ b/nxcomp/Rle.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Rle.h b/nxcomp/Rle.h
index 29bfb09..0e39fae 100644
--- a/nxcomp/Rle.h
+++ b/nxcomp/Rle.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SendEvent.cpp b/nxcomp/SendEvent.cpp
index 369b542..f65b1db 100644
--- a/nxcomp/SendEvent.cpp
+++ b/nxcomp/SendEvent.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SendEvent.h b/nxcomp/SendEvent.h
index 1116b63..9426180 100644
--- a/nxcomp/SendEvent.h
+++ b/nxcomp/SendEvent.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SequenceQueue.cpp b/nxcomp/SequenceQueue.cpp
index bd77af2..ce044b1 100644
--- a/nxcomp/SequenceQueue.cpp
+++ b/nxcomp/SequenceQueue.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SequenceQueue.h b/nxcomp/SequenceQueue.h
index a852757..b243c4c 100644
--- a/nxcomp/SequenceQueue.h
+++ b/nxcomp/SequenceQueue.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerCache.cpp b/nxcomp/ServerCache.cpp
index a56a32a..f0cc6f8 100644
--- a/nxcomp/ServerCache.cpp
+++ b/nxcomp/ServerCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerCache.h b/nxcomp/ServerCache.h
index f8b8a8d..ec213b8 100644
--- a/nxcomp/ServerCache.h
+++ b/nxcomp/ServerCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
index cdaf057..4e6dea3 100644
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -6622,7 +6622,7 @@ int ServerChannel::handleAuthorization(const unsigned char *buffer, int size)
if (*buffer != 1)
{
- char *reason = NULL;
+ const char *reason = NULL;
//
// At the moment we don't take into account the end-
diff --git a/nxcomp/ServerChannel.h b/nxcomp/ServerChannel.h
index 8ce8a6d..6536db8 100644
--- a/nxcomp/ServerChannel.h
+++ b/nxcomp/ServerChannel.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/ServerProxy.cpp
index 6e6bb0a..404dd51 100644
--- a/nxcomp/ServerProxy.cpp
+++ b/nxcomp/ServerProxy.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerProxy.h b/nxcomp/ServerProxy.h
index c027f2c..8c4a884 100644
--- a/nxcomp/ServerProxy.h
+++ b/nxcomp/ServerProxy.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerReadBuffer.cpp b/nxcomp/ServerReadBuffer.cpp
index 0b3c774..53c1dec 100644
--- a/nxcomp/ServerReadBuffer.cpp
+++ b/nxcomp/ServerReadBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerReadBuffer.h b/nxcomp/ServerReadBuffer.h
index 866f4c6..438e2f0 100644
--- a/nxcomp/ServerReadBuffer.h
+++ b/nxcomp/ServerReadBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerStore.cpp b/nxcomp/ServerStore.cpp
index d39f639..b0e13b1 100644
--- a/nxcomp/ServerStore.cpp
+++ b/nxcomp/ServerStore.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ServerStore.h b/nxcomp/ServerStore.h
index a502023..8df1f1e 100644
--- a/nxcomp/ServerStore.h
+++ b/nxcomp/ServerStore.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetClipRectangles.cpp b/nxcomp/SetClipRectangles.cpp
index e44d931..8774744 100644
--- a/nxcomp/SetClipRectangles.cpp
+++ b/nxcomp/SetClipRectangles.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetClipRectangles.h b/nxcomp/SetClipRectangles.h
index 746a274..06b4421 100644
--- a/nxcomp/SetClipRectangles.h
+++ b/nxcomp/SetClipRectangles.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackAlpha.cpp b/nxcomp/SetUnpackAlpha.cpp
index 4477b88..a0dd1fc 100644
--- a/nxcomp/SetUnpackAlpha.cpp
+++ b/nxcomp/SetUnpackAlpha.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackAlpha.h b/nxcomp/SetUnpackAlpha.h
index eeb0206..2e32a65 100644
--- a/nxcomp/SetUnpackAlpha.h
+++ b/nxcomp/SetUnpackAlpha.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackAlphaCompat.cpp b/nxcomp/SetUnpackAlphaCompat.cpp
index 13d8a8b..a8fcabd 100644
--- a/nxcomp/SetUnpackAlphaCompat.cpp
+++ b/nxcomp/SetUnpackAlphaCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackAlphaCompat.h b/nxcomp/SetUnpackAlphaCompat.h
index 46fc97f..80d1522 100644
--- a/nxcomp/SetUnpackAlphaCompat.h
+++ b/nxcomp/SetUnpackAlphaCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackColormap.cpp b/nxcomp/SetUnpackColormap.cpp
index 69cb8d2..d522d32 100644
--- a/nxcomp/SetUnpackColormap.cpp
+++ b/nxcomp/SetUnpackColormap.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackColormap.h b/nxcomp/SetUnpackColormap.h
index 7009d96..53277b3 100644
--- a/nxcomp/SetUnpackColormap.h
+++ b/nxcomp/SetUnpackColormap.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackColormapCompat.cpp b/nxcomp/SetUnpackColormapCompat.cpp
index 58a199c..65b108a 100644
--- a/nxcomp/SetUnpackColormapCompat.cpp
+++ b/nxcomp/SetUnpackColormapCompat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackColormapCompat.h b/nxcomp/SetUnpackColormapCompat.h
index e3a769c..d1ffad8 100644
--- a/nxcomp/SetUnpackColormapCompat.h
+++ b/nxcomp/SetUnpackColormapCompat.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackGeometry.cpp b/nxcomp/SetUnpackGeometry.cpp
index 0a739cb..67b79a4 100644
--- a/nxcomp/SetUnpackGeometry.cpp
+++ b/nxcomp/SetUnpackGeometry.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/SetUnpackGeometry.h b/nxcomp/SetUnpackGeometry.h
index 4a9cca8..3a8224d 100644
--- a/nxcomp/SetUnpackGeometry.h
+++ b/nxcomp/SetUnpackGeometry.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ShapeExtension.cpp b/nxcomp/ShapeExtension.cpp
index 7296347..daa19fb 100644
--- a/nxcomp/ShapeExtension.cpp
+++ b/nxcomp/ShapeExtension.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/ShapeExtension.h b/nxcomp/ShapeExtension.h
index a294d7e..32c3b55 100644
--- a/nxcomp/ShapeExtension.h
+++ b/nxcomp/ShapeExtension.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Socket.cpp b/nxcomp/Socket.cpp
index bac95b7..ea00a9b 100644
--- a/nxcomp/Socket.cpp
+++ b/nxcomp/Socket.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Socket.h b/nxcomp/Socket.h
index bacd4c3..27c3308 100644
--- a/nxcomp/Socket.h
+++ b/nxcomp/Socket.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp
index 3b50da7..50627e7 100644
--- a/nxcomp/Split.cpp
+++ b/nxcomp/Split.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Split.h b/nxcomp/Split.h
index 02f1e2a..c9a3c9a 100644
--- a/nxcomp/Split.h
+++ b/nxcomp/Split.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/StaticCompressor.cpp b/nxcomp/StaticCompressor.cpp
index 1e3d36b..b30e61a 100644
--- a/nxcomp/StaticCompressor.cpp
+++ b/nxcomp/StaticCompressor.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/StaticCompressor.h b/nxcomp/StaticCompressor.h
index 65ef9ef..3e5b25c 100644
--- a/nxcomp/StaticCompressor.h
+++ b/nxcomp/StaticCompressor.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Statistics.cpp b/nxcomp/Statistics.cpp
index 659f3b1..294518f 100644
--- a/nxcomp/Statistics.cpp
+++ b/nxcomp/Statistics.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Statistics.h b/nxcomp/Statistics.h
index 08a318e..44ff883 100644
--- a/nxcomp/Statistics.h
+++ b/nxcomp/Statistics.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/TextCompressor.cpp b/nxcomp/TextCompressor.cpp
index 6314f24..1613122 100644
--- a/nxcomp/TextCompressor.cpp
+++ b/nxcomp/TextCompressor.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/TextCompressor.h b/nxcomp/TextCompressor.h
index eb9219f..b373b98 100644
--- a/nxcomp/TextCompressor.h
+++ b/nxcomp/TextCompressor.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Timestamp.cpp b/nxcomp/Timestamp.cpp
index 6d4a931..295eb65 100644
--- a/nxcomp/Timestamp.cpp
+++ b/nxcomp/Timestamp.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Timestamp.h b/nxcomp/Timestamp.h
index 3cf36cd..6995398 100644
--- a/nxcomp/Timestamp.h
+++ b/nxcomp/Timestamp.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/TranslateCoords.cpp b/nxcomp/TranslateCoords.cpp
index 00f0ae8..e67e1da 100644
--- a/nxcomp/TranslateCoords.cpp
+++ b/nxcomp/TranslateCoords.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/TranslateCoords.h b/nxcomp/TranslateCoords.h
index 469f3b3..3f21b24 100644
--- a/nxcomp/TranslateCoords.h
+++ b/nxcomp/TranslateCoords.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Transport.cpp b/nxcomp/Transport.cpp
index 21012a8..4b49678 100644
--- a/nxcomp/Transport.cpp
+++ b/nxcomp/Transport.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Transport.h b/nxcomp/Transport.h
index b6ff8ed..2f313b2 100644
--- a/nxcomp/Transport.h
+++ b/nxcomp/Transport.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
index 162ff78..05f62bd 100644
--- a/nxcomp/Types.h
+++ b/nxcomp/Types.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Unpack.cpp b/nxcomp/Unpack.cpp
index 03c898f..5fc4944 100644
--- a/nxcomp/Unpack.cpp
+++ b/nxcomp/Unpack.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -32,6 +32,72 @@ z_stream unpackStream;
static int unpackInitialized;
+int Unpack8To8(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack8To8(T_colormap *colormap, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack8To16(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack8To16(T_colormap *colormap, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack8To24(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack8To24(T_colormap *colormap, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack8To32(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack8To32(T_colormap *colormap, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack15To16(const unsigned char *data, unsigned char *out,
+ unsigned char *end);
+
+int Unpack15To24(const unsigned char *data, unsigned char *out,
+ unsigned char *end);
+
+int Unpack15To32(const unsigned char *data, unsigned char *out,
+ unsigned char *end);
+
+int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack16To16(const unsigned char *data, unsigned char *out,
+ unsigned char *end, int imageByteOrder);
+
+int Unpack16To24(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack16To24(const unsigned char *data, unsigned char *out,
+ unsigned char *end, int imageByteOrder);
+
+int Unpack16To32(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack16To32(const unsigned char *data, unsigned char *out,
+ unsigned char *end, int imageByteOrder);
+
+int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack24To24(const unsigned char *data, unsigned char *out,
+ unsigned char *end);
+
+int Unpack24To32(const T_colormask *colormask, const unsigned char *data,
+ unsigned char *out, unsigned char *end);
+
+int Unpack24To32(const unsigned char *data, unsigned char *out, unsigned char *end);
+
+int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
+ unsigned int *out, unsigned int *end);
+
+
void UnpackInit()
{
if (unpackInitialized == 0)
@@ -540,11 +606,15 @@ int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
{
while (out < end)
{
- if (data[0] == data[1] == data[2] == 0x00)
+ if (data[0] == 0x00 &&
+ data[1] == 0x00 &&
+ data[2] == 0x00)
{
out[0] = out[1] = out[2] = 0x00;
}
- else if (data[0] == data[1] == data[2] == 0xff)
+ else if (data[0] == 0xff &&
+ data[1] == 0xff &&
+ data[2] == 0xff)
{
out[0] = out[1] = out[2] = 0xff;
}
diff --git a/nxcomp/Unpack.h b/nxcomp/Unpack.h
index 00e7f12..65a410f 100644
--- a/nxcomp/Unpack.h
+++ b/nxcomp/Unpack.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Utils.cpp b/nxcomp/Utils.cpp
index c7c4abb..a282078 100644
--- a/nxcomp/Utils.cpp
+++ b/nxcomp/Utils.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Vars.c b/nxcomp/Vars.c
index 1351a9c..0d93a6d 100644
--- a/nxcomp/Vars.c
+++ b/nxcomp/Vars.c
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/WriteBuffer.cpp b/nxcomp/WriteBuffer.cpp
index 6380107..ac38fe6 100644
--- a/nxcomp/WriteBuffer.cpp
+++ b/nxcomp/WriteBuffer.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/WriteBuffer.h b/nxcomp/WriteBuffer.h
index 6c11092..4673cec 100644
--- a/nxcomp/WriteBuffer.h
+++ b/nxcomp/WriteBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/XidCache.cpp b/nxcomp/XidCache.cpp
index 2217fdb..a9a723c 100644
--- a/nxcomp/XidCache.cpp
+++ b/nxcomp/XidCache.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/XidCache.h b/nxcomp/XidCache.h
index 202d2fa..78a94d8 100644
--- a/nxcomp/XidCache.h
+++ b/nxcomp/XidCache.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Z.cpp b/nxcomp/Z.cpp
index 6b333f4..e6c93cd 100644
--- a/nxcomp/Z.cpp
+++ b/nxcomp/Z.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/Z.h b/nxcomp/Z.h
index 0e33ad3..d7f7fa1 100644
--- a/nxcomp/Z.h
+++ b/nxcomp/Z.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nxcomp/configure b/nxcomp/configure
index 3612ce5..633baf8 100755
--- a/nxcomp/configure
+++ b/nxcomp/configure
@@ -2687,8 +2687,8 @@ echo "${ECHO_T}no" >&6
;;
esac
-echo "$as_me:$LINENO: checking whether compiler accepts -Wmissing-declarations and -Wnested-externs" >&5
-echo $ECHO_N "checking whether compiler accepts -Wmissing-declarations and -Wnested-externs... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether compiler accepts -Wmissing-declarations" >&5
+echo $ECHO_N "checking whether compiler accepts -Wmissing-declarations... $ECHO_C" >&6
gcc_version=`${CC} --version | grep 'gcc (GCC) [3-4].' | head -n 1`
case "${gcc_version}" in
gcc*)
@@ -2699,7 +2699,7 @@ echo "${ECHO_T}no" >&6
*)
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
+ CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
;;
esac
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 348f362..e9ab81d 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -68,7 +68,7 @@ case "${gcc_version}" in
;;
esac
-AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and -Wnested-externs])
+AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations])
gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
case "${gcc_version}" in
gcc*)
@@ -77,7 +77,7 @@ case "${gcc_version}" in
*)
AC_MSG_RESULT([yes])
- CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
+ CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
;;
esac
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list