jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp

@@ -165,11 +165,11 @@
 
     /**
      * 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;
 
         switch (message) {
         case WM_INITDIALOG:

@@ -858,11 +858,11 @@
 
     char buffer[sizeof(PackageType) + sizeof(IsJavaWindowPackage)];
     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);
 
     isVMInstanceChainInUse = true;
     AccessBridgeJavaVMInstance *current = javaVMs;

@@ -963,11 +963,11 @@
 
     char buffer[sizeof(PackageType) + sizeof(GetAccessibleContextFromHWNDPackage)];
     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);
 
     DEBUG_CODE(pkg->rVMID = (long ) 0x01010101);
     DEBUG_CODE(pkg->rAccessibleContext = (JOBJECT64) 0x01010101);

@@ -1125,11 +1125,11 @@
 
     PrintDebugString("WinAccessBridge::getAccessibleContextWithFocus(%p, %X, )", window, vmID);
     // 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;
             return TRUE;
         }