Zebediah Figura : msi: Pass the given record to the callback.
Alexandre Julliard
julliard at winehq.org
Mon Jun 19 14:49:30 CDT 2017
Module: wine
Branch: master
Commit: 4e49ae3cc69b595f791410b3060dc18ddb9412cc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e49ae3cc69b595f791410b3060dc18ddb9412cc
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sun Jun 18 21:53:30 2017 -0500
msi: Pass the given record to the callback.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/package.c | 3 +--
dlls/msi/tests/package.c | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index eae01e0..e195764 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1818,8 +1818,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 a7cec7f..146d1fc 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -9096,7 +9096,6 @@ static INT CALLBACK externalui_record_callback(void *context, UINT message_type,
r = MsiRecordGetFieldCount(hrecord);
ok(r == 1, "expected 1, got %u\n", r);
r = MsiRecordGetInteger(hrecord, 1);
- todo_wine
ok(r == 12345, "expected 12345, got %u\n", r);
return retval;
}
More information about the wine-cvs
mailing list