--- old/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp	2015-12-16 14:33:50.821356130 +0100
+++ new/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp	2015-12-16 14:33:50.653356127 +0100
@@ -1726,7 +1726,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyCaretChangePackage *pkg = (PropertyCaretChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyCaretChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -1781,7 +1781,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyDescriptionChangePackage *pkg = (PropertyDescriptionChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyDescriptionChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -1867,7 +1867,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyNameChangePackage *pkg = (PropertyNameChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyNameChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -1951,7 +1951,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertySelectionChangePackage *pkg = (PropertySelectionChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertySelectionChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2004,7 +2004,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyStateChangePackage *pkg = (PropertyStateChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyStateChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2088,7 +2088,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyTextChangePackage *pkg = (PropertyTextChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyTextChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2141,7 +2141,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyValueChangePackage *pkg = (PropertyValueChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyValueChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2224,7 +2224,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyVisibleDataChangePackage *pkg = (PropertyVisibleDataChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyVisibleDataChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2276,7 +2276,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyChildChangePackage *pkg = (PropertyChildChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyChildChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2334,7 +2334,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyActiveDescendentChangePackage *pkg = (PropertyActiveDescendentChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyActiveDescendentChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2392,7 +2392,7 @@
     PackageType *type = (PackageType *) buffer;
     PropertyTableModelChangePackage *pkg = (PropertyTableModelChangePackage *) (buffer + sizeof(PackageType));
     *type = cPropertyTableModelChangePackage;
-    pkg->vmID = (long) dialogWindow;
+    pkg->vmID = (long)(uintptr_t) dialogWindow;
 
     // make new Global Refs and send events only to those ATs that want 'em
     AccessBridgeATInstance *ati = ATs;
@@ -2483,7 +2483,7 @@
         PackageType *type = (PackageType *) buffer;                                     \
         packageStruct *pkg = (packageStruct *) (buffer + sizeof(PackageType));          \
         *type = packageConstant;                                                        \
-        pkg->vmID = (long) dialogWindow;                                                \
+        pkg->vmID = (long)(uintptr_t) dialogWindow;                                     \
                                                                                         \
         /* make new Global Refs, send events only to those ATs that want 'em */         \
         AccessBridgeATInstance *ati = ATs;                                              \
@@ -2521,7 +2521,7 @@
         PackageType *type = (PackageType *) buffer;
         JavaShutdownPackage *pkg = (JavaShutdownPackage *) (buffer + sizeof(PackageType));
         *type = cJavaShutdownPackage;
-        pkg->vmID = (long) dialogWindow;
+        pkg->vmID = (long)(uintptr_t) dialogWindow;
 
         /* make new Global Refs, send events only to those ATs that want 'em */
         AccessBridgeATInstance *ati = ATs;
@@ -2719,7 +2719,7 @@
     }
 
     // Get the component
-    return awt.GetComponent(env, (void *)windowHandle);
+    return awt.GetComponent(env, (void *)(uintptr_t) windowHandle);
     }
 
 
@@ -2762,7 +2762,7 @@
         dsi_win = (JAWT_Win32DrawingSurfaceInfo *)dsi->platformInfo;
 
         // Get the window handle
-        windowHandle = (jint)dsi_win->hwnd;
+        windowHandle = (jint)(uintptr_t)dsi_win->hwnd;
 
         // Free the drawing surface info
         ds->FreeDrawingSurfaceInfo(dsi);