September 2017 - Wine-commits

Matteo Bruni : d3d9/tests: Properly check for mipmap autogeneration support.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 9480e817198d7ca5f636e98cbb6f6632a852fc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9480e817198d7ca5f636e98cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:05 2017 +0200 d3d9/tests: Properly check for mipmap autogeneration support. CheckDeviceFormat() returns D3DOK_NOAUTOGEN if the texture format is otherwise supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fb30636..cb737e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6801,7 +6801,7 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device) hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_CUBETEXTURE, D3DFMT_X8R8G8B8); IDirect3D9_Release(d3d); - if (FAILED(hr)) + if (hr != D3D_OK) { skip("No cube mipmap generation support, skipping tests.\n"); return; @@ -6937,8 +6937,8 @@ static void test_mipmap_gen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8))) + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) { skip("No mipmap generation support, skipping tests.\n"); IDirect3D9_Release(d3d);

1 0

Matteo Bruni : d3d9/tests: Add a test for nonrenderable format D3DUSAGE_AUTOGENMIPMAP support.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: cc7c6928da9ee7a0335abf76801a9cb5fcbabc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7c6928da9ee7a0335abf768… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:06 2017 +0200 d3d9/tests: Add a test for nonrenderable format D3DUSAGE_AUTOGENMIPMAP support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cb737e2..1d8b8a9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6921,6 +6921,18 @@ static void test_cube_textures(void) static void test_mipmap_gen(void) { + static const D3DFORMAT formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_A1R5G5B5, + D3DFMT_A4R4G4B4, + D3DFMT_A8, + D3DFMT_L8, + D3DFMT_A8L8, + D3DFMT_V8U8, + D3DFMT_DXT5, + }; D3DTEXTUREFILTERTYPE filter_type; IDirect3DTexture9 *texture; IDirect3DSurface9 *surface; @@ -6928,6 +6940,7 @@ static void test_mipmap_gen(void) D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; + BOOL renderable; ULONG refcount; unsigned int i; DWORD levels; @@ -6937,6 +6950,25 @@ static void test_mipmap_gen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, formats[i]); + if (FAILED(hr)) + { + skip("Skipping unsupported format %#x.\n", formats[i]); + continue; + } + renderable = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, formats[i])); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); + todo_wine_if (!renderable && hr == D3D_OK) + ok((hr == D3D_OK && renderable) || hr == D3DOK_NOAUTOGEN, + "Got unexpected hr %#x for %srenderable format %#x.\n", + hr, renderable ? "" : "non", formats[i]); + } + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) {

1 0

Matteo Bruni : wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 25a8773d21d0113dc5e4f9dee49d9d9dbeed347b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a8773d21d0113dc5e4f9dee… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:07 2017 +0200 wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 1 - dlls/wined3d/directx.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1d8b8a9..b24136a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6963,7 +6963,6 @@ static void test_mipmap_gen(void) D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, formats[i])); hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); - todo_wine_if (!renderable && hr == D3D_OK) ok((hr == D3D_OK && renderable) || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x for %srenderable format %#x.\n", hr, renderable ? "" : "non", formats[i]); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 168e494..da66ad3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5364,7 +5364,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !gl_info->supported[SGIS_GENERATE_MIPMAP]) + if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && (!gl_info->supported[SGIS_GENERATE_MIPMAP] + || (format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) { TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); return WINED3DOK_NOAUTOGEN;

1 0

Zebediah Figura : msi/tests: Add a helper to delete an installed package.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 9f6e6587420bfb6ab8f3f86822875826bd86dd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6e6587420bfb6ab8f3f8682… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 20 23:53:50 2017 -0500 msi/tests: Add a helper to delete an installed package. 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/tests/install.c | 224 +++++++---------------------------------------- 1 file changed, 32 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f6e6587420bfb6ab8f3f…

1 0

Zebediah Figura : msi: Add a missing UI message in the ExecuteAction action.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: af9ee877488b9365d23edfdeb20a3860ba1a6127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9ee877488b9365d23edfdeb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 20 23:53:49 2017 -0500 msi: Add a missing UI message in the ExecuteAction action. 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/action.c | 19 ++++++++++++++++++- dlls/msi/tests/package.c | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ed9dfeb..915ff17 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5571,8 +5571,9 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','_','P','r','o','p','e','r','t','y','`',0}; WCHAR *productname; WCHAR *action; + WCHAR *info_template; MSIQUERY *view; - MSIRECORD *uirow; + MSIRECORD *uirow, *uirow_info; UINT rc; /* Send COMMONDATA and INFO messages. */ @@ -5586,6 +5587,22 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package) MSI_ProcessMessageVerbatim(package, INSTALLMESSAGE_COMMONDATA, uirow); /* FIXME: send INSTALLMESSAGE_PROGRESS */ MSI_ProcessMessageVerbatim(package, INSTALLMESSAGE_COMMONDATA, uirow); + + if (!(needs_ui_sequence(package) && ui_sequence_exists(package))) + { + uirow_info = MSI_CreateRecord(0); + if (!uirow_info) + { + msiobj_release(&uirow->hdr); + return ERROR_OUTOFMEMORY; + } + info_template = msi_get_error_message(package->db, MSIERR_INFO_LOGGINGSTART); + MSI_RecordSetStringW(uirow_info, 0, info_template); + msi_free(info_template); + MSI_ProcessMessage(package, INSTALLMESSAGE_INFO|MB_ICONHAND, uirow_info); + msiobj_release(&uirow_info->hdr); + } + MSI_ProcessMessage(package, INSTALLMESSAGE_COMMONDATA, uirow); productname = msi_dup_property(package->db, INSTALLPROPERTY_PRODUCTNAMEW); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f7dbb58..78ec1cc 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9519,7 +9519,7 @@ static void test_top_level_action(void) /* test INSTALL */ r = MsiDoActionA(hpkg, "INSTALL"); ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); - ok_sequence(toplevel_install_sequence, "INSTALL (no UI)", TRUE); + ok_sequence(toplevel_install_sequence, "INSTALL (no UI)", FALSE); /* test INSTALL with reduced+ UI */ /* for some reason we need to re-open the package to change the internal UI */

1 0

Fabian Maurer : evr/tests: Add tests.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 98923665105334ca6aaf39a756b62da606ecc861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98923665105334ca6aaf39a75… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Sep 20 14:03:36 2017 +0200 evr/tests: Add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/evr/tests/Makefile.in | 5 ++ dlls/evr/tests/filter.c | 185 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+) diff --git a/configure b/configure index 8f20593..f53bea5 100755 --- a/configure +++ b/configure @@ -18339,6 +18339,7 @@ wine_fn_config_lib dxguid wine_fn_config_dll dxva2 enable_dxva2 wine_fn_config_dll esent enable_esent wine_fn_config_dll evr enable_evr +wine_fn_config_test dlls/evr/tests evr_test wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-authz-context-l1-1-0 enable_ext_ms_win_authz_context_l1_1_0 diff --git a/configure.ac b/configure.ac index 54c1024..edeeb0d 100644 --- a/configure.ac +++ b/configure.ac @@ -3122,6 +3122,7 @@ WINE_CONFIG_LIB(dxguid) WINE_CONFIG_DLL(dxva2) WINE_CONFIG_DLL(esent) WINE_CONFIG_DLL(evr) +WINE_CONFIG_TEST(dlls/evr/tests) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-authz-context-l1-1-0) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in new file mode 100644 index 0000000..c370646 --- /dev/null +++ b/dlls/evr/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = evr.dll +IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32 + +C_SRCS = \ + filter.c diff --git a/dlls/evr/tests/filter.c b/dlls/evr/tests/filter.c new file mode 100644 index 0000000..4f82b14 --- /dev/null +++ b/dlls/evr/tests/filter.c @@ -0,0 +1,185 @@ +/* + * Copyright 2017 Fabian Maurer + * + * 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 + */ + +#define COBJMACROS + +#include <stdio.h> + +#include "dshow.h" +#include "evr.h" +#include "d3d9.h" +#include "initguid.h" +#include "dxva2api.h" + +#include "wine/test.h" + +#define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ + ok(hr == S_OK, "%s: run %d: IUnknown_QueryInterface returned %x\n", testid, testrun, hr); \ + ok(ppv != NULL, "%s: run %d: Pointer is NULL\n", testid, testrun); + +#define QI_FAIL(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ + ok(hr == E_NOINTERFACE, "%s: run %d: IUnknown_QueryInterface returned %x\n", testid, testrun, hr); \ + ok(ppv == NULL, "%s: run %d: Pointer is %p\n", testid, testrun, ppv); + +#define ADDREF_EXPECT(iface, num) if (iface) { \ + refCount = IUnknown_AddRef(iface); \ + ok(refCount == num, "%s: run %d: IUnknown_AddRef should return %d, got %d\n", testid, testrun, num, refCount); \ +} + +#define RELEASE_EXPECT(iface, num) if (iface) { \ + refCount = IUnknown_Release(iface); \ + ok(refCount == num, "%s: run %d: IUnknown_Release should return %d, got %d\n", testid, testrun, num, refCount); \ +} + +static void test_aggregation(const CLSID clsid_inner, const IID iid_inner, const char *testid, int testrun) +{ + const CLSID clsid_outer = CLSID_SystemClock; + const IID iid_outer = IID_IReferenceClock; + HRESULT hr; + ULONG refCount; + IUnknown *unk_outer = NULL; + IUnknown *unk_inner = NULL; + IUnknown *unk_inner_fail = NULL; + IUnknown *unk_outer_test = NULL; + IUnknown *unk_inner_test = NULL; + IUnknown *unk_aggregatee = NULL; + IUnknown *unk_aggregator = NULL; + IUnknown *unk_test = NULL; + + hr = CoCreateInstance(&clsid_outer, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unk_outer); + ok(hr == S_OK, "%s: run %d: First CoCreateInstance failed with %x\n", testid, testrun, hr); + ok(unk_outer != NULL, "%s: run %d: unk_outer is NULL\n", testid, testrun); + + if (!unk_outer) + { + skip("%s: run %d: unk_outer is NULL\n", testid, testrun); + return; + } + + /* for aggregation, we should only be able to request IUnknown */ + hr = CoCreateInstance(&clsid_inner, unk_outer, CLSCTX_INPROC_SERVER, &iid_inner, (LPVOID*)&unk_inner_fail); + if (hr == REGDB_E_CLASSNOTREG) + { + skip("%s: run %d: Class not registered\n", testid, testrun); + return; + } + ok(hr == E_NOINTERFACE, "%s: run %d: Second CoCreateInstance returned %x\n", testid, testrun, hr); + ok(unk_inner_fail == NULL, "%s: run %d: unk_inner_fail is not NULL\n", testid, testrun); + + /* aggregation, request IUnknown */ + hr = CoCreateInstance(&clsid_inner, unk_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unk_inner); + ok(hr == S_OK, "%s: run %d: Third CoCreateInstance returned %x\n", testid, testrun, hr); + ok(unk_inner != NULL, "%s: run %d: unk_inner is NULL\n", testid, testrun); + + if (!unk_inner) + { + skip("%s: run %d: unk_inner is NULL\n", testid, testrun); + return; + } + + ADDREF_EXPECT(unk_outer, 2); + ADDREF_EXPECT(unk_inner, 2); + RELEASE_EXPECT(unk_outer, 1); + RELEASE_EXPECT(unk_inner, 1); + + QI_FAIL(unk_outer, iid_inner, unk_aggregatee); + QI_FAIL(unk_inner, iid_outer, unk_aggregator); + + QI_SUCCEED(unk_outer, iid_outer, unk_aggregator); + QI_SUCCEED(unk_outer, IID_IUnknown, unk_outer_test); + QI_SUCCEED(unk_inner, iid_inner, unk_aggregatee); + QI_SUCCEED(unk_inner, IID_IUnknown, unk_inner_test); + + if (!unk_aggregator || !unk_outer_test || !unk_aggregatee || !unk_inner_test) + { + skip("%s: run %d: One of the required interfaces is NULL\n", testid, testrun); + return; + } + + ADDREF_EXPECT(unk_aggregator, 5); + ADDREF_EXPECT(unk_outer_test, 6); + ADDREF_EXPECT(unk_aggregatee, 7); + ADDREF_EXPECT(unk_inner_test, 3); + RELEASE_EXPECT(unk_aggregator, 6); + RELEASE_EXPECT(unk_outer_test, 5); + RELEASE_EXPECT(unk_aggregatee, 4); + RELEASE_EXPECT(unk_inner_test, 2); + + QI_SUCCEED(unk_aggregator, IID_IUnknown, unk_test); + QI_SUCCEED(unk_outer_test, IID_IUnknown, unk_test); + QI_SUCCEED(unk_aggregatee, IID_IUnknown, unk_test); + QI_SUCCEED(unk_inner_test, IID_IUnknown, unk_test); + + QI_FAIL(unk_aggregator, iid_inner, unk_test); + QI_FAIL(unk_outer_test, iid_inner, unk_test); + QI_FAIL(unk_aggregatee, iid_inner, unk_test); + QI_SUCCEED(unk_inner_test, iid_inner, unk_test); + + QI_SUCCEED(unk_aggregator, iid_outer, unk_test); + QI_SUCCEED(unk_outer_test, iid_outer, unk_test); + QI_SUCCEED(unk_aggregatee, iid_outer, unk_test); + QI_FAIL(unk_inner_test, iid_outer, unk_test); + + RELEASE_EXPECT(unk_aggregator, 10); + RELEASE_EXPECT(unk_outer_test, 9); + RELEASE_EXPECT(unk_aggregatee, 8); + RELEASE_EXPECT(unk_inner_test, 2); + RELEASE_EXPECT(unk_outer, 7); + RELEASE_EXPECT(unk_inner, 1); + + do + { + refCount = IUnknown_Release(unk_inner); + } while (refCount); + + do + { + refCount = IUnknown_Release(unk_outer); + } while (refCount); +} + +static void test_evr_filter_aggregations(void) +{ + const IID * iids[] = { + &IID_IAMCertifiedOutputProtection, &IID_IAMFilterMiscFlags, &IID_IBaseFilter, + &IID_IKsPropertySet, &IID_IMediaEventSink, &IID_IMediaSeeking, &IID_IQualityControl, + &IID_IQualProp, &IID_IEVRFilterConfig, &IID_IMFGetService, &IID_IMFVideoPositionMapper, + &IID_IMFVideoRenderer, &IID_IQualityControl + }; + int i; + + if(!strcmp(winetest_platform, "wine")) + { + skip("Not supported yet.\n"); + return; + } + + for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + { + test_aggregation(CLSID_EnhancedVideoRenderer, *iids[i], "filter", i); + } +} + +START_TEST(filter) +{ + CoInitialize(NULL); + + test_evr_filter_aggregations(); + + CoUninitialize(); +}

1 0

Hans Leidekker : webservices: Add traces.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 98a3892412e157010db8fd3e2f13c1a6dd7568cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a3892412e157010db8fd3e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:11 2017 +0200 webservices: Add traces. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 2 ++ dlls/webservices/error.c | 1 + dlls/webservices/heap.c | 2 ++ dlls/webservices/listener.c | 1 + dlls/webservices/msg.c | 11 +++++++++-- dlls/webservices/proxy.c | 16 +++++++++++++--- dlls/webservices/reader.c | 1 + dlls/webservices/writer.c | 1 + 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 20d4f4c..775035b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -304,6 +304,7 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; + TRACE( "created %p\n", channel ); *handle = (WS_CHANNEL *)channel; return S_OK; } @@ -332,6 +333,7 @@ HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const W if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; + TRACE( "created %p\n", channel ); *handle = (WS_CHANNEL *)channel; return S_OK; } diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index 3173735..747af2a 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -102,6 +102,7 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count, } } + TRACE( "created %p\n", error ); *handle = (WS_ERROR *)error; return S_OK; } diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 1104cf0..080cc0d 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -208,6 +208,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR prop_set( heap->prop, heap->prop_count, WS_HEAP_PROPERTY_MAX_SIZE, &max_size, sizeof(max_size) ); prop_set( heap->prop, heap->prop_count, WS_HEAP_PROPERTY_TRIM_SIZE, &trim_size, sizeof(trim_size) ); + TRACE( "created %p\n", heap ); *handle = (WS_HEAP *)heap; return S_OK; } @@ -363,6 +364,7 @@ HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *p return WS_E_QUOTA_EXCEEDED; } + TRACE( "created %p\n", xmlbuf ); *handle = (WS_XML_BUFFER *)xmlbuf; return S_OK; } diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a658ee7..41afb27 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -227,6 +227,7 @@ HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING bindin if ((hr = create_listener( type, binding, properties, count, &listener )) != S_OK) return hr; + TRACE( "created %p\n", listener ); *handle = (WS_LISTENER *)listener; return S_OK; } diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index fdbd672..f4d167f 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -214,6 +214,8 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle, WS_ERROR *error ) { + HRESULT hr; + TRACE( "%u %u %p %u %p %p\n", env_version, addr_version, properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -222,7 +224,10 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V { return E_INVALIDARG; } - return create_msg( env_version, addr_version, properties, count, handle ); + + if ((hr = create_msg( env_version, addr_version, properties, count, handle )) != S_OK) return hr; + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** @@ -248,7 +253,9 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M sizeof(version_addr), NULL )) != S_OK || !version_addr) version_addr = WS_ADDRESSING_VERSION_1_0; - return create_msg( version_env, version_addr, properties, count, handle ); + if ((hr = create_msg( version_env, version_addr, properties, count, handle )) != S_OK) return hr; + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 3b3d2da..a4041fe 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -135,9 +135,13 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE NULL )) != S_OK) return hr; if ((hr = create_proxy( channel, proxy_props, proxy_props_count, handle )) != S_OK) + { WsFreeChannel( channel ); + return hr; + } - return hr; + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** @@ -194,8 +198,14 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, if ((hr = WsCreateChannel( channel_type, binding, channel_props, channel_props_count, NULL, &channel, NULL )) != S_OK) return hr; - if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) WsFreeChannel( channel ); - return hr; + if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) + { + WsFreeChannel( channel ); + return hr; + } + + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0e5cdd3..953af4c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -558,6 +558,7 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c return hr; } + TRACE( "created %p\n", reader ); *handle = (WS_XML_READER *)reader; return S_OK; } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index c3de82d..1baac07 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -236,6 +236,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c return hr; } + TRACE( "created %p\n", writer ); *handle = (WS_XML_WRITER *)writer; return S_OK; }

1 0

Hans Leidekker : webservices: Use separate dictionaries for sending and receiving messages.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 9169053957a12eedd8bdf072337c5102cbe480dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9169053957a12eedd8bdf0723… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:12 2017 +0200 webservices: Use separate dictionaries for sending and receiving messages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 775035b..16a8b84 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -105,7 +105,8 @@ struct channel WS_MESSAGE *msg; WS_ENCODING encoding; enum session_state session_state; - struct dictionary dict; + struct dictionary dict_send; + struct dictionary dict_recv; union { struct @@ -160,7 +161,8 @@ static void reset_channel( struct channel *channel ) channel->msg = NULL; channel->read_size = 0; channel->session_state = SESSION_STATE_UNINITIALIZED; - clear_dict( &channel->dict ); + clear_dict( &channel->dict_send ); + clear_dict( &channel->dict_recv ); switch (channel->binding) { @@ -967,13 +969,13 @@ static HRESULT receive_preamble_ack( struct channel *channel ) static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG len ) { - ULONG table_size = string_table_size( &channel->dict.dict ); + ULONG table_size = string_table_size( &channel->dict_send.dict ); HRESULT hr; if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_SIZED_ENVELOPE )) != S_OK) return hr; if ((hr = send_size( channel->u.tcp.socket, size_length(table_size) + table_size + len )) != S_OK) return hr; if ((hr = send_size( channel->u.tcp.socket, table_size )) != S_OK) return hr; - if ((hr = send_string_table( channel->u.tcp.socket, &channel->dict.dict )) != S_OK) return hr; + if ((hr = send_string_table( channel->u.tcp.socket, &channel->dict_send.dict )) != S_OK) return hr; return send_bytes( channel->u.tcp.socket, data, len ); } @@ -1092,10 +1094,10 @@ static HRESULT init_writer( struct channel *channel ) case WS_ENCODING_XML_BINARY_SESSION_1: if ((hr = writer_enable_lookup( channel->writer )) != S_OK) return hr; - clear_dict( &channel->dict ); + clear_dict( &channel->dict_send ); bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; bin.dynamicStringCallback = dict_cb; - bin.dynamicStringCallbackState = &channel->dict; + bin.dynamicStringCallbackState = &channel->dict_send; encoding = &bin.encoding; break; @@ -1229,7 +1231,7 @@ static HRESULT init_reader( struct channel *channel ) case WS_ENCODING_XML_BINARY_SESSION_1: bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; - bin.dynamicDictionary = &channel->dict.dict; + bin.dynamicDictionary = &channel->dict_recv.dict; /* fall through */ case WS_ENCODING_XML_BINARY_1: @@ -1555,8 +1557,8 @@ static HRESULT receive_message_session_setup( struct channel *channel ) if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1) { ULONG size; - if ((hr = build_dict( (const BYTE *)channel->read_buf, channel->read_size, &channel->dict, &size )) != S_OK) - return hr; + if ((hr = build_dict( (const BYTE *)channel->read_buf, channel->read_size, &channel->dict_recv, + &size )) != S_OK) return hr; channel->read_size -= size; memmove( channel->read_buf, channel->read_buf + size, channel->read_size ); }

1 0

Hans Leidekker : webservices: Read the string table in all sized envelopes.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 049d8cfc7d2cf5fc047bd8c1aef1519139e759d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=049d8cfc7d2cf5fc047bd8c1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:13 2017 +0200 webservices: Read the string table in all sized envelopes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 16a8b84..a8ad012 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1547,12 +1547,10 @@ static HRESULT send_preamble_ack( struct channel *channel ) return S_OK; } -static HRESULT receive_message_session_setup( struct channel *channel ) +static HRESULT receive_message_session( struct channel *channel ) { HRESULT hr; - if ((hr = receive_preamble( channel )) != S_OK) return hr; - if ((hr = send_preamble_ack( channel )) != S_OK) return hr; if ((hr = receive_sized_envelope( channel )) != S_OK) return hr; if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1) { @@ -1566,13 +1564,6 @@ static HRESULT receive_message_session_setup( struct channel *channel ) return init_reader( channel ); } -static HRESULT receive_message_session( struct channel *channel ) -{ - HRESULT hr; - if ((hr = receive_sized_envelope( channel )) != S_OK) return hr; - return init_reader( channel ); -} - static HRESULT receive_message_sock( struct channel *channel, SOCKET socket ) { HRESULT hr; @@ -1596,7 +1587,9 @@ static HRESULT receive_message( struct channel *channel ) switch (channel->session_state) { case SESSION_STATE_UNINITIALIZED: - return receive_message_session_setup( channel ); + if ((hr = receive_preamble( channel )) != S_OK) return hr; + if ((hr = send_preamble_ack( channel )) != S_OK) return hr; + /* fall through */ case SESSION_STATE_SETUP_COMPLETE: return receive_message_session( channel );

1 0

Hans Leidekker : webservices: Add asynchronous support for WsReceiveMessage.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 97ccfe20784f88cd38284e230861c71a7c09f116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ccfe20784f88cd38284e230… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:14 2017 +0200 webservices: Add asynchronous support for WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 259 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 230 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97ccfe20784f88cd38284…

1 0