--- old/make/copy/Copy-jdk.accessibility.gmk 2016-10-26 21:20:20.781355200 -0500
+++ new/make/copy/Copy-jdk.accessibility.gmk 2016-10-26 21:20:20.016311500 -0500
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2104, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2104, 2016, 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
@@ -31,7 +31,7 @@
TARGETS += $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCallbacks.h \
$(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCalls.h \
$(INCLUDE_DST_OS_DIR)/bridge/AccessBridgePackages.h \
- $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCalls.c
+ $(INCLUDE_DST_OS_DIR)/bridge/readme.html
$(INCLUDE_DST_OS_DIR)/bridge/%: \
$(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge/%
--- old/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCalls.c 2016-10-26 21:20:25.733638500 -0500
+++ new/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCalls.c 2016-10-26 21:20:24.936592900 -0500
@@ -1,26 +1,33 @@
/*
- * Copyright (c) 2005, 2015, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
+ * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Oracle nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
@@ -40,7 +47,6 @@
//#define ACCESSBRIDGE_64
#include "AccessBridgeCalls.h"
-#include "AccessBridgeDebug.h"
#ifdef __cplusplus
extern "C" {
@@ -52,10 +58,8 @@
BOOL theAccessBridgeInitializedFlag = FALSE;
#define LOAD_FP(result, type, name) \
- PrintDebugString("LOAD_FP loading: %s ...", name); \
if ((theAccessBridge.result = \
(type) GetProcAddress(theAccessBridgeInstance, name)) == (type) 0) { \
- PrintDebugString("LOAD_FP failed: %s", name); \
return FALSE; \
}
@@ -212,7 +216,6 @@
theAccessBridge.Windows_run();
theAccessBridgeInitializedFlag = TRUE;
- PrintDebugString("theAccessBridgeInitializedFlag = TRUE");
return TRUE;
} else {
return FALSE;
--- /dev/null 2016-10-26 21:20:31.000000000 -0500
+++ new/src/jdk.accessibility/windows/native/include/bridge/readme.html 2016-10-26 21:20:30.238896200 -0500
@@ -0,0 +1,18 @@
+
+
+
+
+Java Access Bridge API readme
+
+
+ Java Access Bridge API
+ This directory contains the header files required to interface to the Java Access Bridge API.
+ In addition to these header files AccessBridgeCalls.c must be compiled and linked to your application.
+ AccessBridgeCalls.c implements the Java Access Bridge API and
+ also hides the complexities associated with interfacing to the associated Java Access Bridge DLL
+ which is installed when Java is installed.
+ AccessBridgeCalls.c is available for download from the
+
+ OpenJDK repository.
+
+