Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Handle the remote case in MsiSummaryInfoSetProperty.

Browse source 
Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 190ef475fa3164d2f468d5b09c58c8150d30f129 by Dmitry Timoshkov <dmitry@baikal.ru>
This commit is contained in:
winesync 2022-03-12 23:57:39 +01:00 • committed by Mark Jansen
parent a8bfcb28ab
commit 636f46adb6
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dll/win32/msi/suminfo.c
View file

@ -851,7 +851,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) 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; return ERROR_INVALID_HANDLE;
}
str.unicode = TRUE; str.unicode = TRUE;
str.str.w = szValue; str.str.w = szValue;
@ -882,7 +892,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) 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; return ERROR_INVALID_HANDLE;
}
str.unicode = FALSE; str.unicode = FALSE;
str.str.a = szValue; str.str.a = szValue;

4
modules/rostests/winetests/msi/custom.c
View file

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