September 2017 - Wine-Commits

Fabian Maurer : evr/tests: Add tests.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

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

Hugh Bellamy : gdiplus: Add GdipCreateLineBrushFromRectWithAngle tests.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: b8f56c0b8641706c003fc84106243fb759283939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f56c0b8641706c003fc8410… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Wed Sep 20 17:42:31 2017 +0100 gdiplus: Add GdipCreateLineBrushFromRectWithAngle tests. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 5 +++- dlls/gdiplus/tests/brush.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d5cd94a..26e3419 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -481,9 +481,12 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); - if (!rect || !rect->Width || !rect->Height) + if (!rect || !line || wrap == WrapModeClamp) return InvalidParameter; + if (!rect->Width || !rect->Height) + return OutOfMemory; + angle = fmodf(angle, 360); if (angle < 0) angle += 360; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 45b2710..9be500d 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -72,6 +72,68 @@ static void test_createHatchBrush(void) expect(InvalidParameter, status); } +static void test_createLineBrushFromRectWithAngle(void) +{ + GpStatus status; + GpLineGradient *brush; + GpRectF rect1 = { 1, 3, 1, 2 }; + GpRectF rect2 = { 1, 3, -1, -2 }; + GpRectF rect3 = { 1, 3, 0, 1 }; + GpRectF rect4 = { 1, 3, 1, 0 }; + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 0, TRUE, WrapModeTile, &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect2, 10, 11, 135, TRUE, (WrapMode)(WrapModeTile - 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect2, 10, 11, -225, FALSE, (WrapMode)(WrapModeTile - 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 405, TRUE, (WrapMode)(WrapModeClamp + 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 45, FALSE, (WrapMode)(WrapModeClamp + 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeTileFlipX, &brush); + expect(Ok, status); + + status = GdipCreateLineBrushFromRectWithAngle(NULL, 10, 11, 90, TRUE, WrapModeTile, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeTileFlipXY, &brush); + expect(OutOfMemory, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeTileFlipXY, &brush); + expect(OutOfMemory, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeTileFlipXY, NULL); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeTileFlipXY, NULL); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeTile, NULL); + expect(InvalidParameter, status); + + GdipDeleteBrush((GpBrush *) brush); +} + static void test_type(void) { GpStatus status; @@ -1612,6 +1674,7 @@ START_TEST(brush) test_constructor_destructor(); test_createHatchBrush(); + test_createLineBrushFromRectWithAngle(); test_type(); test_gradientblendcount(); test_getblend();

1 0

Hans Leidekker : webservices: Support more text types in is_empty_text_node.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 04ae90993a95515f38a827acf786ccca040eeab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ae90993a95515f38a827acf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:16 2017 +0200 webservices: Support more text types in is_empty_text_node. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 953af4c..c2dbdb0 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5911,6 +5911,18 @@ static BOOL is_empty_text_node( const struct node *node ) const WS_XML_BASE64_TEXT *base64 = (const WS_XML_BASE64_TEXT *)text->text; return !base64->length; } + case WS_XML_TEXT_TYPE_BOOL: + case WS_XML_TEXT_TYPE_INT32: + case WS_XML_TEXT_TYPE_INT64: + case WS_XML_TEXT_TYPE_UINT64: + case WS_XML_TEXT_TYPE_FLOAT: + case WS_XML_TEXT_TYPE_DOUBLE: + case WS_XML_TEXT_TYPE_DECIMAL: + case WS_XML_TEXT_TYPE_GUID: + case WS_XML_TEXT_TYPE_UNIQUE_ID: + case WS_XML_TEXT_TYPE_DATETIME: + return FALSE; + default: ERR( "unhandled text type %u\n", text->text->textType ); return FALSE;

1 0

Hans Leidekker : webservices: Use separate dictionaries for sending and receiving messages.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

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

Zebediah Figura : msi: Add a missing UI message in the ExecuteAction action.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

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

Zebediah Figura : msi/tests: Add a helper to delete an installed package.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

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

Michael Müller : xinput9_1_0: Avoid DLL forwarding.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 0991e015316e382f787b1f5c93b483c3faf04b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0991e015316e382f787b1f5c9… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 20 19:12:07 2017 +0200 xinput9_1_0: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput9_1_0/Makefile.in | 4 ++++ dlls/xinput9_1_0/xinput9_1_0.spec | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index 0c4b7e7..900efb3 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput9_1_0.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput9_1_0/xinput9_1_0.spec b/dlls/xinput9_1_0/xinput9_1_0.spec index 5d95b3e..8833ffb 100644 --- a/dlls/xinput9_1_0/xinput9_1_0.spec +++ b/dlls/xinput9_1_0/xinput9_1_0.spec @@ -1,4 +1,4 @@ -@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr)

1 0

Józef Kucia : xinput1_4: Avoid DLL forwarding.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 315a3b4a2fe5be4dcabbe570af75084df8b6ae35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=315a3b4a2fe5be4dcabbe570a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 20 19:12:06 2017 +0200 xinput1_4: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_4/Makefile.in | 4 ++++ dlls/xinput1_4/xinput1_4.spec | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index f881d19..92bcb4b 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput1_4.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index 4b88c71..8c3f4c0 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -1,9 +1,9 @@ 1 stdcall -private DllMain(long long ptr) -2 stdcall XInputGetState(long ptr) xinput1_3.XInputGetState -3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -5 stdcall XInputEnable(long) xinput1_3.XInputEnable -7 stdcall XInputGetBatteryInformation(long long ptr) xinput1_3.XInputGetBatteryInformation -8 stdcall XInputGetKeystroke(long long ptr) xinput1_3.XInputGetKeystroke +2 stdcall XInputGetState(long ptr) +3 stdcall XInputSetState(long ptr) +4 stdcall XInputGetCapabilities(long long ptr) +5 stdcall XInputEnable(long) +7 stdcall XInputGetBatteryInformation(long long ptr) +8 stdcall XInputGetKeystroke(long long ptr) 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) -100 stdcall XInputGetStateEx(long ptr) xinput1_3.XInputGetStateEx +100 stdcall XInputGetStateEx(long ptr)

1 0

Józef Kucia : xinput1_2: Avoid DLL forwarding.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 13852ba4af693572099b5d4bd52a76d201c3818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13852ba4af693572099b5d4bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 20 19:12:05 2017 +0200 xinput1_2: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_2/Makefile.in | 4 ++++ dlls/xinput1_2/xinput1_2.spec | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 16fed94..1a9ac73 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput1_2.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_2/xinput1_2.spec b/dlls/xinput1_2/xinput1_2.spec index 95759c3..5a55370 100644 --- a/dlls/xinput1_2/xinput1_2.spec +++ b/dlls/xinput1_2/xinput1_2.spec @@ -1,5 +1,5 @@ -@ stdcall XInputEnable(long) xinput1_3.XInputEnable -@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +@ stdcall XInputEnable(long) +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr)

1 0

Józef Kucia : xinput1_1: Avoid DLL forwarding.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: ff8c49eec33ab2688d0fe50960e08075a908f139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8c49eec33ab2688d0fe5096… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 20 19:12:04 2017 +0200 xinput1_1: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 4 ++++ dlls/xinput1_1/xinput1_1.spec | 10 +++++----- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_3/{xinput1_3_main.c => xinput_main.c} | 0 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index fc341d1..e08b999 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput1_1.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_1/xinput1_1.spec b/dlls/xinput1_1/xinput1_1.spec index 95759c3..5a55370 100644 --- a/dlls/xinput1_1/xinput1_1.spec +++ b/dlls/xinput1_1/xinput1_1.spec @@ -1,5 +1,5 @@ -@ stdcall XInputEnable(long) xinput1_3.XInputEnable -@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +@ stdcall XInputEnable(long) +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr) diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index cf8f730..0fe3f6d 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -2,6 +2,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput C_SRCS = \ - xinput1_3_main.c + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput_main.c similarity index 100% rename from dlls/xinput1_3/xinput1_3_main.c rename to dlls/xinput1_3/xinput_main.c

1 0