--- old/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp	2015-12-16 14:33:46.797356066 +0100
+++ new/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp	2015-12-16 14:33:46.629356063 +0100
@@ -1594,7 +1594,7 @@
             DWORD fThread = ::GetWindowThreadProcessId(fHWnd, NULL);
             if (fThread != AwtToolkit::GetInstance().MainThread()) {
                 // check if this thread has been already blocked
-                BlockedThreadStruct *blockedThread = (BlockedThreadStruct *)sm_BlockedThreads.get((void *)fThread);
+                BlockedThreadStruct *blockedThread = (BlockedThreadStruct *)sm_BlockedThreads.get((void *)(uintptr_t)fThread);
                 if (blocked) {
                     if (blockedThread == NULL) {
                         blockedThread = new BlockedThreadStruct;
@@ -1603,7 +1603,7 @@
                                                                       0, fThread);
                         blockedThread->mouseHook = ::SetWindowsHookEx(WH_MOUSE, (HOOKPROC)AwtDialog::MouseHookProc_NonTT,
                                                                       0, fThread);
-                        sm_BlockedThreads.put((void *)fThread, blockedThread);
+                        sm_BlockedThreads.put((void *)(uintptr_t)fThread, blockedThread);
                     } else {
                         blockedThread->framesCount++;
                     }
@@ -1615,7 +1615,7 @@
                         if ((blockedThread->framesCount) == 1) {
                             ::UnhookWindowsHookEx(blockedThread->modalHook);
                             ::UnhookWindowsHookEx(blockedThread->mouseHook);
-                            sm_BlockedThreads.remove((void *)fThread);
+                            sm_BlockedThreads.remove((void *)(uintptr_t)fThread);
                             delete blockedThread;
                         } else {
                             blockedThread->framesCount--;