Properly resize the buffer based on ERROR_MORE_DATA.

Also remember to free the allocated buffer.

Properly resize the buffer based on ERROR_MORE_DATA.
9170cc82 · Aric Stewart · Alexandre Julliard · 0f394ae6 · 9170cc82
Commit 9170cc82 authored Jul 11, 2005 by Aric Stewart Committed by Alexandre Julliard Jul 11, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

registry.c dlls/msi/registry.c +12 -1

No files found.
--- a/dlls/msi/registry.c
+++ b/dlls/msi/registry.c
@@ -873,9 +873,18 @@ UINT WINAPI MsiEnumComponentQualifiersW( LPWSTR szComponent, DWORD iIndex,
    rc = RegEnumValueW(key, iIndex, lpQualifierBuf, pcchQualifierBuf, NULL, 
                    NULL, (LPBYTE)full_buffer, &full_buffer_size);

+    if (rc == ERROR_MORE_DATA)
+    {
+        HeapFree(GetProcessHeap(),0,full_buffer);
+        full_buffer_size+=sizeof(WCHAR);
+        full_buffer = HeapAlloc(GetProcessHeap(),0,full_buffer_size);
+        rc = RegEnumValueW(key, iIndex, lpQualifierBuf, pcchQualifierBuf, NULL, 
+                    NULL, (LPBYTE)full_buffer, &full_buffer_size);
+    }
+    
    RegCloseKey(key);

-    if (rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA)
+    if (rc == ERROR_SUCCESS)
    {
        if (lpApplicationDataBuf && pcchApplicationDataBuf)
        {
@@ -898,6 +907,8 @@ UINT WINAPI MsiEnumComponentQualifiersW( LPWSTR szComponent, DWORD iIndex,
                        debugstr_w(lpApplicationDataBuf));
    }

+    HeapFree(GetProcessHeap(),0,full_buffer);
+
    return rc;
 }