January 2020 - Wine-commits

Zebediah Figura : winegstreamer: Catch errors while waiting for pin connection.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: a191a0c23a62288ba8906283c5727c5e5a2ccca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a191a0c23a62288ba8906283… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 20:28:41 2020 -0600 winegstreamer: Catch errors while waiting for pin connection. In the event that the user is missing GStreamer plugins this may allow the program to terminate gracefully rather than hanging in the init_gst() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e67efd58eb..7ae70d0a73 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -68,7 +68,7 @@ struct gstdemux GstBus *bus; guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; - HANDLE no_more_pads_event, duration_event; + HANDLE no_more_pads_event, duration_event, error_event; HANDLE push_thread; @@ -1139,6 +1139,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) ERR("%s\n", dbg_info); g_error_free(err); g_free(dbg_info); + SetEvent(filter->error_event); break; case GST_MESSAGE_WARNING: gst_message_parse_warning(msg, &err, &dbg_info); @@ -1225,6 +1226,7 @@ static void gstdemux_destroy(struct strmbase_filter *iface) CloseHandle(filter->no_more_pads_event); CloseHandle(filter->duration_event); + CloseHandle(filter->error_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ if (filter->sink.pin.peer) @@ -1498,12 +1500,14 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) for (i = 0; i < filter->cStreams; ++i) { struct gstdemux_source *pin = filter->ppPins[i]; + const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; } filter->ignore_flush = TRUE; @@ -1536,6 +1540,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = gstdecoder_init_gst; *phr = S_OK; @@ -2171,6 +2176,7 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) struct gstdemux_source *pin; GstElement *element; LONGLONG duration; + HANDLE events[2]; int ret; if (!(element = gst_element_factory_make("wavparse", NULL))) @@ -2214,7 +2220,10 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + events[0] = pin->caps_event; + events[1] = filter->error_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; filter->ignore_flush = TRUE; gst_element_set_state(filter->container, GST_STATE_READY); @@ -2246,6 +2255,7 @@ IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_init_gst; + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); *phr = S_OK; TRACE("Created WAVE parser %p.\n", object); @@ -2311,12 +2321,14 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) for (i = 0; i < filter->cStreams; ++i) { struct gstdemux_source *pin = filter->ppPins[i]; + const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; } filter->ignore_flush = TRUE; @@ -2349,6 +2361,7 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = avi_splitter_init_gst; *phr = S_OK; @@ -2383,6 +2396,7 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) struct gstdemux_source *pin; GstElement *element; LONGLONG duration; + HANDLE events[2]; int ret; if (!(element = gst_element_factory_make("mpegaudioparse", NULL))) @@ -2419,14 +2433,20 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) return FALSE; } - WaitForSingleObject(filter->duration_event, INFINITE); + events[0] = filter->duration_event; + events[1] = filter->error_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; + gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration); pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + events[0] = pin->caps_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; filter->ignore_flush = TRUE; gst_element_set_state(filter->container, GST_STATE_READY); @@ -2486,6 +2506,7 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; object->duration_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = mpeg_splitter_init_gst; *phr = S_OK;

1 0

Zebediah Figura : ntdll/tests: Fix some exception test failures.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 7662fe0b47b5365f5092cf005fb43229c1911424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7662fe0b47b5365f5092cf00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:33:33 2020 -0600 ntdll/tests: Fix some exception test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 44df47466b..7b77cbb795 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -367,8 +367,9 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce trace("vect. handler %08x addr:%p context.Eip:%x\n", rec->ExceptionCode, rec->ExceptionAddress, context->Eip); - ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", - rec->ExceptionAddress, (char *)code_mem + 0xb); + ok(rec->ExceptionAddress == (char *)code_mem + 0xb + || broken(rec->ExceptionAddress == code_mem || !rec->ExceptionAddress) /* 2008 */, + "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); if (NtCurrentTeb()->Peb->BeingDebugged) ok((void *)context->Eax == pRtlRaiseException || @@ -403,8 +404,9 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR trace( "exception: %08x flags:%x addr:%p context: Eip:%x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip ); - ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", - rec->ExceptionAddress, (char *)code_mem + 0xb); + ok(rec->ExceptionAddress == (char *)code_mem + 0xb + || broken(rec->ExceptionAddress == code_mem || !rec->ExceptionAddress) /* 2008 */, + "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) || broken(context->ContextFlags == CONTEXT_FULL), /* win2003 */ @@ -515,8 +517,10 @@ static DWORD unwind_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECOR ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08x instead of %08x\n", rec->ExceptionCode, STATUS_UNWIND); - ok(rec->ExceptionAddress == (char *)code_mem + 0x22, "ExceptionAddress at %p instead of %p\n", - rec->ExceptionAddress, (char *)code_mem + 0x22); + ok(rec->ExceptionAddress == (char *)code_mem + 0x22 || broken(TRUE) /* Win10 1709 */, + "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0x22); + ok(context->Eip == (DWORD)code_mem + 0x22, "context->Eip is %08x instead of %08x\n", + context->Eip, (DWORD)code_mem + 0x22); ok(context->Eax == unwind_expected_eax, "context->Eax is %08x instead of %08x\n", context->Eax, unwind_expected_eax);

1 0

Zebediah Figura : mfplat/tests: Link dynamically to d3d11.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: fe6ad8f88f78d2986f08bb8159b4626807175e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6ad8f88f78d2986f08bb81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 22:05:10 2020 -0600 mfplat/tests: Link dynamically to d3d11. Apparently the wxppro testbot has mfplat, but not d3d11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47894 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index dafb429142..c58a0463e5 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat mfuuid propsys uuid d3d11 +IMPORTS = ole32 mfplat mfuuid propsys uuid C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1db4d2dcc4..b61d91d14e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -59,6 +59,10 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); @@ -525,6 +529,11 @@ static void init_functions(void) X(MFRemovePeriodicCallback); #undef X + if ((mod = LoadLibraryA("d3d11.dll"))) + { + pD3D11CreateDevice = (void *)GetProcAddress(mod, "D3D11CreateDevice"); + } + is_win8_plus = pMFPutWaitingWorkItem != NULL; } @@ -3746,7 +3755,7 @@ static void test_dxgi_device_manager(void) ok(manager != manager2, "got wrong pointer: %p.\n", manager2); EXPECT_REF(manager, 1); - hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL); ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); EXPECT_REF(d3d11_dev, 1); @@ -3773,7 +3782,7 @@ static void test_dxgi_device_manager(void) EXPECT_REF(manager, 1); EXPECT_REF(d3d11_dev, 2); - hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &d3d11_dev2, NULL, NULL); ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); EXPECT_REF(d3d11_dev2, 1);

1 0

Vijay Kiran Kamuju : include: Add IWbemContext and IWbemCallResult interface and other class definitions.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 3b1c3e57fcac4e23c0f9b376a483c4949ee7739f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1c3e57fcac4e23c0f9b376… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jan 1 17:46:32 2020 +0100 include: Add IWbemContext and IWbemCallResult interface and other class definitions. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wbemcli.idl | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 54cdb886aa..5b5ca61bec 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3A,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") +cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3a,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") cpp_quote("DEFINE_GUID(CLSID_WbemStatusCode, 0xeb87e1bd,0x3233,0x11d2,0xae,0xc9,0x00,0xc0,0x4f,0xb6,0x88,0x20);") import "oaidl.idl"; @@ -333,6 +333,48 @@ typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE WBEM_FLAG_STRONG_VALIDATION = 0x100000 } WBEM_GENERIC_FLAG_TYPE; +[ + object, + restricted, + local, + uuid(44aca674-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemContext : IUnknown +{ + HRESULT Clone( + [out] IWbemContext **ppNewCopy); + + HRESULT GetNames( + [in] long lFlags, + [out] SAFEARRAY(BSTR) *pNames); + + HRESULT BeginEnumeration( + [in] long lFlags); + + HRESULT Next( + [in] long lFlags, + [out] BSTR *pstrName, + [out] VARIANT *pValue); + + HRESULT EndEnumeration(); + + HRESULT SetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [in] VARIANT *pValue); + + HRESULT GetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [out] VARIANT *pValue); + + HRESULT DeleteValue( + [in, string] LPCWSTR wszName, + [in] long lFlags); + + HRESULT DeleteAll(); +} + [ object, restricted, @@ -486,6 +528,30 @@ interface IWbemServices : IUnknown [in] IWbemObjectSink *pResponseHandler); } +[ + object, + restricted, + uuid(44aca675-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemCallResult : IUnknown +{ + HRESULT GetResultObject( + [in] long lTimeout, + [out] IWbemClassObject **ppResultObject); + + HRESULT GetResultString( + [in] long lTimeout, + [out] BSTR *pstrResultString); + + HRESULT GetResultServices( + [in] long lTimeout, + [out] IWbemServices **ppServices); + + HRESULT GetCallStatus( + [in] long lTimeout, + [out] long *plStatus); +} + [ object, restricted, @@ -703,3 +769,19 @@ coclass UnsecuredApartment interface IUnsecuredApartment; interface IWbemUnsecuredApartment; }; + +[ + uuid(9a653086-174f-11d2-b5f9-00104b703efd) +] +coclass WbemClassObject +{ + interface IWbemClassObject; +}; + +[ + uuid(eb87e1bd-3233-11d2-aec9-00c04fb68820) +] +coclass WbemStatusCodeText +{ + interface IWbemStatusCodeText; +};

1 0

Zebediah Figura : ntdll: Avoid debug traces in _vsnprintf().
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: d409ef0188ab2b04244f6c7ef0577252bcc5feed URL: https://source.winehq.org/git/wine.git/?a=commit;h=d409ef0188ab2b04244f6c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 20:30:32 2020 -0600 ntdll: Avoid debug traces in _vsnprintf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 4176f945f5..f61441b36b 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -452,7 +452,6 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis LPCWSTR q, p = format; pf_flags flags; - TRACE("format is %s\n",debugstr_w(format)); while (*p) { q = strchrW( p, '%' );

1 0

Zebediah Figura : ole32/tests: Fix some failures on Windows 10.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 261046fbb1c78b2db1d0ea063721689b5db6a770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=261046fbb1c78b2db1d0ea06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:24:59 2020 +0000 ole32/tests: Fix some failures on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2aaa34e51b..582b63f484 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -61,6 +61,7 @@ static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID CLSID_DfMarshal = { 0x0000030b, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static const GUID CLSID_ft_unmarshaler_1809 = {0x00000359, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -1392,7 +1393,7 @@ static ULONG WINAPI CustomMarshal_Release(IMarshal *iface) static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - CHECK_EXPECT(CustomMarshal_GetUnmarshalClass); + CHECK_EXPECT2(CustomMarshal_GetUnmarshalClass); *clsid = *unmarshal_class; return S_OK; } @@ -3329,8 +3330,8 @@ static void test_freethreadedmarshaler(void) hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL, &clsid); ok_ole_success(hr, IMarshal_GetUnmarshalClass); - ok(IsEqualIID(&clsid, &CLSID_StdMarshal), "clsid = %s\n", - wine_dbgstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &CLSID_StdMarshal) || IsEqualGUID(&clsid, &CLSID_ft_unmarshaler_1809) /* Win10 1809 */, + "clsid = %s\n", wine_dbgstr_guid(&clsid)); IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL);

1 0

Zebediah Figura : ole32/tests: Only test the original SChannelHookCallInfo structure.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: b181b0bbdec2ee84922b9176c3084aeaf24b5922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b181b0bbdec2ee84922b9176… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:00 2020 +0000 ole32/tests: Only test the original SChannelHookCallInfo structure. This in some sense reverts most of edaf60d71ad1b12315f512c65b3b8c8536e70935. Unless an application depends on the new hook structure, this seems far too much like testing internal behaviour. That the structure seems to have changed multiple times in Windows 10 makes this unlikely. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 84 ++++------------------------------------------ 1 file changed, 7 insertions(+), 77 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 582b63f484..e31a89a075 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4325,19 +4325,9 @@ static ULONG WINAPI TestChannelHook_Release(IChannelHook *iface) return 1; } -static BOOL new_hook_struct; -static int method, server_tid; +static int method; static GUID causality; -struct new_hook_info -{ - IID iid; - GUID causality; - DWORD server_pid; - DWORD server_tid; - WORD method; -}; - static void WINAPI TestChannelHook_ClientGetSize( IChannelHook *iface, REFGUID uExtent, @@ -4347,12 +4337,9 @@ static void WINAPI TestChannelHook_ClientGetSize( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientGetSize\n"); trace("\t%s\n", debugstr_iid(riid)); - if (info->cbSize != sizeof(*info)) - new_hook_struct = TRUE; - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(!info->pObject, "pObject should be NULL\n"); @@ -4361,19 +4348,6 @@ static void WINAPI TestChannelHook_ClientGetSize( else ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - if (method == 3) - causality = new_info->causality; - else - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -4390,24 +4364,13 @@ static void WINAPI TestChannelHook_ClientFillBuffer( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientFillBuffer\n"); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(!info->pObject, "pObject should be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -4427,9 +4390,8 @@ static void WINAPI TestChannelHook_ClientNotify( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); todo_wine { @@ -4437,16 +4399,6 @@ static void WINAPI TestChannelHook_ClientNotify( } ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); } @@ -4462,24 +4414,13 @@ static void WINAPI TestChannelHook_ServerNotify( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerNotify\n"); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(cbDataSize == 1, "cbDataSize should have been 1 instead of %d\n", cbDataSize); ok(*(unsigned char *)pDataBuffer == 0xcc, "pDataBuffer should have contained 0xcc instead of 0x%x\n", *(unsigned char *)pDataBuffer); @@ -4496,24 +4437,14 @@ static void WINAPI TestChannelHook_ServerGetSize( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerGetSize\n"); trace("\t%s\n", debugstr_iid(riid)); - if (!new_hook_struct) + + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); if (hrFault != S_OK) @@ -4571,7 +4502,6 @@ static void test_channel_hook(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream); ok_ole_success(hr, CreateStreamOnHGlobal); tid = start_host_object2(&object_data, &thread); - server_tid = tid; ok_more_than_one_lock();

1 0

Zebediah Figura : ole32/tests: Get rid of some workarounds for no longer supported versions of Windows.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: f3b9ecef12557b68a932d4c34ff2253f786d37c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b9ecef12557b68a932d4c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:01 2020 +0000 ole32/tests: Get rid of some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 58 +++++++--------------------------------------- 1 file changed, 9 insertions(+), 49 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e31a89a075..6dbeb2d84d 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1120,13 +1120,7 @@ static void test_proxy_marshal_and_unmarshal_strong(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); /* marshal the proxy */ hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLESTRONG); - ok(hr == S_OK /* WinNT */ || hr == E_INVALIDARG /* Win9x */, - "CoMarshalInterface should have return S_OK or E_INVALIDARG instead of 0x%08x\n", hr); - if (FAILED(hr)) - { - IUnknown_Release(pProxy); - goto end; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); ok_more_than_one_lock(); ok_non_zero_external_conn(); @@ -1147,7 +1141,6 @@ static void test_proxy_marshal_and_unmarshal_strong(void) ok_more_than_one_lock(); ok_non_zero_external_conn(); -end: IStream_Release(pStream); end_host_object(tid, thread); @@ -1831,11 +1824,6 @@ static void test_crash_couninitialize(void) HANDLE thread; DWORD tid; - if(!GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateActCtxW")) { - win_skip("Skipping crash tests on win2k.\n"); - return; - } - crash_thread_success = FALSE; thread = CreateThread(NULL, 0, crash_couninitialize_proc, NULL, 0, &tid); ok(!WaitForSingleObject(thread, 10000), "wait timed out\n"); @@ -2485,20 +2473,15 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) IUnknown * proxy = NULL; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); - todo_wine - ok(hr == CO_E_NOTINITIALIZED, - "COM should have failed with CO_E_NOTINITIALIZED on using proxy without apartment, but instead returned 0x%08x\n", - hr); + todo_wine ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr); hr = IClassFactory_QueryInterface(cf, &IID_IMultiQI, (LPVOID *)&proxy); - /* Win9x returns S_OK, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface for local interface without apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(proxy); hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); - /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface without apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(proxy); @@ -2511,8 +2494,7 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) hr); hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); - /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); /* now be really bad and release the proxy from the wrong apartment */ IClassFactory_Release(cf); @@ -2556,10 +2538,6 @@ static void test_proxy_used_in_wrong_thread(void) ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); CloseHandle(thread); - /* do release statement on Win9x that we should have done above */ - if (!GetProcAddress(GetModuleHandleA("ole32"), "CoRegisterSurrogateEx")) - IUnknown_Release(pProxy); - ok_no_locks(); end_host_object(tid, host_thread); @@ -3176,9 +3154,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * if (mshctx == MSHCTX_INPROC) { DWORD expected_size = round_global_size(3*sizeof(DWORD) + sizeof(GUID)); - ok(size == expected_size || - broken(size == (2*sizeof(DWORD))) /* Win9x & NT4 */, - "size should have been %d instead of %d\n", expected_size, size); + ok(size == expected_size, "expected size %u, got %u\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); @@ -3846,9 +3822,7 @@ static void test_local_server(void) * class in the registry */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - ok(hr == REGDB_E_CLASSNOTREG || /* NT */ - hr == S_OK /* Win9x */, - "CoGetClassObject should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + todo_wine ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); /* Resume the object suspended above ... */ hr = CoResumeClassObjects(); @@ -3883,10 +3857,7 @@ static void test_local_server(void) /* try to connect again after SCM has suspended registered class objects */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - ok(hr == CO_E_SERVER_STOPPING || /* NT */ - hr == REGDB_E_CLASSNOTREG || /* win2k */ - hr == S_OK /* Win9x */, - "CoGetClassObject should have returned CO_E_SERVER_STOPPING or REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + todo_wine ok(hr == CO_E_SERVER_STOPPING || hr == REGDB_E_CLASSNOTREG /* Win10 1709+ */, "Got hr %#x.\n", hr); hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); @@ -3943,13 +3914,7 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv) IClassFactory *cf; hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); - ok(hr == CO_E_NOTINITIALIZED || - broken(hr == E_UNEXPECTED) /* win2k */ || - broken(hr == S_OK) /* NT 4 */, - "IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED or E_UNEXPECTED instead of 0x%08x\n", - hr); - if (hr == S_OK) - IClassFactory_Release(cf); + ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr); CoInitialize(NULL); @@ -4535,11 +4500,6 @@ START_TEST(marshal) int argc; char **argv; - if (!GetProcAddress(hOle32, "CoRegisterSurrogateEx")) { - win_skip("skipping test on win9x\n"); - return; - } - pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject");

1 0

Zebediah Figura : ole32/tests: Make the tests less verbose by default.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 3772c620b0cb25dbca723693aeccaa376c995000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3772c620b0cb25dbca723693… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:02 2020 +0000 ole32/tests: Make the tests less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 59 +++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 6dbeb2d84d..b61ed31fc6 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -202,7 +202,7 @@ static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { - trace("add connection\n"); + if (winetest_debug > 1) trace("add connection\n"); return ++external_connections; } @@ -210,7 +210,7 @@ static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { - trace("release connection %d\n", fLastReleaseCloses); + if (winetest_debug > 1) trace("release connection %d\n", fLastReleaseCloses); last_release_closes = fLastReleaseCloses; return --external_connections; } @@ -2577,7 +2577,7 @@ static DWORD WINAPI MessageFilter_HandleInComingCall( { static int callcount = 0; DWORD ret; - trace("HandleInComingCall\n"); + if (winetest_debug > 1) trace("HandleInComingCall()\n"); switch (callcount) { case 0: @@ -2600,7 +2600,7 @@ static DWORD WINAPI MessageFilter_RetryRejectedCall( DWORD dwTickCount, DWORD dwRejectType) { - trace("RetryRejectedCall\n"); + if (winetest_debug > 1) trace("RetryRejectedCall()\n"); return 0; } @@ -2610,7 +2610,7 @@ static DWORD WINAPI MessageFilter_MessagePending( DWORD dwTickCount, DWORD dwPendingType) { - trace("MessagePending\n"); + if (winetest_debug > 1) trace("MessagePending()\n"); return PENDINGMSG_WAITNOPROCESS; } @@ -3165,7 +3165,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); } - if (size >= 3*sizeof(DWORD) + sizeof(GUID)) + if (size >= 3*sizeof(DWORD) + sizeof(GUID) && winetest_debug > 1) { trace("got guid data: %s\n", wine_dbgstr_guid((GUID *)marshal_data)); } @@ -3755,7 +3755,6 @@ again: if (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) { - trace("Message 0x%x\n", msg.message); TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -3941,7 +3940,6 @@ static void test_globalinterfacetable(void) IClassFactory *cf; ULONG ref; - trace("test_globalinterfacetable\n"); cLocks = 0; hr = pDllGetClassObject(&CLSID_StdGlobalInterfaceTable, &IID_IClassFactory, (void**)&cf); @@ -4243,30 +4241,6 @@ static void test_implicit_mta(void) CoUninitialize(); } -static const char *debugstr_iid(REFIID riid) -{ - static char name[256]; - HKEY hkeyInterface; - WCHAR bufferW[39]; - char buffer[39]; - LONG name_size = sizeof(name); - StringFromGUID2(riid, bufferW, ARRAY_SIZE(bufferW)); - WideCharToMultiByte(CP_ACP, 0, bufferW, ARRAY_SIZE(bufferW), buffer, sizeof(buffer), NULL, NULL); - if (RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_QUERY_VALUE, &hkeyInterface) != ERROR_SUCCESS) - { - memcpy(name, buffer, sizeof(buffer)); - goto done; - } - if (RegQueryValueA(hkeyInterface, buffer, name, &name_size) != ERROR_SUCCESS) - { - memcpy(name, buffer, sizeof(buffer)); - goto done; - } - RegCloseKey(hkeyInterface); -done: - return name; -} - static HRESULT WINAPI TestChannelHook_QueryInterface(IChannelHook *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IChannelHook)) @@ -4300,8 +4274,8 @@ static void WINAPI TestChannelHook_ClientGetSize( ULONG *pDataSize ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientGetSize\n"); - trace("\t%s\n", debugstr_iid(riid)); + + if (winetest_debug > 1) trace("IChannelHook::ClientGetSize(iid %s)\n", debugstr_guid(riid)); if (info->cbSize == sizeof(*info)) { @@ -4327,7 +4301,8 @@ static void WINAPI TestChannelHook_ClientFillBuffer( void *pDataBuffer ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientFillBuffer\n"); + + if (winetest_debug > 1) trace("IChannelHook::ClientFillBuffer()\n"); if (info->cbSize == sizeof(*info)) { @@ -4353,7 +4328,8 @@ static void WINAPI TestChannelHook_ClientNotify( HRESULT hrFault ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); + + if (winetest_debug > 1) trace("IChannelHook::ClientNotify(hr %#x)\n", hrFault); if (info->cbSize == sizeof(*info)) { @@ -4377,7 +4353,8 @@ static void WINAPI TestChannelHook_ServerNotify( DWORD lDataRep ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ServerNotify\n"); + + if (winetest_debug > 1) trace("IChannelHook::ServerNotify()\n"); if (info->cbSize == sizeof(*info)) { @@ -4400,8 +4377,8 @@ static void WINAPI TestChannelHook_ServerGetSize( ULONG *pDataSize ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ServerGetSize\n"); - trace("\t%s\n", debugstr_iid(riid)); + + if (winetest_debug > 1) trace("IChannelHook::ServerGetSize(iid %s, hr %#x)\n", debugstr_guid(riid), hrFault); if (info->cbSize == sizeof(*info)) { @@ -4412,9 +4389,6 @@ static void WINAPI TestChannelHook_ServerGetSize( } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); - if (hrFault != S_OK) - trace("\thrFault = 0x%08x\n", hrFault); - *pDataSize = 0; } @@ -4426,7 +4400,6 @@ static void WINAPI TestChannelHook_ServerFillBuffer( void *pDataBuffer, HRESULT hrFault ) { - trace("TestChannelHook_ServerFillBuffer\n"); ok(0, "TestChannelHook_ServerFillBuffer shouldn't be called\n"); }

1 0

Nikolay Sivov : include: Update DWRITE_INFORMATIONAL_STRING_ID enum.
by Alexandre Julliard 01 Jan '20

01 Jan '20

Module: wine Branch: master Commit: 456392f3e752e33f3f4b54600d382b2cc493baa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=456392f3e752e33f3f4b5460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 31 22:06:46 2019 +0300 include: Update DWRITE_INFORMATIONAL_STRING_ID enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite.idl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index bfb2c1b37d..b92b1544e0 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -127,12 +127,18 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_LICENSE_INFO_URL, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT, DWRITE_INFORMATIONAL_STRING_FULL_NAME, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, - DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME + DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME, + DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, + DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, + DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, } DWRITE_INFORMATIONAL_STRING_ID; typedef enum DWRITE_FONT_SIMULATIONS

1 0