Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 13650) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 13651) @@ -1159,13 +1159,16 @@ platform.getDefaultStyle().equals(LafPreference.LAF.get())) { try { - final int currentBuild = Integer.parseInt(PlatformHookWindows.getCurrentBuild()); - final int javaVersion = Utils.getJavaVersion(); - final int javaUpdate = Utils.getJavaUpdate(); - final int javaBuild = Utils.getJavaBuild(); - // See https://technet.microsoft.com/en-us/windows/release-info.aspx - if (currentBuild >= 15_063 && ((javaVersion == 8 && javaUpdate < 141) - || (javaVersion == 9 && javaUpdate == 0 && javaBuild < 173))) { - // Workaround from https://bugs.openjdk.java.net/browse/JDK-8179014 - UIManager.put("FileChooser.useSystemExtensionHiding", Boolean.FALSE); + String build = PlatformHookWindows.getCurrentBuild(); + if (build != null) { + final int currentBuild = Integer.parseInt(build); + final int javaVersion = Utils.getJavaVersion(); + final int javaUpdate = Utils.getJavaUpdate(); + final int javaBuild = Utils.getJavaBuild(); + // See https://technet.microsoft.com/en-us/windows/release-info.aspx + if (currentBuild >= 15_063 && ((javaVersion == 8 && javaUpdate < 141) + || (javaVersion == 9 && javaUpdate == 0 && javaBuild < 173))) { + // Workaround from https://bugs.openjdk.java.net/browse/JDK-8179014 + UIManager.put("FileChooser.useSystemExtensionHiding", Boolean.FALSE); + } } } catch (NumberFormatException | ReflectiveOperationException | JosmRuntimeException e) { Index: /trunk/src/org/openstreetmap/josm/tools/WinRegistry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/WinRegistry.java (revision 13650) +++ /trunk/src/org/openstreetmap/josm/tools/WinRegistry.java (revision 13651) @@ -41,5 +41,5 @@ public static final int HKEY_LOCAL_MACHINE = 0x80000002; - private static final int REG_SUCCESS = 0; + private static final long REG_SUCCESS = 0L; private static final int KEY_READ = 0x20019; @@ -54,16 +54,37 @@ private static final Method regEnumKeyEx; + private static boolean java11; + static { + regOpenKey = getDeclaredMethod("WindowsRegOpenKey", int.class, byte[].class, int.class); + regCloseKey = getDeclaredMethod("WindowsRegCloseKey", int.class); + regQueryValueEx = getDeclaredMethod("WindowsRegQueryValueEx", int.class, byte[].class); + regEnumValue = getDeclaredMethod("WindowsRegEnumValue", int.class, int.class, int.class); + regQueryInfoKey = getDeclaredMethod("WindowsRegQueryInfoKey1", int.class); + regEnumKeyEx = getDeclaredMethod("WindowsRegEnumKeyEx", int.class, int.class, int.class); + Utils.setObjectsAccessible(regOpenKey, regCloseKey, regQueryValueEx, regEnumValue, regQueryInfoKey, regEnumKeyEx); + } + + private static Method getDeclaredMethod(String name, Class... parameterTypes) { try { - regOpenKey = userClass.getDeclaredMethod("WindowsRegOpenKey", int.class, byte[].class, int.class); - regCloseKey = userClass.getDeclaredMethod("WindowsRegCloseKey", int.class); - regQueryValueEx = userClass.getDeclaredMethod("WindowsRegQueryValueEx", int.class, byte[].class); - regEnumValue = userClass.getDeclaredMethod("WindowsRegEnumValue", int.class, int.class, int.class); - regQueryInfoKey = userClass.getDeclaredMethod("WindowsRegQueryInfoKey1", int.class); - regEnumKeyEx = userClass.getDeclaredMethod("WindowsRegEnumKeyEx", int.class, int.class, int.class); - Utils.setObjectsAccessible(regOpenKey, regCloseKey, regQueryValueEx, regEnumValue, regQueryInfoKey, regEnumKeyEx); - } catch (RuntimeException | ReflectiveOperationException e) { - throw new JosmRuntimeException(e); - } + return userClass.getDeclaredMethod(name, parameterTypes); + } catch (NoSuchMethodException e) { + if (parameterTypes.length > 0 && parameterTypes[0] == int.class) { + // JDK-8198899: change of signature in Java 11. Old signature to drop when we switch to Java 11 + Class[] parameterTypesCopy = Utils.copyArray(parameterTypes); + parameterTypesCopy[0] = long.class; + java11 = true; + return getDeclaredMethod(name, parameterTypesCopy); + } + Logging.log(Logging.LEVEL_ERROR, "Unable to find WindowsReg method", e); + return null; + } catch (RuntimeException e) { + Logging.log(Logging.LEVEL_ERROR, "Unable to get WindowsReg method", e); + return null; + } + } + + private static Number hkey(int key) { + return java11 ? ((Number) Long.valueOf(key)) : ((Number) Integer.valueOf(key)); } @@ -135,12 +156,25 @@ // ===================== + private static Number getNumber(Object array, int index) { + if (array instanceof int[]) { + return ((int[]) array)[index]; + } else if (array instanceof long[]) { + return ((long[]) array)[index]; + } + throw new IllegalArgumentException(); + } + private static String readString(Preferences root, int hkey, String key, String value) throws IllegalAccessException, InvocationTargetException { - int[] handles = (int[]) regOpenKey.invoke(root, Integer.valueOf(hkey), toCstr(key), Integer.valueOf(KEY_READ)); - if (handles[1] != REG_SUCCESS) { - return null; - } - byte[] valb = (byte[]) regQueryValueEx.invoke(root, Integer.valueOf(handles[0]), toCstr(value)); - regCloseKey.invoke(root, Integer.valueOf(handles[0])); + if (regOpenKey == null || regQueryValueEx == null || regCloseKey == null) { + return null; + } + // Need to capture both int[] (Java 8-10) and long[] (Java 11+) + Object handles = regOpenKey.invoke(root, hkey(hkey), toCstr(key), Integer.valueOf(KEY_READ)); + if (getNumber(handles, 1).longValue() != REG_SUCCESS) { + return null; + } + byte[] valb = (byte[]) regQueryValueEx.invoke(root, getNumber(handles, 0), toCstr(value)); + regCloseKey.invoke(root, getNumber(handles, 0)); return (valb != null ? new String(valb, StandardCharsets.UTF_8).trim() : null); } @@ -148,19 +182,24 @@ private static Map readStringValues(Preferences root, int hkey, String key) throws IllegalAccessException, InvocationTargetException { + if (regOpenKey == null || regQueryInfoKey == null || regEnumValue == null || regCloseKey == null) { + return null; + } HashMap results = new HashMap<>(); - int[] handles = (int[]) regOpenKey.invoke(root, Integer.valueOf(hkey), toCstr(key), Integer.valueOf(KEY_READ)); - if (handles[1] != REG_SUCCESS) { - return null; - } - int[] info = (int[]) regQueryInfoKey.invoke(root, Integer.valueOf(handles[0])); - - int count = info[0]; // count - int maxlen = info[3]; // value length max + // Need to capture both int[] (Java 8-10) and long[] (Java 11+) + Object handles = regOpenKey.invoke(root, hkey(hkey), toCstr(key), Integer.valueOf(KEY_READ)); + if (getNumber(handles, 1).longValue() != REG_SUCCESS) { + return null; + } + // Need to capture both int[] (Java 8-10) and long[] (Java 11+) + Object info = regQueryInfoKey.invoke(root, getNumber(handles, 0)); + + int count = getNumber(info, 0).intValue(); + int maxlen = getNumber(info, 3).intValue(); for (int index = 0; index < count; index++) { - byte[] name = (byte[]) regEnumValue.invoke(root, Integer.valueOf(handles[0]), Integer.valueOf(index), Integer.valueOf(maxlen + 1)); + byte[] name = (byte[]) regEnumValue.invoke(root, getNumber(handles, 0), Integer.valueOf(index), Integer.valueOf(maxlen + 1)); String value = readString(hkey, key, new String(name, StandardCharsets.UTF_8)); results.put(new String(name, StandardCharsets.UTF_8).trim(), value); } - regCloseKey.invoke(root, Integer.valueOf(handles[0])); + regCloseKey.invoke(root, getNumber(handles, 0)); return results; } @@ -168,18 +207,23 @@ private static List readStringSubKeys(Preferences root, int hkey, String key) throws IllegalAccessException, InvocationTargetException { + if (regOpenKey == null || regQueryInfoKey == null || regEnumKeyEx == null || regCloseKey == null) { + return null; + } List results = new ArrayList<>(); - int[] handles = (int[]) regOpenKey.invoke(root, Integer.valueOf(hkey), toCstr(key), Integer.valueOf(KEY_READ)); - if (handles[1] != REG_SUCCESS) { + // Need to capture both int[] (Java 8-10) and long[] (Java 11+) + Object handles = regOpenKey.invoke(root, hkey(hkey), toCstr(key), Integer.valueOf(KEY_READ)); + if (getNumber(handles, 1).longValue() != REG_SUCCESS) { return Collections.emptyList(); } - int[] info = (int[]) regQueryInfoKey.invoke(root, Integer.valueOf(handles[0])); - - int count = info[0]; // Fix: info[2] was being used here with wrong results. Suggested by davenpcj, confirmed by Petrucio - int maxlen = info[3]; // value length max + // Need to capture both int[] (Java 8-10) and long[] (Java 11+) + Object info = regQueryInfoKey.invoke(root, getNumber(handles, 0)); + + int count = getNumber(info, 0).intValue(); + int maxlen = getNumber(info, 3).intValue(); for (int index = 0; index < count; index++) { - byte[] name = (byte[]) regEnumKeyEx.invoke(root, Integer.valueOf(handles[0]), Integer.valueOf(index), Integer.valueOf(maxlen + 1)); + byte[] name = (byte[]) regEnumKeyEx.invoke(root, getNumber(handles, 0), Integer.valueOf(index), Integer.valueOf(maxlen + 1)); results.add(new String(name, StandardCharsets.UTF_8).trim()); } - regCloseKey.invoke(root, Integer.valueOf(handles[0])); + regCloseKey.invoke(root, getNumber(handles, 0)); return results; }