[PATCH 5/5] reg: Allocate memory for the value name buffer as necessary when deleting all registry values in a given key
Hugh McMaster
hugh.mcmaster at outlook.com
Mon Jul 24 07:48:14 CDT 2017
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/reg.c | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 6d48dece05..a968bec98f 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -471,40 +471,35 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
if (value_all)
{
- LPWSTR szValue;
- DWORD maxValue;
- DWORD count;
+ DWORD max_value_len = 256, value_len;
+ WCHAR *value_name;
LONG rc;
- rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, &maxValue, NULL, NULL, NULL);
- if (rc != ERROR_SUCCESS)
- {
- RegCloseKey(key);
- output_message(STRING_GENERAL_FAILURE);
- return 1;
- }
- maxValue++;
- szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR));
+ value_name = resize_buffer(NULL, max_value_len * sizeof(WCHAR));
while (1)
{
- count = maxValue;
- rc = RegEnumValueW(key, 0, szValue, &count, NULL, NULL, NULL, NULL);
+ value_len = max_value_len;
+ rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL);
if (rc == ERROR_SUCCESS)
{
- rc = RegDeleteValueW(key, szValue);
+ rc = RegDeleteValueW(key, value_name);
if (rc != ERROR_SUCCESS)
{
- HeapFree(GetProcessHeap(), 0, szValue);
+ HeapFree(GetProcessHeap(), 0, value_name);
RegCloseKey(key);
output_message(STRING_VALUEALL_FAILED, key_name);
return 1;
}
}
+ else if (rc == ERROR_MORE_DATA)
+ {
+ max_value_len *= 2;
+ resize_buffer(value_name, max_value_len * sizeof(WCHAR));
+ }
else break;
}
- HeapFree(GetProcessHeap(), 0, szValue);
+ HeapFree(GetProcessHeap(), 0, value_name);
}
else if (value_name || value_empty)
{
--
2.13.2
More information about the wine-patches
mailing list