aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:53 +0100
committerReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:53 +0100
commit477961678194817aaf1aaf3602f1c91d288a539d (patch)
treed66356753053a34f93b4f6059631e0f6c4eb298c /nxcomp
parent799bf672a3588f205bd18ef39d9908069e0cd6d5 (diff)
downloadnx-libs-nxcomp/3.4.0-6.tar.gz
nx-libs-nxcomp/3.4.0-6.tar.bz2
nx-libs-nxcomp/3.4.0-6.zip
Imported nxcomp-3.4.0-6.tar.gznxcomp/3.4.0-6
Summary: Imported nxcomp-3.4.0-6.tar.gz Keywords: Imported nxcomp-3.4.0-6.tar.gz into Git repository
Diffstat (limited to 'nxcomp')
-rw-r--r--nxcomp/ActionCache.cpp2
-rw-r--r--nxcomp/ActionCache.h2
-rw-r--r--nxcomp/ActionCacheCompat.h2
-rw-r--r--nxcomp/Agent.cpp2
-rw-r--r--nxcomp/Agent.h2
-rw-r--r--nxcomp/Alpha.cpp3
-rw-r--r--nxcomp/Alpha.h2
-rw-r--r--nxcomp/Auth.cpp24
-rw-r--r--nxcomp/Auth.h2
-rw-r--r--nxcomp/Bitmap.cpp2
-rw-r--r--nxcomp/Bitmap.h2
-rw-r--r--nxcomp/BlockCache.cpp2
-rw-r--r--nxcomp/BlockCache.h2
-rw-r--r--nxcomp/BlockCacheSet.cpp2
-rw-r--r--nxcomp/BlockCacheSet.h2
-rw-r--r--nxcomp/CHANGELOG23
-rw-r--r--nxcomp/ChangeGC.cpp2
-rw-r--r--nxcomp/ChangeGC.h2
-rw-r--r--nxcomp/ChangeGCCompat.cpp2
-rw-r--r--nxcomp/ChangeGCCompat.h2
-rw-r--r--nxcomp/ChangeProperty.cpp2
-rw-r--r--nxcomp/ChangeProperty.h2
-rw-r--r--nxcomp/Channel.cpp6
-rw-r--r--nxcomp/Channel.h6
-rw-r--r--nxcomp/ChannelCache.cpp2
-rw-r--r--nxcomp/ChannelCache.h2
-rw-r--r--nxcomp/ChannelStore.h2
-rw-r--r--nxcomp/CharCache.cpp2
-rw-r--r--nxcomp/CharCache.h2
-rw-r--r--nxcomp/Children.cpp21
-rw-r--r--nxcomp/ClearArea.cpp2
-rw-r--r--nxcomp/ClearArea.h2
-rw-r--r--nxcomp/ClientCache.cpp2
-rw-r--r--nxcomp/ClientCache.h2
-rw-r--r--nxcomp/ClientChannel.cpp8
-rw-r--r--nxcomp/ClientChannel.h2
-rw-r--r--nxcomp/ClientProxy.cpp2
-rw-r--r--nxcomp/ClientProxy.h2
-rw-r--r--nxcomp/ClientReadBuffer.cpp2
-rw-r--r--nxcomp/ClientReadBuffer.h2
-rw-r--r--nxcomp/ClientStore.cpp2
-rw-r--r--nxcomp/ClientStore.h2
-rw-r--r--nxcomp/Colormap.cpp3
-rw-r--r--nxcomp/Colormap.h2
-rw-r--r--nxcomp/ConfigureWindow.cpp2
-rw-r--r--nxcomp/ConfigureWindow.h2
-rw-r--r--nxcomp/Control.cpp2
-rw-r--r--nxcomp/Control.h2
-rw-r--r--nxcomp/CopyArea.cpp2
-rw-r--r--nxcomp/CopyArea.h2
-rw-r--r--nxcomp/CreateGC.cpp2
-rw-r--r--nxcomp/CreateGC.h2
-rw-r--r--nxcomp/CreatePixmap.cpp2
-rw-r--r--nxcomp/CreatePixmap.h2
-rw-r--r--nxcomp/CreatePixmapCompat.cpp2
-rw-r--r--nxcomp/CreatePixmapCompat.h2
-rw-r--r--nxcomp/DecodeBuffer.cpp2
-rw-r--r--nxcomp/DecodeBuffer.h2
-rw-r--r--nxcomp/EncodeBuffer.cpp2
-rw-r--r--nxcomp/EncodeBuffer.h2
-rw-r--r--nxcomp/FillPoly.cpp2
-rw-r--r--nxcomp/FillPoly.h2
-rw-r--r--nxcomp/Fork.cpp3
-rw-r--r--nxcomp/Fork.h4
-rw-r--r--nxcomp/FreeCache.h2
-rw-r--r--nxcomp/GenericChannel.cpp2
-rw-r--r--nxcomp/GenericChannel.h2
-rw-r--r--nxcomp/GenericReadBuffer.cpp2
-rw-r--r--nxcomp/GenericReadBuffer.h2
-rw-r--r--nxcomp/GenericReply.cpp2
-rw-r--r--nxcomp/GenericReply.h2
-rw-r--r--nxcomp/GenericRequest.cpp2
-rw-r--r--nxcomp/GenericRequest.h2
-rw-r--r--nxcomp/GetImage.cpp2
-rw-r--r--nxcomp/GetImage.h2
-rw-r--r--nxcomp/GetImageReply.cpp2
-rw-r--r--nxcomp/GetImageReply.h2
-rw-r--r--nxcomp/GetProperty.cpp2
-rw-r--r--nxcomp/GetProperty.h2
-rw-r--r--nxcomp/GetPropertyReply.cpp2
-rw-r--r--nxcomp/GetPropertyReply.h2
-rw-r--r--nxcomp/ImageText16.cpp2
-rw-r--r--nxcomp/ImageText16.h2
-rw-r--r--nxcomp/ImageText8.cpp2
-rw-r--r--nxcomp/ImageText8.h2
-rw-r--r--nxcomp/IntCache.cpp2
-rw-r--r--nxcomp/IntCache.h2
-rw-r--r--nxcomp/InternAtom.cpp2
-rw-r--r--nxcomp/InternAtom.h2
-rw-r--r--nxcomp/Jpeg.cpp8
-rw-r--r--nxcomp/Jpeg.h2
-rw-r--r--nxcomp/Keeper.cpp2
-rw-r--r--nxcomp/Keeper.h2
-rw-r--r--nxcomp/LICENSE2
-rw-r--r--nxcomp/List.cpp2
-rw-r--r--nxcomp/List.h2
-rw-r--r--nxcomp/ListFontsReply.cpp2
-rw-r--r--nxcomp/ListFontsReply.h2
-rw-r--r--nxcomp/Loop.cpp32
-rw-r--r--nxcomp/Makefile.in2
-rw-r--r--nxcomp/Message.cpp2
-rw-r--r--nxcomp/Message.h2
-rw-r--r--nxcomp/Misc.cpp4
-rw-r--r--nxcomp/Misc.h8
-rw-r--r--nxcomp/NX.h2
-rw-r--r--nxcomp/NXalert.h2
-rw-r--r--nxcomp/NXmitshm.h2
-rw-r--r--nxcomp/NXpack.h2
-rw-r--r--nxcomp/NXproto.h2
-rw-r--r--nxcomp/NXrender.h2
-rw-r--r--nxcomp/NXvars.h2
-rw-r--r--nxcomp/OpcodeCache.h2
-rw-r--r--nxcomp/OpcodeStore.cpp2
-rw-r--r--nxcomp/OpcodeStore.h2
-rw-r--r--nxcomp/Pack.c2
-rw-r--r--nxcomp/Pgn.cpp23
-rw-r--r--nxcomp/Pgn.h2
-rw-r--r--nxcomp/Pipe.cpp5
-rw-r--r--nxcomp/Pipe.h8
-rw-r--r--nxcomp/PolyArc.cpp2
-rw-r--r--nxcomp/PolyArc.h2
-rw-r--r--nxcomp/PolyFillArc.cpp2
-rw-r--r--nxcomp/PolyFillArc.h2
-rw-r--r--nxcomp/PolyFillRectangle.cpp2
-rw-r--r--nxcomp/PolyFillRectangle.h2
-rw-r--r--nxcomp/PolyLine.cpp2
-rw-r--r--nxcomp/PolyLine.h2
-rw-r--r--nxcomp/PolyPoint.cpp2
-rw-r--r--nxcomp/PolyPoint.h2
-rw-r--r--nxcomp/PolySegment.cpp2
-rw-r--r--nxcomp/PolySegment.h2
-rw-r--r--nxcomp/PolyText16.cpp2
-rw-r--r--nxcomp/PolyText16.h2
-rw-r--r--nxcomp/PolyText8.cpp2
-rw-r--r--nxcomp/PolyText8.h2
-rw-r--r--nxcomp/PositionCacheCompat.cpp2
-rw-r--r--nxcomp/PositionCacheCompat.h2
-rw-r--r--nxcomp/Proxy.cpp4
-rw-r--r--nxcomp/Proxy.h2
-rw-r--r--nxcomp/ProxyReadBuffer.cpp2
-rw-r--r--nxcomp/ProxyReadBuffer.h2
-rw-r--r--nxcomp/PutImage.cpp2
-rw-r--r--nxcomp/PutImage.h2
-rw-r--r--nxcomp/PutPackedImage.cpp2
-rw-r--r--nxcomp/PutPackedImage.h2
-rw-r--r--nxcomp/QueryFontReply.cpp2
-rw-r--r--nxcomp/QueryFontReply.h2
-rw-r--r--nxcomp/ReadBuffer.cpp2
-rw-r--r--nxcomp/ReadBuffer.h2
-rw-r--r--nxcomp/RenderAddGlyphs.cpp2
-rw-r--r--nxcomp/RenderAddGlyphs.h2
-rw-r--r--nxcomp/RenderChangePicture.cpp2
-rw-r--r--nxcomp/RenderChangePicture.h2
-rw-r--r--nxcomp/RenderComposite.cpp2
-rw-r--r--nxcomp/RenderComposite.h2
-rw-r--r--nxcomp/RenderCompositeCompat.cpp2
-rw-r--r--nxcomp/RenderCompositeCompat.h2
-rw-r--r--nxcomp/RenderCompositeGlyphs.cpp2
-rw-r--r--nxcomp/RenderCompositeGlyphs.h2
-rw-r--r--nxcomp/RenderCompositeGlyphsCompat.cpp2
-rw-r--r--nxcomp/RenderCompositeGlyphsCompat.h2
-rw-r--r--nxcomp/RenderCreateGlyphSet.cpp2
-rw-r--r--nxcomp/RenderCreateGlyphSet.h2
-rw-r--r--nxcomp/RenderCreateGlyphSetCompat.cpp2
-rw-r--r--nxcomp/RenderCreateGlyphSetCompat.h2
-rw-r--r--nxcomp/RenderCreatePicture.cpp2
-rw-r--r--nxcomp/RenderCreatePicture.h2
-rw-r--r--nxcomp/RenderCreatePictureCompat.cpp2
-rw-r--r--nxcomp/RenderCreatePictureCompat.h2
-rw-r--r--nxcomp/RenderExtension.cpp2
-rw-r--r--nxcomp/RenderExtension.h2
-rw-r--r--nxcomp/RenderFillRectangles.cpp2
-rw-r--r--nxcomp/RenderFillRectangles.h2
-rw-r--r--nxcomp/RenderFreeGlyphSet.cpp2
-rw-r--r--nxcomp/RenderFreeGlyphSet.h2
-rw-r--r--nxcomp/RenderFreePicture.cpp2
-rw-r--r--nxcomp/RenderFreePicture.h2
-rw-r--r--nxcomp/RenderFreePictureCompat.cpp2
-rw-r--r--nxcomp/RenderFreePictureCompat.h2
-rw-r--r--nxcomp/RenderGenericRequest.cpp2
-rw-r--r--nxcomp/RenderGenericRequest.h2
-rw-r--r--nxcomp/RenderMinorExtensionHeaders.h2
-rw-r--r--nxcomp/RenderMinorExtensionMethods.h2
-rw-r--r--nxcomp/RenderMinorExtensionTags.h2
-rw-r--r--nxcomp/RenderPictureClip.cpp2
-rw-r--r--nxcomp/RenderPictureClip.h2
-rw-r--r--nxcomp/RenderPictureClipCompat.cpp2
-rw-r--r--nxcomp/RenderPictureClipCompat.h2
-rw-r--r--nxcomp/RenderPictureFilter.cpp2
-rw-r--r--nxcomp/RenderPictureFilter.h2
-rw-r--r--nxcomp/RenderPictureTransform.cpp2
-rw-r--r--nxcomp/RenderPictureTransform.h2
-rw-r--r--nxcomp/RenderTrapezoids.cpp2
-rw-r--r--nxcomp/RenderTrapezoids.h2
-rw-r--r--nxcomp/RenderTriangles.cpp2
-rw-r--r--nxcomp/RenderTriangles.h2
-rw-r--r--nxcomp/Rgb.cpp2
-rw-r--r--nxcomp/Rgb.h2
-rw-r--r--nxcomp/Rle.cpp2
-rw-r--r--nxcomp/Rle.h2
-rw-r--r--nxcomp/SendEvent.cpp2
-rw-r--r--nxcomp/SendEvent.h2
-rw-r--r--nxcomp/SequenceQueue.cpp2
-rw-r--r--nxcomp/SequenceQueue.h2
-rw-r--r--nxcomp/ServerCache.cpp2
-rw-r--r--nxcomp/ServerCache.h2
-rw-r--r--nxcomp/ServerChannel.cpp4
-rw-r--r--nxcomp/ServerChannel.h2
-rw-r--r--nxcomp/ServerProxy.cpp2
-rw-r--r--nxcomp/ServerProxy.h2
-rw-r--r--nxcomp/ServerReadBuffer.cpp2
-rw-r--r--nxcomp/ServerReadBuffer.h2
-rw-r--r--nxcomp/ServerStore.cpp2
-rw-r--r--nxcomp/ServerStore.h2
-rw-r--r--nxcomp/SetClipRectangles.cpp2
-rw-r--r--nxcomp/SetClipRectangles.h2
-rw-r--r--nxcomp/SetUnpackAlpha.cpp2
-rw-r--r--nxcomp/SetUnpackAlpha.h2
-rw-r--r--nxcomp/SetUnpackAlphaCompat.cpp2
-rw-r--r--nxcomp/SetUnpackAlphaCompat.h2
-rw-r--r--nxcomp/SetUnpackColormap.cpp2
-rw-r--r--nxcomp/SetUnpackColormap.h2
-rw-r--r--nxcomp/SetUnpackColormapCompat.cpp2
-rw-r--r--nxcomp/SetUnpackColormapCompat.h2
-rw-r--r--nxcomp/SetUnpackGeometry.cpp2
-rw-r--r--nxcomp/SetUnpackGeometry.h2
-rw-r--r--nxcomp/ShapeExtension.cpp2
-rw-r--r--nxcomp/ShapeExtension.h2
-rw-r--r--nxcomp/Socket.cpp2
-rw-r--r--nxcomp/Socket.h2
-rw-r--r--nxcomp/Split.cpp2
-rw-r--r--nxcomp/Split.h2
-rw-r--r--nxcomp/StaticCompressor.cpp2
-rw-r--r--nxcomp/StaticCompressor.h2
-rw-r--r--nxcomp/Statistics.cpp2
-rw-r--r--nxcomp/Statistics.h2
-rw-r--r--nxcomp/TextCompressor.cpp2
-rw-r--r--nxcomp/TextCompressor.h2
-rw-r--r--nxcomp/Timestamp.cpp2
-rw-r--r--nxcomp/Timestamp.h2
-rw-r--r--nxcomp/TranslateCoords.cpp2
-rw-r--r--nxcomp/TranslateCoords.h2
-rw-r--r--nxcomp/Transport.cpp2
-rw-r--r--nxcomp/Transport.h2
-rw-r--r--nxcomp/Types.h2
-rw-r--r--nxcomp/Unpack.cpp76
-rw-r--r--nxcomp/Unpack.h2
-rw-r--r--nxcomp/Utils.cpp2
-rw-r--r--nxcomp/Vars.c2
-rw-r--r--nxcomp/WriteBuffer.cpp2
-rw-r--r--nxcomp/WriteBuffer.h2
-rw-r--r--nxcomp/XidCache.cpp2
-rw-r--r--nxcomp/XidCache.h2
-rw-r--r--nxcomp/Z.cpp2
-rw-r--r--nxcomp/Z.h2
-rwxr-xr-xnxcomp/configure6
-rw-r--r--nxcomp/configure.in4
257 files changed, 448 insertions, 305 deletions
diff --git a/nxcomp/ActionCache.cpp b/nxcomp/ActionCache.cpp
index e3bf295c8..79b670021 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 6ff374f4c..23265fcf2 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 2e563b0b9..8281db826 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 eca5db460..c0b729d06 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 8012e2dd7..fac5acd43 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 85852bfa9..931101495 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 73912a516..80620e1aa 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 f0f1a00a5..d8e999132 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 5dae8a60f..aac1d1e3f 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 3349ca541..b5bad226a 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 5b74e3767..57a1b35bb 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 eaaba2793..f885290f0 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 fe66dcab7..b9146ceea 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 03f1fa6ad..8959ba2b3 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 a5dde33ea..e27b18088 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 0c5a6678c..bedb2ccbf 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 56f004457..574651763 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 d990e39bf..81b808d87 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 479a26286..ca2973774 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 db244b000..3a7b0c0a9 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 4ae70aa3d..0270d7274 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 063425150..f941fced9 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 47506302e..71b556b0d 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 44f6c9133..68fe1d7e9 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 cdf99fdfe..eaf8e426b 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 95fd717cd..7b94893b6 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 9545330d6..3103fb308 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 80abb77b9..2803a1b1d 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 177237d61..53710f181 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 7e824fb56..a19b882e8 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 55266e42f..223a3b3e1 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 3a936c983..039eea44e 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 69b18687e..2a82009a3 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 7c09c0a83..6702e5b66 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 2f967d798..31d6d125a 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 6c907bf35..9924bb263 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 a02dcade1..ef63bb0eb 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 9cf473f81..2b669ba2d 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 952534c1e..b32033b17 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 b4afa8964..6dee630ac 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 c5c7af679..be0e892b4 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 e86078a7e..54a68a309 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 1e755be1a..5702beca9 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 84a83a767..e0056f86c 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 5956f48c5..995ab1831 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 9d4189c83..bb511b0d4 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 39dfaea6c..ce99567d7 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 5d0849a8e..c21477544 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 bd767f27c..e384ce13c 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 51421b283..a811f3801 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 ff2adea1a..f1c10e69b 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 6f8e66933..b77f13c47 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 1497a37dd..403786747 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 afe2b0f57..1d742e452 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 dd8f6b200..6ea346ee1 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 8235194c2..e8cf8d99f 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 6e1bf7fd0..077bfdfc0 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 3fdf689a6..9345f4e23 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 2c4d78c77..466a1d7a0 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 5225e5cf5..9f5ac5352 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 5a6dc049a..37df3772b 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 6edab9334..f33968494 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 e1f91bd2f..48faa2992 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 d7de8e4a8..9df9f4041 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 b59b8c846..01fa42cd8 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 9bb753d92..641ad36d4 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 327346d34..ba4f1e7e8 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 5ae9d6993..b7b6d93f4 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 a8be615c5..6b1fdd1fa 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 02755706b..9daccc566 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 217833c5c..de97b86d0 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 9058b7116..40077291b 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 57617ead8..3175fc2ba 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 50e6c7d2b..6be574dbb 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 c00bad71f..f48fb9079 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 f83b2e80b..d4bc21b5a 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 b5c8212a9..ee7b0bfa3 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 f91d3f41d..d358f8a6f 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 bee84d0c3..a73425354 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 b141b76ae..223131803 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 3304618e5..0f6b19508 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 d453cf5d1..569fdbe13 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 6eed5bdad..0e116a4fe 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 f46180a6d..161977677 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 acc242e8e..c56502f90 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 b3ad38520..8262d5605 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 81069884d..15cc8ea53 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 e1af495b9..d90c8c058 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 4b90f7e9f..f7f366dce 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 70d4a95ac..b3973227c 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 fb15a6780..f3743d07a 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 b02468d63..fd9b79f45 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 8256fcc59..c357b2116 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 708f7a754..2b3203474 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 858728d4a..1ba104b59 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 1045a751d..b5e41ae11 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 233f69c40..5bace82f2 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 b405994fa..078fd7ebc 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 18618d355..d5f5d0338 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 552c57f94..434118b4e 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 0c17ca218..72d4fff3d 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 60b62b24a..dcfff7cb6 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 9c0c1ca4d..2c72259e3 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 251947d3a..200831757 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 7da1eec37..d98af79bb 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 d7f328c7f..2f01a3071 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 c5cf8ce3c..aa79ec8ae 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 e7a54f67e..de1c0f0d9 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 571ebd7c6..ce25cc4c7 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 0514e41a8..bc359f273 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 019907822..3bee6d3ed 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 af3950bb9..529f8eee1 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 2762ae769..909744821 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 5d16c11fb..f6626dfef 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 81b7f32da..59a54cfbf 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 8145bba7f..a68373441 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 f9abc04ff..ddf9b75d1 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 02e0b720c..7238d0c73 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 46343a2ad..b4563a967 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 c04154052..e572fa454 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 bafb2f8bc..50d2fd9a9 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 596ba3382..2733eb62a 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 729c9eb2b..721f5ac97 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 8573b5bb1..e1e6b7876 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 3e3e0e2e7..bf94c4818 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 b6d2ae29e..4d285e0b1 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 44ccf50e7..39447e659 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 37fa85f4f..847300f78 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 57a83afb2..e090ff9fa 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 e2b099939..e9259d958 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 e77dfdfd4..a74865827 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 ac72466ab..d90b093ec 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 f3e6a8ac2..cda6cceed 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 92962f535..15752721d 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 bd727e285..eac5aab7c 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 4331ba76c..4a6a2cd63 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 ae7e2be67..983e45382 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 b1ce362bf..347dd5add 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 8fd2b7d17..3d6c62c54 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 60e774c32..b0de14921 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 582b4638f..b87b215bf 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 a7233a9da..325a4aa66 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 fe5f3c8d3..e9535cb29 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 95b0bad07..eae16a16f 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 80ebdfadf..5287a5b57 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 01fd473fc..2d42587f7 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 dac4fed0a..537da4e63 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 360e3e72e..13122e278 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 97579d9e8..20130120a 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 6c8cc3c4c..1d53ec0f8 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 b2e62398f..918a70c8d 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 397255120..5dbe39d52 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 f7a635ba8..e6a89a610 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 9629b95d2..e3c121b48 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 30b820318..91fa30aaa 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 ac14ce181..5a1eff213 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 29344bd06..a26db35ba 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 302a26aaa..1135633ff 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 8657bb9d4..527fd3d12 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 5a7daad0d..3fe10fafb 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 729136e65..7a00608c2 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 fc0bd571f..b9da8d7bf 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 c754b32cb..0f14ce0c5 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 30e87c7f5..49e9f741d 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 2c30c6936..174313e10 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 d117167a5..cb3d56534 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 32545a556..35de9b86b 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 6ba014ecd..fa4dcb400 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 491f8efb8..15c8c85b3 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 e3b1cb7f8..79c26e64e 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 a9c61802a..275ef1c1d 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 d705d31ae..6f08d97a4 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 3287300aa..189855907 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 a8b616431..50010e381 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 b6b830e8b..7233031ed 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 efb44f7ee..b1074f33f 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 d46b55f93..2329cb4e5 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 5079c9c96..fb4c7ac54 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 c8ece85b5..32d613ae0 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 d45498cdd..4f979c18f 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 5eef81c51..8fa3acb76 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 49354f20a..dda0042d8 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 cf40ee743..397f6966e 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 8b351db44..1d61b103c 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 280691f59..7428e7219 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 bba35acc3..35b320c31 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 551903ae2..67d873008 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 e898bd5c8..05fc5cda8 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 1d2188735..b48fdca15 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 775cea506..cf6ad5494 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 77729592d..048b73e6c 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 ea78478ad..061b6a3d8 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 65b9842c5..32fcd01c0 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 3e147ebb3..3f3202016 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 7c7024b0a..e98bf3506 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 d2c79b46d..6c4d105a1 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 ee5930229..ad2e2fd92 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 78c655d54..98ead38e3 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 22eac04a3..b7b1460bd 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 29bfb095d..0e39fae5a 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 369b54221..f65b1dbb2 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 1116b6330..9426180a4 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 bd77af249..ce044b1ff 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 a85275766..b243c4c9f 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 a56a32a32..f0cc6f825 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 f8b8a8da8..ec213b89f 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 cdaf057c8..4e6dea324 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 8ce8a6dfc..6536db829 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 6e6bb0a92..404dd5123 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 c027f2ce7..8c4a88410 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 0b3c7747e..53c1dec57 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 866f4c688..438e2f0da 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 d39f63983..b0e13b1ad 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 a50202352..8df1f1e9c 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 e44d93108..8774744fb 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 746a274f7..06b4421f5 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 4477b8847..a0dd1fc2e 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 eeb0206c7..2e32a6590 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 13d8a8ba4..a8fcabdeb 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 46fc97f90..80d1522c0 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 69cb8d2ea..d522d328e 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 7009d96a3..53277b3f0 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 58a199c61..65b108a82 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 e3a769cd9..d1ffad876 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 0a739cb65..67b79a410 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 4a9cca829..3a8224dfb 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 7296347e6..daa19fbb4 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 a294d7ea3..32c3b55ef 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 bac95b718..ea00a9b4e 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 bacd4c35b..27c330850 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 3b50da7e2..50627e793 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 02f1e2a35..c9a3c9ad3 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 1e3d36b66..b30e61a80 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 65ef9ef79..3e5b25ca1 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 659f3b1de..294518fb7 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 08a318e1a..44ff8834f 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 6314f246c..16131222c 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 eb9219fe5..b373b98b8 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 6d4a9311f..295eb65cf 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 3cf36cd2b..69953988a 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 00f0ae8b6..e67e1dac5 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 469f3b3a1..3f21b243c 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 21012a8c4..4b4967826 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 b6ff8ed4d..2f313b29f 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 162ff78f2..05f62bd00 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 03c898f87..5fc494465 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 00e7f1214..65a410fb6 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 c7c4abb48..a2820782a 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 1351a9cf9..0d93a6dc6 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 6380107e8..ac38fe688 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 6c11092ef..4673cecee 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 2217fdb34..a9a723c76 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 202d2fa61..78a94d8d0 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 6b333f4b7..e6c93cd10 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 0e33ad3b7..d7f7fa185 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 3612ce5d0..633baf840 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 348f362ff..e9ab81da8 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