[PATCH v2 4/6] msi: Allocate buffer in msi_get_file_version_info().

[Paul Gofman]

From: Paul Gofman

---
 dlls/msi/appsearch.c | 20 ++++----------------
 dlls/msi/files.c     | 24 ++++++++++++++----------
 dlls/msi/msipriv.h   |  2 +-
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index 88450087196..092a61560a4 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -178,18 +178,9 @@ static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, struct signature *s
     if (attr == INVALID_FILE_ATTRIBUTES || (attr & FILE_ATTRIBUTE_DIRECTORY))
         return NULL;

-    size = msi_get_file_version_info( package, path, 0, NULL );
-    if (!size)
+    if (!(buffer = msi_get_file_version_info( package, path )))
         return wcsdup(path);

-    buffer = malloc(size);
-    if (!buffer)
-        return NULL;
-
-    size = msi_get_file_version_info( package, path, size, buffer );
-    if (!size)
-        goto done;
-
     if (!VerQueryValueW(buffer, L"\", (LPVOID)&info, &size) || !info)
         goto done;

@@ -656,17 +647,14 @@ static UINT file_version_matches( MSIPACKAGE *package, const struct signature *s
                                   BOOL *matches )
 {
     UINT len;
-    void *version;
     VS_FIXEDFILEINFO *info = NULL;
-    DWORD size = msi_get_file_version_info( package, filePath, 0, NULL );
+    void *version;

*matches = FALSE;

-    if (!size) return ERROR_SUCCESS;
-    if (!(version = malloc( size ))) return ERROR_OUTOFMEMORY;
+    if (!(version = msi_get_file_version_info( package, filePath ))) return ERROR_SUCCESS;

-    if (msi_get_file_version_info( package, filePath, size, version ))
-        VerQueryValueW( version, L"\", (void **)&info, &len );
+    VerQueryValueW( version, L"\", (void **)&info, &len );

if (info)
     {
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 35166788dae..8dd2b67a792 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -157,27 +157,31 @@ static BOOL apply_filepatch( MSIPACKAGE *package, const WCHAR *patch, const WCHA
     return ret;
 }

-DWORD msi_get_file_version_info( MSIPACKAGE *package, const WCHAR *path, DWORD buflen, BYTE *buffer )
+BYTE *msi_get_file_version_info( MSIPACKAGE *package, const WCHAR *path )
 {
-    DWORD size, handle;
+    DWORD size;
+    BYTE *buffer = NULL;
+
     msi_disable_fs_redirection( package );
-    if (buffer) size = GetFileVersionInfoW( path, 0, buflen, buffer );
-    else size = GetFileVersionInfoSizeW( path, &handle );
+    if (!(size = GetFileVersionInfoSizeW( path, NULL ))) goto done;
+    if (!(buffer = malloc( size ))) goto done;
+    if (!GetFileVersionInfoW( path, 0, size, buffer ))
+    {
+        free( buffer );
+        buffer = NULL;
+    }
+done:
     msi_revert_fs_redirection( package );
-    return size;
+    return buffer;
 }

VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *package, const WCHAR *filename )
 {
     VS_FIXEDFILEINFO *ptr, *ret;
-    DWORD version_size;
     UINT size;
     void *version;

-    if (!(version_size = msi_get_file_version_info( package, filename, 0, NULL ))) return NULL;
-    if (!(version = malloc( version_size ))) return NULL;
-
-    msi_get_file_version_info( package, filename, version_size, version );
+    if (!(version = msi_get_file_version_info( package, filename ))) return NULL;

if (!VerQueryValueW( version, L"\", (void **)&ptr, &size ))
     {
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index e20ead557ce..aebfc85ab76 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -1114,7 +1114,7 @@ extern BOOL msi_set_file_attributes( MSIPACKAGE *, const WCHAR *, DWORD );
 extern HANDLE msi_find_first_file( MSIPACKAGE *, const WCHAR *, WIN32_FIND_DATAW * );
 extern BOOL msi_find_next_file( MSIPACKAGE *, HANDLE, WIN32_FIND_DATAW * );
 extern BOOL msi_move_file( MSIPACKAGE *, const WCHAR *, const WCHAR *, DWORD );
-extern DWORD msi_get_file_version_info( MSIPACKAGE *, const WCHAR *, DWORD, BYTE * );
+extern BYTE *msi_get_file_version_info( MSIPACKAGE *, const WCHAR * );
 extern BOOL msi_create_full_path( MSIPACKAGE *, const WCHAR * );
 extern DWORD msi_get_disk_file_size( MSIPACKAGE *, const WCHAR * );
 extern VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *, const WCHAR * );