November 2017 - Wine-devel - list.winehq.org

[PATCH] widl: Generate header macros even for aggregate return methods.
by Dmitry Timoshkov 14 Nov '17

14 Nov '17

A generated macro has a clear suggestion what to do (#define WIDL_C_INLINE_WRAPPERS) instead of completely omitting the macro and leaving one wondering what is going on. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/header.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b5fe2326d6..9f92127d06 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -960,7 +960,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * if (is_override_method(iface, child, func)) continue; - if (!is_callas(func->attrs) && !is_aggregate_return(func)) { + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -969,6 +969,12 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * fprintf(header, ",%s", arg->name); fprintf(header, ") "); + if (is_aggregate_return(func)) + { + fprintf(header, "%s_%s_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support\n", name, get_name(func)); + continue; + } + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) -- 2.15.0

1 0

[PATCH 1/3] urlmon: Added user marshaling implementation for OnDataAvailable.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-)

2 2

[PATCH 1/3 v2] urlmon: Added user marshaling implementation for OnDataAvailable.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-)

1 0

[PATCH] libport: Fix typo in rintf.
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Spotted by Joris Huizer. --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00be43..2c0d22294c 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif -- 2.15.0

1 0

[PATCH 3/3] urlmon/tests: Added IBindStatusCallback marshaling tests.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/misc.c | 723 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 723 insertions(+)

1 0

[PATCH 2/3] urlmon: Added user marshaling implementation for GetBindInfo[Ex].
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 113 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 99 insertions(+), 14 deletions(-)

1 0

[PATCH 3/3] mlang: Correct wrong code pages data.
by Ziqing Hui 13 Nov '17

13 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 94 +++++++++++++++++++++++++----------------------- dlls/mlang/tests/mlang.c | 23 +----------- 2 files changed, 50 insertions(+), 67 deletions(-)

2 1

[PATCH] quartz/tests: Add a couple of tests for return values (Coverity)
by Nikolay Sivov 13 Nov '17

13 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/quartz/tests/avisplitter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 23167b59b8..8bafb14157 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -422,8 +422,10 @@ static void test_filter_graph(void) } ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - IBaseFilter_EnumPins(pnull, &nullenum); - IEnumPins_Next(nullenum, 1, &nullpin, NULL); + hr = IBaseFilter_EnumPins(pnull, &nullenum); + ok(hr == S_OK, "Failed to enum pins, hr %#x.\n", hr); + hr = IEnumPins_Next(nullenum, 1, &nullpin, NULL); + ok(hr == S_OK, "Failed to get next pin, hr %#x.\n", hr); IEnumPins_Release(nullenum); IPin_QueryDirection(nullpin, &dir); @@ -489,7 +491,9 @@ fail2: if (dir == PINDIR_OUTPUT) { PIN_INFO info; - IPin_QueryPinInfo(to, &info); + + hr = IPin_QueryPinInfo(to, &info); + ok(hr == S_OK, "Failed to query pin info, hr %#x.\n", hr); /* Release twice: Once normal, second from the * previous while loop -- 2.15.0

1 0

[PATCH] shell32: avoid a crash in testsuite
by Marcus Meissner 13 Nov '17

13 Nov '17

This happens on wow32 builds, we try to call a 64bit program via the generic typelib marshalling and disp is NULL. We still fail, just do not pop up the crash dialog. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/shell32/tests/shelldispatch.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9825c3a4e9..92562650f3 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1088,6 +1088,9 @@ todo_wine { IUnknown *unk; ok(disp != NULL, "got %p\n", disp); + + if (disp == NULL) goto skip_disp_tests; + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ @@ -1165,6 +1168,7 @@ if (hr == S_OK) { IServiceProvider_Release(sp); IDispatch_Release(disp); } +skip_disp_tests: disp = (void*)0xdeadbeef; ret = 0xdead; -- 2.15.0

2 1

[PATCH v2 1/2] include: Add roparameterizediid.idl
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Added winrt pragma and removed inheritance from IUnknown. --- include/Makefile.in | 1 + include/roparameterizediid.idl | 93 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..a975f884fb --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,93 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *basetype + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetRuntimeClassParameterizedDefault( + GUID iid, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetWinRtInterface( + GUID iid + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

1 0