Commit a905217b authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

Fix a copy and paste error, check for a null value and discard

unneeded errors.
parent 79a6626b
......@@ -127,7 +127,7 @@ static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig,
maxVersion = load_dynamic_stringW(row,4);
if (maxVersion)
{
ACTION_VerStrToInteger(minVersion, &sig->MaxVersionMS,
ACTION_VerStrToInteger(maxVersion, &sig->MaxVersionMS,
&sig->MaxVersionLS);
HeapFree(GetProcessHeap(), 0, maxVersion);
}
......@@ -610,6 +610,9 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, BOOL *appFound,
}
else
rc = ERROR_OUTOFMEMORY;
if (rc != ERROR_OUTOFMEMORY )
rc = ERROR_SUCCESS;
return rc;
}
......@@ -689,6 +692,9 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, BOOL *appFound,
ERR("Error is %x\n",rc);
goto end;
}
if (MSI_RecordIsNull(row,4))
depth = 0;
else
depth = MSI_RecordGetInteger(row,4);
ACTION_ExpandAnyPath(package, buffer, expanded,
sizeof(expanded) / sizeof(expanded[0]));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment