ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Handle the remote case in MsiSummaryInfoSetProperty. 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dmitry Timoshkov 2018-09-08 11:45:15 +08:00 committed by Alexandre Julliard
parent 4acd7b6c45
commit 190ef475fa
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/msi/suminfo.c
View File

@ -836,7 +836,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT
return ERROR_INVALID_PARAMETER;
if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO )))
{
MSIHANDLE remote;
if ((remote = msi_get_remote( handle )))
{
WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n");
return ERROR_FUNCTION_FAILED;
}
return ERROR_INVALID_HANDLE;
}
str.unicode = TRUE;
str.str.w = szValue;
@ -867,7 +877,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT
return ERROR_INVALID_PARAMETER;
if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO )))
{
MSIHANDLE remote;
if ((remote = msi_get_remote( handle )))
{
WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n");
return ERROR_FUNCTION_FAILED;
}
return ERROR_INVALID_HANDLE;
}
str.unicode = FALSE;
str.str.a = szValue;

4
dlls/msi/tests/custom.c
View File

@ -499,7 +499,9 @@ todo_wine
ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer);
r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, "");
todo_wine
ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r);
r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL);
ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r);
r = MsiCloseHandle(suminfo);