From ef7d5e4d08949a526d011381bd441bcdf21fa60c Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <sorin-dot-sbarnea@gmail.com>
Date: Sat, 21 Mar 2009 22:02:56 +0000
Subject: [PATCH] Fixed issue #17: Copying text from a remote computer crashes
 java programs.

---
 lib/platform/CXWindowsUtil.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/platform/CXWindowsUtil.cpp b/lib/platform/CXWindowsUtil.cpp
index a33fc4ee..edf21be0 100644
--- a/lib/platform/CXWindowsUtil.cpp
+++ b/lib/platform/CXWindowsUtil.cpp
@@ -1381,7 +1381,11 @@ CXWindowsUtil::setWindowProperty(Display* display, Window window,
 {
 	const UInt32 length       = 4 * XMaxRequestSize(display);
 	const unsigned char* data = reinterpret_cast<const unsigned char*>(vdata);
-	const UInt32 datumSize    = static_cast<UInt32>(format / 8);
+	UInt32 datumSize    = static_cast<UInt32>(format / 8);
+	// format 32 on 64bit systems is 8 bytes not 4.
+	if (format == 32) {
+		datumSize = sizeof(Atom);
+	}
 
 	// save errors
 	bool error = false;