From 9af1018fa2c8b364b7dd73bcaf013ded6920d79c Mon Sep 17 00:00:00 2001 From: Elbandi Date: Thu, 17 Nov 2011 01:18:21 +0100 Subject: [PATCH] eliminate double Advapi32 call from getValues --- core/src/main/java/hudson/util/jna/RegistryKey.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/util/jna/RegistryKey.java b/core/src/main/java/hudson/util/jna/RegistryKey.java index 18dc4f8d99..b04c9c0f80 100644 --- a/core/src/main/java/hudson/util/jna/RegistryKey.java +++ b/core/src/main/java/hudson/util/jna/RegistryKey.java @@ -242,11 +242,12 @@ public class RegistryKey { lpType = new IntByReference(); lpData = new byte[1]; lpcbData = new IntByReference(); + lpcbData.setValue(0); dwIndex = 0; + OUTER: while (true) { - lpcbData.setValue(0); result = Advapi32.INSTANCE.RegEnumValue(handle, dwIndex, lpValueName, lpcchValueName, null, lpType, lpData, lpcbData); switch (result) { @@ -256,9 +257,9 @@ public class RegistryKey { case WINERROR.ERROR_MORE_DATA: lpData = new byte[lpcbData.getValue()]; lpcchValueName = new IntByReference(16384); - check(Advapi32.INSTANCE.RegEnumValue(handle, dwIndex, lpValueName, lpcchValueName, null, - lpType, lpData, lpcbData)); + continue OUTER; + case WINERROR.ERROR_SUCCESS: name = new String(lpValueName, 0, lpcchValueName.getValue()); switch (lpType.getValue()) { @@ -277,6 +278,7 @@ public class RegistryKey { check(result); } dwIndex++; + lpcbData.setValue(0); } }