April 2018 - Wine-Commits - list.winehq.org

Roderick Colenbrander : ntdll: Read correct sysfs entry for core information.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: e502dce411439284db6f043e37bc0f4e51e50f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e502dce411439284db6f043e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 18 22:30:27 2018 -0700 ntdll: Read correct sysfs entry for core information. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8995c36..c3f5df3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1497,7 +1497,7 @@ static inline BOOL logical_proc_info_add_group(SYSTEM_LOGICAL_PROCESSOR_INFORMAT static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) { - static const char core_info[] = "/sys/devices/system/cpu/cpu%u/%s"; + static const char core_info[] = "/sys/devices/system/cpu/cpu%u/topology/%s"; static const char cache_info[] = "/sys/devices/system/cpu/cpu%u/cache/index%u/%s"; static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap";

1 0

Jactry Zeng : riched20: Implement EM_SELECTIONTYPE.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 915201a13f2f16244b1e0510c927e7925e5361de URL: https://source.winehq.org/git/wine.git/?a=commit;h=915201a13f2f16244b1e0510… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Apr 19 17:44:59 2018 +0800 riched20: Implement EM_SELECTIONTYPE. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 46 +++++++++++++++++++++- dlls/riched20/tests/editor.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c57d3ea..eb67e11 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -90,7 +90,7 @@ + EM_REPLACESEL (proper style?) ANSI&Unicode + EM_SCROLL + EM_SCROLLCARET - - EM_SELECTIONTYPE + + EM_SELECTIONTYPE - EM_SETBIDIOPTIONS 3.0 + EM_SETBKGNDCOLOR + EM_SETCHARFORMAT (partly done, no ANSI) @@ -2960,6 +2960,47 @@ static void ME_SetDefaultFormatRect(ME_TextEditor *editor) editor->rcFormat.right -= 1; } +static LONG ME_GetSelectionType(ME_TextEditor *editor) +{ + LONG sel_type = SEL_EMPTY; + LONG start, end; + + ME_GetSelectionOfs(editor, &start, &end); + if (start == end) + sel_type = SEL_EMPTY; + else + { + LONG object_count = 0, character_count = 0; + int i; + + for (i = 0; i < end - start; i++) + { + ME_Cursor cursor; + + ME_CursorFromCharOfs(editor, start + i, &cursor); + if (cursor.pRun->member.run.reobj) + object_count++; + else + character_count++; + if (character_count >= 2 && object_count >= 2) + return (SEL_TEXT | SEL_MULTICHAR | SEL_OBJECT | SEL_MULTIOBJECT); + } + if (character_count) + { + sel_type |= SEL_TEXT; + if (character_count >= 2) + sel_type |= SEL_MULTICHAR; + } + if (object_count) + { + sel_type |= SEL_OBJECT; + if (object_count >= 2) + sel_type |= SEL_MULTIOBJECT; + } + } + return sel_type; +} + static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) { CHARRANGE selrange; @@ -3498,7 +3539,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) @@ -3814,6 +3854,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_UpdateRepaint(editor, FALSE); return len; } + case EM_SELECTIONTYPE: + return ME_GetSelectionType(editor); case EM_SETBKGNDCOLOR: { LRESULT lColor; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9bfbf45..2a6907b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include <stdio.h> #include <assert.h> @@ -30,6 +32,7 @@ #include <winnls.h> #include <ole2.h> #include <richedit.h> +#include <richole.h> #include <commdlg.h> #include <time.h> #include <wine/test.h> @@ -8798,6 +8801,94 @@ static void test_para_numbering(void) DestroyWindow( edit ); } +static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, + LPSTORAGE pstg, LPOLECLIENTSITE polesite, LONG sizel_cx, + LONG sizel_cy, DWORD aspect, DWORD flags, DWORD user) +{ + reobj->cbStruct = sizeof(*reobj); + reobj->clsid = CLSID_NULL; + reobj->cp = cp; + reobj->poleobj = poleobj; + reobj->pstg = pstg; + reobj->polesite = polesite; + reobj->sizel.cx = sizel_cx; + reobj->sizel.cy = sizel_cy; + reobj->dvaspect = aspect; + reobj->dwFlags = flags; + reobj->dwUser = user; +} + +static void test_EM_SELECTIONTYPE(void) +{ + HWND hwnd = new_richedit(NULL); + IRichEditOle *reole = NULL; + static const char text1[] = "abcdefg\n"; + int result; + REOBJECT reo1, reo2; + IOleClientSite *clientsite; + HRESULT hr; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text1); + SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole); + + SendMessageA(hwnd, EM_SETSEL, 1, 1); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_EMPTY, "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 1, 2); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_TEXT, "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 2, 5); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT | SEL_MULTICHAR), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 1); + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); + fill_reobject_struct(&reo1, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, + DVASPECT_CONTENT, 0, 1); + hr = IRichEditOle_InsertObject(reole, &reo1); + ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + IOleClientSite_Release(clientsite); + + SendMessageA(hwnd, EM_SETSEL, 0, 1); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_OBJECT, "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 2); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT | SEL_OBJECT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 3); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT | SEL_MULTICHAR | SEL_OBJECT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 2, 3); + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); + fill_reobject_struct(&reo2, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, + DVASPECT_CONTENT, 0, 2); + hr = IRichEditOle_InsertObject(reole, &reo2); + ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + IOleClientSite_Release(clientsite); + + SendMessageA(hwnd, EM_SETSEL, 0, 2); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_OBJECT | SEL_TEXT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 3); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_OBJECT | SEL_MULTIOBJECT | SEL_TEXT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 4); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT| SEL_MULTICHAR | SEL_OBJECT | SEL_MULTIOBJECT), "got wrong selection type: %x.\n", result); + + IRichEditOle_Release(reole); + DestroyWindow(hwnd); +} + START_TEST( editor ) { BOOL ret; @@ -8872,6 +8963,7 @@ START_TEST( editor ) test_background(); test_eop_char_fmt(); test_para_numbering(); + test_EM_SELECTIONTYPE(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Zebediah Figura : msi: Make MsiViewFetch() RPC-compatible.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 39c116fd0c0aca6517b9c1f31296bf8665cf7834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c116fd0c0aca6517b9c1f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:06 2018 -0500 msi: Make MsiViewFetch() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 ++ dlls/msi/msiquery.c | 29 +++++++++++++++++++-- dlls/msi/record.c | 55 ++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/winemsi.idl | 1 + 5 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7ea898c..f386f90 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -831,6 +831,8 @@ extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int) DECLSPE 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; +extern struct wire_record *marshal_record(MSIHANDLE handle) DECLSPEC_HIDDEN; +extern void free_remote_record(struct wire_record *rec) DECLSPEC_HIDDEN; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index bfc239a..6eddf7a 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -389,8 +389,22 @@ UINT WINAPI MsiViewFetch(MSIHANDLE hView, MSIHANDLE *record) *record = 0; query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); - if( !query ) - return ERROR_INVALID_HANDLE; + if (!query) + { + struct wire_record *wire_rec = NULL; + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hView))) + return ERROR_INVALID_HANDLE; + + ret = remote_ViewFetch(remote, &wire_rec); + if (!ret) + { + ret = unmarshal_record(wire_rec, record); + free_remote_record(wire_rec); + } + return ret; + } ret = MSI_ViewFetch( query, &rec ); if( ret == ERROR_SUCCESS ) { @@ -1054,3 +1068,14 @@ UINT __cdecl remote_ViewExecute(MSIHANDLE view, struct wire_record *remote_rec) MsiCloseHandle(rec); return r; } + +UINT __cdecl remote_ViewFetch(MSIHANDLE view, struct wire_record **rec) +{ + MSIHANDLE handle; + UINT r = MsiViewFetch(view, &handle); + *rec = NULL; + if (!r) + *rec = marshal_record(handle); + MsiCloseHandle(handle); + return r; +} diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 4c504ea..91892d7 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1103,3 +1103,58 @@ UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) msiobj_release(&rec->hdr); return ERROR_SUCCESS; } + +struct wire_record *marshal_record(MSIHANDLE handle) +{ + struct wire_record *ret; + unsigned int i, count; + MSIRECORD *rec; + + if (!(rec = msihandle2msiinfo(handle, MSIHANDLETYPE_RECORD))) + return NULL; + + count = MSI_RecordGetFieldCount(rec); + ret = midl_user_allocate(sizeof(*ret) + count * sizeof(ret->fields[0])); + ret->count = count; + + for (i = 0; i <= count; i++) + { + switch (rec->fields[i].type) + { + case MSIFIELD_NULL: + break; + case MSIFIELD_INT: + ret->fields[i].u.iVal = rec->fields[i].u.iVal; + break; + case MSIFIELD_WSTR: + ret->fields[i].u.szwVal = strdupW(rec->fields[i].u.szwVal); + break; + case MSIFIELD_STREAM: + IStream_AddRef(rec->fields[i].u.stream); + ret->fields[i].u.stream = rec->fields[i].u.stream; + break; + default: + ERR("invalid field type %d\n", rec->fields[i].type); + break; + } + ret->fields[i].type = rec->fields[i].type; + } + + msiobj_release(&rec->hdr); + return ret; +} + +void free_remote_record(struct wire_record *rec) +{ + int i; + + for (i = 0; i <= rec->count; i++) + { + if (rec->fields[i].type == MSIFIELD_WSTR) + midl_user_free(rec->fields[i].u.szwVal); + else if (rec->fields[i].type == MSIFIELD_STREAM) + IStream_Release(rec->fields[i].u.stream); + } + + midl_user_free(rec); +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 8a0a20a..479cb93 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -243,7 +243,9 @@ static void test_props(MSIHANDLE hinst) static void test_db(MSIHANDLE hinst) { - MSIHANDLE hdb, view, rec; + MSIHANDLE hdb, view, rec, rec2; + char buffer[10]; + DWORD sz; UINT r; hdb = MsiGetActiveDatabase(hinst); @@ -264,6 +266,56 @@ static void test_db(MSIHANDLE hinst) r = MsiViewExecute(view, 0); ok(hinst, !r, "got %u\n", r); + r = MsiViewFetch(view, &rec2); + ok(hinst, !r, "got %u\n", r); + + r = MsiRecordGetFieldCount(rec2); + ok(hinst, r == 3, "got %u\n", r); + + sz = sizeof(buffer); + r = MsiRecordGetStringA(rec2, 1, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == strlen(buffer), "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "one"), "got '%s'\n", buffer); + + r = MsiRecordGetInteger(rec2, 2); + ok(hinst, r == 1, "got %d\n", r); + + sz = sizeof(buffer); + r = MsiRecordReadStream(rec2, 3, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, !memcmp(buffer, "unus", 4), "wrong data\n"); + + r = MsiCloseHandle(rec2); + ok(hinst, !r, "got %u\n", r); + + r = MsiViewFetch(view, &rec2); + ok(hinst, !r, "got %u\n", r); + + r = MsiRecordGetFieldCount(rec2); + ok(hinst, r == 3, "got %u\n", r); + + sz = sizeof(buffer); + r = MsiRecordGetStringA(rec2, 1, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == strlen(buffer), "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "two"), "got '%s'\n", buffer); + + r = MsiRecordGetInteger(rec2, 2); + ok(hinst, r == 2, "got %d\n", r); + + sz = sizeof(buffer); + r = MsiRecordReadStream(rec2, 3, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, !memcmp(buffer, "duo", 3), "wrong data\n"); + + r = MsiCloseHandle(rec2); + ok(hinst, !r, "got %u\n", r); + + r = MsiViewFetch(view, &rec2); + ok(hinst, r == ERROR_NO_MORE_ITEMS, "got %u\n", r); + ok(hinst, !rec2, "got %u\n", rec2); + r = MsiCloseHandle(view); ok(hinst, !r, "got %u\n", r); @@ -276,6 +328,19 @@ static void test_db(MSIHANDLE hinst) r = MsiViewExecute(view, rec); ok(hinst, !r, "got %u\n", r); + r = MsiViewFetch(view, &rec2); + ok(hinst, !r, "got %u\n", r); + + r = MsiRecordGetInteger(rec2, 2); + ok(hinst, r == 1, "got %d\n", r); + + r = MsiCloseHandle(rec2); + ok(hinst, !r, "got %u\n", r); + + r = MsiViewFetch(view, &rec2); + ok(hinst, r == ERROR_NO_MORE_ITEMS, "got %u\n", r); + ok(hinst, !rec2, "got %u\n", rec2); + r = MsiCloseHandle(rec); ok(hinst, !r, "got %u\n", r); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index e698f76..b892f34 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -57,6 +57,7 @@ struct wire_record { interface IWineMsiRemote { UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); + UINT remote_ViewFetch( [in] MSIHANDLE view, [out] struct wire_record **record ); MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); HRESULT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSIHANDLE *keys );

1 0

Zebediah Figura : msi: Make MsiViewExecute() RPC-compatible.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: afb5eede24c35308d2370fd3b492545aed607ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afb5eede24c35308d2370fd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:05 2018 -0500 msi: Make MsiViewExecute() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 39 ++++++++++++++++++++++++++++++--------- dlls/msi/record.c | 6 ++++++ dlls/msi/tests/custom.c | 20 +++++++++++++++++++- dlls/msi/winemsi.idl | 2 ++ 4 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 9518c59..bfc239a 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -458,25 +458,32 @@ UINT WINAPI MsiViewExecute(MSIHANDLE hView, MSIHANDLE hRec) TRACE("%d %d\n", hView, hRec); - query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); - if( !query ) - return ERROR_INVALID_HANDLE; - if( hRec ) { rec = msihandle2msiinfo( hRec, MSIHANDLETYPE_RECORD ); if( !rec ) - { - ret = ERROR_INVALID_HANDLE; - goto out; - } + return ERROR_INVALID_HANDLE; + } + + query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); + if( !query ) + { + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hView))) + return ERROR_INVALID_HANDLE; + + ret = remote_ViewExecute(remote, rec ? (struct wire_record *)&rec->count : NULL); + + if (rec) + msiobj_release(&rec->hdr); + return ret; } msiobj_lock( &rec->hdr ); ret = MSI_ViewExecute( query, rec ); msiobj_unlock( &rec->hdr ); -out: msiobj_release( &query->hdr ); if( rec ) msiobj_release( &rec->hdr ); @@ -1033,3 +1040,17 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( return r; } + +UINT __cdecl remote_ViewExecute(MSIHANDLE view, struct wire_record *remote_rec) +{ + MSIHANDLE rec = 0; + UINT r; + + if ((r = unmarshal_record(remote_rec, &rec))) + return r; + + r = MsiViewExecute(view, rec); + + MsiCloseHandle(rec); + return r; +} diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 7b53d86..4c504ea 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1061,6 +1061,12 @@ UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) unsigned int i; UINT r; + if (!in) + { + *out = 0; + return ERROR_SUCCESS; + } + rec = MSI_CreateRecord(in->count); if (!rec) return ERROR_OUTOFMEMORY; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index e7a56ae..8a0a20a 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -243,7 +243,7 @@ static void test_props(MSIHANDLE hinst) static void test_db(MSIHANDLE hinst) { - MSIHANDLE hdb, view; + MSIHANDLE hdb, view, rec; UINT r; hdb = MsiGetActiveDatabase(hinst); @@ -261,6 +261,24 @@ static void test_db(MSIHANDLE hinst) r = MsiDatabaseOpenViewA(hdb, "SELECT * FROM `Test`", &view); ok(hinst, !r, "got %u\n", r); + r = MsiViewExecute(view, 0); + ok(hinst, !r, "got %u\n", r); + + r = MsiCloseHandle(view); + ok(hinst, !r, "got %u\n", r); + + r = MsiDatabaseOpenViewA(hdb, "SELECT * FROM `Test` WHERE `Name` = ?", &view); + ok(hinst, !r, "got %u\n", r); + + rec = MsiCreateRecord(1); + MsiRecordSetStringA(rec, 1, "one"); + + r = MsiViewExecute(view, rec); + ok(hinst, !r, "got %u\n", r); + + r = MsiCloseHandle(rec); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(view); ok(hinst, !r, "got %u\n", r); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 54e6eb8..e698f76 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -56,6 +56,8 @@ struct wire_record { ] interface IWineMsiRemote { + UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); + MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); HRESULT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSIHANDLE *keys ); HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo );

1 0

Zebediah Figura : msi: Make MsiDatabaseOpenView() RPC-compatible.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: c6bd4d8c35de1ae452a5b5bec69d4779c813b37f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6bd4d8c35de1ae452a5b5be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:04 2018 -0500 msi: Make MsiDatabaseOpenView() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 5 ++--- dlls/msi/msiquery.c | 27 +++++++++++---------------- dlls/msi/tests/custom.c | 14 +++++++++++++- dlls/msi/winemsi.idl | 2 +- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c1309a5..c1cf493 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1923,8 +1923,7 @@ HRESULT __cdecl remote_DatabaseGetSummaryInformation(MSIHANDLE db, UINT updateco return HRESULT_FROM_WIN32(r); } -HRESULT __cdecl remote_DatabaseOpenView(MSIHANDLE db, LPCWSTR query, MSIHANDLE *view) +UINT __cdecl remote_DatabaseOpenView(MSIHANDLE db, LPCWSTR query, MSIHANDLE *view) { - UINT r = MsiDatabaseOpenViewW(db, query, view); - return HRESULT_FROM_WIN32(r); + return MsiDatabaseOpenViewW(db, query, view); } diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index fb99c96..9518c59 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -116,9 +116,6 @@ UINT MSI_DatabaseOpenViewW(MSIDATABASE *db, TRACE("%s %p\n", debugstr_w(szQuery), pView); - if( !szQuery) - return ERROR_INVALID_PARAMETER; - /* pre allocate a handle to hold a pointer to the view */ query = alloc_msiobject( MSIHANDLETYPE_VIEW, sizeof (MSIQUERY), MSI_CloseView ); @@ -247,26 +244,24 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb, TRACE("%s %p\n", debugstr_w(szQuery), phView); + if (!phView) + return ERROR_INVALID_PARAMETER; + + if (!szQuery) + return ERROR_BAD_QUERY_SYNTAX; + db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if( !db ) { - MSIHANDLE remote; - HRESULT hr; + MSIHANDLE remote, remote_view; if (!(remote = msi_get_remote(hdb))) return ERROR_INVALID_HANDLE; - hr = remote_DatabaseOpenView(remote, szQuery, phView); - - if (FAILED(hr)) - { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; + ret = remote_DatabaseOpenView(remote, szQuery, &remote_view); + if (!ret) + *phView = alloc_msi_remote_handle(remote_view); + return ret; } ret = MSI_DatabaseOpenViewW( db, szQuery, &query ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0756994..e7a56ae 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -243,7 +243,7 @@ static void test_props(MSIHANDLE hinst) static void test_db(MSIHANDLE hinst) { - MSIHANDLE hdb; + MSIHANDLE hdb, view; UINT r; hdb = MsiGetActiveDatabase(hinst); @@ -252,6 +252,18 @@ static void test_db(MSIHANDLE hinst) r = MsiDatabaseIsTablePersistentA(hdb, "Test"); ok(hinst, r == MSICONDITION_TRUE, "got %u\n", r); + r = MsiDatabaseOpenViewA(hdb, NULL, &view); + ok(hinst, r == ERROR_BAD_QUERY_SYNTAX, "got %u\n", r); + + r = MsiDatabaseOpenViewA(hdb, "SELECT * FROM `Test`", NULL); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + r = MsiDatabaseOpenViewA(hdb, "SELECT * FROM `Test`", &view); + ok(hinst, !r, "got %u\n", r); + + r = MsiCloseHandle(view); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(hdb); ok(hinst, !r, "got %u\n", r); } diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 86f03e3..54e6eb8 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -59,7 +59,7 @@ interface IWineMsiRemote MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); HRESULT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSIHANDLE *keys ); HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); - HRESULT remote_DatabaseOpenView( [in] MSIHANDLE db, [in] LPCWSTR query, [out] MSIHANDLE *view ); + UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size );

1 0

Zebediah Figura : msi: Make MsiDatabaseIsTablePersistent() RPC-compatible.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 252dd11f20a7ac2285d4f082f3ab3f3168f494dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=252dd11f20a7ac2285d4f082… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:03 2018 -0500 msi: Make MsiDatabaseIsTablePersistent() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 5 ++--- dlls/msi/msiquery.c | 9 +-------- dlls/msi/tests/custom.c | 3 +++ dlls/msi/tests/install.c | 16 ++++++++++++++++ dlls/msi/winemsi.idl | 2 +- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index d3eb910..c1309a5 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1906,10 +1906,9 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) return ret; } -HRESULT __cdecl remote_DatabaseIsTablePersistent(MSIHANDLE db, LPCWSTR table, MSICONDITION *persistent) +MSICONDITION __cdecl remote_DatabaseIsTablePersistent(MSIHANDLE db, LPCWSTR table) { - *persistent = MsiDatabaseIsTablePersistentW(db, table); - return S_OK; + return MsiDatabaseIsTablePersistentW(db, table); } HRESULT __cdecl remote_DatabaseGetPrimaryKeys(MSIHANDLE db, LPCWSTR table, MSIHANDLE *keys) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 1ba3076..fb99c96 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -1024,19 +1024,12 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE ); if( !db ) { - HRESULT hr; - MSICONDITION condition; MSIHANDLE remote; if (!(remote = msi_get_remote(hDatabase))) return MSICONDITION_ERROR; - hr = remote_DatabaseIsTablePersistent(remote, szTableName, &condition); - - if (FAILED(hr)) - return MSICONDITION_ERROR; - - return condition; + return remote_DatabaseIsTablePersistent(remote, szTableName); } r = MSI_DatabaseIsTablePersistent( db, szTableName ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 00dcab3..0756994 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -249,6 +249,9 @@ static void test_db(MSIHANDLE hinst) hdb = MsiGetActiveDatabase(hinst); ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); + r = MsiDatabaseIsTablePersistentA(hdb, "Test"); + ok(hinst, r == MSICONDITION_TRUE, "got %u\n", r); + r = MsiCloseHandle(hdb); ok(hinst, !r, "got %u\n", r); } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 62fb81f..41a77cd 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4108,11 +4108,25 @@ static INT CALLBACK ok_callback(void *context, UINT message_type, MSIHANDLE reco static void test_customaction1(void) { + MSIHANDLE hdb, record; UINT r; create_database(msifile, ca1_tables, sizeof(ca1_tables) / sizeof(msi_table)); add_custom_dll(); + /* create a test table */ + MsiOpenDatabaseW(msifileW, MSIDBOPEN_TRANSACT, &hdb); + run_query(hdb, 0, "CREATE TABLE `Test` (`Name` CHAR(10), `Number` INTEGER, `Data` OBJECT PRIMARY KEY `Name`)"); + create_file("unus", 10); + create_file("duo", 10); + record = MsiCreateRecord(1); + MsiRecordSetStreamA(record, 1, "unus"); + run_query(hdb, record, "INSERT INTO `Test` (`Name`, `Number`, `Data`) VALUES ('one', 1, ?)"); + MsiRecordSetStreamA(record, 1, "duo"); + run_query(hdb, record, "INSERT INTO `Test` (`Name`, `Number`, `Data`) VALUES ('two', 2, ?)"); + MsiDatabaseCommit(hdb); + MsiCloseHandle(hdb); + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, "MAIN_TEST=1"); @@ -4136,6 +4150,8 @@ static void test_customaction1(void) ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); DeleteFileA(msifile); + DeleteFileA("unus"); + DeleteFileA("duo"); } static void test_customaction51(void) diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index c158583..86f03e3 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -56,7 +56,7 @@ struct wire_record { ] interface IWineMsiRemote { - HRESULT remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSICONDITION *persistent ); + MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); HRESULT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSIHANDLE *keys ); HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); HRESULT remote_DatabaseOpenView( [in] MSIHANDLE db, [in] LPCWSTR query, [out] MSIHANDLE *view );

1 0

Zebediah Figura : msi: Make MsiGetActiveDatabase() RPC-compatible.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: a6934768d1070d91c764d5c88fe276a9d6163683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6934768d1070d91c764d5c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:02 2018 -0500 msi: Make MsiGetActiveDatabase() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 9 ++++----- dlls/msi/tests/custom.c | 13 +++++++++++++ dlls/msi/winemsi.idl | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e7f51a6..d18736b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1686,7 +1686,8 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) } else if ((remote = msi_get_remote(hInstall))) { - remote_GetActiveDatabase(remote, &handle); + handle = remote_GetActiveDatabase(remote); + handle = alloc_msi_remote_handle(handle); } return handle; @@ -2420,11 +2421,9 @@ UINT WINAPI MsiGetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, return MSI_GetProperty( hInstall, szName, &val, pchValueBuf ); } -HRESULT __cdecl remote_GetActiveDatabase(MSIHANDLE hinst, MSIHANDLE *handle) +MSIHANDLE __cdecl remote_GetActiveDatabase(MSIHANDLE hinst) { - *handle = MsiGetActiveDatabase(hinst); - - return S_OK; + return MsiGetActiveDatabase(hinst); } UINT __cdecl remote_GetProperty(MSIHANDLE hinst, LPCWSTR property, LPWSTR *value, DWORD *size) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 8d32348..00dcab3 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -241,6 +241,18 @@ static void test_props(MSIHANDLE hinst) ok(hinst, !memcmp(buffer, "a\0\0\0\xcc", 5), "wrong data\n"); } +static void test_db(MSIHANDLE hinst) +{ + MSIHANDLE hdb; + UINT r; + + hdb = MsiGetActiveDatabase(hinst); + ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); + + r = MsiCloseHandle(hdb); + ok(hinst, !r, "got %u\n", r); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) @@ -265,6 +277,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); test_props(hinst); + test_db(hinst); return ERROR_SUCCESS; } diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index d97db4c..c158583 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -61,7 +61,7 @@ interface IWineMsiRemote HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); HRESULT remote_DatabaseOpenView( [in] MSIHANDLE db, [in] LPCWSTR query, [out] MSIHANDLE *view ); - HRESULT remote_GetActiveDatabase( [in] MSIHANDLE hinst, [out] MSIHANDLE *handle ); + MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value ); int remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] struct wire_record *record );

1 0

Anton Romanov : wmp: Add seeking and duration.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: bb2d13b44c5268f62356a39c52ddd70a8acb56f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2d13b44c5268f62356a39c… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Wed Apr 18 22:01:46 2018 -0700 wmp: Add seeking and duration. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 65 ++++++++++++++++++++++++++++++++++++++++-------- dlls/wmp/tests/media.c | 39 ++++++++++++++++++++++++++++- dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 24494 bytes dlls/wmp/wmp_private.h | 3 +++ 5 files changed, 97 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb2d13b44c5268f62356…

1 0

Piotr Caban : msi: Support NULL value in INSERT query.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 63ccdfeaaab56aca42d21a884789eb5048064276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ccdfeaaab56aca42d21a88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 18 17:59:25 2018 +0200 msi: Support NULL value in INSERT query. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/sql.y | 9 ++++++++- dlls/msi/tests/package.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 366764d..2101c68 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -658,6 +658,12 @@ const_val: if( !$$ ) YYABORT; } + | TK_NULL + { + $$ = EXPR_sval( info, NULL ); + if ( !$$ ) + YYABORT; + } ; column_val: @@ -921,7 +927,8 @@ static struct expr * EXPR_sval( void *info, const struct sql_str *str ) if( e ) { e->type = EXPR_SVAL; - if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS ) + if( !str) e->u.sval = NULL; + else if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS ) return NULL; /* e will be freed by query destructor */ } return e; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e3a0894..c2e2106 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3705,7 +3705,7 @@ static void test_states(void) add_custom_action_entry( hdb, "'ConditionCheck7', 19, '', 'Condition check failed (7)'" ); add_custom_action_entry( hdb, "'ConditionCheck8', 19, '', 'Condition check failed (8)'" ); add_custom_action_entry( hdb, - "'VBFeatureRequest', 38, '', 'Session.FeatureRequestState(\"three\") = 3'" ); + "'VBFeatureRequest', 38, NULL, 'Session.FeatureRequestState(\"three\") = 3'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck1', 'REINSTALL', '798'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck2', 'NOT REMOVE AND Preselected', '799'" );

1 0

Owen Rudge : wsdapi: Create Body and Hello elements in Hello message.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 86515b390eace818af0897dce0fd943639c66801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86515b390eace818af0897dc… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:49 2018 +0100 wsdapi: Create Body and Hello elements in Hello message. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 39 ++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/discovery.c | 6 ++++-- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 96efefd..a2a4223 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -73,6 +73,8 @@ static const WCHAR instanceIdString[] = { 'I','n','s','t','a','n','c','e','I','d static const WCHAR messageNumberString[] = { 'M','e','s','s','a','g','e','N','u','m','b','e','r', 0 }; static const WCHAR sequenceIdString[] = { 'S','e','q','u','e','n','c','e','I','d', 0 }; static const WCHAR emptyString[] = { 0 }; +static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; +static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; struct discovered_namespace { @@ -732,6 +734,10 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER ret = write_xml_element(header_element, writer); if (FAILED(ret)) goto cleanup; + /* Write the body */ + ret = write_xml_element(body_element, writer); + if (FAILED(ret)) goto cleanup; + ret = WsWriteEndElement(writer, NULL); if (FAILED(ret)) goto cleanup; @@ -774,7 +780,7 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ char *full_xml; HRESULT ret; - ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, discovered_namespaces); + ret = create_soap_envelope(impl->xmlContext, header, body_element, &heap, &xml, &xml_length, discovered_namespaces); if (ret != S_OK) return ret; /* Prefix the XML header */ @@ -812,7 +818,9 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *hdr_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any) { + WSDXML_ELEMENT *body_element = NULL, *hello_element; struct list *discoveredNamespaces = NULL; + WSDXML_NAME *body_name = NULL; WSD_SOAP_HEADER soapHeader; WSD_APP_SEQUENCE sequence; WCHAR message_id[64]; @@ -822,21 +830,42 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON sequence.MessageNumber = msg_num; sequence.SequenceId = session_id; - if (!create_guid(message_id)) goto cleanup; + if (!create_guid(message_id)) goto failed; discoveredNamespaces = WSDAllocateLinkedMemory(NULL, sizeof(struct list)); - if (!discoveredNamespaces) goto cleanup; + if (!discoveredNamespaces) goto failed; list_init(discoveredNamespaces); populate_soap_header(&soapHeader, discoveryTo, actionHello, message_id, &sequence, hdr_any); - /* TODO: Populate message body */ + ret = IWSDXMLContext_AddNameToNamespace(impl->xmlContext, envelopeNsUri, bodyString, &body_name); + if (FAILED(ret)) goto cleanup; + + /* <soap:Body>, <wsd:Hello> */ + ret = WSDXMLBuildAnyForSingleElement(body_name, NULL, &body_element); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, body_element, discoveryNsUri, helloString, NULL, &hello_element); + if (FAILED(ret)) goto cleanup; + + /* Write any body elements */ + if (any != NULL) + { + ret = duplicate_element(hello_element, any, discoveredNamespaces); + if (FAILED(ret)) goto cleanup; + } /* Write and send the message */ - ret = write_and_send_message(impl, &soapHeader, NULL, discoveredNamespaces, NULL, APP_MAX_DELAY); + ret = write_and_send_message(impl, &soapHeader, body_element, discoveredNamespaces, NULL, APP_MAX_DELAY); + goto cleanup; + +failed: + ret = E_OUTOFMEMORY; cleanup: + WSDFreeLinkedMemory(body_name); + WSDFreeLinkedMemory(body_element); WSDFreeLinkedMemory(discoveredNamespaces); return ret; diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 20d3442..06bde89 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -507,7 +507,7 @@ static void Publish_tests(void) messageStorage *msgStorage; WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; - BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE; + BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE, body_hello_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; @@ -629,8 +629,9 @@ static void Publish_tests(void) metadata_version_seen = (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); any_header_seen = (strstr(msg, "<wine:Beer>PublishTest</wine:Beer>") != NULL); wine_ns_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\"") != NULL); + body_hello_seen = (strstr(msg, "<soap:Body><wsd:Hello") != NULL); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && - any_header_seen && wine_ns_seen; + any_header_seen && wine_ns_seen && body_hello_seen; if (messageOK) break; } @@ -649,6 +650,7 @@ static void Publish_tests(void) todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); ok(any_header_seen == TRUE, "Custom header not received\n"); ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); + ok(body_hello_seen == TRUE, "Body and Hello elements not received\n"); after_publish_test:

1 0