From 3e924126b56c4d421e8263d25f6b14aa4ceed047 Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 13 Nov 2011 09:27:51 +0100
Subject: Imported nxcomp-3.1.0-4.tar.gz

Summary: Imported nxcomp-3.1.0-4.tar.gz
Keywords:

Imported nxcomp-3.1.0-4.tar.gz
into Git repository
---
 nxcomp/Statistics.cpp | 1995 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1995 insertions(+)
 create mode 100755 nxcomp/Statistics.cpp

(limited to 'nxcomp/Statistics.cpp')

diff --git a/nxcomp/Statistics.cpp b/nxcomp/Statistics.cpp
new file mode 100755
index 000000000..8b57921d4
--- /dev/null
+++ b/nxcomp/Statistics.cpp
@@ -0,0 +1,1995 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of NoMachine. Redistribution and use of the present      */
+/* software is allowed according to terms specified in the file LICENSE   */
+/* which comes in the source distribution.                                */
+/*                                                                        */
+/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/*                                                                        */
+/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
+#include <stdio.h>
+
+#include "Statistics.h"
+
+#include "Control.h"
+
+#include "Proxy.h"
+
+#include "ClientStore.h"
+#include "ServerStore.h"
+
+//
+// Length of temporary buffer
+// used to format output.
+//
+
+#define FORMAT_LENGTH          1024
+
+//
+// Log level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Note that when presenting statistics we invert the
+// correct semantics of X client and server entities.
+// This is questionable, but matches the user's pers-
+// pective of running remote X applications on its
+// local client.
+//
+
+Statistics::Statistics(Proxy *proxy) : proxy_(proxy)
+{
+  transportPartial_.idleTime_             = 0;
+  transportPartial_.readTime_             = 0;
+  transportPartial_.writeTime_            = 0;
+  transportPartial_.proxyBytesIn_         = 0;
+  transportPartial_.proxyBytesOut_        = 0;
+  transportPartial_.proxyFramesIn_        = 0;
+  transportPartial_.proxyFramesOut_       = 0;
+  transportPartial_.proxyWritesOut_       = 0;
+  transportPartial_.compressedBytesIn_    = 0;
+  transportPartial_.compressedBytesOut_   = 0;
+  transportPartial_.decompressedBytesIn_  = 0;
+  transportPartial_.decompressedBytesOut_ = 0;
+  transportPartial_.framingBitsOut_       = 0;
+
+  transportTotal_.idleTime_             = 0;
+  transportTotal_.readTime_             = 0;
+  transportTotal_.writeTime_            = 0;
+  transportTotal_.proxyBytesIn_         = 0;
+  transportTotal_.proxyBytesOut_        = 0;
+  transportTotal_.proxyFramesIn_        = 0;
+  transportTotal_.proxyFramesOut_       = 0;
+  transportTotal_.proxyWritesOut_       = 0;
+  transportTotal_.compressedBytesIn_    = 0;
+  transportTotal_.compressedBytesOut_   = 0;
+  transportTotal_.decompressedBytesIn_  = 0;
+  transportTotal_.decompressedBytesOut_ = 0;
+  transportTotal_.framingBitsOut_       = 0;
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    protocolPartial_.requestCached_[i]  = 0;
+    protocolPartial_.requestReplied_[i] = 0;
+    protocolPartial_.requestCount_[i]   = 0;
+    protocolPartial_.requestBitsIn_[i]  = 0;
+    protocolPartial_.requestBitsOut_[i] = 0;
+
+    protocolPartial_.renderRequestCached_[i]  = 0;
+    protocolPartial_.renderRequestCount_[i]   = 0;
+    protocolPartial_.renderRequestBitsIn_[i]  = 0;
+    protocolPartial_.renderRequestBitsOut_[i] = 0;
+
+    protocolPartial_.replyCached_[i]  = 0;
+    protocolPartial_.replyCount_[i]   = 0;
+    protocolPartial_.replyBitsIn_[i]  = 0;
+    protocolPartial_.replyBitsOut_[i] = 0;
+
+    protocolPartial_.eventCached_[i]  = 0;
+    protocolPartial_.eventCount_[i]   = 0;
+    protocolPartial_.eventBitsIn_[i]  = 0;
+    protocolPartial_.eventBitsOut_[i] = 0;
+
+    protocolTotal_.requestCached_[i]  = 0;
+    protocolTotal_.requestReplied_[i] = 0;
+    protocolTotal_.requestCount_[i]   = 0;
+    protocolTotal_.requestBitsIn_[i]  = 0;
+    protocolTotal_.requestBitsOut_[i] = 0;
+
+    protocolTotal_.renderRequestCached_[i]  = 0;
+    protocolTotal_.renderRequestCount_[i]   = 0;
+    protocolTotal_.renderRequestBitsIn_[i]  = 0;
+    protocolTotal_.renderRequestBitsOut_[i] = 0;
+
+    protocolTotal_.replyCached_[i]  = 0;
+    protocolTotal_.replyCount_[i]   = 0;
+    protocolTotal_.replyBitsIn_[i]  = 0;
+    protocolTotal_.replyBitsOut_[i] = 0;
+
+    protocolTotal_.eventCached_[i]  = 0;
+    protocolTotal_.eventCount_[i]   = 0;
+    protocolTotal_.eventBitsIn_[i]  = 0;
+    protocolTotal_.eventBitsOut_[i] = 0;
+  }
+
+  protocolPartial_.cupsCount_    = 0;
+  protocolPartial_.cupsBitsIn_   = 0;
+  protocolPartial_.cupsBitsOut_  = 0;
+
+  protocolPartial_.smbCount_     = 0;
+  protocolPartial_.smbBitsIn_    = 0;
+  protocolPartial_.smbBitsOut_   = 0;
+
+  protocolPartial_.mediaCount_   = 0;
+  protocolPartial_.mediaBitsIn_  = 0;
+  protocolPartial_.mediaBitsOut_ = 0;
+
+  protocolPartial_.httpCount_    = 0;
+  protocolPartial_.httpBitsIn_   = 0;
+  protocolPartial_.httpBitsOut_  = 0;
+
+  protocolPartial_.fontCount_    = 0;
+  protocolPartial_.fontBitsIn_   = 0;
+  protocolPartial_.fontBitsOut_  = 0;
+
+  protocolPartial_.slaveCount_   = 0;
+  protocolPartial_.slaveBitsIn_  = 0;
+  protocolPartial_.slaveBitsOut_ = 0;
+
+  protocolTotal_.cupsCount_    = 0;
+  protocolTotal_.cupsBitsIn_   = 0;
+  protocolTotal_.cupsBitsOut_  = 0;
+
+  protocolTotal_.smbCount_     = 0;
+  protocolTotal_.smbBitsIn_    = 0;
+  protocolTotal_.smbBitsOut_   = 0;
+
+  protocolTotal_.mediaCount_   = 0;
+  protocolTotal_.mediaBitsIn_  = 0;
+  protocolTotal_.mediaBitsOut_ = 0;
+
+  protocolTotal_.httpCount_    = 0;
+  protocolTotal_.httpBitsIn_   = 0;
+  protocolTotal_.httpBitsOut_  = 0;
+
+  protocolTotal_.fontCount_    = 0;
+  protocolTotal_.fontBitsIn_   = 0;
+  protocolTotal_.fontBitsOut_  = 0;
+
+  protocolTotal_.slaveCount_   = 0;
+  protocolTotal_.slaveBitsIn_  = 0;
+  protocolTotal_.slaveBitsOut_ = 0;
+
+  packedPartial_.packedBytesIn_  = 0;
+  packedPartial_.packedBytesOut_ = 0;
+
+  packedTotal_.packedBytesIn_    = 0;
+  packedTotal_.packedBytesOut_   = 0;
+
+  splitPartial_.splitCount_           = 0;
+  splitPartial_.splitAborted_         = 0;
+  splitPartial_.splitAbortedBytesOut_ = 0;
+
+  splitTotal_.splitCount_             = 0;
+  splitTotal_.splitAborted_           = 0;
+  splitTotal_.splitAbortedBytesOut_   = 0;
+
+  overallPartial_.overallBytesIn_  = 0;
+  overallPartial_.overallBytesOut_ = 0;
+
+  overallTotal_.overallBytesIn_    = 0;
+  overallTotal_.overallBytesOut_   = 0;
+
+  proxyData_.protocolCount_ = 0;
+  proxyData_.controlCount_  = 0;
+  proxyData_.splitCount_    = 0;
+  proxyData_.dataCount_     = 0;
+
+  proxyData_.streamRatio_ = 1;
+
+  startShortFrameTs_ = getTimestamp();
+  startLongFrameTs_  = getTimestamp();
+  startFrameTs_      = getTimestamp();
+
+  bytesInShortFrame_ = 0;
+  bytesInLongFrame_  = 0;
+
+  bitrateInShortFrame_ = 0;
+  bitrateInLongFrame_  = 0;
+
+  topBitrate_ = 0;
+
+  congestionInFrame_ = 0;
+}
+
+Statistics::~Statistics()
+{
+}
+
+int Statistics::resetPartialStats()
+{
+  transportPartial_.idleTime_             = 0;
+  transportPartial_.readTime_             = 0;
+  transportPartial_.writeTime_            = 0;
+  transportPartial_.proxyBytesIn_         = 0;
+  transportPartial_.proxyBytesOut_        = 0;
+  transportPartial_.proxyFramesIn_        = 0;
+  transportPartial_.proxyFramesOut_       = 0;
+  transportPartial_.proxyWritesOut_       = 0;
+  transportPartial_.compressedBytesIn_    = 0;
+  transportPartial_.compressedBytesOut_   = 0;
+  transportPartial_.decompressedBytesIn_  = 0;
+  transportPartial_.decompressedBytesOut_ = 0;
+  transportPartial_.framingBitsOut_       = 0;
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    protocolPartial_.requestCached_[i]  = 0;
+    protocolPartial_.requestReplied_[i] = 0;
+    protocolPartial_.requestCount_[i]   = 0;
+    protocolPartial_.requestBitsIn_[i]  = 0;
+    protocolPartial_.requestBitsOut_[i] = 0;
+
+    protocolPartial_.renderRequestCached_[i]  = 0;
+    protocolPartial_.renderRequestCount_[i]   = 0;
+    protocolPartial_.renderRequestBitsIn_[i]  = 0;
+    protocolPartial_.renderRequestBitsOut_[i] = 0;
+
+    protocolPartial_.replyCached_[i]  = 0;
+    protocolPartial_.replyCount_[i]   = 0;
+    protocolPartial_.replyBitsIn_[i]  = 0;
+    protocolPartial_.replyBitsOut_[i] = 0;
+
+    protocolPartial_.eventCached_[i]  = 0;
+    protocolPartial_.eventCount_[i]   = 0;
+    protocolPartial_.eventBitsIn_[i]  = 0;
+    protocolPartial_.eventBitsOut_[i] = 0;
+  }
+
+  protocolPartial_.cupsCount_    = 0;
+  protocolPartial_.cupsBitsIn_   = 0;
+  protocolPartial_.cupsBitsOut_  = 0;
+
+  protocolPartial_.smbCount_     = 0;
+  protocolPartial_.smbBitsIn_    = 0;
+  protocolPartial_.smbBitsOut_   = 0;
+
+  protocolPartial_.mediaCount_   = 0;
+  protocolPartial_.mediaBitsIn_  = 0;
+  protocolPartial_.mediaBitsOut_ = 0;
+
+  protocolPartial_.httpCount_    = 0;
+  protocolPartial_.httpBitsIn_   = 0;
+  protocolPartial_.httpBitsOut_  = 0;
+
+  protocolPartial_.fontCount_    = 0;
+  protocolPartial_.fontBitsIn_   = 0;
+  protocolPartial_.fontBitsOut_  = 0;
+
+  protocolPartial_.slaveCount_   = 0;
+  protocolPartial_.slaveBitsIn_  = 0;
+  protocolPartial_.slaveBitsOut_ = 0;
+
+  packedPartial_.packedBytesIn_  = 0;
+  packedPartial_.packedBytesOut_ = 0;
+
+  splitPartial_.splitCount_           = 0;
+  splitPartial_.splitAborted_         = 0;
+  splitPartial_.splitAbortedBytesOut_ = 0;
+
+  overallPartial_.overallBytesIn_  = 0;
+  overallPartial_.overallBytesOut_ = 0;
+
+  return 1;
+}
+
+void Statistics::addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut)
+{
+  transportPartial_.compressedBytesIn_ += bytesIn;
+  transportTotal_.compressedBytesIn_ += bytesIn;
+
+  transportPartial_.compressedBytesOut_ += bytesOut;
+  transportTotal_.compressedBytesOut_ += bytesOut;
+
+  double ratio = bytesIn / bytesOut;
+
+  if (ratio < 1)
+  {
+    ratio = 1;
+  }
+
+  #if defined(TEST) || defined(TOKEN)
+  *logofs << "Statistics: TOKEN! Old ratio was "
+          << proxyData_.streamRatio_ << " current is "
+          << (double) ratio << " new ratio is " << (double)
+             ((proxyData_.streamRatio_ * 2) + ratio) / 3 << ".\n"
+          << logofs_flush;
+  #endif
+
+  proxyData_.streamRatio_ = ((proxyData_.streamRatio_ * 2) + ratio) / 3;
+
+  #if defined(TEST) || defined(TOKEN)
+  *logofs << "Statistics: TOKEN! Updated compressed bytes "
+          << "with " << bytesIn << " in " << bytesOut << " out "
+          << "and ratio " << (double) proxyData_.streamRatio_
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+//
+// Recalculate the current bitrate. The bytes written
+// are accounted at the time the transport actually
+// writes the data to the network, not at the time it
+// receives the data from the upper layers. The reason
+// is that data can be compressed by the stream com-
+// pressor, so we can become aware of the new bitrate
+// only afer having flushed the ZLIB stream. This also
+// means that, to have a reliable estimate, we need to
+// flush the link often.
+//
+
+void Statistics::updateBitrate(int bytes)
+{
+  T_timestamp thisFrameTs = getNewTimestamp();
+
+  int diffFramesInMs = diffTimestamp(startFrameTs_, thisFrameTs);
+
+  #ifdef DEBUG
+  *logofs << "Statistics: Difference since previous timestamp is "
+          << diffFramesInMs << " Ms.\n" << logofs_flush;
+  #endif
+
+  if (diffFramesInMs > 0)
+  {
+    #ifdef DEBUG
+    *logofs << "Statistics: Removing " << diffFramesInMs
+            << " Ms in short and long time frame.\n"
+            << logofs_flush;
+    #endif
+
+    int shortBytesToRemove = (int) (((double) bytesInShortFrame_ * (double) diffFramesInMs) /
+                                       (double) control -> ShortBitrateTimeFrame);
+
+    int longBytesToRemove = (int) (((double) bytesInLongFrame_ * (double) diffFramesInMs) /
+                                      (double) control -> LongBitrateTimeFrame);
+
+    #ifdef DEBUG
+    *logofs << "Statistics: Removing " << shortBytesToRemove
+            << " bytes from " << bytesInShortFrame_
+            << " in the short frame.\n" << logofs_flush;
+    #endif
+
+    bytesInShortFrame_ -= shortBytesToRemove;
+
+    if (bytesInShortFrame_ < 0)
+    {
+      #ifdef TEST
+      *logofs << "Statistics: Bytes in short frame are "
+              << bytesInShortFrame_ << ". Set to 0.\n"
+              << logofs_flush;
+      #endif
+
+      bytesInShortFrame_ = 0;
+    }
+
+    #ifdef DEBUG
+    *logofs << "Statistics: Removing " << longBytesToRemove
+            << " bytes from " << bytesInLongFrame_
+            << " in the long frame.\n" << logofs_flush;
+    #endif
+
+    bytesInLongFrame_ -= longBytesToRemove;
+
+    if (bytesInLongFrame_ < 0)
+    {
+      #ifdef TEST
+      *logofs << "Statistics: Bytes in long frame are "
+              << bytesInLongFrame_ << ". Set to 0.\n"
+              << logofs_flush;
+      #endif
+
+      bytesInLongFrame_ = 0;
+    }
+
+    int diffStartInMs;
+
+    diffStartInMs = diffTimestamp(thisFrameTs, startShortFrameTs_);
+
+    if (diffStartInMs > control -> ShortBitrateTimeFrame)
+    {
+      addMsToTimestamp(startShortFrameTs_, diffStartInMs);
+    }
+
+    diffStartInMs = diffTimestamp(thisFrameTs, startLongFrameTs_);
+
+    if (diffStartInMs > control -> LongBitrateTimeFrame)
+    {
+      addMsToTimestamp(startLongFrameTs_, diffStartInMs);
+    }
+
+    startFrameTs_ = thisFrameTs;
+  }
+
+  #ifdef DEBUG
+  *logofs << "Statistics: Adding " << bytes << " bytes to "
+          << bytesInShortFrame_ << " in the short frame.\n"
+          << logofs_flush;
+  #endif
+
+  bytesInShortFrame_ = bytesInShortFrame_ + bytes;
+
+  #ifdef DEBUG
+  *logofs << "Statistics: Adding " << bytes << " bytes to "
+          << bytesInLongFrame_ << " in the long frame.\n"
+          << logofs_flush;
+  #endif
+
+  bytesInLongFrame_ = bytesInLongFrame_ + bytes;
+
+  bitrateInShortFrame_ = (int) ((double) bytesInShortFrame_ /
+                                   ((double) control -> ShortBitrateTimeFrame / 1000));
+
+  bitrateInLongFrame_ = (int) ((double) bytesInLongFrame_ /
+                                   ((double) control -> LongBitrateTimeFrame / 1000));
+
+  if (bitrateInShortFrame_ > topBitrate_)
+  {
+    topBitrate_ = bitrateInShortFrame_;
+  }
+
+  #ifdef TEST
+  *logofs << "Statistics: Current bitrate is short " << bitrateInShortFrame_
+          << " long " << bitrateInLongFrame_ << " top " << topBitrate_
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+void Statistics::updateCongestion(int remaining, int limit)
+{
+  #ifdef TEST
+  *logofs << "Statistics: Updating the congestion "
+          << "counters at " << strMsTimestamp()
+          << ".\n" << logofs_flush;
+  #endif
+
+  double current = remaining;
+
+  if (current < 0)
+  {
+    current = 0;
+  }
+
+  current = 9 * (limit - current) / limit;
+
+  #ifdef TEST
+  *logofs << "Statistics: Current congestion is "
+          << current << " with " << limit << " tokens "
+          << "and " << remaining << " remaining.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // If the current congestion counter is greater
+  // than the previous, take the current value,
+  // otherwise ramp down the value by calculating
+  // the average of the last 8 updates.
+  //
+
+  #ifdef TEST
+  *logofs << "Statistics: Old congestion was "
+          << congestionInFrame_;
+  #endif
+
+  if (current >= congestionInFrame_)
+  {
+    congestionInFrame_ = current;
+  }
+  else
+  {
+    congestionInFrame_ = ((congestionInFrame_ * 7) + current) / 8;
+  }
+
+  #ifdef TEST
+  *logofs << " new congestion is "
+          << ((congestionInFrame_ * 7) + current) / 8
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Call the function with 0 bytes flushed
+  // so the agent can update its congestion
+  // counter.
+  //
+
+  FlushCallback(0);
+}
+
+int Statistics::getClientCacheStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  //
+  // Print message cache data according
+  // to local and remote view.
+  //
+
+  MessageStore *currentStore = NULL;
+  MessageStore *anyStore     = NULL;
+
+  char format[FORMAT_LENGTH];
+
+  strcat(buffer, "\nNX Cache Statistics\n");
+  strcat(buffer, "-------------------\n\n");
+
+  for (int m = proxy_client; m <= proxy_server; m++)
+  {
+    if (m == proxy_client)
+    {
+      strcat(buffer, "Request\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-------\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+    else
+    {
+      strcat(buffer, "\nReply\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-----\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+
+    for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+    {
+      if (m == proxy_client)
+      {
+        currentStore = proxy_ -> getClientStore() -> getRequestStore(i);
+      }
+      else
+      {
+        currentStore = proxy_ -> getServerStore() -> getReplyStore(i);
+      }
+
+      if (currentStore != NULL &&
+              (currentStore -> getLocalStorageSize() ||
+                   currentStore -> getRemoteStorageSize()))
+      {
+        anyStore = currentStore;
+
+        sprintf(format, "#%d\t%d\t", i, currentStore -> getSize());
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getLocalStorageSize(),
+                    ((double) currentStore -> getLocalStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getRemoteStorageSize(),
+                    ((double) currentStore -> getRemoteStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d/%.0f KB\n", currentStore -> cacheSlots,
+                    ((double) control -> getUpperStorageSize() / 100 *
+                          currentStore -> cacheThreshold) / 1024);
+
+        strcat(buffer, format);
+      }
+    }
+
+    if (anyStore == NULL)
+    {
+      strcat(buffer, "N/A\n");
+    }
+  }
+
+  if (anyStore != NULL)
+  {
+    sprintf(format, "\ncache: %d bytes (%d KB) available at server.\n",
+                control -> ClientTotalStorageSize,
+                    control -> ClientTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) available at client.\n\n",
+                control -> ServerTotalStorageSize,
+                    control -> ServerTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at server.\n",
+                anyStore -> getLocalTotalStorageSize(),
+                    anyStore -> getLocalTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at client.\n\n\n",
+                anyStore -> getRemoteTotalStorageSize(),
+                    anyStore -> getRemoteTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "\ncache: N/A\n\n");
+  }
+
+  return 1;
+}
+
+int Statistics::getClientProtocolStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  struct T_transportData *transportData;
+  struct T_protocolData  *protocolData;
+  struct T_overallData   *overallData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+    protocolData = &protocolPartial_;
+    overallData = &overallPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+    protocolData = &protocolTotal_;
+    overallData = &overallTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  double countRequestIn        = 0;
+  double countCachedRequestIn  = 0;
+  double countRepliedRequestIn = 0;
+
+  double countRequestBitsIn  = 0;
+  double countRequestBitsOut = 0;
+
+  double countAnyIn   = 0;
+  double countBitsIn  = 0;
+  double countBitsOut = 0;
+
+  //
+  // Print request data.
+  //
+
+  strcat(buffer, "NX Server Side Protocol Statistics\n");
+  strcat(buffer, "----------------------------------\n\n");
+
+  //
+  // Print render data.
+  //
+
+  strcat(buffer, "Render  Total\tCached\tBits In\t\tBits Out\tBits/Request\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t------------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> renderRequestCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> renderRequestCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> renderRequestCount_[i],
+                    protocolData -> renderRequestCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> renderRequestCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> renderRequestBitsIn_[i], protocolData -> renderRequestBitsIn_[i] / 8192,
+                      protocolData -> renderRequestBitsOut_[i], protocolData -> renderRequestBitsOut_[i] / 8192,
+                          protocolData -> renderRequestBitsIn_[i] / protocolData -> renderRequestCount_[i],
+                              protocolData -> renderRequestBitsOut_[i] / protocolData -> renderRequestCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> renderRequestBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> renderRequestBitsIn_[i] /
+                                         protocolData -> renderRequestBitsOut_[i]);
+
+        strcat(buffer, format);
+      }
+      else
+      {
+        strcat(buffer, "1:1\n");
+      }
+    }
+
+    countRequestIn        += protocolData -> renderRequestCount_[i];
+    countCachedRequestIn  += protocolData -> renderRequestCached_[i];
+
+    countRequestBitsIn  += protocolData -> renderRequestBitsIn_[i];
+    countRequestBitsOut += protocolData -> renderRequestBitsOut_[i];
+
+    countAnyIn   += protocolData -> renderRequestCount_[i];
+    countBitsIn  += protocolData -> renderRequestBitsIn_[i];
+    countBitsOut += protocolData -> renderRequestBitsOut_[i];
+  }
+
+  if (countRequestIn > 0)
+  {
+    if (countCachedRequestIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countRequestIn, countCachedRequestIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countRequestIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countRequestBitsIn, countRequestBitsIn / 8192, countRequestBitsOut,
+                    countRequestBitsOut / 8192, countRequestBitsIn / countRequestIn,
+                        countRequestBitsOut / countRequestIn);
+
+    strcat(buffer, format);
+
+    if (countRequestBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countRequestBitsIn / countRequestBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n\n");
+  }
+
+  countRequestIn        = 0;
+  countCachedRequestIn  = 0;
+
+  countRequestBitsIn  = 0;
+  countRequestBitsOut = 0;
+
+  countAnyIn   = 0;
+  countBitsIn  = 0;
+  countBitsOut = 0;
+
+  //
+  // Print other requests' data.
+  //
+
+  strcat(buffer, "\nRequest Total\tCached\tBits In\t\tBits Out\tBits/Request\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t------------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> requestCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 5)
+      {
+        strcat(format, " ");
+      }
+
+      //
+      // Mark NX agent-related requests, those
+      // having a reply and finally those that
+      // have been probably tainted by client
+      // side.
+      //
+
+      if (i >= X_NXFirstOpcode && i <= X_NXLastOpcode)
+      {
+        strcat(format, "A");
+      }
+
+      if (i != X_NXInternalGenericReply && protocolData -> requestReplied_[i] > 0)
+      {
+        strcat(format, "R");
+      }
+
+      if (i == X_NoOperation && control -> TaintReplies)
+      {
+        strcat(format, "T");
+      }
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> requestCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> requestCount_[i],
+                    protocolData -> requestCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> requestCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> requestBitsIn_[i], protocolData -> requestBitsIn_[i] / 8192,
+                      protocolData -> requestBitsOut_[i], protocolData -> requestBitsOut_[i] / 8192,
+                          protocolData -> requestBitsIn_[i] / protocolData -> requestCount_[i],
+                              protocolData -> requestBitsOut_[i] / protocolData -> requestCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> requestBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> requestBitsIn_[i] /
+                                         protocolData -> requestBitsOut_[i]);
+
+        strcat(buffer, format);
+      }
+      else
+      {
+        strcat(buffer, "1:1\n");
+      }
+    }
+
+    countRequestIn        += protocolData -> requestCount_[i];
+    countCachedRequestIn  += protocolData -> requestCached_[i];
+    countRepliedRequestIn += protocolData -> requestReplied_[i];
+
+    countRequestBitsIn  += protocolData -> requestBitsIn_[i];
+    countRequestBitsOut += protocolData -> requestBitsOut_[i];
+
+    countAnyIn   += protocolData -> requestCount_[i];
+    countBitsIn  += protocolData -> requestBitsIn_[i];
+    countBitsOut += protocolData -> requestBitsOut_[i];
+  }
+
+  if (countRequestIn > 0)
+  {
+    if (countCachedRequestIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countRequestIn, countCachedRequestIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countRequestIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countRequestBitsIn, countRequestBitsIn / 8192, countRequestBitsOut,
+                    countRequestBitsOut / 8192, countRequestBitsIn / countRequestIn,
+                        countRequestBitsOut / countRequestIn);
+
+    strcat(buffer, format);
+
+    if (countRequestBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countRequestBitsIn / countRequestBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n\n");
+  }
+
+  //
+  // Print transport data.
+  //
+
+  getTimeStats(type, buffer);
+
+  countAnyIn   += protocolData -> cupsCount_;
+  countBitsIn  += protocolData -> cupsBitsIn_;
+  countBitsOut += protocolData -> cupsBitsOut_;
+
+  countAnyIn   += protocolData -> smbCount_;
+  countBitsIn  += protocolData -> smbBitsIn_;
+  countBitsOut += protocolData -> smbBitsOut_;
+
+  countAnyIn   += protocolData -> mediaCount_;
+  countBitsIn  += protocolData -> mediaBitsIn_;
+  countBitsOut += protocolData -> mediaBitsOut_;
+
+  countAnyIn   += protocolData -> httpCount_;
+  countBitsIn  += protocolData -> httpBitsIn_;
+  countBitsOut += protocolData -> httpBitsOut_;
+
+  countAnyIn   += protocolData -> fontCount_;
+  countBitsIn  += protocolData -> fontBitsIn_;
+  countBitsOut += protocolData -> fontBitsOut_;
+
+  countAnyIn   += protocolData -> slaveCount_;
+  countBitsIn  += protocolData -> slaveBitsIn_;
+  countBitsOut += protocolData -> slaveBitsOut_;
+
+  //
+  // Save the overall amount of bytes
+  // coming from X clients.
+  //
+
+  overallData -> overallBytesIn_ = countBitsIn / 8;
+
+  //
+  // Print performance data.
+  //
+
+  if (transportData -> readTime_ > 0)
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn / (transportData -> readTime_ / 1000),
+                    (countBitsIn + transportData -> framingBitsOut_) / 8192 /
+                         (transportData -> readTime_ / 1000));
+  }
+  else
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn, (countBitsIn + transportData ->
+                    framingBitsOut_) / 8192);
+  }
+
+  strcat(buffer, format);
+
+  strcat(buffer, "link: ");
+
+  //
+  // ZLIB compression stats.
+  //
+
+  getStreamStats(type, buffer);
+
+  //
+  // Save the overall amount of bytes
+  // sent on NX proxy link.
+  //
+
+  if (transportData -> compressedBytesOut_ > 0)
+  {
+    overallData -> overallBytesOut_ = transportData -> compressedBytesOut_;
+  }
+  else
+  {
+    overallData -> overallBytesOut_ = countBitsOut / 8;
+  }
+
+  //
+  // Print info on multiplexing overhead.
+  //
+
+  getFramingStats(type, buffer);
+
+  //
+  // Print stats about additional channels.
+  //
+
+  getServicesStats(type, buffer);
+
+  //
+  // Compression summary.
+  //
+
+  double ratio = 1;
+
+  if (transportData -> compressedBytesOut_ / 1024 > 0)
+  {
+    ratio = ((countBitsIn + transportData -> framingBitsOut_) / 8192) /
+                  (transportData -> compressedBytesOut_ / 1024);
+
+  }
+  else if (countBitsOut > 0)
+  {
+    ratio = (countBitsIn + transportData -> framingBitsOut_) /
+                 countBitsOut;
+  }
+
+  sprintf(format, "      Protocol compression ratio is %5.3f:1.\n\n",
+              ratio);
+
+  strcat(buffer, format);
+
+  getBitrateStats(type, buffer);
+
+  getSplitStats(type, buffer);
+
+  sprintf(format, "      %.0f total handled replies (%.0f unmatched).\n\n\n",
+              countRepliedRequestIn, protocolData -> requestReplied_[X_NXInternalGenericReply]);
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getClientOverallStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  struct T_overallData *overallData;
+  struct T_packedData  *packedData;
+
+  if (type == PARTIAL_STATS)
+  {
+    overallData = &overallPartial_;
+    packedData  = &packedPartial_;
+  }
+  else
+  {
+    overallData = &overallTotal_;
+    packedData = &packedTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  //
+  // Print header including link type,
+  // followed by info on packed images.
+  //
+
+  strcat(buffer, "NX Compression Summary\n");
+  strcat(buffer, "----------------------\n\n");
+
+  char label[FORMAT_LENGTH];
+
+  switch (control -> LinkMode)
+  {
+    case LINK_TYPE_NONE:
+    {
+      strcpy(label, "NONE");
+
+      break;
+    }
+    case LINK_TYPE_MODEM:
+    {
+      strcpy(label, "MODEM");
+
+      break;
+    }
+    case LINK_TYPE_ISDN:
+    {
+      strcpy(label, "ISDN");
+
+      break;
+    }
+    case LINK_TYPE_ADSL:
+    {
+      strcpy(label, "ADSL");
+
+      break;
+    }
+    case LINK_TYPE_WAN:
+    {
+      strcpy(label, "WAN");
+
+      break;
+    }
+    case LINK_TYPE_LAN:
+    {
+      strcpy(label, "LAN");
+
+      break;
+    }
+    default:
+    {
+      strcpy(label, "Unknown");
+
+      break;
+    }
+  }
+
+  sprintf(format, "link:    %s", label);
+
+  if (control -> LocalDeltaCompression == 1)
+  {
+    strcat(format, " with protocol compression enabled.");
+  }
+  else
+  {
+    strcat(format, " with protocol compression disabled.");
+  }
+
+  strcat(format, "\n\n");
+
+  strcat(buffer, format);
+
+  if (packedData -> packedBytesIn_ > 0)
+  {
+    sprintf(format, "images:  %.0f bytes (%.0f KB) packed to %.0f (%.0f KB).\n\n",
+                packedData -> packedBytesOut_, packedData -> packedBytesOut_ / 1024,
+                    packedData -> packedBytesIn_, packedData -> packedBytesIn_ / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "         Images compression ratio is %5.3f:1.\n\n",
+                packedData -> packedBytesOut_ / packedData -> packedBytesIn_);
+
+    strcat(buffer, format);
+  }
+
+  double overallIn = overallData -> overallBytesIn_ - packedData -> packedBytesIn_ +
+                         packedData -> packedBytesOut_;
+
+  double overallOut = overallData -> overallBytesOut_;
+
+  sprintf(format, "overall: %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+              overallIn, overallIn / 1024, overallOut, overallOut / 1024);
+
+  strcat(buffer, format);
+
+  if (overallData -> overallBytesOut_ > 0)
+  {
+    sprintf(format, "         Overall NX server compression ratio is %5.3f:1.\n\n\n",
+                overallIn / overallOut);
+  }
+  else
+  {
+    sprintf(format, "         Overall NX server compression ratio is 1:1.\n\n\n");
+  }
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getServerCacheStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  //
+  // Print message cache data according
+  // to local and remote view.
+  //
+
+  MessageStore *currentStore = NULL;
+  MessageStore *anyStore     = NULL;
+
+  char format[FORMAT_LENGTH];
+
+  strcat(buffer, "\nNX Cache Statistics\n");
+  strcat(buffer, "-------------------\n\n");
+
+  for (int m = proxy_client; m <= proxy_server; m++)
+  {
+    if (m == proxy_client)
+    {
+      strcat(buffer, "Request\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-------\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+    else
+    {
+      strcat(buffer, "\nReply\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-----\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+
+    for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+    {
+      if (m == proxy_client)
+      {
+        currentStore = proxy_ -> getClientStore() -> getRequestStore(i);
+      }
+      else
+      {
+        currentStore = proxy_ -> getServerStore() -> getReplyStore(i);
+      }
+
+      if (currentStore != NULL &&
+              (currentStore -> getLocalStorageSize() ||
+                   currentStore -> getRemoteStorageSize()))
+      {
+        anyStore = currentStore;
+
+        sprintf(format, "#%d\t%d\t", i, currentStore -> getSize());
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getRemoteStorageSize(),
+                    ((double) currentStore -> getRemoteStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getLocalStorageSize(),
+                    ((double) currentStore -> getLocalStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d/%.0f KB\n", currentStore -> cacheSlots,
+                    ((double) control -> getUpperStorageSize() / 100 *
+                          currentStore -> cacheThreshold) / 1024);
+
+        strcat(buffer, format);
+      }
+    }
+
+    if (anyStore == NULL)
+    {
+      strcat(buffer, "N/A\n");
+    }
+  }
+
+  if (anyStore != NULL)
+  {
+    sprintf(format, "\ncache: %d bytes (%d KB) available at server.\n",
+                control -> ClientTotalStorageSize,
+                    control -> ClientTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) available at client.\n\n",
+                control -> ServerTotalStorageSize,
+                    control -> ServerTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at server.\n",
+                anyStore -> getRemoteTotalStorageSize(),
+                    anyStore -> getRemoteTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at client.\n\n\n",
+                anyStore -> getLocalTotalStorageSize(),
+                    anyStore -> getLocalTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "\ncache: N/A\n\n");
+  }
+
+  return 1;
+}
+
+int Statistics::getServerProtocolStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  struct T_transportData *transportData;
+  struct T_protocolData  *protocolData;
+  struct T_overallData   *overallData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+    protocolData = &protocolPartial_;
+    overallData = &overallPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+    protocolData = &protocolTotal_;
+    overallData = &overallTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  double countReplyBitsIn  = 0;
+  double countReplyBitsOut = 0;
+
+  double countReplyIn        = 0;
+  double countCachedReplyIn  = 0;
+
+  double countEventBitsIn  = 0;
+  double countEventBitsOut = 0;
+
+  double countEventIn        = 0;
+  double countCachedEventIn  = 0;
+
+  double countAnyIn   = 0;
+  double countBitsIn  = 0;
+  double countBitsOut = 0;
+
+  //
+  // Print reply data.
+  //
+
+  strcat(buffer, "NX Client Side Protocol Statistics\n");
+  strcat(buffer, "----------------------------------\n\n");
+
+  strcat(buffer, "Reply   Total\tCached\tBits In\t\tBits Out\tBits/Reply\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t----------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> replyCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 5)
+      {
+        strcat(format, " ");
+      }
+
+      //
+      // Mark replies originated
+      // by NX agent requests.
+      //
+
+      if (i >= X_NXFirstOpcode && i <= X_NXLastOpcode)
+      {
+        strcat(format, "A");
+      }
+
+      //
+      // Mark replies that we didn't
+      // match against a request.
+      //
+
+      if (i == 1)
+      {
+        strcat(format, "U");
+      }
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> replyCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> replyCount_[i],
+                    protocolData -> replyCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> replyCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> replyBitsIn_[i], protocolData -> replyBitsIn_[i] / 8192,
+                      protocolData -> replyBitsOut_[i], protocolData -> replyBitsOut_[i] / 8192,
+                          protocolData -> replyBitsIn_[i] / protocolData -> replyCount_[i],
+                              protocolData -> replyBitsOut_[i] / protocolData -> replyCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> replyBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> replyBitsIn_[i] /
+                                         protocolData -> replyBitsOut_[i]);
+      }
+      else
+      {
+        sprintf(format, "1:1\n");
+      }
+
+      strcat(buffer, format);
+    }
+
+    countReplyIn       += protocolData -> replyCount_[i];
+    countCachedReplyIn += protocolData -> replyCached_[i];
+
+    countReplyBitsIn  += protocolData -> replyBitsIn_[i];
+    countReplyBitsOut += protocolData -> replyBitsOut_[i];
+
+    countAnyIn   += protocolData -> replyCount_[i];
+    countBitsIn  += protocolData -> replyBitsIn_[i];
+    countBitsOut += protocolData -> replyBitsOut_[i];
+  }
+
+  if (countReplyIn > 0)
+  {
+    if (countCachedReplyIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countReplyIn, countCachedReplyIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countReplyIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countReplyBitsIn, countReplyBitsIn / 8192, countReplyBitsOut,
+                    countReplyBitsOut / 8192, countReplyBitsIn / countReplyIn,
+                        countReplyBitsOut / countReplyIn);
+
+    strcat(buffer, format);
+
+    if (countReplyBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countReplyBitsIn / countReplyBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n");
+  }
+
+  strcat(buffer, "\n");
+
+  //
+  // Print event and error data.
+  //
+
+  strcat(buffer, "Event   Total\tCached\tBits In\t\tBits Out\tBits/Event\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t----------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> eventCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> eventCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> eventCount_[i],
+                    protocolData -> eventCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> eventCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> eventBitsIn_[i], protocolData -> eventBitsIn_[i] / 8192,
+                      protocolData -> eventBitsOut_[i], protocolData -> eventBitsOut_[i] / 8192,
+                          protocolData -> eventBitsIn_[i] / protocolData -> eventCount_[i],
+                              protocolData -> eventBitsOut_[i] / protocolData -> eventCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> eventBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> eventBitsIn_[i] /
+                                         protocolData -> eventBitsOut_[i]);
+      }
+      else
+      {
+        sprintf(format, "1:1\n");
+      }
+
+      strcat(buffer, format);
+    }
+
+    countEventIn       += protocolData -> eventCount_[i];
+    countCachedEventIn += protocolData -> eventCached_[i];
+
+    countEventBitsIn  += protocolData -> eventBitsIn_[i];
+    countEventBitsOut += protocolData -> eventBitsOut_[i];
+
+    countAnyIn   += protocolData -> eventCount_[i];
+    countBitsIn  += protocolData -> eventBitsIn_[i];
+    countBitsOut += protocolData -> eventBitsOut_[i];
+  }
+
+  if (countEventIn > 0)
+  {
+    if (countCachedEventIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countEventIn, countCachedEventIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countEventIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countEventBitsIn, countEventBitsIn / 8192, countEventBitsOut,
+                    countEventBitsOut / 8192, countEventBitsIn / countEventIn,
+                        countEventBitsOut / countEventIn);
+
+    strcat(buffer, format);
+
+    if (countEventBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countEventBitsIn / countEventBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n\n");
+  }
+
+  //
+  // Print transport data.
+  //
+
+  getTimeStats(type, buffer);
+
+  countAnyIn   += protocolData -> cupsCount_;
+  countBitsIn  += protocolData -> cupsBitsIn_;
+  countBitsOut += protocolData -> cupsBitsOut_;
+
+  countAnyIn   += protocolData -> smbCount_;
+  countBitsIn  += protocolData -> smbBitsIn_;
+  countBitsOut += protocolData -> smbBitsOut_;
+
+  countAnyIn   += protocolData -> mediaCount_;
+  countBitsIn  += protocolData -> mediaBitsIn_;
+  countBitsOut += protocolData -> mediaBitsOut_;
+
+  countAnyIn   += protocolData -> httpCount_;
+  countBitsIn  += protocolData -> httpBitsIn_;
+  countBitsOut += protocolData -> httpBitsOut_;
+
+  countAnyIn   += protocolData -> fontCount_;
+  countBitsIn  += protocolData -> fontBitsIn_;
+  countBitsOut += protocolData -> fontBitsOut_;
+
+  countAnyIn   += protocolData -> slaveCount_;
+  countBitsIn  += protocolData -> slaveBitsIn_;
+  countBitsOut += protocolData -> slaveBitsOut_;
+
+  //
+  // Save the overall amount of bytes
+  // coming from X clients.
+  //
+
+  overallData -> overallBytesIn_ = countBitsIn / 8;
+
+  //
+  // Print performance data.
+  //
+
+  if (transportData -> readTime_ > 0)
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn / (transportData -> readTime_ / 1000),
+                    (countBitsIn + transportData -> framingBitsOut_) / 8192 /
+                         (transportData -> readTime_ / 1000));
+  }
+  else
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn, (countBitsIn + transportData ->
+                    framingBitsOut_) / 8192);
+  }
+
+  strcat(buffer, format);
+
+  strcat(buffer, "link: ");
+
+  //
+  // ZLIB compression stats.
+  //
+
+  getStreamStats(type, buffer);
+
+  //
+  // Save the overall amount of bytes
+  // sent on NX proxy link.
+  //
+
+  if (transportData -> compressedBytesOut_ > 0)
+  {
+    overallData -> overallBytesOut_ = transportData -> compressedBytesOut_;
+  }
+  else
+  {
+    overallData -> overallBytesOut_ = countBitsOut / 8;
+  }
+
+  //
+  // Print info on multiplexing overhead.
+  //
+
+  getFramingStats(type, buffer);
+
+  //
+  // Print stats about additional channels.
+  //
+
+  getServicesStats(type, buffer);
+
+  //
+  // Compression summary.
+  //
+
+  double ratio = 1;
+
+  if (transportData -> compressedBytesOut_ / 1024 > 0)
+  {
+    ratio = ((countBitsIn + transportData -> framingBitsOut_) / 8192) /
+                  (transportData -> compressedBytesOut_ / 1024);
+
+  }
+  else if (countBitsOut > 0)
+  {
+    ratio = (countBitsIn + transportData -> framingBitsOut_) /
+                 countBitsOut;
+  }
+
+  sprintf(format, "      Protocol compression ratio is %5.3f:1.\n\n",
+              ratio);
+
+  strcat(buffer, format);
+
+  getBitrateStats(type, buffer);
+
+  //
+  // These are not included in output.
+  //
+  // getSplitStats(type, buffer);
+  //
+
+  strcat(buffer, "\n");
+
+  //
+  // These statistics are not included in output.
+  // You can check it anyway to get the effective
+  // amount of bytes produced by unpack procedure.
+  //
+  // getClientOverallStats(type, buffer);
+  //
+
+  return 1;
+}
+
+int Statistics::getServerOverallStats(int type, char *&buffer)
+{
+  return 1;
+}
+
+int Statistics::getTimeStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  sprintf(format, "\ntime: %.0f Ms idle, %.0f Ms (%.0f Ms in read, %.0f Ms in write) running.\n\n",
+              transportData -> idleTime_, transportData -> readTime_,
+                  transportData -> readTime_ - transportData -> writeTime_,
+                      transportData -> writeTime_);
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getStreamStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  if (transportData -> compressedBytesOut_ > 0)
+  {
+    sprintf(format, "%.0f bytes (%.0f KB) compressed to %.0f (%.0f KB).\n",
+                transportData -> compressedBytesIn_, transportData -> compressedBytesIn_ / 1024,
+                    transportData -> compressedBytesOut_, transportData -> compressedBytesOut_ / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "      %5.3f:1 stream compression ratio.\n\n",
+                transportData -> compressedBytesIn_ / transportData -> compressedBytesOut_);
+
+    strcat(buffer, format);
+  }
+
+  if (transportData -> decompressedBytesOut_ > 0)
+  {
+    if (transportData -> compressedBytesOut_ > 0)
+    {
+      strcat(buffer, "      ");
+    }
+
+    sprintf(format, "%.0f bytes (%.0f KB) decompressed to %.0f (%.0f KB).\n",
+                transportData -> decompressedBytesIn_, transportData -> decompressedBytesIn_ / 1024,
+                    transportData -> decompressedBytesOut_, transportData -> decompressedBytesOut_ / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "      %5.3f:1 stream compression ratio.\n\n",
+                transportData -> decompressedBytesOut_ / transportData -> decompressedBytesIn_);
+
+    strcat(buffer, format);
+  }
+
+  if (transportData -> compressedBytesOut_ > 0 ||
+          transportData -> decompressedBytesOut_ > 0)
+  {
+    strcat(buffer, "      ");
+  }
+
+  return 1;
+}
+
+int Statistics::getServicesStats(int type, char *&buffer)
+{
+  struct T_protocolData *protocolData;
+
+  if (type == PARTIAL_STATS)
+  {
+    protocolData = &protocolPartial_;
+  }
+  else
+  {
+    protocolData = &protocolTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  if (protocolData -> cupsBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f CUPS messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> cupsCount_ , protocolData -> cupsBitsIn_ / 8,
+                    protocolData -> cupsBitsIn_ / 8192, protocolData -> cupsBitsOut_ / 8,
+                        protocolData -> cupsBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> smbBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f SMB messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> smbCount_ , protocolData -> smbBitsIn_ / 8,
+                    protocolData -> smbBitsIn_ / 8192, protocolData -> smbBitsOut_ / 8,
+                        protocolData -> smbBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> mediaBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f multimedia messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> mediaCount_ , protocolData -> mediaBitsIn_ / 8,
+                    protocolData -> mediaBitsIn_ / 8192, protocolData -> mediaBitsOut_ / 8,
+                        protocolData -> mediaBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> httpBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f HTTP messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> httpCount_ , protocolData -> httpBitsIn_ / 8,
+                    protocolData -> httpBitsIn_ / 8192, protocolData -> httpBitsOut_ / 8,
+                        protocolData -> httpBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> fontBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f font server messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> fontCount_ , protocolData -> fontBitsIn_ / 8,
+                    protocolData -> fontBitsIn_ / 8192, protocolData -> fontBitsOut_ / 8,
+                        protocolData -> fontBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> slaveBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f slave messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> slaveCount_ , protocolData -> slaveBitsIn_ / 8,
+                    protocolData -> slaveBitsIn_ / 8192, protocolData -> slaveBitsOut_ / 8,
+                        protocolData -> slaveBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  return 1;
+}
+
+int Statistics::getFramingStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  //
+  // Print info on multiplexing overhead.
+  //
+
+  sprintf(format, "%.0f frames in, %.0f frames out, %.0f writes out.\n\n",
+              transportData -> proxyFramesIn_, transportData -> proxyFramesOut_,
+                  transportData -> proxyWritesOut_);
+
+  strcat(buffer, format);
+
+  sprintf(format, "      %.0f bytes (%.0f KB) used for framing and multiplexing.\n\n",
+              transportData -> framingBitsOut_ / 8, transportData -> framingBitsOut_ / 8192);
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getBitrateStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+  struct T_overallData   *overallData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+    overallData = &overallPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+    overallData = &overallTotal_;
+  }
+
+  double total = 0;
+
+  if (transportData -> idleTime_ + transportData -> readTime_ > 0)
+  {
+    total = overallData -> overallBytesOut_ /
+                ((transportData -> idleTime_ + transportData -> readTime_) / 1000);
+  }
+
+  char format[FORMAT_LENGTH];
+
+  sprintf(format, "      %.0f B/s average, %d B/s %ds, %d B/s %ds, %d B/s maximum.\n\n",
+              total, getBitrateInShortFrame(), control -> ShortBitrateTimeFrame / 1000,
+                  getBitrateInLongFrame(), control -> LongBitrateTimeFrame / 1000,
+                      getTopBitrate());
+
+  strcat(buffer, format);
+
+  resetTopBitrate();
+
+  return 1;
+}
+
+int Statistics::getSplitStats(int type, char *&buffer)
+{
+  //
+  // Don't print these statistics if persistent
+  // cache of images is disabled.
+  //
+
+  if (control -> ImageCacheEnableLoad == 0 &&
+          control -> ImageCacheEnableSave == 0)
+  {
+    return 0;
+  }
+
+  struct T_splitData *splitData;
+
+  if (type == PARTIAL_STATS)
+  {
+    splitData = &splitPartial_;
+  }
+  else
+  {
+    splitData = &splitTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  //
+  // Print info on split messages restored from disk.
+  //
+
+  sprintf(format, "      %.0f images streamed, %.0f restored, %.0f bytes (%.0f KB) cached.\n\n",
+              splitData -> splitCount_, splitData -> splitAborted_, splitData -> splitAbortedBytesOut_,
+                  splitData -> splitAbortedBytesOut_ / 1024);
+
+  strcat(buffer, format);
+
+  return 1;
+}
-- 
cgit v1.2.3


From 92239dafb601d2ee5da1554d19631267c81fe57c Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 13 Nov 2011 09:27:52 +0100
Subject: Imported nxcomp-3.2.0-6.tar.gz

Summary: Imported nxcomp-3.2.0-6.tar.gz
Keywords:

Imported nxcomp-3.2.0-6.tar.gz
into Git repository
---
 nxcomp/Auth.cpp          |   8 +++
 nxcomp/Auth.h            |   7 +++
 nxcomp/CHANGELOG         |  34 +++++++++-
 nxcomp/Children.cpp      |  69 ++++++++++++++++++++
 nxcomp/ClientChannel.cpp |  14 ++++-
 nxcomp/Control.cpp       |  61 +++++++++++-------
 nxcomp/Control.h         |   6 ++
 nxcomp/Loop.cpp          | 159 ++++++++++++++++++++++++++++++++++++++++++++++-
 nxcomp/ServerChannel.cpp |  14 ++++-
 nxcomp/Statistics.cpp    |   4 +-
 nxcomp/Timestamp.h       |  63 +++----------------
 nxcomp/VERSION           |   2 +-
 12 files changed, 355 insertions(+), 86 deletions(-)

(limited to 'nxcomp/Statistics.cpp')

diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
index 57e2070ec..78f93a013 100755
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -55,6 +55,8 @@ Auth::Auth(char *display, char *cookie)
 
   dataSize_ = 0;
 
+  generatedCookie_ = 0;
+
   if (display == NULL || *display == '\0' || cookie == NULL ||
           *cookie == '\0' || strlen(cookie) != 32)
   {
@@ -316,16 +318,20 @@ int Auth::getCookie()
             << "auth command.\n" << logofs_flush;
     #endif
 
+    #ifdef TEST
     cerr << "Warning" << ": Failed to read data from the X "
          << "auth command.\n";
+    #endif
 
     #ifdef PANIC
     *logofs << "Auth: WARNING! Generating a fake cookie for "
             << "X authentication.\n" << logofs_flush;
     #endif
 
+    #ifdef TEST
     cerr << "Warning" << ": Generating a fake cookie for "
          << "X authentication.\n";
+    #endif
 
     generateCookie(realCookie_);
   }
@@ -621,6 +627,8 @@ void Auth::generateCookie(char *cookie)
     data >>= 8;
   }
 
+  generatedCookie_ = 1;
+
   #ifdef TEST
   *logofs << "Auth: Generated X cookie string '"
           << cookie << "'.\n" << logofs_flush;
diff --git a/nxcomp/Auth.h b/nxcomp/Auth.h
index c8e960b45..1b77aaab2 100755
--- a/nxcomp/Auth.h
+++ b/nxcomp/Auth.h
@@ -52,6 +52,11 @@ class Auth
                         realData_ != NULL && dataSize_ != 0);
   }
 
+  int isFake() const
+  {
+    return generatedCookie_;
+  }
+
   //
   // Method called in the channel class to find if the
   // provided cookie matches the fake one. If the data
@@ -107,6 +112,8 @@ class Auth
   char *realData_;
 
   int dataSize_;
+
+  int generatedCookie_;
 };
 
 #endif /* Auth_H */
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index 12b77e5a5..cceeb07c5 100755
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -1,5 +1,35 @@
 ChangeLog:
 
+nxcomp-3.2.0-6
+
+- Changes considering that unsetenv() returns void on Mac OS X.
+
+nxcomp-3.2.0-5
+
+- Fixed TR03F02024. Assume the launchd unix socket as X socket.
+
+- Changed the authorization cookie retrieval when using the launchd
+  socket on MacOSX, in order to wait for the X server start.
+
+nxcomp-3.2.0-4
+
+- Fixed TR03F02026. Unset environment variable LD_LIBRARY_PATH before
+  calling the exec function running nxclient.
+
+nxcomp-3.2.0-3
+
+- Fix addMsTimestamp() and subMsTimestamp(). Remove the check for
+  a valid input in diffTimestamp() and diffUsTimestamp().
+
+nxcomp-3.2.0-2
+
+- Fixed TR12E01973. Now the correct number of bits are used for the
+  number of points in a X_FillPoly request.
+
+nxcomp-3.2.0-1
+
+- Opened the 3.2.0 branch based on nxcomp-3.1.0-6.
+
 nxcomp-3.1.0-6
 
 - Always use a timeout of 50 ms to update the congestion counter.
@@ -36,7 +66,7 @@ nxcomp-3.1.0-2
   
 nxcomp-3.1.0-1
 
-- Opened the 3.0.1 branch based on nxcomp-3.0.0-46.
+- Opened the 3.1.0 branch based on nxcomp-3.0.0-46.
 
 nxcomp-3.0.0-46
 
@@ -325,7 +355,7 @@ nxcomp-3.0.0-15
 
 - Removed the pending_ flag from the proxy and channel class mem-
   bers. If needed, the classes will query the transport buffers
-  to see whether there is data pending.B
+  to see whether there is data pending.
 
 - Removed the additional parameter from NXTransFlush().
 
diff --git a/nxcomp/Children.cpp b/nxcomp/Children.cpp
index c9b4b96ef..ec4ce35f3 100755
--- a/nxcomp/Children.cpp
+++ b/nxcomp/Children.cpp
@@ -71,6 +71,10 @@ extern char *GetClientPath();
 
 extern int CheckParent(char *name, char *type, int parent);
 
+#ifdef __sun
+extern char **environ;
+#endif
+
 //
 // Close all the unused descriptors and
 // install any signal handler that might
@@ -85,6 +89,12 @@ static void SystemCleanup(char *name);
 
 static void MemoryCleanup(char *name);
 
+//
+// Remove 'name' from the environment.
+//
+
+static int UnsetEnv(char *name);
+
 //
 // Start a nxclient process in dialog mode.
 //
@@ -187,6 +197,8 @@ int NXTransDialog(const char *caption, const char *message,
 
   parent[DEFAULT_STRING_LIMIT - 1] = '\0';
 
+  UnsetEnv("LD_LIBRARY_PATH");
+
   for (int i = 0; i < 2; i++)
   {
     if (local != 0)
@@ -409,6 +421,8 @@ int NXTransClient(const char* display)
 
   #endif
 
+  UnsetEnv("LD_LIBRARY_PATH");
+
   for (int i = 0; i < 2; i++)
   {
     execlp(command, command, NULL);
@@ -962,3 +976,58 @@ void MemoryCleanup(char *name)
 
   EnableSignals();
 }
+
+int UnsetEnv(char *name)
+{
+  int result;
+
+  #ifdef __sun
+
+  char **pEnv = environ;
+
+  int nameLen = strlen(name) + 1;
+
+  char *varName = new char[nameLen + 1];
+
+  strcpy(varName, name);
+
+  strcat(varName, "=");
+
+  pEnv = environ;
+
+  while (*pEnv != NULL)
+  {
+    if (!strncmp(varName, *pEnv, nameLen))
+    {
+      break;
+    }
+
+    *pEnv++;
+  }
+
+  while (*pEnv != NULL)
+  {
+    *pEnv = *(pEnv + 1);
+
+    pEnv++;
+  }
+
+  result = 0;
+
+  #else
+
+  #ifdef __APPLE__
+
+  unsetenv(name);
+  result = 0;
+
+  #else
+
+  result = unsetenv(name);
+
+  #endif
+
+  #endif
+
+  return result;
+}
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
index 3c45501d6..e69a8794a 100755
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/ClientChannel.cpp
@@ -1139,8 +1139,18 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           }
 
           unsigned int numPoints = ((inputLength - 16) >> 2);
-          encodeBuffer.encodeCachedValue(numPoints, 14,
-                             clientCache_ -> fillPolyNumPointsCache, 4);
+
+          if (control -> isProtoStep10() == 1)
+          {
+            encodeBuffer.encodeCachedValue(numPoints, 16,
+                               clientCache_ -> fillPolyNumPointsCache, 4);
+          }
+          else
+          {
+            encodeBuffer.encodeCachedValue(numPoints, 14,
+                               clientCache_ -> fillPolyNumPointsCache, 4);
+          }
+
           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
                              clientCache_ -> drawableCache);
           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
index e6693d44c..19105beef 100755
--- a/nxcomp/Control.cpp
+++ b/nxcomp/Control.cpp
@@ -659,10 +659,11 @@ Control::Control()
   // time the session is negotiated.
   //
 
-  protoStep6_ = 0;
-  protoStep7_ = 0;
-  protoStep8_ = 0;
-  protoStep9_ = 0;
+  protoStep6_  = 0;
+  protoStep7_  = 0;
+  protoStep8_  = 0;
+  protoStep9_  = 0;
+  protoStep10_ = 0;
 }
 
 Control::~Control()
@@ -734,37 +735,51 @@ void Control::setProtoStep(int step)
   {
     case 6:
     {
-      protoStep6_ = 1;
-      protoStep7_ = 0;
-      protoStep8_ = 0;
-      protoStep9_ = 0;
+      protoStep6_  = 1;
+      protoStep7_  = 0;
+      protoStep8_  = 0;
+      protoStep9_  = 0;
+      protoStep10_ = 0;
 
       break;
     }
     case 7:
     {
-      protoStep6_ = 1;
-      protoStep7_ = 1;
-      protoStep8_ = 0;
-      protoStep9_ = 0;
+      protoStep6_  = 1;
+      protoStep7_  = 1;
+      protoStep8_  = 0;
+      protoStep9_  = 0;
+      protoStep10_ = 0;
 
       break;
     }
     case 8:
     {
-      protoStep6_ = 1;
-      protoStep7_ = 1;
-      protoStep8_ = 1;
-      protoStep9_ = 0;
+      protoStep6_  = 1;
+      protoStep7_  = 1;
+      protoStep8_  = 1;
+      protoStep9_  = 0;
+      protoStep10_ = 0;
 
       break;
     }
     case 9:
     {
-      protoStep6_ = 1;
-      protoStep7_ = 1;
-      protoStep8_ = 1;
-      protoStep9_ = 1;
+      protoStep6_  = 1;
+      protoStep7_  = 1;
+      protoStep8_  = 1;
+      protoStep9_  = 1;
+      protoStep10_ = 0;
+
+      break;
+    }
+    case 10:
+    {
+      protoStep6_  = 1;
+      protoStep7_  = 1;
+      protoStep8_  = 1;
+      protoStep9_  = 1;
+      protoStep10_ = 1;
 
       break;
     }
@@ -783,7 +798,11 @@ void Control::setProtoStep(int step)
 
 int Control::getProtoStep()
 {
-  if (protoStep9_ == 1)
+  if (protoStep10_ == 1)
+  {
+    return 10;
+  }
+  else if (protoStep9_ == 1)
   {
     return 9;
   }
diff --git a/nxcomp/Control.h b/nxcomp/Control.h
index 9d998a318..9750b4c2f 100755
--- a/nxcomp/Control.h
+++ b/nxcomp/Control.h
@@ -719,6 +719,11 @@ class Control
     return protoStep9_;
   }
 
+  int isProtoStep10()
+  {
+    return protoStep10_;
+  }
+
   private:
 
   //
@@ -736,6 +741,7 @@ class Control
   int protoStep7_;
   int protoStep8_;
   int protoStep9_;
+  int protoStep10_;
 };
 
 #endif /* Control_H */
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 0a5b3a2eb..9992a77e2 100755
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -887,6 +887,13 @@ static int useFontSocket  = 0;
 static int useSlaveSocket = 0;
 static int useAgentSocket = 0;
 
+//
+// Set if the launchd service is running
+// and its socket must be used as X socket.
+//
+
+static int useLaunchdSocket = 0;
+
 //
 // Set by user if he/she wants to modify
 // the default TCP_NODELAY option as set
@@ -3745,7 +3752,90 @@ int SetupAuthInstance()
   {
     if (authCookie != NULL && *authCookie != '\0')
     {
-      auth = new Auth(displayHost, authCookie);
+      if (useLaunchdSocket == 1)
+      {
+        //
+        // If we are going to retrieve the X11 autho-
+        // rization through the launchd service, make
+        // a connection to its socket to trigger the
+        // X server starting.
+        //
+
+        sockaddr_un launchdAddrUnix;
+
+        unsigned int launchdAddrLength = sizeof(sockaddr_un);
+
+        int launchdAddrFamily = AF_UNIX;
+
+        launchdAddrUnix.sun_family = AF_UNIX;
+
+        const int launchdAddrNameLength = 108;
+
+        int success = -1;
+
+        strncpy(launchdAddrUnix.sun_path, displayHost, launchdAddrNameLength);
+
+        *(launchdAddrUnix.sun_path + launchdAddrNameLength - 1) = '\0';
+
+        #ifdef TEST
+        *logofs << "Loop: Connecting to launchd service "
+                << "on Unix port '" << displayHost << "'.\n" << logofs_flush;
+        #endif
+
+        int launchdFd = socket(launchdAddrFamily, SOCK_STREAM, PF_UNSPEC);
+
+        if (launchdFd < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Call to socket failed. "
+                  << "Error is " << EGET() << " '" << ESTR()
+                  << "'.\n" << logofs_flush;
+          #endif
+        }
+        else if ((success = connect(launchdFd, (sockaddr *) &launchdAddrUnix, launchdAddrLength)) < 0)
+        {
+          #ifdef WARNING
+          *logofs << "Loop: WARNING! Connection to launchd service "
+                  << "on Unix port '" << displayHost << "' failed "
+                  << "with error " << EGET() << ", '" << ESTR() << "'.\n"
+                  << logofs_flush;
+          #endif
+        }
+
+        if (launchdFd >= 0)
+        {
+          close(launchdFd);
+        }
+
+        //
+        // The real cookie will not be available
+        // until the X server starts. Query for the
+        // cookie in a loop, unless the connection
+        // to the launchd service failed.
+        //
+
+        int attempts = (success < 0 ? 1 : 10);
+
+        for (int i = 0; i < attempts; i++)
+        {
+          delete auth;
+
+          auth = new Auth(displayHost, authCookie);
+
+          if (auth != NULL && auth -> isFake() == 1)
+          {
+            usleep(200000);
+
+            continue;
+          }
+
+          break;
+        }
+      }
+      else
+      {
+        auth = new Auth(displayHost, authCookie);
+      }
 
       if (auth == NULL || auth -> isValid() != 1)
       {
@@ -3758,6 +3848,20 @@ int SetupAuthInstance()
 
         HandleCleanup();
       }
+      else if (auth -> isFake() == 1)
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Could not retrieve the X server "
+                << "authentication cookie.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Warning" << ": Failed to read data from the X "
+             << "auth command.\n";
+
+        cerr << "Warning" << ": Generated a fake cookie for X "
+             << "authentication.\n";
+      }
     }
     else
     {
@@ -4068,6 +4172,20 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
   strcpy(display, displayHost);
 
+  #ifdef __APPLE__
+
+  if (strncasecmp(display, "/tmp/launch", 11) == 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Using launchd service on socket '"
+            << display << "'.\n" << logofs_flush;
+    #endif
+
+    useLaunchdSocket = 1;
+  }
+
+  #endif
+
   char *separator = rindex(display, ':');
 
   if ((separator == NULL) || !isdigit(*(separator + 1)))
@@ -4092,7 +4210,16 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
           << xPort << "'.\n" << logofs_flush;
   #endif
 
+  #ifdef __APPLE__
+
+  if (separator == display || strcmp(display, "unix") == 0 ||
+          useLaunchdSocket == 1)
+
+  #else
+
   if (separator == display || strcmp(display, "unix") == 0)
+
+  #endif
   {
     //
     // UNIX domain port.
@@ -4129,6 +4256,15 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
     snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s/.X11-unix",
                  control -> TempPath);
 
+    #ifdef __APPLE__
+
+    if (useLaunchdSocket == 1)
+    {
+      snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s", display);
+    }
+
+    #endif
+
     *(unixSocketDir + DEFAULT_STRING_LENGTH - 1) = '\0';
 
     #ifdef TEST
@@ -4160,6 +4296,15 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
     sprintf(unixSocketName, "%s/X%d", unixSocketDir, xPort);
 
+    #ifdef __APPLE__
+
+    if (useLaunchdSocket == 1)
+    {
+      sprintf(unixSocketName, "%s:%d", unixSocketDir, xPort);
+    }
+
+    #endif
+
     #ifdef TEST
     *logofs << "Loop: Assuming X socket name '" << unixSocketName
             << "'.\n" << logofs_flush;
@@ -12345,9 +12490,13 @@ int SetVersion()
   {
     step = 7;
   }
-  else if (major >= 3)
+  else if (major == 3)
   {
-    if (minor > 0 || patch > 0)
+    if (minor >= 2)
+    {
+      step = 10;
+    }
+    else if (minor > 0 || patch > 0)
     {
       step = 9;
     }
@@ -12356,6 +12505,10 @@ int SetVersion()
       step = 8;
     }
   }
+  else if (major > 3)
+  {
+    step = 10;
+  }
 
   if (step == 0)
   {
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
index ba731c5ab..8df4bad94 100755
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -2753,8 +2753,18 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           }
 
           unsigned int numPoints;
-          decodeBuffer.decodeCachedValue(numPoints, 14,
-                                 clientCache_ -> fillPolyNumPointsCache, 4);
+
+          if (control -> isProtoStep10() == 1)
+          {
+            decodeBuffer.decodeCachedValue(numPoints, 16,
+                               clientCache_ -> fillPolyNumPointsCache, 4);
+          }
+          else
+          {
+            decodeBuffer.decodeCachedValue(numPoints, 14,
+                               clientCache_ -> fillPolyNumPointsCache, 4);
+          }
+
           outputLength = 16 + (numPoints << 2);
           outputMessage = writeBuffer_.addMessage(outputLength);
           decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
diff --git a/nxcomp/Statistics.cpp b/nxcomp/Statistics.cpp
index 8b57921d4..b70dd2eed 100755
--- a/nxcomp/Statistics.cpp
+++ b/nxcomp/Statistics.cpp
@@ -410,14 +410,14 @@ void Statistics::updateBitrate(int bytes)
 
     if (diffStartInMs > control -> ShortBitrateTimeFrame)
     {
-      addMsToTimestamp(startShortFrameTs_, diffStartInMs);
+      addMsTimestamp(startShortFrameTs_, diffStartInMs);
     }
 
     diffStartInMs = diffTimestamp(thisFrameTs, startLongFrameTs_);
 
     if (diffStartInMs > control -> LongBitrateTimeFrame)
     {
-      addMsToTimestamp(startLongFrameTs_, diffStartInMs);
+      addMsTimestamp(startLongFrameTs_, diffStartInMs);
     }
 
     startFrameTs_ = thisFrameTs;
diff --git a/nxcomp/Timestamp.h b/nxcomp/Timestamp.h
index 270dd3863..15246ddd5 100755
--- a/nxcomp/Timestamp.h
+++ b/nxcomp/Timestamp.h
@@ -87,20 +87,13 @@ inline T_timestamp getTimestamp(long ms)
 
 inline long diffTimestamp(const T_timestamp &ts1, const T_timestamp &ts2)
 {
-  if (ts1.tv_sec == 0 && ts1.tv_usec == 0)
-  {
-     return -1;
-  }
-
   //
   // Add 500 microseconds to round up
   // to the nearest millisecond.
   //
 
-  long ms = ((ts2.tv_sec * 1000 + (ts2.tv_usec + 500) / 1000) -
-                 (ts1.tv_sec * 1000 + (ts1.tv_usec + 500) / 1000));
-
-  return (ms < 0 ? -1 : ms);
+  return ((ts2.tv_sec * 1000 + (ts2.tv_usec + 500) / 1000) -
+             (ts1.tv_sec * 1000 + (ts1.tv_usec + 500) / 1000));
 }
 
 //
@@ -110,20 +103,8 @@ inline long diffTimestamp(const T_timestamp &ts1, const T_timestamp &ts2)
 
 inline long diffUsTimestamp(const T_timestamp &ts1, const T_timestamp &ts2)
 {
-  if (ts1.tv_sec == 0 && ts1.tv_usec == 0)
-  {
-     return -1;
-  }
-
-  //
-  // Add 500 microseconds to round up
-  // to the nearest millisecond.
-  //
-
-  long ms = ((ts2.tv_sec * 1000000 + ts2.tv_usec) -
-                 (ts1.tv_sec * 1000000 + ts1.tv_usec));
-
-  return (ms < 0 ? -1 : ms);
+  return ((ts2.tv_sec * 1000000 + ts2.tv_usec) -
+             (ts1.tv_sec * 1000000 + ts1.tv_usec));
 }
 
 //
@@ -234,40 +215,16 @@ inline bool isTimestamp(const T_timestamp &ts)
   return 1;
 }
 
-inline void subMsToTimestamp(T_timestamp &ts, long ms)
+inline void subMsTimestamp(T_timestamp &ts, long ms)
 {
-  long sec = ms / 1000;
-
-  ts.tv_sec -= sec;
-
-  long mod = ms % (ms * 1000);
-
-  if (ts.tv_usec >= (mod * 1000))
-  {
-    ts.tv_sec -= mod * 1000;
-  }
-  else
-  {
-    ts.tv_sec--;
-
-    ts.tv_usec = 1000000 - mod * 1000;
-  }
+  ts.tv_sec  -= ms / 1000;
+  ts.tv_usec -= (ms % 1000) * 1000;
 }
 
-inline void addMsToTimestamp(T_timestamp &ts, long ms)
+inline void addMsTimestamp(T_timestamp &ts, long ms)
 {
-  long sec = ms / 1000;
-
-  ts.tv_sec += sec;
-
-  long mod = ms % (ms * 1000);
-
-  ts.tv_usec += mod * 1000;
-
-  if (ts.tv_usec > 1000000)
-  {
-    ts.tv_sec += 1;
-  }
+  ts.tv_sec  += ms / 1000;
+  ts.tv_usec += (ms % 1000) * 1000;
 }
 
 //
diff --git a/nxcomp/VERSION b/nxcomp/VERSION
index fd2a01863..944880fa1 100755
--- a/nxcomp/VERSION
+++ b/nxcomp/VERSION
@@ -1 +1 @@
-3.1.0
+3.2.0
-- 
cgit v1.2.3


From 799bf672a3588f205bd18ef39d9908069e0cd6d5 Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 13 Nov 2011 09:27:52 +0100
Subject: Imported nxcomp-3.4.0-1.tar.gz

Summary: Imported nxcomp-3.4.0-1.tar.gz
Keywords:

Imported nxcomp-3.4.0-1.tar.gz
into Git repository
---
 nxcomp/ActionCache.cpp                 | 4 ++--
 nxcomp/ActionCache.h                   | 4 ++--
 nxcomp/ActionCacheCompat.h             | 4 ++--
 nxcomp/Agent.cpp                       | 4 ++--
 nxcomp/Agent.h                         | 4 ++--
 nxcomp/Alpha.cpp                       | 4 ++--
 nxcomp/Alpha.h                         | 4 ++--
 nxcomp/Auth.cpp                        | 4 ++--
 nxcomp/Auth.h                          | 4 ++--
 nxcomp/Bitmap.cpp                      | 4 ++--
 nxcomp/Bitmap.h                        | 4 ++--
 nxcomp/BlockCache.cpp                  | 4 ++--
 nxcomp/BlockCache.h                    | 4 ++--
 nxcomp/BlockCacheSet.cpp               | 4 ++--
 nxcomp/BlockCacheSet.h                 | 4 ++--
 nxcomp/CHANGELOG                       | 8 ++++++++
 nxcomp/COPYING                         | 0
 nxcomp/ChangeGC.cpp                    | 4 ++--
 nxcomp/ChangeGC.h                      | 4 ++--
 nxcomp/ChangeGCCompat.cpp              | 4 ++--
 nxcomp/ChangeGCCompat.h                | 4 ++--
 nxcomp/ChangeProperty.cpp              | 4 ++--
 nxcomp/ChangeProperty.h                | 4 ++--
 nxcomp/Channel.cpp                     | 4 ++--
 nxcomp/Channel.h                       | 4 ++--
 nxcomp/ChannelCache.cpp                | 4 ++--
 nxcomp/ChannelCache.h                  | 4 ++--
 nxcomp/ChannelStore.h                  | 4 ++--
 nxcomp/CharCache.cpp                   | 4 ++--
 nxcomp/CharCache.h                     | 4 ++--
 nxcomp/Children.cpp                    | 4 ++--
 nxcomp/ClearArea.cpp                   | 4 ++--
 nxcomp/ClearArea.h                     | 4 ++--
 nxcomp/ClientCache.cpp                 | 4 ++--
 nxcomp/ClientCache.h                   | 4 ++--
 nxcomp/ClientChannel.cpp               | 4 ++--
 nxcomp/ClientChannel.h                 | 4 ++--
 nxcomp/ClientProxy.cpp                 | 4 ++--
 nxcomp/ClientProxy.h                   | 4 ++--
 nxcomp/ClientReadBuffer.cpp            | 4 ++--
 nxcomp/ClientReadBuffer.h              | 4 ++--
 nxcomp/ClientStore.cpp                 | 4 ++--
 nxcomp/ClientStore.h                   | 4 ++--
 nxcomp/Colormap.cpp                    | 4 ++--
 nxcomp/Colormap.h                      | 4 ++--
 nxcomp/ConfigureWindow.cpp             | 4 ++--
 nxcomp/ConfigureWindow.h               | 4 ++--
 nxcomp/Control.cpp                     | 4 ++--
 nxcomp/Control.h                       | 4 ++--
 nxcomp/CopyArea.cpp                    | 4 ++--
 nxcomp/CopyArea.h                      | 4 ++--
 nxcomp/CreateGC.cpp                    | 4 ++--
 nxcomp/CreateGC.h                      | 4 ++--
 nxcomp/CreatePixmap.cpp                | 4 ++--
 nxcomp/CreatePixmap.h                  | 4 ++--
 nxcomp/CreatePixmapCompat.cpp          | 4 ++--
 nxcomp/CreatePixmapCompat.h            | 4 ++--
 nxcomp/DecodeBuffer.cpp                | 4 ++--
 nxcomp/DecodeBuffer.h                  | 4 ++--
 nxcomp/EncodeBuffer.cpp                | 4 ++--
 nxcomp/EncodeBuffer.h                  | 4 ++--
 nxcomp/FillPoly.cpp                    | 4 ++--
 nxcomp/FillPoly.h                      | 4 ++--
 nxcomp/Fork.cpp                        | 4 ++--
 nxcomp/Fork.h                          | 4 ++--
 nxcomp/FreeCache.h                     | 4 ++--
 nxcomp/GenericChannel.cpp              | 4 ++--
 nxcomp/GenericChannel.h                | 4 ++--
 nxcomp/GenericReadBuffer.cpp           | 4 ++--
 nxcomp/GenericReadBuffer.h             | 4 ++--
 nxcomp/GenericReply.cpp                | 4 ++--
 nxcomp/GenericReply.h                  | 4 ++--
 nxcomp/GenericRequest.cpp              | 4 ++--
 nxcomp/GenericRequest.h                | 4 ++--
 nxcomp/GetImage.cpp                    | 4 ++--
 nxcomp/GetImage.h                      | 4 ++--
 nxcomp/GetImageReply.cpp               | 4 ++--
 nxcomp/GetImageReply.h                 | 4 ++--
 nxcomp/GetProperty.cpp                 | 4 ++--
 nxcomp/GetProperty.h                   | 4 ++--
 nxcomp/GetPropertyReply.cpp            | 4 ++--
 nxcomp/GetPropertyReply.h              | 4 ++--
 nxcomp/ImageText16.cpp                 | 4 ++--
 nxcomp/ImageText16.h                   | 4 ++--
 nxcomp/ImageText8.cpp                  | 4 ++--
 nxcomp/ImageText8.h                    | 4 ++--
 nxcomp/IntCache.cpp                    | 4 ++--
 nxcomp/IntCache.h                      | 4 ++--
 nxcomp/InternAtom.cpp                  | 4 ++--
 nxcomp/InternAtom.h                    | 4 ++--
 nxcomp/Jpeg.cpp                        | 4 ++--
 nxcomp/Jpeg.h                          | 4 ++--
 nxcomp/Keeper.cpp                      | 4 ++--
 nxcomp/Keeper.h                        | 4 ++--
 nxcomp/LICENSE                         | 2 +-
 nxcomp/List.cpp                        | 4 ++--
 nxcomp/List.h                          | 4 ++--
 nxcomp/ListFontsReply.cpp              | 4 ++--
 nxcomp/ListFontsReply.h                | 4 ++--
 nxcomp/Loop.cpp                        | 4 ++--
 nxcomp/MD5.c                           | 0
 nxcomp/MD5.h                           | 0
 nxcomp/Makefile.in                     | 4 ++--
 nxcomp/Message.cpp                     | 4 ++--
 nxcomp/Message.h                       | 4 ++--
 nxcomp/Misc.cpp                        | 6 +++---
 nxcomp/Misc.h                          | 4 ++--
 nxcomp/NX.h                            | 4 ++--
 nxcomp/NXalert.h                       | 4 ++--
 nxcomp/NXmitshm.h                      | 4 ++--
 nxcomp/NXpack.h                        | 4 ++--
 nxcomp/NXproto.h                       | 4 ++--
 nxcomp/NXrender.h                      | 4 ++--
 nxcomp/NXvars.h                        | 4 ++--
 nxcomp/OpcodeCache.h                   | 4 ++--
 nxcomp/OpcodeStore.cpp                 | 4 ++--
 nxcomp/OpcodeStore.h                   | 4 ++--
 nxcomp/Pack.c                          | 4 ++--
 nxcomp/Pgn.cpp                         | 4 ++--
 nxcomp/Pgn.h                           | 4 ++--
 nxcomp/Pipe.cpp                        | 4 ++--
 nxcomp/Pipe.h                          | 4 ++--
 nxcomp/PolyArc.cpp                     | 4 ++--
 nxcomp/PolyArc.h                       | 4 ++--
 nxcomp/PolyFillArc.cpp                 | 4 ++--
 nxcomp/PolyFillArc.h                   | 4 ++--
 nxcomp/PolyFillRectangle.cpp           | 4 ++--
 nxcomp/PolyFillRectangle.h             | 4 ++--
 nxcomp/PolyLine.cpp                    | 4 ++--
 nxcomp/PolyLine.h                      | 4 ++--
 nxcomp/PolyPoint.cpp                   | 4 ++--
 nxcomp/PolyPoint.h                     | 4 ++--
 nxcomp/PolySegment.cpp                 | 4 ++--
 nxcomp/PolySegment.h                   | 4 ++--
 nxcomp/PolyText16.cpp                  | 4 ++--
 nxcomp/PolyText16.h                    | 4 ++--
 nxcomp/PolyText8.cpp                   | 4 ++--
 nxcomp/PolyText8.h                     | 4 ++--
 nxcomp/PositionCacheCompat.cpp         | 4 ++--
 nxcomp/PositionCacheCompat.h           | 4 ++--
 nxcomp/Proxy.cpp                       | 4 ++--
 nxcomp/Proxy.h                         | 4 ++--
 nxcomp/ProxyReadBuffer.cpp             | 4 ++--
 nxcomp/ProxyReadBuffer.h               | 4 ++--
 nxcomp/PutImage.cpp                    | 4 ++--
 nxcomp/PutImage.h                      | 4 ++--
 nxcomp/PutPackedImage.cpp              | 4 ++--
 nxcomp/PutPackedImage.h                | 4 ++--
 nxcomp/QueryFontReply.cpp              | 4 ++--
 nxcomp/QueryFontReply.h                | 4 ++--
 nxcomp/README                          | 0
 nxcomp/README-IPAQ                     | 0
 nxcomp/ReadBuffer.cpp                  | 4 ++--
 nxcomp/ReadBuffer.h                    | 4 ++--
 nxcomp/RenderAddGlyphs.cpp             | 4 ++--
 nxcomp/RenderAddGlyphs.h               | 4 ++--
 nxcomp/RenderChangePicture.cpp         | 4 ++--
 nxcomp/RenderChangePicture.h           | 4 ++--
 nxcomp/RenderComposite.cpp             | 4 ++--
 nxcomp/RenderComposite.h               | 4 ++--
 nxcomp/RenderCompositeCompat.cpp       | 4 ++--
 nxcomp/RenderCompositeCompat.h         | 4 ++--
 nxcomp/RenderCompositeGlyphs.cpp       | 4 ++--
 nxcomp/RenderCompositeGlyphs.h         | 4 ++--
 nxcomp/RenderCompositeGlyphsCompat.cpp | 4 ++--
 nxcomp/RenderCompositeGlyphsCompat.h   | 4 ++--
 nxcomp/RenderCreateGlyphSet.cpp        | 4 ++--
 nxcomp/RenderCreateGlyphSet.h          | 4 ++--
 nxcomp/RenderCreateGlyphSetCompat.cpp  | 4 ++--
 nxcomp/RenderCreateGlyphSetCompat.h    | 4 ++--
 nxcomp/RenderCreatePicture.cpp         | 4 ++--
 nxcomp/RenderCreatePicture.h           | 4 ++--
 nxcomp/RenderCreatePictureCompat.cpp   | 4 ++--
 nxcomp/RenderCreatePictureCompat.h     | 4 ++--
 nxcomp/RenderExtension.cpp             | 4 ++--
 nxcomp/RenderExtension.h               | 4 ++--
 nxcomp/RenderFillRectangles.cpp        | 4 ++--
 nxcomp/RenderFillRectangles.h          | 4 ++--
 nxcomp/RenderFreeGlyphSet.cpp          | 4 ++--
 nxcomp/RenderFreeGlyphSet.h            | 4 ++--
 nxcomp/RenderFreePicture.cpp           | 4 ++--
 nxcomp/RenderFreePicture.h             | 4 ++--
 nxcomp/RenderFreePictureCompat.cpp     | 4 ++--
 nxcomp/RenderFreePictureCompat.h       | 4 ++--
 nxcomp/RenderGenericRequest.cpp        | 4 ++--
 nxcomp/RenderGenericRequest.h          | 4 ++--
 nxcomp/RenderMinorExtensionHeaders.h   | 4 ++--
 nxcomp/RenderMinorExtensionMethods.h   | 4 ++--
 nxcomp/RenderMinorExtensionTags.h      | 4 ++--
 nxcomp/RenderPictureClip.cpp           | 4 ++--
 nxcomp/RenderPictureClip.h             | 4 ++--
 nxcomp/RenderPictureClipCompat.cpp     | 4 ++--
 nxcomp/RenderPictureClipCompat.h       | 4 ++--
 nxcomp/RenderPictureFilter.cpp         | 4 ++--
 nxcomp/RenderPictureFilter.h           | 4 ++--
 nxcomp/RenderPictureTransform.cpp      | 4 ++--
 nxcomp/RenderPictureTransform.h        | 4 ++--
 nxcomp/RenderTrapezoids.cpp            | 4 ++--
 nxcomp/RenderTrapezoids.h              | 4 ++--
 nxcomp/RenderTriangles.cpp             | 4 ++--
 nxcomp/RenderTriangles.h               | 4 ++--
 nxcomp/Rgb.cpp                         | 4 ++--
 nxcomp/Rgb.h                           | 4 ++--
 nxcomp/Rle.cpp                         | 4 ++--
 nxcomp/Rle.h                           | 4 ++--
 nxcomp/SendEvent.cpp                   | 4 ++--
 nxcomp/SendEvent.h                     | 4 ++--
 nxcomp/SequenceQueue.cpp               | 4 ++--
 nxcomp/SequenceQueue.h                 | 4 ++--
 nxcomp/ServerCache.cpp                 | 4 ++--
 nxcomp/ServerCache.h                   | 4 ++--
 nxcomp/ServerChannel.cpp               | 4 ++--
 nxcomp/ServerChannel.h                 | 4 ++--
 nxcomp/ServerProxy.cpp                 | 4 ++--
 nxcomp/ServerProxy.h                   | 4 ++--
 nxcomp/ServerReadBuffer.cpp            | 4 ++--
 nxcomp/ServerReadBuffer.h              | 4 ++--
 nxcomp/ServerStore.cpp                 | 4 ++--
 nxcomp/ServerStore.h                   | 4 ++--
 nxcomp/SetClipRectangles.cpp           | 4 ++--
 nxcomp/SetClipRectangles.h             | 4 ++--
 nxcomp/SetUnpackAlpha.cpp              | 4 ++--
 nxcomp/SetUnpackAlpha.h                | 4 ++--
 nxcomp/SetUnpackAlphaCompat.cpp        | 4 ++--
 nxcomp/SetUnpackAlphaCompat.h          | 4 ++--
 nxcomp/SetUnpackColormap.cpp           | 4 ++--
 nxcomp/SetUnpackColormap.h             | 4 ++--
 nxcomp/SetUnpackColormapCompat.cpp     | 4 ++--
 nxcomp/SetUnpackColormapCompat.h       | 4 ++--
 nxcomp/SetUnpackGeometry.cpp           | 4 ++--
 nxcomp/SetUnpackGeometry.h             | 4 ++--
 nxcomp/ShapeExtension.cpp              | 4 ++--
 nxcomp/ShapeExtension.h                | 4 ++--
 nxcomp/Socket.cpp                      | 4 ++--
 nxcomp/Socket.h                        | 4 ++--
 nxcomp/Split.cpp                       | 4 ++--
 nxcomp/Split.h                         | 4 ++--
 nxcomp/StaticCompressor.cpp            | 4 ++--
 nxcomp/StaticCompressor.h              | 4 ++--
 nxcomp/Statistics.cpp                  | 4 ++--
 nxcomp/Statistics.h                    | 4 ++--
 nxcomp/TextCompressor.cpp              | 4 ++--
 nxcomp/TextCompressor.h                | 4 ++--
 nxcomp/Timestamp.cpp                   | 4 ++--
 nxcomp/Timestamp.h                     | 4 ++--
 nxcomp/TranslateCoords.cpp             | 4 ++--
 nxcomp/TranslateCoords.h               | 4 ++--
 nxcomp/Transport.cpp                   | 4 ++--
 nxcomp/Transport.h                     | 4 ++--
 nxcomp/Types.h                         | 4 ++--
 nxcomp/Unpack.cpp                      | 4 ++--
 nxcomp/Unpack.h                        | 4 ++--
 nxcomp/Utils.cpp                       | 4 ++--
 nxcomp/VERSION                         | 2 +-
 nxcomp/Vars.c                          | 4 ++--
 nxcomp/WriteBuffer.cpp                 | 4 ++--
 nxcomp/WriteBuffer.h                   | 4 ++--
 nxcomp/XidCache.cpp                    | 4 ++--
 nxcomp/XidCache.h                      | 4 ++--
 nxcomp/Z.cpp                           | 4 ++--
 nxcomp/Z.h                             | 4 ++--
 nxcomp/configure.in                    | 0
 262 files changed, 517 insertions(+), 509 deletions(-)
 mode change 100755 => 100644 nxcomp/ActionCache.cpp
 mode change 100755 => 100644 nxcomp/ActionCache.h
 mode change 100755 => 100644 nxcomp/ActionCacheCompat.h
 mode change 100755 => 100644 nxcomp/Agent.cpp
 mode change 100755 => 100644 nxcomp/Agent.h
 mode change 100755 => 100644 nxcomp/Alpha.cpp
 mode change 100755 => 100644 nxcomp/Alpha.h
 mode change 100755 => 100644 nxcomp/Auth.cpp
 mode change 100755 => 100644 nxcomp/Auth.h
 mode change 100755 => 100644 nxcomp/Bitmap.cpp
 mode change 100755 => 100644 nxcomp/Bitmap.h
 mode change 100755 => 100644 nxcomp/BlockCache.cpp
 mode change 100755 => 100644 nxcomp/BlockCache.h
 mode change 100755 => 100644 nxcomp/BlockCacheSet.cpp
 mode change 100755 => 100644 nxcomp/BlockCacheSet.h
 mode change 100755 => 100644 nxcomp/CHANGELOG
 mode change 100755 => 100644 nxcomp/COPYING
 mode change 100755 => 100644 nxcomp/ChangeGC.cpp
 mode change 100755 => 100644 nxcomp/ChangeGC.h
 mode change 100755 => 100644 nxcomp/ChangeGCCompat.cpp
 mode change 100755 => 100644 nxcomp/ChangeGCCompat.h
 mode change 100755 => 100644 nxcomp/ChangeProperty.cpp
 mode change 100755 => 100644 nxcomp/ChangeProperty.h
 mode change 100755 => 100644 nxcomp/Channel.cpp
 mode change 100755 => 100644 nxcomp/Channel.h
 mode change 100755 => 100644 nxcomp/ChannelCache.cpp
 mode change 100755 => 100644 nxcomp/ChannelCache.h
 mode change 100755 => 100644 nxcomp/ChannelStore.h
 mode change 100755 => 100644 nxcomp/CharCache.cpp
 mode change 100755 => 100644 nxcomp/CharCache.h
 mode change 100755 => 100644 nxcomp/Children.cpp
 mode change 100755 => 100644 nxcomp/ClearArea.cpp
 mode change 100755 => 100644 nxcomp/ClearArea.h
 mode change 100755 => 100644 nxcomp/ClientCache.cpp
 mode change 100755 => 100644 nxcomp/ClientCache.h
 mode change 100755 => 100644 nxcomp/ClientChannel.cpp
 mode change 100755 => 100644 nxcomp/ClientChannel.h
 mode change 100755 => 100644 nxcomp/ClientProxy.cpp
 mode change 100755 => 100644 nxcomp/ClientProxy.h
 mode change 100755 => 100644 nxcomp/ClientReadBuffer.cpp
 mode change 100755 => 100644 nxcomp/ClientReadBuffer.h
 mode change 100755 => 100644 nxcomp/ClientStore.cpp
 mode change 100755 => 100644 nxcomp/ClientStore.h
 mode change 100755 => 100644 nxcomp/Colormap.cpp
 mode change 100755 => 100644 nxcomp/Colormap.h
 mode change 100755 => 100644 nxcomp/ConfigureWindow.cpp
 mode change 100755 => 100644 nxcomp/ConfigureWindow.h
 mode change 100755 => 100644 nxcomp/Control.cpp
 mode change 100755 => 100644 nxcomp/Control.h
 mode change 100755 => 100644 nxcomp/CopyArea.cpp
 mode change 100755 => 100644 nxcomp/CopyArea.h
 mode change 100755 => 100644 nxcomp/CreateGC.cpp
 mode change 100755 => 100644 nxcomp/CreateGC.h
 mode change 100755 => 100644 nxcomp/CreatePixmap.cpp
 mode change 100755 => 100644 nxcomp/CreatePixmap.h
 mode change 100755 => 100644 nxcomp/CreatePixmapCompat.cpp
 mode change 100755 => 100644 nxcomp/CreatePixmapCompat.h
 mode change 100755 => 100644 nxcomp/DecodeBuffer.cpp
 mode change 100755 => 100644 nxcomp/DecodeBuffer.h
 mode change 100755 => 100644 nxcomp/EncodeBuffer.cpp
 mode change 100755 => 100644 nxcomp/EncodeBuffer.h
 mode change 100755 => 100644 nxcomp/FillPoly.cpp
 mode change 100755 => 100644 nxcomp/FillPoly.h
 mode change 100755 => 100644 nxcomp/Fork.cpp
 mode change 100755 => 100644 nxcomp/Fork.h
 mode change 100755 => 100644 nxcomp/FreeCache.h
 mode change 100755 => 100644 nxcomp/GenericChannel.cpp
 mode change 100755 => 100644 nxcomp/GenericChannel.h
 mode change 100755 => 100644 nxcomp/GenericReadBuffer.cpp
 mode change 100755 => 100644 nxcomp/GenericReadBuffer.h
 mode change 100755 => 100644 nxcomp/GenericReply.cpp
 mode change 100755 => 100644 nxcomp/GenericReply.h
 mode change 100755 => 100644 nxcomp/GenericRequest.cpp
 mode change 100755 => 100644 nxcomp/GenericRequest.h
 mode change 100755 => 100644 nxcomp/GetImage.cpp
 mode change 100755 => 100644 nxcomp/GetImage.h
 mode change 100755 => 100644 nxcomp/GetImageReply.cpp
 mode change 100755 => 100644 nxcomp/GetImageReply.h
 mode change 100755 => 100644 nxcomp/GetProperty.cpp
 mode change 100755 => 100644 nxcomp/GetProperty.h
 mode change 100755 => 100644 nxcomp/GetPropertyReply.cpp
 mode change 100755 => 100644 nxcomp/GetPropertyReply.h
 mode change 100755 => 100644 nxcomp/ImageText16.cpp
 mode change 100755 => 100644 nxcomp/ImageText16.h
 mode change 100755 => 100644 nxcomp/ImageText8.cpp
 mode change 100755 => 100644 nxcomp/ImageText8.h
 mode change 100755 => 100644 nxcomp/IntCache.cpp
 mode change 100755 => 100644 nxcomp/IntCache.h
 mode change 100755 => 100644 nxcomp/InternAtom.cpp
 mode change 100755 => 100644 nxcomp/InternAtom.h
 mode change 100755 => 100644 nxcomp/Jpeg.cpp
 mode change 100755 => 100644 nxcomp/Jpeg.h
 mode change 100755 => 100644 nxcomp/Keeper.cpp
 mode change 100755 => 100644 nxcomp/Keeper.h
 mode change 100755 => 100644 nxcomp/LICENSE
 mode change 100755 => 100644 nxcomp/List.cpp
 mode change 100755 => 100644 nxcomp/List.h
 mode change 100755 => 100644 nxcomp/ListFontsReply.cpp
 mode change 100755 => 100644 nxcomp/ListFontsReply.h
 mode change 100755 => 100644 nxcomp/Loop.cpp
 mode change 100755 => 100644 nxcomp/MD5.c
 mode change 100755 => 100644 nxcomp/MD5.h
 mode change 100755 => 100644 nxcomp/Makefile.in
 mode change 100755 => 100644 nxcomp/Message.cpp
 mode change 100755 => 100644 nxcomp/Message.h
 mode change 100755 => 100644 nxcomp/Misc.cpp
 mode change 100755 => 100644 nxcomp/Misc.h
 mode change 100755 => 100644 nxcomp/NX.h
 mode change 100755 => 100644 nxcomp/NXalert.h
 mode change 100755 => 100644 nxcomp/NXmitshm.h
 mode change 100755 => 100644 nxcomp/NXpack.h
 mode change 100755 => 100644 nxcomp/NXproto.h
 mode change 100755 => 100644 nxcomp/NXrender.h
 mode change 100755 => 100644 nxcomp/NXvars.h
 mode change 100755 => 100644 nxcomp/OpcodeCache.h
 mode change 100755 => 100644 nxcomp/OpcodeStore.cpp
 mode change 100755 => 100644 nxcomp/OpcodeStore.h
 mode change 100755 => 100644 nxcomp/Pack.c
 mode change 100755 => 100644 nxcomp/Pgn.cpp
 mode change 100755 => 100644 nxcomp/Pgn.h
 mode change 100755 => 100644 nxcomp/Pipe.cpp
 mode change 100755 => 100644 nxcomp/Pipe.h
 mode change 100755 => 100644 nxcomp/PolyArc.cpp
 mode change 100755 => 100644 nxcomp/PolyArc.h
 mode change 100755 => 100644 nxcomp/PolyFillArc.cpp
 mode change 100755 => 100644 nxcomp/PolyFillArc.h
 mode change 100755 => 100644 nxcomp/PolyFillRectangle.cpp
 mode change 100755 => 100644 nxcomp/PolyFillRectangle.h
 mode change 100755 => 100644 nxcomp/PolyLine.cpp
 mode change 100755 => 100644 nxcomp/PolyLine.h
 mode change 100755 => 100644 nxcomp/PolyPoint.cpp
 mode change 100755 => 100644 nxcomp/PolyPoint.h
 mode change 100755 => 100644 nxcomp/PolySegment.cpp
 mode change 100755 => 100644 nxcomp/PolySegment.h
 mode change 100755 => 100644 nxcomp/PolyText16.cpp
 mode change 100755 => 100644 nxcomp/PolyText16.h
 mode change 100755 => 100644 nxcomp/PolyText8.cpp
 mode change 100755 => 100644 nxcomp/PolyText8.h
 mode change 100755 => 100644 nxcomp/PositionCacheCompat.cpp
 mode change 100755 => 100644 nxcomp/PositionCacheCompat.h
 mode change 100755 => 100644 nxcomp/Proxy.cpp
 mode change 100755 => 100644 nxcomp/Proxy.h
 mode change 100755 => 100644 nxcomp/ProxyReadBuffer.cpp
 mode change 100755 => 100644 nxcomp/ProxyReadBuffer.h
 mode change 100755 => 100644 nxcomp/PutImage.cpp
 mode change 100755 => 100644 nxcomp/PutImage.h
 mode change 100755 => 100644 nxcomp/PutPackedImage.cpp
 mode change 100755 => 100644 nxcomp/PutPackedImage.h
 mode change 100755 => 100644 nxcomp/QueryFontReply.cpp
 mode change 100755 => 100644 nxcomp/QueryFontReply.h
 mode change 100755 => 100644 nxcomp/README
 mode change 100755 => 100644 nxcomp/README-IPAQ
 mode change 100755 => 100644 nxcomp/ReadBuffer.cpp
 mode change 100755 => 100644 nxcomp/ReadBuffer.h
 mode change 100755 => 100644 nxcomp/RenderAddGlyphs.cpp
 mode change 100755 => 100644 nxcomp/RenderAddGlyphs.h
 mode change 100755 => 100644 nxcomp/RenderChangePicture.cpp
 mode change 100755 => 100644 nxcomp/RenderChangePicture.h
 mode change 100755 => 100644 nxcomp/RenderComposite.cpp
 mode change 100755 => 100644 nxcomp/RenderComposite.h
 mode change 100755 => 100644 nxcomp/RenderCompositeCompat.cpp
 mode change 100755 => 100644 nxcomp/RenderCompositeCompat.h
 mode change 100755 => 100644 nxcomp/RenderCompositeGlyphs.cpp
 mode change 100755 => 100644 nxcomp/RenderCompositeGlyphs.h
 mode change 100755 => 100644 nxcomp/RenderCompositeGlyphsCompat.cpp
 mode change 100755 => 100644 nxcomp/RenderCompositeGlyphsCompat.h
 mode change 100755 => 100644 nxcomp/RenderCreateGlyphSet.cpp
 mode change 100755 => 100644 nxcomp/RenderCreateGlyphSet.h
 mode change 100755 => 100644 nxcomp/RenderCreateGlyphSetCompat.cpp
 mode change 100755 => 100644 nxcomp/RenderCreateGlyphSetCompat.h
 mode change 100755 => 100644 nxcomp/RenderCreatePicture.cpp
 mode change 100755 => 100644 nxcomp/RenderCreatePicture.h
 mode change 100755 => 100644 nxcomp/RenderCreatePictureCompat.cpp
 mode change 100755 => 100644 nxcomp/RenderCreatePictureCompat.h
 mode change 100755 => 100644 nxcomp/RenderExtension.cpp
 mode change 100755 => 100644 nxcomp/RenderExtension.h
 mode change 100755 => 100644 nxcomp/RenderFillRectangles.cpp
 mode change 100755 => 100644 nxcomp/RenderFillRectangles.h
 mode change 100755 => 100644 nxcomp/RenderFreeGlyphSet.cpp
 mode change 100755 => 100644 nxcomp/RenderFreeGlyphSet.h
 mode change 100755 => 100644 nxcomp/RenderFreePicture.cpp
 mode change 100755 => 100644 nxcomp/RenderFreePicture.h
 mode change 100755 => 100644 nxcomp/RenderFreePictureCompat.cpp
 mode change 100755 => 100644 nxcomp/RenderFreePictureCompat.h
 mode change 100755 => 100644 nxcomp/RenderGenericRequest.cpp
 mode change 100755 => 100644 nxcomp/RenderGenericRequest.h
 mode change 100755 => 100644 nxcomp/RenderMinorExtensionHeaders.h
 mode change 100755 => 100644 nxcomp/RenderMinorExtensionMethods.h
 mode change 100755 => 100644 nxcomp/RenderMinorExtensionTags.h
 mode change 100755 => 100644 nxcomp/RenderPictureClip.cpp
 mode change 100755 => 100644 nxcomp/RenderPictureClip.h
 mode change 100755 => 100644 nxcomp/RenderPictureClipCompat.cpp
 mode change 100755 => 100644 nxcomp/RenderPictureClipCompat.h
 mode change 100755 => 100644 nxcomp/RenderPictureFilter.cpp
 mode change 100755 => 100644 nxcomp/RenderPictureFilter.h
 mode change 100755 => 100644 nxcomp/RenderPictureTransform.cpp
 mode change 100755 => 100644 nxcomp/RenderPictureTransform.h
 mode change 100755 => 100644 nxcomp/RenderTrapezoids.cpp
 mode change 100755 => 100644 nxcomp/RenderTrapezoids.h
 mode change 100755 => 100644 nxcomp/RenderTriangles.cpp
 mode change 100755 => 100644 nxcomp/RenderTriangles.h
 mode change 100755 => 100644 nxcomp/Rgb.cpp
 mode change 100755 => 100644 nxcomp/Rgb.h
 mode change 100755 => 100644 nxcomp/Rle.cpp
 mode change 100755 => 100644 nxcomp/Rle.h
 mode change 100755 => 100644 nxcomp/SendEvent.cpp
 mode change 100755 => 100644 nxcomp/SendEvent.h
 mode change 100755 => 100644 nxcomp/SequenceQueue.cpp
 mode change 100755 => 100644 nxcomp/SequenceQueue.h
 mode change 100755 => 100644 nxcomp/ServerCache.cpp
 mode change 100755 => 100644 nxcomp/ServerCache.h
 mode change 100755 => 100644 nxcomp/ServerChannel.cpp
 mode change 100755 => 100644 nxcomp/ServerChannel.h
 mode change 100755 => 100644 nxcomp/ServerProxy.cpp
 mode change 100755 => 100644 nxcomp/ServerProxy.h
 mode change 100755 => 100644 nxcomp/ServerReadBuffer.cpp
 mode change 100755 => 100644 nxcomp/ServerReadBuffer.h
 mode change 100755 => 100644 nxcomp/ServerStore.cpp
 mode change 100755 => 100644 nxcomp/ServerStore.h
 mode change 100755 => 100644 nxcomp/SetClipRectangles.cpp
 mode change 100755 => 100644 nxcomp/SetClipRectangles.h
 mode change 100755 => 100644 nxcomp/SetUnpackAlpha.cpp
 mode change 100755 => 100644 nxcomp/SetUnpackAlpha.h
 mode change 100755 => 100644 nxcomp/SetUnpackAlphaCompat.cpp
 mode change 100755 => 100644 nxcomp/SetUnpackAlphaCompat.h
 mode change 100755 => 100644 nxcomp/SetUnpackColormap.cpp
 mode change 100755 => 100644 nxcomp/SetUnpackColormap.h
 mode change 100755 => 100644 nxcomp/SetUnpackColormapCompat.cpp
 mode change 100755 => 100644 nxcomp/SetUnpackColormapCompat.h
 mode change 100755 => 100644 nxcomp/SetUnpackGeometry.cpp
 mode change 100755 => 100644 nxcomp/SetUnpackGeometry.h
 mode change 100755 => 100644 nxcomp/ShapeExtension.cpp
 mode change 100755 => 100644 nxcomp/ShapeExtension.h
 mode change 100755 => 100644 nxcomp/Socket.cpp
 mode change 100755 => 100644 nxcomp/Socket.h
 mode change 100755 => 100644 nxcomp/Split.cpp
 mode change 100755 => 100644 nxcomp/Split.h
 mode change 100755 => 100644 nxcomp/StaticCompressor.cpp
 mode change 100755 => 100644 nxcomp/StaticCompressor.h
 mode change 100755 => 100644 nxcomp/Statistics.cpp
 mode change 100755 => 100644 nxcomp/Statistics.h
 mode change 100755 => 100644 nxcomp/TextCompressor.cpp
 mode change 100755 => 100644 nxcomp/TextCompressor.h
 mode change 100755 => 100644 nxcomp/Timestamp.cpp
 mode change 100755 => 100644 nxcomp/Timestamp.h
 mode change 100755 => 100644 nxcomp/TranslateCoords.cpp
 mode change 100755 => 100644 nxcomp/TranslateCoords.h
 mode change 100755 => 100644 nxcomp/Transport.cpp
 mode change 100755 => 100644 nxcomp/Transport.h
 mode change 100755 => 100644 nxcomp/Types.h
 mode change 100755 => 100644 nxcomp/Unpack.cpp
 mode change 100755 => 100644 nxcomp/Unpack.h
 mode change 100755 => 100644 nxcomp/Utils.cpp
 mode change 100755 => 100644 nxcomp/VERSION
 mode change 100755 => 100644 nxcomp/Vars.c
 mode change 100755 => 100644 nxcomp/WriteBuffer.cpp
 mode change 100755 => 100644 nxcomp/WriteBuffer.h
 mode change 100755 => 100644 nxcomp/XidCache.cpp
 mode change 100755 => 100644 nxcomp/XidCache.h
 mode change 100755 => 100644 nxcomp/Z.cpp
 mode change 100755 => 100644 nxcomp/Z.h
 mode change 100755 => 100644 nxcomp/configure.in

(limited to 'nxcomp/Statistics.cpp')

diff --git a/nxcomp/ActionCache.cpp b/nxcomp/ActionCache.cpp
old mode 100755
new mode 100644
index fae4b7758..e3bf295c8
--- a/nxcomp/ActionCache.cpp
+++ b/nxcomp/ActionCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ActionCache.h b/nxcomp/ActionCache.h
old mode 100755
new mode 100644
index 022171f9b..6ff374f4c
--- a/nxcomp/ActionCache.h
+++ b/nxcomp/ActionCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ActionCacheCompat.h b/nxcomp/ActionCacheCompat.h
old mode 100755
new mode 100644
index 1577f1c61..2e563b0b9
--- a/nxcomp/ActionCacheCompat.h
+++ b/nxcomp/ActionCacheCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Agent.cpp b/nxcomp/Agent.cpp
old mode 100755
new mode 100644
index 1c2d66aab..eca5db460
--- a/nxcomp/Agent.cpp
+++ b/nxcomp/Agent.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h
old mode 100755
new mode 100644
index 0b3df0bb2..8012e2dd7
--- a/nxcomp/Agent.h
+++ b/nxcomp/Agent.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Alpha.cpp b/nxcomp/Alpha.cpp
old mode 100755
new mode 100644
index 546345500..85852bfa9
--- a/nxcomp/Alpha.cpp
+++ b/nxcomp/Alpha.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Alpha.h b/nxcomp/Alpha.h
old mode 100755
new mode 100644
index 02fbf642d..73912a516
--- a/nxcomp/Alpha.h
+++ b/nxcomp/Alpha.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
old mode 100755
new mode 100644
index 78f93a013..f0f1a00a5
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Auth.h b/nxcomp/Auth.h
old mode 100755
new mode 100644
index 1b77aaab2..5dae8a60f
--- a/nxcomp/Auth.h
+++ b/nxcomp/Auth.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Bitmap.cpp b/nxcomp/Bitmap.cpp
old mode 100755
new mode 100644
index c474568ec..3349ca541
--- a/nxcomp/Bitmap.cpp
+++ b/nxcomp/Bitmap.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Bitmap.h b/nxcomp/Bitmap.h
old mode 100755
new mode 100644
index 2753f5e4e..5b74e3767
--- a/nxcomp/Bitmap.h
+++ b/nxcomp/Bitmap.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/BlockCache.cpp b/nxcomp/BlockCache.cpp
old mode 100755
new mode 100644
index 55821e972..eaaba2793
--- a/nxcomp/BlockCache.cpp
+++ b/nxcomp/BlockCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/BlockCache.h b/nxcomp/BlockCache.h
old mode 100755
new mode 100644
index f1a0970e9..fe66dcab7
--- a/nxcomp/BlockCache.h
+++ b/nxcomp/BlockCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/BlockCacheSet.cpp b/nxcomp/BlockCacheSet.cpp
old mode 100755
new mode 100644
index 23bc1fa73..03f1fa6ad
--- a/nxcomp/BlockCacheSet.cpp
+++ b/nxcomp/BlockCacheSet.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/BlockCacheSet.h b/nxcomp/BlockCacheSet.h
old mode 100755
new mode 100644
index 0a257ac0a..a5dde33ea
--- a/nxcomp/BlockCacheSet.h
+++ b/nxcomp/BlockCacheSet.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
old mode 100755
new mode 100644
index dc2c38410..0c5a6678c
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -1,5 +1,13 @@
 ChangeLog:
 
+nxcomp-3.4.0-1
+
+- Opened the 3.4.0 branch based on nxcomp-3.3.0-4.
+
+- Changed version number.
+
+- Updated copyright to year 2009.
+
 nxcomp-3.3.0-4
 
 - Check if the variable storing the ping time exceeded the maximum
diff --git a/nxcomp/COPYING b/nxcomp/COPYING
old mode 100755
new mode 100644
diff --git a/nxcomp/ChangeGC.cpp b/nxcomp/ChangeGC.cpp
old mode 100755
new mode 100644
index 01e5936ed..56f004457
--- a/nxcomp/ChangeGC.cpp
+++ b/nxcomp/ChangeGC.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChangeGC.h b/nxcomp/ChangeGC.h
old mode 100755
new mode 100644
index 4cb666f99..d990e39bf
--- a/nxcomp/ChangeGC.h
+++ b/nxcomp/ChangeGC.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChangeGCCompat.cpp b/nxcomp/ChangeGCCompat.cpp
old mode 100755
new mode 100644
index 532202d41..479a26286
--- a/nxcomp/ChangeGCCompat.cpp
+++ b/nxcomp/ChangeGCCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChangeGCCompat.h b/nxcomp/ChangeGCCompat.h
old mode 100755
new mode 100644
index b829ca189..db244b000
--- a/nxcomp/ChangeGCCompat.h
+++ b/nxcomp/ChangeGCCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChangeProperty.cpp b/nxcomp/ChangeProperty.cpp
old mode 100755
new mode 100644
index 136813fc1..4ae70aa3d
--- a/nxcomp/ChangeProperty.cpp
+++ b/nxcomp/ChangeProperty.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChangeProperty.h b/nxcomp/ChangeProperty.h
old mode 100755
new mode 100644
index f1ccfa882..063425150
--- a/nxcomp/ChangeProperty.h
+++ b/nxcomp/ChangeProperty.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Channel.cpp b/nxcomp/Channel.cpp
old mode 100755
new mode 100644
index 1fdb3a0d3..47506302e
--- a/nxcomp/Channel.cpp
+++ b/nxcomp/Channel.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Channel.h b/nxcomp/Channel.h
old mode 100755
new mode 100644
index 1a58760c0..44f6c9133
--- a/nxcomp/Channel.h
+++ b/nxcomp/Channel.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChannelCache.cpp b/nxcomp/ChannelCache.cpp
old mode 100755
new mode 100644
index 91d9f1f5a..cdf99fdfe
--- a/nxcomp/ChannelCache.cpp
+++ b/nxcomp/ChannelCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChannelCache.h b/nxcomp/ChannelCache.h
old mode 100755
new mode 100644
index d79779a30..95fd717cd
--- a/nxcomp/ChannelCache.h
+++ b/nxcomp/ChannelCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ChannelStore.h b/nxcomp/ChannelStore.h
old mode 100755
new mode 100644
index 5c2acf527..9545330d6
--- a/nxcomp/ChannelStore.h
+++ b/nxcomp/ChannelStore.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CharCache.cpp b/nxcomp/CharCache.cpp
old mode 100755
new mode 100644
index 0d03fa0a4..80abb77b9
--- a/nxcomp/CharCache.cpp
+++ b/nxcomp/CharCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CharCache.h b/nxcomp/CharCache.h
old mode 100755
new mode 100644
index 1ec978bc5..177237d61
--- a/nxcomp/CharCache.h
+++ b/nxcomp/CharCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Children.cpp b/nxcomp/Children.cpp
old mode 100755
new mode 100644
index ec4ce35f3..7e824fb56
--- a/nxcomp/Children.cpp
+++ b/nxcomp/Children.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClearArea.cpp b/nxcomp/ClearArea.cpp
old mode 100755
new mode 100644
index a3d1353a7..55266e42f
--- a/nxcomp/ClearArea.cpp
+++ b/nxcomp/ClearArea.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClearArea.h b/nxcomp/ClearArea.h
old mode 100755
new mode 100644
index a18a9035f..3a936c983
--- a/nxcomp/ClearArea.h
+++ b/nxcomp/ClearArea.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientCache.cpp b/nxcomp/ClientCache.cpp
old mode 100755
new mode 100644
index d2fb35089..69b18687e
--- a/nxcomp/ClientCache.cpp
+++ b/nxcomp/ClientCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientCache.h b/nxcomp/ClientCache.h
old mode 100755
new mode 100644
index 73a3809f8..7c09c0a83
--- a/nxcomp/ClientCache.h
+++ b/nxcomp/ClientCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
old mode 100755
new mode 100644
index ef9ea270c..2f967d798
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/ClientChannel.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientChannel.h b/nxcomp/ClientChannel.h
old mode 100755
new mode 100644
index 3403776fc..6c907bf35
--- a/nxcomp/ClientChannel.h
+++ b/nxcomp/ClientChannel.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/ClientProxy.cpp
old mode 100755
new mode 100644
index dcd382b1d..a02dcade1
--- a/nxcomp/ClientProxy.cpp
+++ b/nxcomp/ClientProxy.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientProxy.h b/nxcomp/ClientProxy.h
old mode 100755
new mode 100644
index 458446bc4..9cf473f81
--- a/nxcomp/ClientProxy.h
+++ b/nxcomp/ClientProxy.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientReadBuffer.cpp b/nxcomp/ClientReadBuffer.cpp
old mode 100755
new mode 100644
index 4d849c6d7..952534c1e
--- a/nxcomp/ClientReadBuffer.cpp
+++ b/nxcomp/ClientReadBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientReadBuffer.h b/nxcomp/ClientReadBuffer.h
old mode 100755
new mode 100644
index 7e22776ed..b4afa8964
--- a/nxcomp/ClientReadBuffer.h
+++ b/nxcomp/ClientReadBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientStore.cpp b/nxcomp/ClientStore.cpp
old mode 100755
new mode 100644
index 48996c08c..c5c7af679
--- a/nxcomp/ClientStore.cpp
+++ b/nxcomp/ClientStore.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ClientStore.h b/nxcomp/ClientStore.h
old mode 100755
new mode 100644
index 29f0a16e0..e86078a7e
--- a/nxcomp/ClientStore.h
+++ b/nxcomp/ClientStore.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Colormap.cpp b/nxcomp/Colormap.cpp
old mode 100755
new mode 100644
index 515bb2b32..1e755be1a
--- a/nxcomp/Colormap.cpp
+++ b/nxcomp/Colormap.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Colormap.h b/nxcomp/Colormap.h
old mode 100755
new mode 100644
index 5c40eb245..84a83a767
--- a/nxcomp/Colormap.h
+++ b/nxcomp/Colormap.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ConfigureWindow.cpp b/nxcomp/ConfigureWindow.cpp
old mode 100755
new mode 100644
index 8b16a03cd..5956f48c5
--- a/nxcomp/ConfigureWindow.cpp
+++ b/nxcomp/ConfigureWindow.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ConfigureWindow.h b/nxcomp/ConfigureWindow.h
old mode 100755
new mode 100644
index b09dda6dc..9d4189c83
--- a/nxcomp/ConfigureWindow.h
+++ b/nxcomp/ConfigureWindow.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
old mode 100755
new mode 100644
index 19105beef..39dfaea6c
--- a/nxcomp/Control.cpp
+++ b/nxcomp/Control.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Control.h b/nxcomp/Control.h
old mode 100755
new mode 100644
index 9750b4c2f..5d0849a8e
--- a/nxcomp/Control.h
+++ b/nxcomp/Control.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CopyArea.cpp b/nxcomp/CopyArea.cpp
old mode 100755
new mode 100644
index 993db4252..bd767f27c
--- a/nxcomp/CopyArea.cpp
+++ b/nxcomp/CopyArea.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CopyArea.h b/nxcomp/CopyArea.h
old mode 100755
new mode 100644
index 1735a5d8e..51421b283
--- a/nxcomp/CopyArea.h
+++ b/nxcomp/CopyArea.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CreateGC.cpp b/nxcomp/CreateGC.cpp
old mode 100755
new mode 100644
index 92ad73f6a..ff2adea1a
--- a/nxcomp/CreateGC.cpp
+++ b/nxcomp/CreateGC.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CreateGC.h b/nxcomp/CreateGC.h
old mode 100755
new mode 100644
index 7987b2375..6f8e66933
--- a/nxcomp/CreateGC.h
+++ b/nxcomp/CreateGC.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CreatePixmap.cpp b/nxcomp/CreatePixmap.cpp
old mode 100755
new mode 100644
index cc2b5bdcf..1497a37dd
--- a/nxcomp/CreatePixmap.cpp
+++ b/nxcomp/CreatePixmap.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CreatePixmap.h b/nxcomp/CreatePixmap.h
old mode 100755
new mode 100644
index 0a5baa5d2..afe2b0f57
--- a/nxcomp/CreatePixmap.h
+++ b/nxcomp/CreatePixmap.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CreatePixmapCompat.cpp b/nxcomp/CreatePixmapCompat.cpp
old mode 100755
new mode 100644
index 91c736397..dd8f6b200
--- a/nxcomp/CreatePixmapCompat.cpp
+++ b/nxcomp/CreatePixmapCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/CreatePixmapCompat.h b/nxcomp/CreatePixmapCompat.h
old mode 100755
new mode 100644
index 694045b0d..8235194c2
--- a/nxcomp/CreatePixmapCompat.h
+++ b/nxcomp/CreatePixmapCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/DecodeBuffer.cpp b/nxcomp/DecodeBuffer.cpp
old mode 100755
new mode 100644
index 828328952..6e1bf7fd0
--- a/nxcomp/DecodeBuffer.cpp
+++ b/nxcomp/DecodeBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/DecodeBuffer.h b/nxcomp/DecodeBuffer.h
old mode 100755
new mode 100644
index 131a4e6fa..3fdf689a6
--- a/nxcomp/DecodeBuffer.h
+++ b/nxcomp/DecodeBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/EncodeBuffer.cpp
old mode 100755
new mode 100644
index 883fd0c65..2c4d78c77
--- a/nxcomp/EncodeBuffer.cpp
+++ b/nxcomp/EncodeBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/EncodeBuffer.h b/nxcomp/EncodeBuffer.h
old mode 100755
new mode 100644
index 2ae241868..5225e5cf5
--- a/nxcomp/EncodeBuffer.h
+++ b/nxcomp/EncodeBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/FillPoly.cpp b/nxcomp/FillPoly.cpp
old mode 100755
new mode 100644
index 73c08d394..5a6dc049a
--- a/nxcomp/FillPoly.cpp
+++ b/nxcomp/FillPoly.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/FillPoly.h b/nxcomp/FillPoly.h
old mode 100755
new mode 100644
index 142ce43c6..6edab9334
--- a/nxcomp/FillPoly.h
+++ b/nxcomp/FillPoly.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Fork.cpp b/nxcomp/Fork.cpp
old mode 100755
new mode 100644
index 7240855b9..e1f91bd2f
--- a/nxcomp/Fork.cpp
+++ b/nxcomp/Fork.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Fork.h b/nxcomp/Fork.h
old mode 100755
new mode 100644
index d6fe879ef..d7de8e4a8
--- a/nxcomp/Fork.h
+++ b/nxcomp/Fork.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/FreeCache.h b/nxcomp/FreeCache.h
old mode 100755
new mode 100644
index 826906c25..b59b8c846
--- a/nxcomp/FreeCache.h
+++ b/nxcomp/FreeCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericChannel.cpp b/nxcomp/GenericChannel.cpp
old mode 100755
new mode 100644
index 689a99070..9bb753d92
--- a/nxcomp/GenericChannel.cpp
+++ b/nxcomp/GenericChannel.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericChannel.h b/nxcomp/GenericChannel.h
old mode 100755
new mode 100644
index 82223fe2f..327346d34
--- a/nxcomp/GenericChannel.h
+++ b/nxcomp/GenericChannel.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericReadBuffer.cpp b/nxcomp/GenericReadBuffer.cpp
old mode 100755
new mode 100644
index 234ee4493..5ae9d6993
--- a/nxcomp/GenericReadBuffer.cpp
+++ b/nxcomp/GenericReadBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericReadBuffer.h b/nxcomp/GenericReadBuffer.h
old mode 100755
new mode 100644
index 72c5bc5fc..a8be615c5
--- a/nxcomp/GenericReadBuffer.h
+++ b/nxcomp/GenericReadBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericReply.cpp b/nxcomp/GenericReply.cpp
old mode 100755
new mode 100644
index 27d236968..02755706b
--- a/nxcomp/GenericReply.cpp
+++ b/nxcomp/GenericReply.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericReply.h b/nxcomp/GenericReply.h
old mode 100755
new mode 100644
index e90f12fc6..217833c5c
--- a/nxcomp/GenericReply.h
+++ b/nxcomp/GenericReply.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericRequest.cpp b/nxcomp/GenericRequest.cpp
old mode 100755
new mode 100644
index bc7960cd1..9058b7116
--- a/nxcomp/GenericRequest.cpp
+++ b/nxcomp/GenericRequest.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GenericRequest.h b/nxcomp/GenericRequest.h
old mode 100755
new mode 100644
index 6bb5d16fb..57617ead8
--- a/nxcomp/GenericRequest.h
+++ b/nxcomp/GenericRequest.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetImage.cpp b/nxcomp/GetImage.cpp
old mode 100755
new mode 100644
index 1d6b12b03..50e6c7d2b
--- a/nxcomp/GetImage.cpp
+++ b/nxcomp/GetImage.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetImage.h b/nxcomp/GetImage.h
old mode 100755
new mode 100644
index 693d9d6bd..c00bad71f
--- a/nxcomp/GetImage.h
+++ b/nxcomp/GetImage.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetImageReply.cpp b/nxcomp/GetImageReply.cpp
old mode 100755
new mode 100644
index 2ebeb1bac..f83b2e80b
--- a/nxcomp/GetImageReply.cpp
+++ b/nxcomp/GetImageReply.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetImageReply.h b/nxcomp/GetImageReply.h
old mode 100755
new mode 100644
index 81c3d171c..b5c8212a9
--- a/nxcomp/GetImageReply.h
+++ b/nxcomp/GetImageReply.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetProperty.cpp b/nxcomp/GetProperty.cpp
old mode 100755
new mode 100644
index d56b87e96..f91d3f41d
--- a/nxcomp/GetProperty.cpp
+++ b/nxcomp/GetProperty.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetProperty.h b/nxcomp/GetProperty.h
old mode 100755
new mode 100644
index 51df2219d..bee84d0c3
--- a/nxcomp/GetProperty.h
+++ b/nxcomp/GetProperty.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetPropertyReply.cpp b/nxcomp/GetPropertyReply.cpp
old mode 100755
new mode 100644
index ac2c19253..b141b76ae
--- a/nxcomp/GetPropertyReply.cpp
+++ b/nxcomp/GetPropertyReply.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/GetPropertyReply.h b/nxcomp/GetPropertyReply.h
old mode 100755
new mode 100644
index 8481678f9..3304618e5
--- a/nxcomp/GetPropertyReply.h
+++ b/nxcomp/GetPropertyReply.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ImageText16.cpp b/nxcomp/ImageText16.cpp
old mode 100755
new mode 100644
index e4a12d93e..d453cf5d1
--- a/nxcomp/ImageText16.cpp
+++ b/nxcomp/ImageText16.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ImageText16.h b/nxcomp/ImageText16.h
old mode 100755
new mode 100644
index bb4c5b9b2..6eed5bdad
--- a/nxcomp/ImageText16.h
+++ b/nxcomp/ImageText16.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ImageText8.cpp b/nxcomp/ImageText8.cpp
old mode 100755
new mode 100644
index f49edbd42..f46180a6d
--- a/nxcomp/ImageText8.cpp
+++ b/nxcomp/ImageText8.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ImageText8.h b/nxcomp/ImageText8.h
old mode 100755
new mode 100644
index 2dda10f91..acc242e8e
--- a/nxcomp/ImageText8.h
+++ b/nxcomp/ImageText8.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/IntCache.cpp b/nxcomp/IntCache.cpp
old mode 100755
new mode 100644
index 72005cc1c..b3ad38520
--- a/nxcomp/IntCache.cpp
+++ b/nxcomp/IntCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/IntCache.h b/nxcomp/IntCache.h
old mode 100755
new mode 100644
index 1288b2872..81069884d
--- a/nxcomp/IntCache.h
+++ b/nxcomp/IntCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/InternAtom.cpp b/nxcomp/InternAtom.cpp
old mode 100755
new mode 100644
index f9608c033..e1af495b9
--- a/nxcomp/InternAtom.cpp
+++ b/nxcomp/InternAtom.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/InternAtom.h b/nxcomp/InternAtom.h
old mode 100755
new mode 100644
index 23a002992..4b90f7e9f
--- a/nxcomp/InternAtom.h
+++ b/nxcomp/InternAtom.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
old mode 100755
new mode 100644
index 4bc57ace5..70d4a95ac
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Jpeg.h b/nxcomp/Jpeg.h
old mode 100755
new mode 100644
index 493e917f8..fb15a6780
--- a/nxcomp/Jpeg.h
+++ b/nxcomp/Jpeg.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Keeper.cpp b/nxcomp/Keeper.cpp
old mode 100755
new mode 100644
index 7c54ee497..b02468d63
--- a/nxcomp/Keeper.cpp
+++ b/nxcomp/Keeper.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Keeper.h b/nxcomp/Keeper.h
old mode 100755
new mode 100644
index 3318811d6..8256fcc59
--- a/nxcomp/Keeper.h
+++ b/nxcomp/Keeper.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/LICENSE b/nxcomp/LICENSE
old mode 100755
new mode 100644
index db99ebeb0..708f7a754
--- a/nxcomp/LICENSE
+++ b/nxcomp/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2007 NoMachine - http://www.nomachine.com/.
+Copyright (c) 2001, 2009 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
old mode 100755
new mode 100644
index a19d5e047..858728d4a
--- a/nxcomp/List.cpp
+++ b/nxcomp/List.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/List.h b/nxcomp/List.h
old mode 100755
new mode 100644
index 0b16c3820..1045a751d
--- a/nxcomp/List.h
+++ b/nxcomp/List.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ListFontsReply.cpp b/nxcomp/ListFontsReply.cpp
old mode 100755
new mode 100644
index 3ed9cdd1c..233f69c40
--- a/nxcomp/ListFontsReply.cpp
+++ b/nxcomp/ListFontsReply.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ListFontsReply.h b/nxcomp/ListFontsReply.h
old mode 100755
new mode 100644
index 5a41f268f..b405994fa
--- a/nxcomp/ListFontsReply.h
+++ b/nxcomp/ListFontsReply.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
old mode 100755
new mode 100644
index 62e868bbf..18618d355
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/MD5.c b/nxcomp/MD5.c
old mode 100755
new mode 100644
diff --git a/nxcomp/MD5.h b/nxcomp/MD5.h
old mode 100755
new mode 100644
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
old mode 100755
new mode 100644
index 703e635f8..552c57f94
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -1,6 +1,6 @@
 ############################################################################
 #                                                                          #
-#  Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.          #
+#  Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.          #
 #                                                                          #
 #  NXCOMP, NX protocol compression and NX extensions to this software      #
 #  are copyright of NoMachine. Redistribution and use of the present       #
@@ -9,7 +9,7 @@
 #                                                                          #
 #  Check http://www.nomachine.com/licensing.html for applicability.        #
 #                                                                          #
-#  NX and NoMachine are trademarks of NoMachine S.r.l.                     #
+#  NX and NoMachine are trademarks of Medialogic S.p.A.                    #
 #                                                                          #
 #  All rights reserved.                                                    #
 #                                                                          #
diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp
old mode 100755
new mode 100644
index 2d8e78486..0c17ca218
--- a/nxcomp/Message.cpp
+++ b/nxcomp/Message.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Message.h b/nxcomp/Message.h
old mode 100755
new mode 100644
index e50c917ed..60b62b24a
--- a/nxcomp/Message.h
+++ b/nxcomp/Message.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
old mode 100755
new mode 100644
index 775f53ac4..9c0c1ca4d
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
@@ -371,7 +371,7 @@ const char *GetUsageInfo()
 
 static const char CopyrightInfo[] =
 "\
-Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.\n\
+Copyright (c) 2001, 2009 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
old mode 100755
new mode 100644
index 23058b7b3..251947d3a
--- a/nxcomp/Misc.h
+++ b/nxcomp/Misc.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/NX.h b/nxcomp/NX.h
old mode 100755
new mode 100644
index c041f8fbe..7da1eec37
--- a/nxcomp/NX.h
+++ b/nxcomp/NX.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/NXalert.h b/nxcomp/NXalert.h
old mode 100755
new mode 100644
index 94758dbea..d7f328c7f
--- a/nxcomp/NXalert.h
+++ b/nxcomp/NXalert.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/NXmitshm.h b/nxcomp/NXmitshm.h
old mode 100755
new mode 100644
index ba2234b07..c5cf8ce3c
--- a/nxcomp/NXmitshm.h
+++ b/nxcomp/NXmitshm.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/NXpack.h b/nxcomp/NXpack.h
old mode 100755
new mode 100644
index f26d2c81b..e7a54f67e
--- a/nxcomp/NXpack.h
+++ b/nxcomp/NXpack.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/NXproto.h b/nxcomp/NXproto.h
old mode 100755
new mode 100644
index 6c46be2e0..571ebd7c6
--- a/nxcomp/NXproto.h
+++ b/nxcomp/NXproto.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/NXrender.h b/nxcomp/NXrender.h
old mode 100755
new mode 100644
index 3ad9cdc9d..0514e41a8
--- a/nxcomp/NXrender.h
+++ b/nxcomp/NXrender.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/NXvars.h b/nxcomp/NXvars.h
old mode 100755
new mode 100644
index ca9c37732..019907822
--- a/nxcomp/NXvars.h
+++ b/nxcomp/NXvars.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/OpcodeCache.h b/nxcomp/OpcodeCache.h
old mode 100755
new mode 100644
index 553900643..af3950bb9
--- a/nxcomp/OpcodeCache.h
+++ b/nxcomp/OpcodeCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/OpcodeStore.cpp b/nxcomp/OpcodeStore.cpp
old mode 100755
new mode 100644
index a880cfb6b..2762ae769
--- a/nxcomp/OpcodeStore.cpp
+++ b/nxcomp/OpcodeStore.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/OpcodeStore.h b/nxcomp/OpcodeStore.h
old mode 100755
new mode 100644
index 39b0cfd7a..5d16c11fb
--- a/nxcomp/OpcodeStore.h
+++ b/nxcomp/OpcodeStore.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Pack.c b/nxcomp/Pack.c
old mode 100755
new mode 100644
index 956630c40..81b7f32da
--- a/nxcomp/Pack.c
+++ b/nxcomp/Pack.c
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp
old mode 100755
new mode 100644
index ee1e154af..8145bba7f
--- a/nxcomp/Pgn.cpp
+++ b/nxcomp/Pgn.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Pgn.h b/nxcomp/Pgn.h
old mode 100755
new mode 100644
index fc46889f9..f9abc04ff
--- a/nxcomp/Pgn.h
+++ b/nxcomp/Pgn.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp
old mode 100755
new mode 100644
index 412c3493f..02e0b720c
--- a/nxcomp/Pipe.cpp
+++ b/nxcomp/Pipe.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Pipe.h b/nxcomp/Pipe.h
old mode 100755
new mode 100644
index a11e0f18d..46343a2ad
--- a/nxcomp/Pipe.h
+++ b/nxcomp/Pipe.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyArc.cpp b/nxcomp/PolyArc.cpp
old mode 100755
new mode 100644
index 0f89df3ea..c04154052
--- a/nxcomp/PolyArc.cpp
+++ b/nxcomp/PolyArc.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyArc.h b/nxcomp/PolyArc.h
old mode 100755
new mode 100644
index 47cb4e3d7..bafb2f8bc
--- a/nxcomp/PolyArc.h
+++ b/nxcomp/PolyArc.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyFillArc.cpp b/nxcomp/PolyFillArc.cpp
old mode 100755
new mode 100644
index 5af9a23a6..596ba3382
--- a/nxcomp/PolyFillArc.cpp
+++ b/nxcomp/PolyFillArc.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyFillArc.h b/nxcomp/PolyFillArc.h
old mode 100755
new mode 100644
index 9f2547b63..729c9eb2b
--- a/nxcomp/PolyFillArc.h
+++ b/nxcomp/PolyFillArc.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyFillRectangle.cpp b/nxcomp/PolyFillRectangle.cpp
old mode 100755
new mode 100644
index 72acbdb44..8573b5bb1
--- a/nxcomp/PolyFillRectangle.cpp
+++ b/nxcomp/PolyFillRectangle.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyFillRectangle.h b/nxcomp/PolyFillRectangle.h
old mode 100755
new mode 100644
index 332475109..3e3e0e2e7
--- a/nxcomp/PolyFillRectangle.h
+++ b/nxcomp/PolyFillRectangle.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyLine.cpp b/nxcomp/PolyLine.cpp
old mode 100755
new mode 100644
index 3eef5c8a8..b6d2ae29e
--- a/nxcomp/PolyLine.cpp
+++ b/nxcomp/PolyLine.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyLine.h b/nxcomp/PolyLine.h
old mode 100755
new mode 100644
index 4f402fe4b..44ccf50e7
--- a/nxcomp/PolyLine.h
+++ b/nxcomp/PolyLine.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyPoint.cpp b/nxcomp/PolyPoint.cpp
old mode 100755
new mode 100644
index 845c67dd3..37fa85f4f
--- a/nxcomp/PolyPoint.cpp
+++ b/nxcomp/PolyPoint.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyPoint.h b/nxcomp/PolyPoint.h
old mode 100755
new mode 100644
index 87bde79c4..57a83afb2
--- a/nxcomp/PolyPoint.h
+++ b/nxcomp/PolyPoint.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolySegment.cpp b/nxcomp/PolySegment.cpp
old mode 100755
new mode 100644
index 989f16aa2..e2b099939
--- a/nxcomp/PolySegment.cpp
+++ b/nxcomp/PolySegment.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolySegment.h b/nxcomp/PolySegment.h
old mode 100755
new mode 100644
index 3137e5c74..e77dfdfd4
--- a/nxcomp/PolySegment.h
+++ b/nxcomp/PolySegment.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyText16.cpp b/nxcomp/PolyText16.cpp
old mode 100755
new mode 100644
index 3b9a7234b..ac72466ab
--- a/nxcomp/PolyText16.cpp
+++ b/nxcomp/PolyText16.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyText16.h b/nxcomp/PolyText16.h
old mode 100755
new mode 100644
index 243181b59..f3e6a8ac2
--- a/nxcomp/PolyText16.h
+++ b/nxcomp/PolyText16.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyText8.cpp b/nxcomp/PolyText8.cpp
old mode 100755
new mode 100644
index e2cc1cebb..92962f535
--- a/nxcomp/PolyText8.cpp
+++ b/nxcomp/PolyText8.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PolyText8.h b/nxcomp/PolyText8.h
old mode 100755
new mode 100644
index a048e7433..bd727e285
--- a/nxcomp/PolyText8.h
+++ b/nxcomp/PolyText8.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PositionCacheCompat.cpp b/nxcomp/PositionCacheCompat.cpp
old mode 100755
new mode 100644
index a6436491b..4331ba76c
--- a/nxcomp/PositionCacheCompat.cpp
+++ b/nxcomp/PositionCacheCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PositionCacheCompat.h b/nxcomp/PositionCacheCompat.h
old mode 100755
new mode 100644
index c4c87e409..ae7e2be67
--- a/nxcomp/PositionCacheCompat.h
+++ b/nxcomp/PositionCacheCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
old mode 100755
new mode 100644
index 8e1d0b565..b1ce362bf
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
old mode 100755
new mode 100644
index 54187a8ec..8fd2b7d17
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ProxyReadBuffer.cpp b/nxcomp/ProxyReadBuffer.cpp
old mode 100755
new mode 100644
index 3c3167e6c..60e774c32
--- a/nxcomp/ProxyReadBuffer.cpp
+++ b/nxcomp/ProxyReadBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ProxyReadBuffer.h b/nxcomp/ProxyReadBuffer.h
old mode 100755
new mode 100644
index 0717ae5fe..582b4638f
--- a/nxcomp/ProxyReadBuffer.h
+++ b/nxcomp/ProxyReadBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PutImage.cpp b/nxcomp/PutImage.cpp
old mode 100755
new mode 100644
index b51a15589..a7233a9da
--- a/nxcomp/PutImage.cpp
+++ b/nxcomp/PutImage.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PutImage.h b/nxcomp/PutImage.h
old mode 100755
new mode 100644
index 510d4f220..fe5f3c8d3
--- a/nxcomp/PutImage.h
+++ b/nxcomp/PutImage.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PutPackedImage.cpp b/nxcomp/PutPackedImage.cpp
old mode 100755
new mode 100644
index 6c8a214b9..95b0bad07
--- a/nxcomp/PutPackedImage.cpp
+++ b/nxcomp/PutPackedImage.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/PutPackedImage.h b/nxcomp/PutPackedImage.h
old mode 100755
new mode 100644
index 1de28fe64..80ebdfadf
--- a/nxcomp/PutPackedImage.h
+++ b/nxcomp/PutPackedImage.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/QueryFontReply.cpp b/nxcomp/QueryFontReply.cpp
old mode 100755
new mode 100644
index dddaf9f13..01fd473fc
--- a/nxcomp/QueryFontReply.cpp
+++ b/nxcomp/QueryFontReply.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/QueryFontReply.h b/nxcomp/QueryFontReply.h
old mode 100755
new mode 100644
index 1476682cb..dac4fed0a
--- a/nxcomp/QueryFontReply.h
+++ b/nxcomp/QueryFontReply.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/README b/nxcomp/README
old mode 100755
new mode 100644
diff --git a/nxcomp/README-IPAQ b/nxcomp/README-IPAQ
old mode 100755
new mode 100644
diff --git a/nxcomp/ReadBuffer.cpp b/nxcomp/ReadBuffer.cpp
old mode 100755
new mode 100644
index a6562851a..360e3e72e
--- a/nxcomp/ReadBuffer.cpp
+++ b/nxcomp/ReadBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ReadBuffer.h b/nxcomp/ReadBuffer.h
old mode 100755
new mode 100644
index 361a6fbd7..97579d9e8
--- a/nxcomp/ReadBuffer.h
+++ b/nxcomp/ReadBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderAddGlyphs.cpp b/nxcomp/RenderAddGlyphs.cpp
old mode 100755
new mode 100644
index 612822205..6c8cc3c4c
--- a/nxcomp/RenderAddGlyphs.cpp
+++ b/nxcomp/RenderAddGlyphs.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderAddGlyphs.h b/nxcomp/RenderAddGlyphs.h
old mode 100755
new mode 100644
index e63adc260..b2e62398f
--- a/nxcomp/RenderAddGlyphs.h
+++ b/nxcomp/RenderAddGlyphs.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderChangePicture.cpp b/nxcomp/RenderChangePicture.cpp
old mode 100755
new mode 100644
index acd1b2398..397255120
--- a/nxcomp/RenderChangePicture.cpp
+++ b/nxcomp/RenderChangePicture.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderChangePicture.h b/nxcomp/RenderChangePicture.h
old mode 100755
new mode 100644
index c4f597650..f7a635ba8
--- a/nxcomp/RenderChangePicture.h
+++ b/nxcomp/RenderChangePicture.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderComposite.cpp b/nxcomp/RenderComposite.cpp
old mode 100755
new mode 100644
index 2075b7468..9629b95d2
--- a/nxcomp/RenderComposite.cpp
+++ b/nxcomp/RenderComposite.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderComposite.h b/nxcomp/RenderComposite.h
old mode 100755
new mode 100644
index 5a0c2c270..30b820318
--- a/nxcomp/RenderComposite.h
+++ b/nxcomp/RenderComposite.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCompositeCompat.cpp b/nxcomp/RenderCompositeCompat.cpp
old mode 100755
new mode 100644
index bca04828b..ac14ce181
--- a/nxcomp/RenderCompositeCompat.cpp
+++ b/nxcomp/RenderCompositeCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCompositeCompat.h b/nxcomp/RenderCompositeCompat.h
old mode 100755
new mode 100644
index edae40cd4..29344bd06
--- a/nxcomp/RenderCompositeCompat.h
+++ b/nxcomp/RenderCompositeCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCompositeGlyphs.cpp b/nxcomp/RenderCompositeGlyphs.cpp
old mode 100755
new mode 100644
index fa45d8fc1..302a26aaa
--- a/nxcomp/RenderCompositeGlyphs.cpp
+++ b/nxcomp/RenderCompositeGlyphs.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCompositeGlyphs.h b/nxcomp/RenderCompositeGlyphs.h
old mode 100755
new mode 100644
index a033895a8..8657bb9d4
--- a/nxcomp/RenderCompositeGlyphs.h
+++ b/nxcomp/RenderCompositeGlyphs.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCompositeGlyphsCompat.cpp b/nxcomp/RenderCompositeGlyphsCompat.cpp
old mode 100755
new mode 100644
index d93e3dc06..5a7daad0d
--- a/nxcomp/RenderCompositeGlyphsCompat.cpp
+++ b/nxcomp/RenderCompositeGlyphsCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCompositeGlyphsCompat.h b/nxcomp/RenderCompositeGlyphsCompat.h
old mode 100755
new mode 100644
index 803780edb..729136e65
--- a/nxcomp/RenderCompositeGlyphsCompat.h
+++ b/nxcomp/RenderCompositeGlyphsCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreateGlyphSet.cpp b/nxcomp/RenderCreateGlyphSet.cpp
old mode 100755
new mode 100644
index 9a1c06371..fc0bd571f
--- a/nxcomp/RenderCreateGlyphSet.cpp
+++ b/nxcomp/RenderCreateGlyphSet.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreateGlyphSet.h b/nxcomp/RenderCreateGlyphSet.h
old mode 100755
new mode 100644
index 62c47943e..c754b32cb
--- a/nxcomp/RenderCreateGlyphSet.h
+++ b/nxcomp/RenderCreateGlyphSet.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreateGlyphSetCompat.cpp b/nxcomp/RenderCreateGlyphSetCompat.cpp
old mode 100755
new mode 100644
index 864fe1078..30e87c7f5
--- a/nxcomp/RenderCreateGlyphSetCompat.cpp
+++ b/nxcomp/RenderCreateGlyphSetCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreateGlyphSetCompat.h b/nxcomp/RenderCreateGlyphSetCompat.h
old mode 100755
new mode 100644
index ce3072b14..2c30c6936
--- a/nxcomp/RenderCreateGlyphSetCompat.h
+++ b/nxcomp/RenderCreateGlyphSetCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreatePicture.cpp b/nxcomp/RenderCreatePicture.cpp
old mode 100755
new mode 100644
index e09416837..d117167a5
--- a/nxcomp/RenderCreatePicture.cpp
+++ b/nxcomp/RenderCreatePicture.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreatePicture.h b/nxcomp/RenderCreatePicture.h
old mode 100755
new mode 100644
index cc2100fe6..32545a556
--- a/nxcomp/RenderCreatePicture.h
+++ b/nxcomp/RenderCreatePicture.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreatePictureCompat.cpp b/nxcomp/RenderCreatePictureCompat.cpp
old mode 100755
new mode 100644
index 49ec39a80..6ba014ecd
--- a/nxcomp/RenderCreatePictureCompat.cpp
+++ b/nxcomp/RenderCreatePictureCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderCreatePictureCompat.h b/nxcomp/RenderCreatePictureCompat.h
old mode 100755
new mode 100644
index 79d8cf88f..491f8efb8
--- a/nxcomp/RenderCreatePictureCompat.h
+++ b/nxcomp/RenderCreatePictureCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderExtension.cpp b/nxcomp/RenderExtension.cpp
old mode 100755
new mode 100644
index 90fc93564..e3b1cb7f8
--- a/nxcomp/RenderExtension.cpp
+++ b/nxcomp/RenderExtension.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderExtension.h b/nxcomp/RenderExtension.h
old mode 100755
new mode 100644
index cdb80820c..a9c61802a
--- a/nxcomp/RenderExtension.h
+++ b/nxcomp/RenderExtension.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFillRectangles.cpp b/nxcomp/RenderFillRectangles.cpp
old mode 100755
new mode 100644
index 71c66121a..d705d31ae
--- a/nxcomp/RenderFillRectangles.cpp
+++ b/nxcomp/RenderFillRectangles.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFillRectangles.h b/nxcomp/RenderFillRectangles.h
old mode 100755
new mode 100644
index b1b32c47c..3287300aa
--- a/nxcomp/RenderFillRectangles.h
+++ b/nxcomp/RenderFillRectangles.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFreeGlyphSet.cpp b/nxcomp/RenderFreeGlyphSet.cpp
old mode 100755
new mode 100644
index ddbbe96da..a8b616431
--- a/nxcomp/RenderFreeGlyphSet.cpp
+++ b/nxcomp/RenderFreeGlyphSet.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFreeGlyphSet.h b/nxcomp/RenderFreeGlyphSet.h
old mode 100755
new mode 100644
index 6d7b73c32..b6b830e8b
--- a/nxcomp/RenderFreeGlyphSet.h
+++ b/nxcomp/RenderFreeGlyphSet.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFreePicture.cpp b/nxcomp/RenderFreePicture.cpp
old mode 100755
new mode 100644
index 308a73bf9..efb44f7ee
--- a/nxcomp/RenderFreePicture.cpp
+++ b/nxcomp/RenderFreePicture.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFreePicture.h b/nxcomp/RenderFreePicture.h
old mode 100755
new mode 100644
index 072303ba2..d46b55f93
--- a/nxcomp/RenderFreePicture.h
+++ b/nxcomp/RenderFreePicture.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFreePictureCompat.cpp b/nxcomp/RenderFreePictureCompat.cpp
old mode 100755
new mode 100644
index fdb64004c..5079c9c96
--- a/nxcomp/RenderFreePictureCompat.cpp
+++ b/nxcomp/RenderFreePictureCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderFreePictureCompat.h b/nxcomp/RenderFreePictureCompat.h
old mode 100755
new mode 100644
index c87c5fcfb..c8ece85b5
--- a/nxcomp/RenderFreePictureCompat.h
+++ b/nxcomp/RenderFreePictureCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderGenericRequest.cpp b/nxcomp/RenderGenericRequest.cpp
old mode 100755
new mode 100644
index 576490164..d45498cdd
--- a/nxcomp/RenderGenericRequest.cpp
+++ b/nxcomp/RenderGenericRequest.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderGenericRequest.h b/nxcomp/RenderGenericRequest.h
old mode 100755
new mode 100644
index 390cb7dd5..5eef81c51
--- a/nxcomp/RenderGenericRequest.h
+++ b/nxcomp/RenderGenericRequest.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderMinorExtensionHeaders.h b/nxcomp/RenderMinorExtensionHeaders.h
old mode 100755
new mode 100644
index b21a38095..49354f20a
--- a/nxcomp/RenderMinorExtensionHeaders.h
+++ b/nxcomp/RenderMinorExtensionHeaders.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderMinorExtensionMethods.h b/nxcomp/RenderMinorExtensionMethods.h
old mode 100755
new mode 100644
index 8daca9639..cf40ee743
--- a/nxcomp/RenderMinorExtensionMethods.h
+++ b/nxcomp/RenderMinorExtensionMethods.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderMinorExtensionTags.h b/nxcomp/RenderMinorExtensionTags.h
old mode 100755
new mode 100644
index 6533fb26f..8b351db44
--- a/nxcomp/RenderMinorExtensionTags.h
+++ b/nxcomp/RenderMinorExtensionTags.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureClip.cpp b/nxcomp/RenderPictureClip.cpp
old mode 100755
new mode 100644
index d4c1eaa5d..280691f59
--- a/nxcomp/RenderPictureClip.cpp
+++ b/nxcomp/RenderPictureClip.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureClip.h b/nxcomp/RenderPictureClip.h
old mode 100755
new mode 100644
index 9d04860bc..bba35acc3
--- a/nxcomp/RenderPictureClip.h
+++ b/nxcomp/RenderPictureClip.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureClipCompat.cpp b/nxcomp/RenderPictureClipCompat.cpp
old mode 100755
new mode 100644
index 66f19f882..551903ae2
--- a/nxcomp/RenderPictureClipCompat.cpp
+++ b/nxcomp/RenderPictureClipCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureClipCompat.h b/nxcomp/RenderPictureClipCompat.h
old mode 100755
new mode 100644
index 50a57e5c1..e898bd5c8
--- a/nxcomp/RenderPictureClipCompat.h
+++ b/nxcomp/RenderPictureClipCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureFilter.cpp b/nxcomp/RenderPictureFilter.cpp
old mode 100755
new mode 100644
index 03add8ff7..1d2188735
--- a/nxcomp/RenderPictureFilter.cpp
+++ b/nxcomp/RenderPictureFilter.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureFilter.h b/nxcomp/RenderPictureFilter.h
old mode 100755
new mode 100644
index 199179cf1..775cea506
--- a/nxcomp/RenderPictureFilter.h
+++ b/nxcomp/RenderPictureFilter.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureTransform.cpp b/nxcomp/RenderPictureTransform.cpp
old mode 100755
new mode 100644
index 5291d541b..77729592d
--- a/nxcomp/RenderPictureTransform.cpp
+++ b/nxcomp/RenderPictureTransform.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderPictureTransform.h b/nxcomp/RenderPictureTransform.h
old mode 100755
new mode 100644
index e49db56f6..ea78478ad
--- a/nxcomp/RenderPictureTransform.h
+++ b/nxcomp/RenderPictureTransform.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderTrapezoids.cpp b/nxcomp/RenderTrapezoids.cpp
old mode 100755
new mode 100644
index a1913fc2d..65b9842c5
--- a/nxcomp/RenderTrapezoids.cpp
+++ b/nxcomp/RenderTrapezoids.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderTrapezoids.h b/nxcomp/RenderTrapezoids.h
old mode 100755
new mode 100644
index 726d3139a..3e147ebb3
--- a/nxcomp/RenderTrapezoids.h
+++ b/nxcomp/RenderTrapezoids.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderTriangles.cpp b/nxcomp/RenderTriangles.cpp
old mode 100755
new mode 100644
index 7fe8bce77..7c7024b0a
--- a/nxcomp/RenderTriangles.cpp
+++ b/nxcomp/RenderTriangles.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/RenderTriangles.h b/nxcomp/RenderTriangles.h
old mode 100755
new mode 100644
index d0c1aaef3..d2c79b46d
--- a/nxcomp/RenderTriangles.h
+++ b/nxcomp/RenderTriangles.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Rgb.cpp b/nxcomp/Rgb.cpp
old mode 100755
new mode 100644
index 5a69b0f44..ee5930229
--- a/nxcomp/Rgb.cpp
+++ b/nxcomp/Rgb.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Rgb.h b/nxcomp/Rgb.h
old mode 100755
new mode 100644
index 34d3a752f..78c655d54
--- a/nxcomp/Rgb.h
+++ b/nxcomp/Rgb.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Rle.cpp b/nxcomp/Rle.cpp
old mode 100755
new mode 100644
index 4173e1632..22eac04a3
--- a/nxcomp/Rle.cpp
+++ b/nxcomp/Rle.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Rle.h b/nxcomp/Rle.h
old mode 100755
new mode 100644
index f1f5737b8..29bfb095d
--- a/nxcomp/Rle.h
+++ b/nxcomp/Rle.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SendEvent.cpp b/nxcomp/SendEvent.cpp
old mode 100755
new mode 100644
index 9daf99f23..369b54221
--- a/nxcomp/SendEvent.cpp
+++ b/nxcomp/SendEvent.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SendEvent.h b/nxcomp/SendEvent.h
old mode 100755
new mode 100644
index 77c2fec20..1116b6330
--- a/nxcomp/SendEvent.h
+++ b/nxcomp/SendEvent.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SequenceQueue.cpp b/nxcomp/SequenceQueue.cpp
old mode 100755
new mode 100644
index b8e7d234e..bd77af249
--- a/nxcomp/SequenceQueue.cpp
+++ b/nxcomp/SequenceQueue.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SequenceQueue.h b/nxcomp/SequenceQueue.h
old mode 100755
new mode 100644
index a5dc8cacd..a85275766
--- a/nxcomp/SequenceQueue.h
+++ b/nxcomp/SequenceQueue.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerCache.cpp b/nxcomp/ServerCache.cpp
old mode 100755
new mode 100644
index b01751db7..a56a32a32
--- a/nxcomp/ServerCache.cpp
+++ b/nxcomp/ServerCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerCache.h b/nxcomp/ServerCache.h
old mode 100755
new mode 100644
index 1f3ad3e8e..f8b8a8da8
--- a/nxcomp/ServerCache.h
+++ b/nxcomp/ServerCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
old mode 100755
new mode 100644
index 8df4bad94..cdaf057c8
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerChannel.h b/nxcomp/ServerChannel.h
old mode 100755
new mode 100644
index 00fc51539..8ce8a6dfc
--- a/nxcomp/ServerChannel.h
+++ b/nxcomp/ServerChannel.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/ServerProxy.cpp
old mode 100755
new mode 100644
index 3f81ba73a..6e6bb0a92
--- a/nxcomp/ServerProxy.cpp
+++ b/nxcomp/ServerProxy.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerProxy.h b/nxcomp/ServerProxy.h
old mode 100755
new mode 100644
index df74673f5..c027f2ce7
--- a/nxcomp/ServerProxy.h
+++ b/nxcomp/ServerProxy.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerReadBuffer.cpp b/nxcomp/ServerReadBuffer.cpp
old mode 100755
new mode 100644
index 68513bb6b..0b3c7747e
--- a/nxcomp/ServerReadBuffer.cpp
+++ b/nxcomp/ServerReadBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerReadBuffer.h b/nxcomp/ServerReadBuffer.h
old mode 100755
new mode 100644
index 18e89b730..866f4c688
--- a/nxcomp/ServerReadBuffer.h
+++ b/nxcomp/ServerReadBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerStore.cpp b/nxcomp/ServerStore.cpp
old mode 100755
new mode 100644
index 5544cd5f2..d39f63983
--- a/nxcomp/ServerStore.cpp
+++ b/nxcomp/ServerStore.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ServerStore.h b/nxcomp/ServerStore.h
old mode 100755
new mode 100644
index 09c6bc273..a50202352
--- a/nxcomp/ServerStore.h
+++ b/nxcomp/ServerStore.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetClipRectangles.cpp b/nxcomp/SetClipRectangles.cpp
old mode 100755
new mode 100644
index 91dad7724..e44d93108
--- a/nxcomp/SetClipRectangles.cpp
+++ b/nxcomp/SetClipRectangles.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetClipRectangles.h b/nxcomp/SetClipRectangles.h
old mode 100755
new mode 100644
index 1f701ff9f..746a274f7
--- a/nxcomp/SetClipRectangles.h
+++ b/nxcomp/SetClipRectangles.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackAlpha.cpp b/nxcomp/SetUnpackAlpha.cpp
old mode 100755
new mode 100644
index febc96d57..4477b8847
--- a/nxcomp/SetUnpackAlpha.cpp
+++ b/nxcomp/SetUnpackAlpha.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackAlpha.h b/nxcomp/SetUnpackAlpha.h
old mode 100755
new mode 100644
index a0ac49424..eeb0206c7
--- a/nxcomp/SetUnpackAlpha.h
+++ b/nxcomp/SetUnpackAlpha.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackAlphaCompat.cpp b/nxcomp/SetUnpackAlphaCompat.cpp
old mode 100755
new mode 100644
index 5e1928625..13d8a8ba4
--- a/nxcomp/SetUnpackAlphaCompat.cpp
+++ b/nxcomp/SetUnpackAlphaCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackAlphaCompat.h b/nxcomp/SetUnpackAlphaCompat.h
old mode 100755
new mode 100644
index 6192bb607..46fc97f90
--- a/nxcomp/SetUnpackAlphaCompat.h
+++ b/nxcomp/SetUnpackAlphaCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackColormap.cpp b/nxcomp/SetUnpackColormap.cpp
old mode 100755
new mode 100644
index 3fe97c771..69cb8d2ea
--- a/nxcomp/SetUnpackColormap.cpp
+++ b/nxcomp/SetUnpackColormap.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackColormap.h b/nxcomp/SetUnpackColormap.h
old mode 100755
new mode 100644
index 697cff8d7..7009d96a3
--- a/nxcomp/SetUnpackColormap.h
+++ b/nxcomp/SetUnpackColormap.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackColormapCompat.cpp b/nxcomp/SetUnpackColormapCompat.cpp
old mode 100755
new mode 100644
index 9dae9e776..58a199c61
--- a/nxcomp/SetUnpackColormapCompat.cpp
+++ b/nxcomp/SetUnpackColormapCompat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackColormapCompat.h b/nxcomp/SetUnpackColormapCompat.h
old mode 100755
new mode 100644
index d47abee53..e3a769cd9
--- a/nxcomp/SetUnpackColormapCompat.h
+++ b/nxcomp/SetUnpackColormapCompat.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackGeometry.cpp b/nxcomp/SetUnpackGeometry.cpp
old mode 100755
new mode 100644
index a85b2bc31..0a739cb65
--- a/nxcomp/SetUnpackGeometry.cpp
+++ b/nxcomp/SetUnpackGeometry.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/SetUnpackGeometry.h b/nxcomp/SetUnpackGeometry.h
old mode 100755
new mode 100644
index 5286f1cc5..4a9cca829
--- a/nxcomp/SetUnpackGeometry.h
+++ b/nxcomp/SetUnpackGeometry.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ShapeExtension.cpp b/nxcomp/ShapeExtension.cpp
old mode 100755
new mode 100644
index f02545caa..7296347e6
--- a/nxcomp/ShapeExtension.cpp
+++ b/nxcomp/ShapeExtension.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/ShapeExtension.h b/nxcomp/ShapeExtension.h
old mode 100755
new mode 100644
index d3fb2b83b..a294d7ea3
--- a/nxcomp/ShapeExtension.h
+++ b/nxcomp/ShapeExtension.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Socket.cpp b/nxcomp/Socket.cpp
old mode 100755
new mode 100644
index e7a0c589b..bac95b718
--- a/nxcomp/Socket.cpp
+++ b/nxcomp/Socket.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Socket.h b/nxcomp/Socket.h
old mode 100755
new mode 100644
index 7ea665b4c..bacd4c35b
--- a/nxcomp/Socket.h
+++ b/nxcomp/Socket.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp
old mode 100755
new mode 100644
index 7a3fe2c0f..3b50da7e2
--- a/nxcomp/Split.cpp
+++ b/nxcomp/Split.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Split.h b/nxcomp/Split.h
old mode 100755
new mode 100644
index b87504f1e..02f1e2a35
--- a/nxcomp/Split.h
+++ b/nxcomp/Split.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/StaticCompressor.cpp b/nxcomp/StaticCompressor.cpp
old mode 100755
new mode 100644
index bd12c5b43..1e3d36b66
--- a/nxcomp/StaticCompressor.cpp
+++ b/nxcomp/StaticCompressor.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/StaticCompressor.h b/nxcomp/StaticCompressor.h
old mode 100755
new mode 100644
index 3a2ced82f..65ef9ef79
--- a/nxcomp/StaticCompressor.h
+++ b/nxcomp/StaticCompressor.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Statistics.cpp b/nxcomp/Statistics.cpp
old mode 100755
new mode 100644
index b70dd2eed..659f3b1de
--- a/nxcomp/Statistics.cpp
+++ b/nxcomp/Statistics.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Statistics.h b/nxcomp/Statistics.h
old mode 100755
new mode 100644
index 8a65472a4..08a318e1a
--- a/nxcomp/Statistics.h
+++ b/nxcomp/Statistics.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/TextCompressor.cpp b/nxcomp/TextCompressor.cpp
old mode 100755
new mode 100644
index 71eb23a9f..6314f246c
--- a/nxcomp/TextCompressor.cpp
+++ b/nxcomp/TextCompressor.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/TextCompressor.h b/nxcomp/TextCompressor.h
old mode 100755
new mode 100644
index 6ee00f343..eb9219fe5
--- a/nxcomp/TextCompressor.h
+++ b/nxcomp/TextCompressor.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Timestamp.cpp b/nxcomp/Timestamp.cpp
old mode 100755
new mode 100644
index a381c3d49..6d4a9311f
--- a/nxcomp/Timestamp.cpp
+++ b/nxcomp/Timestamp.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Timestamp.h b/nxcomp/Timestamp.h
old mode 100755
new mode 100644
index 15246ddd5..3cf36cd2b
--- a/nxcomp/Timestamp.h
+++ b/nxcomp/Timestamp.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/TranslateCoords.cpp b/nxcomp/TranslateCoords.cpp
old mode 100755
new mode 100644
index 135b6a07c..00f0ae8b6
--- a/nxcomp/TranslateCoords.cpp
+++ b/nxcomp/TranslateCoords.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/TranslateCoords.h b/nxcomp/TranslateCoords.h
old mode 100755
new mode 100644
index 1c0397a55..469f3b3a1
--- a/nxcomp/TranslateCoords.h
+++ b/nxcomp/TranslateCoords.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Transport.cpp b/nxcomp/Transport.cpp
old mode 100755
new mode 100644
index db57c890e..21012a8c4
--- a/nxcomp/Transport.cpp
+++ b/nxcomp/Transport.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Transport.h b/nxcomp/Transport.h
old mode 100755
new mode 100644
index 89d2616cb..b6ff8ed4d
--- a/nxcomp/Transport.h
+++ b/nxcomp/Transport.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
old mode 100755
new mode 100644
index 4afc93911..162ff78f2
--- a/nxcomp/Types.h
+++ b/nxcomp/Types.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Unpack.cpp b/nxcomp/Unpack.cpp
old mode 100755
new mode 100644
index afd95552b..03c898f87
--- a/nxcomp/Unpack.cpp
+++ b/nxcomp/Unpack.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Unpack.h b/nxcomp/Unpack.h
old mode 100755
new mode 100644
index 1ceac8c05..00e7f1214
--- a/nxcomp/Unpack.h
+++ b/nxcomp/Unpack.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Utils.cpp b/nxcomp/Utils.cpp
old mode 100755
new mode 100644
index 0e69df976..c7c4abb48
--- a/nxcomp/Utils.cpp
+++ b/nxcomp/Utils.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/VERSION b/nxcomp/VERSION
old mode 100755
new mode 100644
index 15a279981..18091983f
--- a/nxcomp/VERSION
+++ b/nxcomp/VERSION
@@ -1 +1 @@
-3.3.0
+3.4.0
diff --git a/nxcomp/Vars.c b/nxcomp/Vars.c
old mode 100755
new mode 100644
index 448d6ac15..1351a9cf9
--- a/nxcomp/Vars.c
+++ b/nxcomp/Vars.c
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/WriteBuffer.cpp b/nxcomp/WriteBuffer.cpp
old mode 100755
new mode 100644
index 16671fd5b..6380107e8
--- a/nxcomp/WriteBuffer.cpp
+++ b/nxcomp/WriteBuffer.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/WriteBuffer.h b/nxcomp/WriteBuffer.h
old mode 100755
new mode 100644
index 21c4cc5a9..6c11092ef
--- a/nxcomp/WriteBuffer.h
+++ b/nxcomp/WriteBuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/XidCache.cpp b/nxcomp/XidCache.cpp
old mode 100755
new mode 100644
index 185be6fd6..2217fdb34
--- a/nxcomp/XidCache.cpp
+++ b/nxcomp/XidCache.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/XidCache.h b/nxcomp/XidCache.h
old mode 100755
new mode 100644
index 535b5e4d8..202d2fa61
--- a/nxcomp/XidCache.h
+++ b/nxcomp/XidCache.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Z.cpp b/nxcomp/Z.cpp
old mode 100755
new mode 100644
index 5ba031978..6b333f4b7
--- a/nxcomp/Z.cpp
+++ b/nxcomp/Z.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/Z.h b/nxcomp/Z.h
old mode 100755
new mode 100644
index 9753aa99d..0e33ad3b7
--- a/nxcomp/Z.h
+++ b/nxcomp/Z.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -9,7 +9,7 @@
 /*                                                                        */
 /* Check http://www.nomachine.com/licensing.html for applicability.       */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 477961678194817aaf1aaf3602f1c91d288a539d Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 13 Nov 2011 09:27:53 +0100
Subject: Imported nxcomp-3.4.0-6.tar.gz

Summary: Imported nxcomp-3.4.0-6.tar.gz
Keywords:

Imported nxcomp-3.4.0-6.tar.gz
into Git repository
---
 nxcomp/ActionCache.cpp                 |  2 +-
 nxcomp/ActionCache.h                   |  2 +-
 nxcomp/ActionCacheCompat.h             |  2 +-
 nxcomp/Agent.cpp                       |  2 +-
 nxcomp/Agent.h                         |  2 +-
 nxcomp/Alpha.cpp                       |  3 +-
 nxcomp/Alpha.h                         |  2 +-
 nxcomp/Auth.cpp                        | 24 ++++++++---
 nxcomp/Auth.h                          |  2 +-
 nxcomp/Bitmap.cpp                      |  2 +-
 nxcomp/Bitmap.h                        |  2 +-
 nxcomp/BlockCache.cpp                  |  2 +-
 nxcomp/BlockCache.h                    |  2 +-
 nxcomp/BlockCacheSet.cpp               |  2 +-
 nxcomp/BlockCacheSet.h                 |  2 +-
 nxcomp/CHANGELOG                       | 23 ++++++++++
 nxcomp/ChangeGC.cpp                    |  2 +-
 nxcomp/ChangeGC.h                      |  2 +-
 nxcomp/ChangeGCCompat.cpp              |  2 +-
 nxcomp/ChangeGCCompat.h                |  2 +-
 nxcomp/ChangeProperty.cpp              |  2 +-
 nxcomp/ChangeProperty.h                |  2 +-
 nxcomp/Channel.cpp                     |  6 +--
 nxcomp/Channel.h                       |  6 +--
 nxcomp/ChannelCache.cpp                |  2 +-
 nxcomp/ChannelCache.h                  |  2 +-
 nxcomp/ChannelStore.h                  |  2 +-
 nxcomp/CharCache.cpp                   |  2 +-
 nxcomp/CharCache.h                     |  2 +-
 nxcomp/Children.cpp                    | 21 ++++++----
 nxcomp/ClearArea.cpp                   |  2 +-
 nxcomp/ClearArea.h                     |  2 +-
 nxcomp/ClientCache.cpp                 |  2 +-
 nxcomp/ClientCache.h                   |  2 +-
 nxcomp/ClientChannel.cpp               |  8 ++--
 nxcomp/ClientChannel.h                 |  2 +-
 nxcomp/ClientProxy.cpp                 |  2 +-
 nxcomp/ClientProxy.h                   |  2 +-
 nxcomp/ClientReadBuffer.cpp            |  2 +-
 nxcomp/ClientReadBuffer.h              |  2 +-
 nxcomp/ClientStore.cpp                 |  2 +-
 nxcomp/ClientStore.h                   |  2 +-
 nxcomp/Colormap.cpp                    |  3 +-
 nxcomp/Colormap.h                      |  2 +-
 nxcomp/ConfigureWindow.cpp             |  2 +-
 nxcomp/ConfigureWindow.h               |  2 +-
 nxcomp/Control.cpp                     |  2 +-
 nxcomp/Control.h                       |  2 +-
 nxcomp/CopyArea.cpp                    |  2 +-
 nxcomp/CopyArea.h                      |  2 +-
 nxcomp/CreateGC.cpp                    |  2 +-
 nxcomp/CreateGC.h                      |  2 +-
 nxcomp/CreatePixmap.cpp                |  2 +-
 nxcomp/CreatePixmap.h                  |  2 +-
 nxcomp/CreatePixmapCompat.cpp          |  2 +-
 nxcomp/CreatePixmapCompat.h            |  2 +-
 nxcomp/DecodeBuffer.cpp                |  2 +-
 nxcomp/DecodeBuffer.h                  |  2 +-
 nxcomp/EncodeBuffer.cpp                |  2 +-
 nxcomp/EncodeBuffer.h                  |  2 +-
 nxcomp/FillPoly.cpp                    |  2 +-
 nxcomp/FillPoly.h                      |  2 +-
 nxcomp/Fork.cpp                        |  3 +-
 nxcomp/Fork.h                          |  4 +-
 nxcomp/FreeCache.h                     |  2 +-
 nxcomp/GenericChannel.cpp              |  2 +-
 nxcomp/GenericChannel.h                |  2 +-
 nxcomp/GenericReadBuffer.cpp           |  2 +-
 nxcomp/GenericReadBuffer.h             |  2 +-
 nxcomp/GenericReply.cpp                |  2 +-
 nxcomp/GenericReply.h                  |  2 +-
 nxcomp/GenericRequest.cpp              |  2 +-
 nxcomp/GenericRequest.h                |  2 +-
 nxcomp/GetImage.cpp                    |  2 +-
 nxcomp/GetImage.h                      |  2 +-
 nxcomp/GetImageReply.cpp               |  2 +-
 nxcomp/GetImageReply.h                 |  2 +-
 nxcomp/GetProperty.cpp                 |  2 +-
 nxcomp/GetProperty.h                   |  2 +-
 nxcomp/GetPropertyReply.cpp            |  2 +-
 nxcomp/GetPropertyReply.h              |  2 +-
 nxcomp/ImageText16.cpp                 |  2 +-
 nxcomp/ImageText16.h                   |  2 +-
 nxcomp/ImageText8.cpp                  |  2 +-
 nxcomp/ImageText8.h                    |  2 +-
 nxcomp/IntCache.cpp                    |  2 +-
 nxcomp/IntCache.h                      |  2 +-
 nxcomp/InternAtom.cpp                  |  2 +-
 nxcomp/InternAtom.h                    |  2 +-
 nxcomp/Jpeg.cpp                        |  8 ++--
 nxcomp/Jpeg.h                          |  2 +-
 nxcomp/Keeper.cpp                      |  2 +-
 nxcomp/Keeper.h                        |  2 +-
 nxcomp/LICENSE                         |  2 +-
 nxcomp/List.cpp                        |  2 +-
 nxcomp/List.h                          |  2 +-
 nxcomp/ListFontsReply.cpp              |  2 +-
 nxcomp/ListFontsReply.h                |  2 +-
 nxcomp/Loop.cpp                        | 32 +++++++-------
 nxcomp/Makefile.in                     |  2 +-
 nxcomp/Message.cpp                     |  2 +-
 nxcomp/Message.h                       |  2 +-
 nxcomp/Misc.cpp                        |  4 +-
 nxcomp/Misc.h                          |  8 +++-
 nxcomp/NX.h                            |  2 +-
 nxcomp/NXalert.h                       |  2 +-
 nxcomp/NXmitshm.h                      |  2 +-
 nxcomp/NXpack.h                        |  2 +-
 nxcomp/NXproto.h                       |  2 +-
 nxcomp/NXrender.h                      |  2 +-
 nxcomp/NXvars.h                        |  2 +-
 nxcomp/OpcodeCache.h                   |  2 +-
 nxcomp/OpcodeStore.cpp                 |  2 +-
 nxcomp/OpcodeStore.h                   |  2 +-
 nxcomp/Pack.c                          |  2 +-
 nxcomp/Pgn.cpp                         | 23 ++++++++--
 nxcomp/Pgn.h                           |  2 +-
 nxcomp/Pipe.cpp                        |  5 ++-
 nxcomp/Pipe.h                          |  8 ++--
 nxcomp/PolyArc.cpp                     |  2 +-
 nxcomp/PolyArc.h                       |  2 +-
 nxcomp/PolyFillArc.cpp                 |  2 +-
 nxcomp/PolyFillArc.h                   |  2 +-
 nxcomp/PolyFillRectangle.cpp           |  2 +-
 nxcomp/PolyFillRectangle.h             |  2 +-
 nxcomp/PolyLine.cpp                    |  2 +-
 nxcomp/PolyLine.h                      |  2 +-
 nxcomp/PolyPoint.cpp                   |  2 +-
 nxcomp/PolyPoint.h                     |  2 +-
 nxcomp/PolySegment.cpp                 |  2 +-
 nxcomp/PolySegment.h                   |  2 +-
 nxcomp/PolyText16.cpp                  |  2 +-
 nxcomp/PolyText16.h                    |  2 +-
 nxcomp/PolyText8.cpp                   |  2 +-
 nxcomp/PolyText8.h                     |  2 +-
 nxcomp/PositionCacheCompat.cpp         |  2 +-
 nxcomp/PositionCacheCompat.h           |  2 +-
 nxcomp/Proxy.cpp                       |  4 +-
 nxcomp/Proxy.h                         |  2 +-
 nxcomp/ProxyReadBuffer.cpp             |  2 +-
 nxcomp/ProxyReadBuffer.h               |  2 +-
 nxcomp/PutImage.cpp                    |  2 +-
 nxcomp/PutImage.h                      |  2 +-
 nxcomp/PutPackedImage.cpp              |  2 +-
 nxcomp/PutPackedImage.h                |  2 +-
 nxcomp/QueryFontReply.cpp              |  2 +-
 nxcomp/QueryFontReply.h                |  2 +-
 nxcomp/ReadBuffer.cpp                  |  2 +-
 nxcomp/ReadBuffer.h                    |  2 +-
 nxcomp/RenderAddGlyphs.cpp             |  2 +-
 nxcomp/RenderAddGlyphs.h               |  2 +-
 nxcomp/RenderChangePicture.cpp         |  2 +-
 nxcomp/RenderChangePicture.h           |  2 +-
 nxcomp/RenderComposite.cpp             |  2 +-
 nxcomp/RenderComposite.h               |  2 +-
 nxcomp/RenderCompositeCompat.cpp       |  2 +-
 nxcomp/RenderCompositeCompat.h         |  2 +-
 nxcomp/RenderCompositeGlyphs.cpp       |  2 +-
 nxcomp/RenderCompositeGlyphs.h         |  2 +-
 nxcomp/RenderCompositeGlyphsCompat.cpp |  2 +-
 nxcomp/RenderCompositeGlyphsCompat.h   |  2 +-
 nxcomp/RenderCreateGlyphSet.cpp        |  2 +-
 nxcomp/RenderCreateGlyphSet.h          |  2 +-
 nxcomp/RenderCreateGlyphSetCompat.cpp  |  2 +-
 nxcomp/RenderCreateGlyphSetCompat.h    |  2 +-
 nxcomp/RenderCreatePicture.cpp         |  2 +-
 nxcomp/RenderCreatePicture.h           |  2 +-
 nxcomp/RenderCreatePictureCompat.cpp   |  2 +-
 nxcomp/RenderCreatePictureCompat.h     |  2 +-
 nxcomp/RenderExtension.cpp             |  2 +-
 nxcomp/RenderExtension.h               |  2 +-
 nxcomp/RenderFillRectangles.cpp        |  2 +-
 nxcomp/RenderFillRectangles.h          |  2 +-
 nxcomp/RenderFreeGlyphSet.cpp          |  2 +-
 nxcomp/RenderFreeGlyphSet.h            |  2 +-
 nxcomp/RenderFreePicture.cpp           |  2 +-
 nxcomp/RenderFreePicture.h             |  2 +-
 nxcomp/RenderFreePictureCompat.cpp     |  2 +-
 nxcomp/RenderFreePictureCompat.h       |  2 +-
 nxcomp/RenderGenericRequest.cpp        |  2 +-
 nxcomp/RenderGenericRequest.h          |  2 +-
 nxcomp/RenderMinorExtensionHeaders.h   |  2 +-
 nxcomp/RenderMinorExtensionMethods.h   |  2 +-
 nxcomp/RenderMinorExtensionTags.h      |  2 +-
 nxcomp/RenderPictureClip.cpp           |  2 +-
 nxcomp/RenderPictureClip.h             |  2 +-
 nxcomp/RenderPictureClipCompat.cpp     |  2 +-
 nxcomp/RenderPictureClipCompat.h       |  2 +-
 nxcomp/RenderPictureFilter.cpp         |  2 +-
 nxcomp/RenderPictureFilter.h           |  2 +-
 nxcomp/RenderPictureTransform.cpp      |  2 +-
 nxcomp/RenderPictureTransform.h        |  2 +-
 nxcomp/RenderTrapezoids.cpp            |  2 +-
 nxcomp/RenderTrapezoids.h              |  2 +-
 nxcomp/RenderTriangles.cpp             |  2 +-
 nxcomp/RenderTriangles.h               |  2 +-
 nxcomp/Rgb.cpp                         |  2 +-
 nxcomp/Rgb.h                           |  2 +-
 nxcomp/Rle.cpp                         |  2 +-
 nxcomp/Rle.h                           |  2 +-
 nxcomp/SendEvent.cpp                   |  2 +-
 nxcomp/SendEvent.h                     |  2 +-
 nxcomp/SequenceQueue.cpp               |  2 +-
 nxcomp/SequenceQueue.h                 |  2 +-
 nxcomp/ServerCache.cpp                 |  2 +-
 nxcomp/ServerCache.h                   |  2 +-
 nxcomp/ServerChannel.cpp               |  4 +-
 nxcomp/ServerChannel.h                 |  2 +-
 nxcomp/ServerProxy.cpp                 |  2 +-
 nxcomp/ServerProxy.h                   |  2 +-
 nxcomp/ServerReadBuffer.cpp            |  2 +-
 nxcomp/ServerReadBuffer.h              |  2 +-
 nxcomp/ServerStore.cpp                 |  2 +-
 nxcomp/ServerStore.h                   |  2 +-
 nxcomp/SetClipRectangles.cpp           |  2 +-
 nxcomp/SetClipRectangles.h             |  2 +-
 nxcomp/SetUnpackAlpha.cpp              |  2 +-
 nxcomp/SetUnpackAlpha.h                |  2 +-
 nxcomp/SetUnpackAlphaCompat.cpp        |  2 +-
 nxcomp/SetUnpackAlphaCompat.h          |  2 +-
 nxcomp/SetUnpackColormap.cpp           |  2 +-
 nxcomp/SetUnpackColormap.h             |  2 +-
 nxcomp/SetUnpackColormapCompat.cpp     |  2 +-
 nxcomp/SetUnpackColormapCompat.h       |  2 +-
 nxcomp/SetUnpackGeometry.cpp           |  2 +-
 nxcomp/SetUnpackGeometry.h             |  2 +-
 nxcomp/ShapeExtension.cpp              |  2 +-
 nxcomp/ShapeExtension.h                |  2 +-
 nxcomp/Socket.cpp                      |  2 +-
 nxcomp/Socket.h                        |  2 +-
 nxcomp/Split.cpp                       |  2 +-
 nxcomp/Split.h                         |  2 +-
 nxcomp/StaticCompressor.cpp            |  2 +-
 nxcomp/StaticCompressor.h              |  2 +-
 nxcomp/Statistics.cpp                  |  2 +-
 nxcomp/Statistics.h                    |  2 +-
 nxcomp/TextCompressor.cpp              |  2 +-
 nxcomp/TextCompressor.h                |  2 +-
 nxcomp/Timestamp.cpp                   |  2 +-
 nxcomp/Timestamp.h                     |  2 +-
 nxcomp/TranslateCoords.cpp             |  2 +-
 nxcomp/TranslateCoords.h               |  2 +-
 nxcomp/Transport.cpp                   |  2 +-
 nxcomp/Transport.h                     |  2 +-
 nxcomp/Types.h                         |  2 +-
 nxcomp/Unpack.cpp                      | 76 ++++++++++++++++++++++++++++++++--
 nxcomp/Unpack.h                        |  2 +-
 nxcomp/Utils.cpp                       |  2 +-
 nxcomp/Vars.c                          |  2 +-
 nxcomp/WriteBuffer.cpp                 |  2 +-
 nxcomp/WriteBuffer.h                   |  2 +-
 nxcomp/XidCache.cpp                    |  2 +-
 nxcomp/XidCache.h                      |  2 +-
 nxcomp/Z.cpp                           |  2 +-
 nxcomp/Z.h                             |  2 +-
 nxcomp/configure                       |  6 +--
 nxcomp/configure.in                    |  4 +-
 257 files changed, 448 insertions(+), 305 deletions(-)

(limited to 'nxcomp/Statistics.cpp')

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
 
-- 
cgit v1.2.3