[PATCH 5/5] msi: Pass the given record to the callback.
Zebediah Figura
z.figura12 at gmail.com
Sun Jun 18 18:44:21 CDT 2017
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/msi/package.c | 3 +--
dlls/msi/tests/package.c | 3 ---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index f16b1dc..b8387fe 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1789,8 +1789,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC
if (gUIHandlerRecord && (gUIFilterRecord & log_type))
{
- MSIHANDLE rec = MsiCreateRecord( 1 );
- MsiRecordSetStringW( rec, 0, message );
+ MSIHANDLE rec = alloc_msihandle(&record->hdr);
TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n",
gUIHandlerRecord, gUIContextRecord, eMessageType, rec);
rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec );
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 503cf9a..c46ebff 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -9100,12 +9100,9 @@ static INT CALLBACK externalui_record_callback(void *context, UINT message_type,
ok(r == 1, "expected 1, got %u\n", r);
r = MsiRecordGetStringA(hrecord, 0, message, &length);
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
- todo_wine
ok(length == strlen("test message [1]"), "expected %d, got %d\n", strlen("test message [1]"), length);
- todo_wine
ok(!strcmp(message, "test message [1]"), "message didn't match\n");
r = MsiRecordGetInteger(hrecord, 1);
- todo_wine
ok(r == 12345, "expected 12345, got %u\n", r);
return retval;
}
--
2.7.4
More information about the wine-patches
mailing list