Merge pull request #136 from danwi/registry_get_empty_values

Add fix for issue #135 in Advapi32Util (reading empty values)
java-native-access · Oct 8, 2012 · 5c2923c · 5c2923c
2 parents c1a7fd7 + 018ad7f
commit 5c2923c
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 2 deletions.
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java
@@ -1262,8 +1262,28 @@ public static TreeMap<String, Object> registryGetValues(HKEY hKey) {
 
 	    String nameString = Native.toString(name);
 
-	    if(lpcbData.getValue() == 0 && lpType.getValue() == WinNT.REG_BINARY) {
-	        keyValues.put(nameString, new byte[0]);
+	    if(lpcbData.getValue() == 0) {
+	        switch (lpType.getValue()) {
+            case WinNT.REG_BINARY: {
+                keyValues.put(nameString, new byte[0]);
+                break;
+            }
+            case WinNT.REG_SZ:
+            case WinNT.REG_EXPAND_SZ: {
+                keyValues.put(nameString, new char[0]);
+                break;
+            }
+            case WinNT.REG_MULTI_SZ: {
+                keyValues.put(nameString, new String[0]);
+                break;
+            }
+            case WinNT.REG_NONE: {
+                keyValues.put(nameString, null);
+                break;
+            }
+	        default:
+	            throw new RuntimeException("Unsupported empty type: " + lpType.getValue());
+	        }
 	        continue;
 	    }
 

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java
@@ -26,6 +26,8 @@
 import com.sun.jna.platform.win32.WinNT.PSID;
 import com.sun.jna.platform.win32.WinNT.SID_NAME_USE;
 import com.sun.jna.platform.win32.WinNT.WELL_KNOWN_SID_TYPE;
+import com.sun.jna.platform.win32.WinReg.HKEY;
+import com.sun.jna.platform.win32.WinReg.HKEYByReference;
 
 /**
  * @author dblock[at]dblock[dot]org
@@ -316,6 +318,46 @@ public void testRegistryGetValues() {
 		assertEquals(0, stringsRead.length);
 		Advapi32Util.registryDeleteKey(WinReg.HKEY_CURRENT_USER, "Software", "JNA");						
 	}
+
+	public void testRegistryGetEmptyValues() {
+        HKEY root = WinReg.HKEY_CURRENT_USER;
+        String keyPath = "Software\\JNA";
+        Advapi32Util.registryCreateKey(root, "Software", "JNA");
+        doTestRegistryGetEmptyValues(root, keyPath, WinNT.REG_BINARY);
+        doTestRegistryGetEmptyValues(root, keyPath, WinNT.REG_EXPAND_SZ);
+        doTestRegistryGetEmptyValues(root, keyPath, WinNT.REG_MULTI_SZ);
+        doTestRegistryGetEmptyValues(root, keyPath, WinNT.REG_NONE);
+        doTestRegistryGetEmptyValues(root, keyPath, WinNT.REG_SZ);
+        Advapi32Util.registryDeleteKey(root, "Software", "JNA");
+    }
+
+    private void doTestRegistryGetEmptyValues(HKEY root, String keyPath, int valueType) {
+        String valueName = "EmptyValue";
+        registrySetEmptyValue(root, keyPath, valueName, valueType);
+        Map<String, Object> values = Advapi32Util.registryGetValues(root, keyPath);
+        assertEquals(1, values.size());
+        assertTrue(values.containsKey(valueName));
+    }
+
+    private static void registrySetEmptyValue(HKEY root, String keyPath, String name, final int valueType) {
+        HKEYByReference phkKey = new HKEYByReference();
+        int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, WinNT.KEY_READ | WinNT.KEY_WRITE, phkKey);
+        if (rc != W32Errors.ERROR_SUCCESS) {
+            throw new Win32Exception(rc);
+        }
+        try {
+            char[] data = new char[0];
+            rc = Advapi32.INSTANCE.RegSetValueEx(phkKey.getValue(), name, 0, valueType, data, 0);
+            if (rc != W32Errors.ERROR_SUCCESS) {
+                throw new Win32Exception(rc);
+            }
+        } finally {
+            rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+            if (rc != W32Errors.ERROR_SUCCESS) {
+                throw new Win32Exception(rc);
+            }
+        }
+    }
 
 	public void testIsWellKnownSid() {		
 		String everyoneString = "S-1-1-0";