changeset 14897:405c239690ed

8249588: libwindowsaccessbridge issues on 64bit Windows Reviewed-by: arapte, prr
author mbaesken
date Thu, 16 Jul 2020 09:52:48 +0200
parents 3ad72295b457
children 60127f405b1a
files src/windows/native/sun/bridge/WinAccessBridge.cpp src/windows/native/sun/bridge/WinAccessBridge.h
diffstat 2 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/bridge/WinAccessBridge.cpp	Wed Dec 09 10:18:07 2020 +0300
+++ b/src/windows/native/sun/bridge/WinAccessBridge.cpp	Thu Jul 16 09:52:48 2020 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,7 +168,7 @@
      * Our window proc
      *
      */
-    BOOL CALLBACK AccessBridgeDialogProc(HWND hDlg, UINT message, UINT wParam, LONG lParam) {
+    BOOL CALLBACK AccessBridgeDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
         COPYDATASTRUCT *sentToUs;
         char *package;
 
--- a/src/windows/native/sun/bridge/WinAccessBridge.h	Wed Dec 09 10:18:07 2020 +0300
+++ b/src/windows/native/sun/bridge/WinAccessBridge.h	Thu Jul 16 09:52:48 2020 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,15 +43,10 @@
                         LPVOID lpvReserved);
     void AppendToCallOutput(char *s);
     BOOL CALLBACK AccessBridgeDialogProc(HWND hDlg, UINT message,
-                                         UINT wParam, LONG lParam);
+                                         WPARAM wParam, LPARAM lParam);
     HWND getTopLevelHWND(HWND descendent);
 }
 
-LRESULT CALLBACK WinAccessBridgeWindowProc(HWND hWnd, UINT message,
-                                           UINT wParam, LONG lParam);
-
-BOOL CALLBACK DeleteItemProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
-
 /**
  * The WinAccessBridge class.  The core of the Windows AT AccessBridge dll
  */