[PATCH 6/6] msi: Make MsiProcessMessage() RPC-compatible.
Zebediah Figura
z.figura12 at gmail.com
Mon Apr 16 20:20:40 CDT 2018
Instead of passing a remote MSIHANDLE and creating a set of remote_Record*()
methods, we marshal the whole record as a wire struct. We do this for two
reasons: firstly, because chances are whoever is reading the record is going
to want to read the whole thing, so it's much less taxing on IPC to just pass
the whole record once; and secondly, because records can be created on the
client side or returned from the server side, and we don't want to have to
write a lot of extra code to deal with both possibilities.
The wire_record struct is designed so that we can simply pass the relevant
part of an MSIRECORD to the server.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/msi/msipriv.h | 2 ++
dlls/msi/package.c | 41 +++++++++++++++++++----------------------
dlls/msi/record.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
dlls/msi/winemsi.idl | 23 ++++++++++++++++++++++-
4 files changed, 87 insertions(+), 23 deletions(-)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index b2b3e7c..00edaa1 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -39,6 +39,7 @@
#include "wine/debug.h"
#include "msiserver.h"
+#include "winemsi.h"
static const BOOL is_64bit = sizeof(void *) > sizeof(int);
BOOL is_wow64 DECLSPEC_HIDDEN;
@@ -832,6 +833,7 @@ extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) DE
extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int) DECLSPEC_HIDDEN;
extern const WCHAR *msi_record_get_string(const MSIRECORD *, UINT, int *) DECLSPEC_HIDDEN;
extern void dump_record(MSIRECORD *) DECLSPEC_HIDDEN;
+extern UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) DECLSPEC_HIDDEN;
/* stream internals */
extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN;
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index fa498d1..1aa9fb8 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -2051,39 +2051,27 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType,
MsiRecordGetInteger(hRecord, 1) != 2)
return -1;
+ record = msihandle2msiinfo(hRecord, MSIHANDLETYPE_RECORD);
+ if (!record)
+ return ERROR_INVALID_HANDLE;
+
package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE );
if( !package )
{
MSIHANDLE remote;
- HRESULT hr;
if (!(remote = msi_get_remote(hInstall)))
return ERROR_INVALID_HANDLE;
- hr = remote_ProcessMessage(remote, eMessageType, hRecord);
+ ret = remote_ProcessMessage(remote, eMessageType, (struct wire_record *)&record->count);
- if (FAILED(hr))
- {
- if (HRESULT_FACILITY(hr) == FACILITY_WIN32)
- return HRESULT_CODE(hr);
-
- return ERROR_FUNCTION_FAILED;
- }
-
- return ERROR_SUCCESS;
+ msiobj_release(&record->hdr);
+ return ret;
}
- record = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD );
- if( !record )
- goto out;
-
ret = MSI_ProcessMessage( package, eMessageType, record );
-out:
msiobj_release( &package->hdr );
- if( record )
- msiobj_release( &record->hdr );
-
return ret;
}
@@ -2467,10 +2455,19 @@ UINT __cdecl remote_SetProperty(MSIHANDLE hinst, LPCWSTR property, LPCWSTR value
return MsiSetPropertyW(hinst, property, value);
}
-HRESULT __cdecl remote_ProcessMessage(MSIHANDLE hinst, INSTALLMESSAGE message, MSIHANDLE record)
+int __cdecl remote_ProcessMessage(MSIHANDLE hinst, INSTALLMESSAGE message, struct wire_record *remote_rec)
{
- UINT r = MsiProcessMessage(hinst, message, record);
- return HRESULT_FROM_WIN32(r);
+ MSIHANDLE rec;
+ int ret;
+ UINT r;
+
+ if ((r = unmarshal_record(remote_rec, &rec)))
+ return r;
+
+ ret = MsiProcessMessage(hinst, message, rec);
+
+ MsiCloseHandle(rec);
+ return ret;
}
HRESULT __cdecl remote_DoAction(MSIHANDLE hinst, BSTR action)
diff --git a/dlls/msi/record.c b/dlls/msi/record.c
index de45191..e7f9e13 100644
--- a/dlls/msi/record.c
+++ b/dlls/msi/record.c
@@ -1102,3 +1102,47 @@ void dump_record(MSIRECORD *rec)
}
TRACE("]\n");
}
+
+UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out)
+{
+ MSIRECORD *rec;
+ unsigned int i;
+ UINT r;
+
+ rec = MSI_CreateRecord(in->count);
+ if (!rec) return ERROR_OUTOFMEMORY;
+
+ for (i = 0; i <= in->count; i++)
+ {
+ switch (in->fields[i].type)
+ {
+ case MSIFIELD_NULL:
+ break;
+ case MSIFIELD_INT:
+ case MSIFIELD_INTPTR:
+ r = MSI_RecordSetInteger(rec, i, in->fields[i].u.iVal);
+ break;
+ case MSIFIELD_WSTR:
+ r = MSI_RecordSetStringW(rec, i, in->fields[i].u.szwVal);
+ break;
+ case MSIFIELD_STREAM:
+ r = MSI_RecordSetIStream(rec, i, in->fields[i].u.stream);
+ break;
+ default:
+ ERR("invalid field type %d\n", in->fields[i].type);
+ break;
+ }
+
+ if (r)
+ {
+ msiobj_release(&rec->hdr);
+ return r;
+ }
+ }
+
+ *out = alloc_msihandle(&rec->hdr);
+ if (!*out) return ERROR_OUTOFMEMORY;
+
+ msiobj_release(&rec->hdr);
+ return ERROR_SUCCESS;
+}
diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl
index efd3971..6490ad3 100644
--- a/dlls/msi/winemsi.idl
+++ b/dlls/msi/winemsi.idl
@@ -26,9 +26,30 @@ typedef int MSICONDITION;
typedef int MSIRUNMODE;
typedef int INSTALLSTATE;
+#define MSIFIELD_NULL 0
+#define MSIFIELD_INT 1
+#define MSIFIELD_WSTR 3
+#define MSIFIELD_STREAM 4
+#define MSIFIELD_INTPTR 5
cpp_quote("#endif")
cpp_quote("#include \"msiquery.h\"")
+struct wire_field {
+ unsigned int type;
+ [switch_is(type)] union {
+ [case(MSIFIELD_NULL)] ;
+ [case(MSIFIELD_INT, MSIFIELD_INTPTR)] int iVal;
+ [case(MSIFIELD_WSTR), string] LPWSTR szwVal;
+ [case(MSIFIELD_STREAM)] IStream *stream;
+ } u;
+ int len;
+};
+
+struct wire_record {
+ unsigned int count;
+ [size_is(count+1)] struct wire_field fields[];
+};
+
[
uuid(56D58B64-8780-4c22-A8BC-8B0B29E4A9F8)
]
@@ -42,7 +63,7 @@ interface IWineMsiRemote
HRESULT remote_GetActiveDatabase( [in] MSIHANDLE hinst, [out] MSIHANDLE *handle );
UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value );
UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value );
- HRESULT remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] MSIHANDLE record );
+ int remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] struct wire_record *record );
HRESULT remote_DoAction( [in] MSIHANDLE hinst, [in] BSTR action );
HRESULT remote_Sequence( [in] MSIHANDLE hinst, [in] BSTR table, [in] int sequence );
HRESULT remote_GetTargetPath( [in] MSIHANDLE hinst, [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size );
--
2.7.4
More information about the wine-devel
mailing list