--- old/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp	2015-12-16 14:33:51.341356138 +0100
+++ new/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp	2015-12-16 14:33:51.177356135 +0100
@@ -167,7 +167,7 @@
      * Our window proc
      *
      */
-    BOOL CALLBACK AccessBridgeDialogProc(HWND hDlg, UINT message, UINT wParam, LONG lParam) {
+    INT_PTR CALLBACK AccessBridgeDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
         COPYDATASTRUCT *sentToUs;
         char *package;
 
@@ -860,7 +860,7 @@
     PackageType *type = (PackageType *) buffer;
     IsJavaWindowPackage *pkg = (IsJavaWindowPackage *) (buffer + sizeof(PackageType));
     *type = cIsJavaWindowPackage;
-    pkg->window = (jint) window;
+    pkg->window = (jint)(uintptr_t) window;
 
     PrintDebugString("WinAccessBridge::isJavaWindow(%p)", window);
 
@@ -965,7 +965,7 @@
     PackageType *type = (PackageType *) buffer;
     GetAccessibleContextFromHWNDPackage *pkg = (GetAccessibleContextFromHWNDPackage *) (buffer + sizeof(PackageType));
     *type = cGetAccessibleContextFromHWNDPackage;
-    pkg->window = (jint) window;
+    pkg->window = (jint)(uintptr_t) window;
 
     PrintDebugString("WinAccessBridge::getAccessibleContextFromHWND(%p, )", window);
 
@@ -1127,7 +1127,7 @@
     // find vmID, etc. from HWND; ask that VM for the AC w/Focus
         HWND pkgVMID = (HWND)ABLongToHandle( pkg->rVMID ) ;
     if (getAccessibleContextFromHWND(window, (long *)&(pkgVMID), &(pkg->rAccessibleContext)) == TRUE) {
-        HWND destABWindow = javaVMs->findAccessBridgeWindow((long)pkgVMID);     // ineffecient [[[FIXME]]]
+        HWND destABWindow = javaVMs->findAccessBridgeWindow((long)(uintptr_t)pkgVMID);     // ineffecient [[[FIXME]]]
         if (sendMemoryPackage(buffer, sizeof(buffer), destABWindow) == TRUE) {
             *vmID = pkg->rVMID;
             *AccessibleContext = pkg->rAccessibleContext;