msi: MsiCollectUserInfo cannot be called from a custom action (Coverity 565, 566).

baf86bd5 · James Hawkins · Alexandre Julliard · cb958cd7 · baf86bd5
Commit baf86bd5 authored Mar 22, 2009 by James Hawkins Committed by Alexandre Julliard Mar 23, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

msi.c dlls/msi/msi.c +8 -0

No files found.
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -2927,7 +2927,11 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct)
    if (rc != ERROR_SUCCESS)
        return ERROR_INVALID_PARAMETER;

+    /* MsiCollectUserInfo cannot be called from a custom action. */
    package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE);
+    if (!package)
+        return ERROR_CALL_NOT_IMPLEMENTED;
+
    rc = ACTION_PerformUIAction(package, szFirstRun, -1);
    msiobj_release( &package->hdr );

@@ -2949,7 +2953,11 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct)
    if (rc != ERROR_SUCCESS)
        return ERROR_INVALID_PARAMETER;

+    /* MsiCollectUserInfo cannot be called from a custom action. */
    package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE);
+    if (!package)
+        return ERROR_CALL_NOT_IMPLEMENTED;
+
    rc = ACTION_PerformUIAction(package, szFirstRun, -1);
    msiobj_release( &package->hdr );