wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Nikolay Sivov : mf/evr: Create mixer object on activation.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 502341aa76e2e593e5a151afe5451176971a4832 URL: https://source.winehq.org/git/wine.git/?a=commit;h=502341aa76e2e593e5a151af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:12 2020 +0300 mf/evr: Create mixer object on activation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/evr.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 1d2bfc8a78..b64cdb4a64 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,6 +1,6 @@ MODULE = mf.dll IMPORTLIB = mf -IMPORTS = advapi32 mfplat ole32 uuid mfuuid +IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index e0ab44f8b0..4166c1dd3e 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "mf_private.h" +#include "uuids.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -32,6 +33,8 @@ struct video_renderer IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; LONG refcount; + + IMFTransform *mixer; unsigned int flags; CRITICAL_SECTION cs; }; @@ -90,6 +93,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) if (!refcount) { + if (renderer->mixer) + IMFTransform_Release(renderer->mixer); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -228,9 +233,33 @@ static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl = video_renderer_preroll_NotifyPreroll, }; +static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) +{ + unsigned int flags = 0; + IMFActivate *activate; + CLSID clsid; + HRESULT hr; + + if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, + &IID_IMFActivate, (void **)&activate))) + { + IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags); + hr = IMFActivate_ActivateObject(activate, &IID_IMFTransform, (void **)out); + IMFActivate_Release(activate); + if (FAILED(hr) && !(flags & MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL)) + return hr; + } + + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + + return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); +} + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; + HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj); @@ -242,9 +271,19 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->refcount = 1; InitializeCriticalSection(&object->cs); + /* Create mixer. */ + if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer))) + goto done; + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK; + +done: + + IMFMediaSink_Release(&object->IMFMediaSink_iface); + + return hr; } static void evr_shutdown_object(void *user_context, IUnknown *obj)

1 0

Nikolay Sivov : mf: Make freeing function optional for object activator.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 3a973ca8275ac398d7df9fd27a1b777cbed1fad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a973ca8275ac398d7df9fd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:11 2020 +0300 mf: Make freeing function optional for object activator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 9 ++------- dlls/mf/main.c | 3 ++- dlls/mf/sar.c | 9 ++------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 64944673d5..e0ab44f8b0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -258,15 +258,10 @@ static void evr_shutdown_object(void *user_context, IUnknown *obj) } } -static void evr_free_private(void *user_context) -{ -} - static const struct activate_funcs evr_activate_funcs = { - evr_create_object, - evr_shutdown_object, - evr_free_private, + .create_object = evr_create_object, + .shutdown_object = evr_shutdown_object, }; /*********************************************************************** diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 8656c6cddf..62dc1813c7 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -91,7 +91,8 @@ static ULONG WINAPI activate_object_Release(IMFActivate *iface) if (!refcount) { - activate->funcs->free_private(activate->context); + if (activate->funcs->free_private) + activate->funcs->free_private(activate->context); if (activate->object) IUnknown_Release(activate->object); IMFAttributes_Release(activate->attributes); diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 8a27c0658c..6f1f1bd834 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1891,15 +1891,10 @@ static void sar_shutdown_object(void *user_context, IUnknown *obj) } } -static void sar_free_private(void *user_context) -{ -} - static const struct activate_funcs sar_activate_funcs = { - sar_create_object, - sar_shutdown_object, - sar_free_private, + .create_object = sar_create_object, + .shutdown_object = sar_shutdown_object, }; /***********************************************************************

1 0

Gijs Vermeulen : qdvd: Add IDvdGraphBuilder stub.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 4cd2ca96c2b65acd977f7c9217e260c024e0ecbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cd2ca96c2b65acd977f7c92… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 7 10:14:56 2020 -0500 qdvd: Add IDvdGraphBuilder stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18072 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 2 + dlls/qdvd/graph.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/qdvd/qdvd_main.c | 89 ++++++++++++++++++++++++++++++++++--- dlls/qdvd/qdvd_private.h | 30 +++++++++++++ 4 files changed, 227 insertions(+), 6 deletions(-) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index b3b13486ed..8f5089b3ac 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,8 +1,10 @@ MODULE = qdvd.dll +IMPORTS = strmiids uuid ole32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + graph.c \ qdvd_main.c IDL_SRCS = \ diff --git a/dlls/qdvd/graph.c b/dlls/qdvd/graph.c new file mode 100644 index 0000000000..f33293bfa4 --- /dev/null +++ b/dlls/qdvd/graph.c @@ -0,0 +1,112 @@ +/* + * Graph builder + * + * Copyright 2020 Gijs Vermeulen + * + * 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 + */ + +#include "qdvd_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qdvd); + +struct graph_builder +{ + IDvdGraphBuilder IDvdGraphBuilder_iface; + LONG refcount; +}; + +static struct graph_builder *impl_from_IDvdGraphBuilder(IDvdGraphBuilder *iface) +{ + return CONTAINING_RECORD(iface, struct graph_builder, IDvdGraphBuilder_iface); +} + +static ULONG WINAPI graph_builder_AddRef(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + ULONG refcount = InterlockedIncrement(&builder->refcount); + TRACE("%p increasing refcount to %u.\n", builder, refcount); + return refcount; +} + +static ULONG WINAPI graph_builder_Release(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + ULONG refcount = InterlockedDecrement(&builder->refcount); + TRACE("%p decreasing refcount to %u.\n", builder, refcount); + if (!refcount) + free(builder); + return refcount; +} + +static HRESULT WINAPI graph_builder_QueryInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IDvdGraphBuilder) || IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI graph_builder_GetFiltergraph(IDvdGraphBuilder *iface, IGraphBuilder **graph) +{ + FIXME("iface %p, graph %p, stub!\n", iface, graph); + return E_NOTIMPL; +} + +static HRESULT WINAPI graph_builder_GetDvdInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +{ + FIXME("iface %p, iid %s, out %p, stub!\n", iface, debugstr_guid(iid), out); + return E_NOTIMPL; +} + +static HRESULT WINAPI graph_builder_RenderDvdVideoVolume(IDvdGraphBuilder *iface, const WCHAR *path, DWORD flags, AM_DVD_RENDERSTATUS *status) +{ + FIXME("iface %p, path %s, flags %#x, status %p, stub!\n", iface, debugstr_w(path), flags, status); + return E_NOTIMPL; +} + +static const struct IDvdGraphBuilderVtbl graph_builder_vtbl = +{ + graph_builder_QueryInterface, + graph_builder_AddRef, + graph_builder_Release, + graph_builder_GetFiltergraph, + graph_builder_GetDvdInterface, + graph_builder_RenderDvdVideoVolume, +}; + +HRESULT graph_builder_create(IUnknown **out) +{ + struct graph_builder *builder; + + if (!(builder = calloc(1, sizeof(*builder)))) + return E_OUTOFMEMORY; + + builder->IDvdGraphBuilder_iface.lpVtbl = &graph_builder_vtbl; + builder->refcount = 1; + + TRACE("Created DVD graph builder %p.\n", builder); + *out = (IUnknown *)&builder->IDvdGraphBuilder_iface; + return S_OK; +} diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 72dcda7c91..9377f248ce 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -18,17 +18,89 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "oleidl.h" +#include "qdvd_private.h" #include "rpcproxy.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qdvd); static HINSTANCE qdvd_instance; +struct class_factory +{ + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(IUnknown **out); +}; + +static struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **out) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unk; + HRESULT hr; + + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + *out = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (SUCCEEDED(hr = factory->create_instance(&unk))) + { + hr = IUnknown_QueryInterface(unk, iid, out); + IUnknown_Release(unk); + } + return hr; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("lock %d, stub!\n", lock); + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static struct class_factory graph_builder_cf = {{&class_factory_vtbl}, graph_builder_create}; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_WINE_PREATTACH) @@ -44,7 +116,12 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { - FIXME("clsid %s, iid %s, out %p, stub!\n", debugstr_guid(clsid), debugstr_guid(iid), out); + TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + if (IsEqualGUID(clsid, &CLSID_DvdGraphBuilder)) + return IClassFactory_QueryInterface(&graph_builder_cf.IClassFactory_iface, iid, out); + + FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/qdvd/qdvd_private.h b/dlls/qdvd/qdvd_private.h new file mode 100644 index 0000000000..b54dd3ddc1 --- /dev/null +++ b/dlls/qdvd/qdvd_private.h @@ -0,0 +1,30 @@ +/* + * DirectShow DVD filters + * + * Copyright 2020 Gijs Vermeulen + * + * 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 + */ + +#ifndef QDVD_PRIVATE_H +#define QDVD_PRIVATE_H + +#define COBJMACROS +#include "dshow.h" +#include "wine/debug.h" + +HRESULT graph_builder_create(IUnknown **out) DECLSPEC_HIDDEN; + +#endif /* QDVD_PRIVATE_H */

1 0

Gijs Vermeulen : amstream: Add graph to stream in IMediaStreamFilter::AddMediaStream().
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 388c53160dff455c05e87315e6d7c986b78bad45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=388c53160dff455c05e87315… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 7 00:58:14 2020 +0200 amstream: Add graph to stream in IMediaStreamFilter::AddMediaStream(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 4 ++++ dlls/amstream/tests/amstream.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0e09e492cb..0a06e78180 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -497,6 +497,10 @@ static HRESULT WINAPI filter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaS if (FAILED(hr)) return hr; + hr = IAMMediaStream_JoinFilterGraph(pAMMediaStream, This->graph); + if (FAILED(hr)) + return hr; + This->streams[This->nb_streams] = pAMMediaStream; This->nb_streams++; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 608bb2267f..0e9c40d118 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -686,6 +686,7 @@ static void test_add_stream(void) IEnumFilters *enum_filters; IBaseFilter *filters[3]; IGraphBuilder *graph; + FILTER_INFO info; ULONG ref, count; CLSID clsid; HRESULT hr; @@ -755,13 +756,18 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &IID_IUnknown, 0, &stream); ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_QueryFilterInfo(stream_filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &test_mspid, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n"); - if (hr == S_OK) IMediaStream_Release(stream); + IMediaStream_Release(stream); ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); ok(teststream.filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); - todo_wine ok(!!teststream.graph, "Expected a non-NULL graph.\n"); + ok(teststream.graph == info.pGraph, "IFilterGraph objects didn't match.\n"); + + IFilterGraph_Release(info.pGraph); check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, audio_stream);

1 0

Alexandre Julliard : ntdll: Use macros to define both A and W printf functions.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 2d38551dd9012db1361cbd5ff3de6cb5fb90dc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d38551dd9012db1361cbd5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 16:35:04 2020 +0200 ntdll: Use macros to define both A and W printf functions. This is similar to what msvcrt does. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 618 ++-------------------------------------------------- dlls/ntdll/printf.h | 509 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 523 insertions(+), 604 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d38551dd9012db1361c…

1 0

Alexandre Julliard : ntdll: Use proper flags instead of characters for printf flags.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 1a43c5de71eea457855f7dcfb7e5811f1c74ebf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a43c5de71eea457855f7dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 16:12:44 2020 +0200 ntdll: Use proper flags instead of characters for printf flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 56 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 16f64002d4..31235537a3 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -50,11 +50,10 @@ typedef struct pf_output_t typedef struct pf_flags_t { - char Sign, LeftAlign, Alternate, PadZero; + enum { LEN_DEFAULT, LEN_SHORT, LEN_LONG } IntegerLength; + BOOLEAN IntegerDouble, IntegerNative, LeftAlign, Alternate, PadZero, WideString; int FieldLength, Precision; - char IntegerLength, IntegerDouble, IntegerNative; - char WideString; - char Format; + char Sign, Format; } pf_flags; /* @@ -268,9 +267,9 @@ static int pf_handle_string_format( pf_output *out, const void* str, int len, return pf_output_format_A( out, "(null)", -1, flags); /* prefixes take priority over %c,%s vs. %C,%S, so we handle them first */ - if(flags->WideString || flags->IntegerLength == 'l') + if (flags->WideString || flags->IntegerLength == LEN_LONG) return pf_output_format_W( out, str, len, flags); - if(flags->IntegerLength == 'h') + if (flags->IntegerLength == LEN_SHORT) return pf_output_format_A( out, str, len, flags); /* %s,%c -> chars in ansi functions & wchars in unicode @@ -310,7 +309,7 @@ static void pf_integer_conv( char *buf, pf_flags *flags, LONGLONG x ) i = 0; if( x == 0 ) { - flags->Alternate = 0; + flags->Alternate = FALSE; if( flags->Precision ) buf[i++] = '0'; } @@ -410,11 +409,11 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.Sign = *p; } else if( *p == '-' ) - flags.LeftAlign = *p; + flags.LeftAlign = TRUE; else if( *p == '0' ) - flags.PadZero = *p; + flags.PadZero = TRUE; else if( *p == '#' ) - flags.Alternate = *p; + flags.Alternate = TRUE; else break; p++; @@ -427,7 +426,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.FieldLength = va_arg( valist, int ); if (flags.FieldLength < 0) { - flags.LeftAlign = '-'; + flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } p++; @@ -461,19 +460,24 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis { if (*p == 'l' && *(p+1) == 'l') { - flags.IntegerDouble++; + flags.IntegerDouble = TRUE; p += 2; } - else if( *p == 'h' || *p == 'l' || *p == 'L' ) + else if( *p == 'l' || *p == 'L' ) { - flags.IntegerLength = *p; + flags.IntegerLength = LEN_LONG; + p++; + } + else if( *p == 'h') + { + flags.IntegerLength = LEN_SHORT; p++; } else if( *p == 'I' ) { if( *(p+1) == '6' && *(p+2) == '4' ) { - flags.IntegerDouble++; + flags.IntegerDouble = TRUE; p += 3; } else if( *(p+1) == '3' && *(p+2) == '2' ) @@ -481,7 +485,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis else if( p[1] && strchr( "diouxX", p[1] ) ) { if( sizeof(void *) == 8 ) - flags.IntegerDouble = *p; + flags.IntegerDouble = TRUE; p++; } else if( isDigit(*(p+1)) || *(p+1) == 0 ) @@ -490,12 +494,18 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis p++; } else if( *p == 'w' ) - flags.WideString = *p++; + { + flags.WideString = TRUE; + p++; + } else if ((*p == 'z' || *p == 't') && p[1] && strchr("diouxX", p[1])) - flags.IntegerNative = *p++; + { + flags.IntegerNative = TRUE; + p++; + } else if (*p == 'j') { - flags.IntegerDouble++; + flags.IntegerDouble = TRUE; p++; } else if( *p == 'F' ) @@ -532,10 +542,10 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis void *ptr = va_arg( valist, void * ); int prec = flags.Precision; flags.Format = 'X'; - flags.PadZero = '0'; + flags.PadZero = TRUE; flags.Precision = 2*sizeof(void*); pf_integer_conv( pointer, &flags, (ULONG_PTR)ptr ); - flags.PadZero = 0; + flags.PadZero = FALSE; flags.Precision = prec; r = pf_output_format_A( out, pointer, -1, &flags ); } @@ -563,10 +573,10 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis if(flags.IntegerDouble || (flags.IntegerNative && sizeof(void*) == 8)) pf_integer_conv( x, &flags, va_arg(valist, LONGLONG) ); else if(flags.Format=='d' || flags.Format=='i') - pf_integer_conv( x, &flags, flags.IntegerLength!='h' ? + pf_integer_conv( x, &flags, flags.IntegerLength != LEN_SHORT ? va_arg(valist, int) : (short)va_arg(valist, int) ); else - pf_integer_conv( x, &flags, flags.IntegerLength!='h' ? + pf_integer_conv( x, &flags, flags.IntegerLength != LEN_SHORT ? (unsigned int)va_arg(valist, int) : (unsigned short)va_arg(valist, int) ); r = pf_output_format_A( out, x, -1, &flags );

1 0

Brendan Shanks : winex11.drv: Retrieve PCI IDs and device name from Vulkan.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 3a3c7cbd209e23cc6ee88299b3ba877ab20a767f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3c7cbd209e23cc6ee88299… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 6 10:46:18 2020 -0700 winex11.drv: Retrieve PCI IDs and device name from Vulkan. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 14574e198f..141c2ca17f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -687,7 +687,7 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) -static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_info ) +static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRProviderInfo *provider_info ) { static const char *extensions[] = { @@ -706,6 +706,7 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ VkPhysicalDeviceIDProperties id; VkInstance vk_instance = NULL; VkDisplayKHR vk_display; + BOOL ret = FALSE; VkResult vr; if (!vulkan_funcs) @@ -769,7 +770,15 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ properties2.pNext = &id; pvkGetPhysicalDeviceProperties2( vk_physical_devices[device_idx], &properties2 ); - memcpy( uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + /* Ignore Khronos vendor IDs */ + if (properties2.properties.vendorID < 0x10000) + { + gpu->vendor_id = properties2.properties.vendorID; + gpu->device_id = properties2.properties.deviceID; + } + MultiByteToWideChar( CP_UTF8, 0, properties2.properties.deviceName, -1, gpu->name, ARRAY_SIZE(gpu->name) ); + ret = TRUE; goto done; } } @@ -778,6 +787,7 @@ done: heap_free( vk_physical_devices ); if (vk_instance) vulkan_funcs->p_vkDestroyInstance( vk_instance, NULL ); + return ret; } static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) @@ -842,10 +852,9 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) } gpus[i].id = provider_resources->providers[i]; - get_vulkan_device_uuid( &gpus[i].vulkan_uuid, provider_info ); - MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); - /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report - * their PCI address in the name but many others don't */ + if (!get_gpu_properties_from_vulkan( &gpus[i], provider_info )) + MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); + /* FIXME: Add an alternate method of getting PCI IDs, for systems that don't support Vulkan */ pXRRFreeProviderInfo( provider_info ); }

1 0

Huw Davies : server: Remove unnecessary 'remove' parameter from accept_hardware_message request.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 434871fd1b6d1fef8c68e8d35689caec49367e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=434871fd1b6d1fef8c68e8d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 11:21:50 2020 +0100 server: Remove unnecessary 'remove' parameter from accept_hardware_message request. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 17 ++++++++--------- include/wine/server_protocol.h | 4 +--- server/protocol.def | 3 +-- server/queue.c | 36 +++++++++++++++--------------------- server/request.h | 3 +-- server/trace.c | 1 - 6 files changed, 26 insertions(+), 38 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c5c7db667c..53e0b6495b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2271,12 +2271,11 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) * Tell the server we have passed the message to the app * (even though we may end up dropping it later on) */ -static void accept_hardware_message( UINT hw_id, BOOL remove ) +static void accept_hardware_message( UINT hw_id ) { SERVER_START_REQ( accept_hardware_message ) { - req->hw_id = hw_id; - req->remove = remove; + req->hw_id = hw_id; if (wine_server_call( req )) FIXME("Failed to reply to MSG_HARDWARE message. Message may not be removed from queue.\n"); } @@ -2363,10 +2362,10 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { /* skip this message */ HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, TRUE ); - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } - accept_hardware_message( hw_id, remove ); + if (remove) accept_hardware_message( hw_id ); msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); if ( remove && msg->message == WM_KEYDOWN ) @@ -2421,7 +2420,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) { - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } @@ -2517,7 +2516,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hook.s.dwExtraInfo = extra_info; hook.mouseData = msg->wParam; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } @@ -2525,11 +2524,11 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { SendMessageW( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } - accept_hardware_message( hw_id, remove ); + if (remove) accept_hardware_message( hw_id ); if (!remove || info.hwndCapture) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d453f5e661..0f1a0b4477 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3197,8 +3197,6 @@ struct accept_hardware_message_request { struct request_header __header; unsigned int hw_id; - int remove; - char __pad_20[4]; }; struct accept_hardware_message_reply { @@ -6671,7 +6669,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 616 +#define SERVER_PROTOCOL_VERSION 617 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 34c6b5f65d..e55d47bcd2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2352,10 +2352,9 @@ enum message_type @END -/* Accept the current hardware message */ +/* Accept and remove the current hardware message */ @REQ(accept_hardware_message) unsigned int hw_id; /* id of the hardware message */ - int remove; /* should we remove the message? */ @END diff --git a/server/queue.c b/server/queue.c index 432885f9e4..a65eab38bd 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1384,11 +1384,11 @@ static void update_desktop_mouse_state( struct desktop *desktop, unsigned int fl } /* release the hardware message currently being processed by the given thread */ -static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id, - int remove ) +static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id ) { struct thread_input *input = queue->input; - struct message *msg; + struct message *msg, *other; + int clr_bit; LIST_FOR_EACH_ENTRY( msg, &input->msg_list, struct message, entry ) { @@ -1397,26 +1397,20 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - if (remove) + clr_bit = get_hardware_msg_bit( msg ); + LIST_FOR_EACH_ENTRY( other, &input->msg_list, struct message, entry ) { - struct message *other; - int clr_bit; - - clr_bit = get_hardware_msg_bit( msg ); - LIST_FOR_EACH_ENTRY( other, &input->msg_list, struct message, entry ) + if (other != msg && get_hardware_msg_bit( other ) == clr_bit) { - if (other != msg && get_hardware_msg_bit( other ) == clr_bit) - { - clr_bit = 0; - break; - } + clr_bit = 0; + break; } - if (clr_bit) clear_queue_bits( queue, clr_bit ); - - update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); - list_remove( &msg->entry ); - free_message( msg ); } + if (clr_bit) clear_queue_bits( queue, clr_bit ); + + update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); + list_remove( &msg->entry ); + free_message( msg ); } static int queue_hotkey_message( struct desktop *desktop, struct message *msg ) @@ -2080,7 +2074,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) - release_hardware_message( current->queue, data->hw_id, 1 ); + release_hardware_message( current->queue, data->hw_id ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2606,7 +2600,7 @@ DECL_HANDLER(reply_message) DECL_HANDLER(accept_hardware_message) { if (current->queue) - release_hardware_message( current->queue, req->hw_id, req->remove ); + release_hardware_message( current->queue, req->hw_id ); else set_error( STATUS_ACCESS_DENIED ); } diff --git a/server/request.h b/server/request.h index d6e2613c0a..a81d64527d 100644 --- a/server/request.h +++ b/server/request.h @@ -1567,8 +1567,7 @@ C_ASSERT( FIELD_OFFSET(struct reply_message_request, remove) == 12 ); C_ASSERT( FIELD_OFFSET(struct reply_message_request, result) == 16 ); C_ASSERT( sizeof(struct reply_message_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct accept_hardware_message_request, hw_id) == 12 ); -C_ASSERT( FIELD_OFFSET(struct accept_hardware_message_request, remove) == 16 ); -C_ASSERT( sizeof(struct accept_hardware_message_request) == 24 ); +C_ASSERT( sizeof(struct accept_hardware_message_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_message_reply_request, cancel) == 12 ); C_ASSERT( sizeof(struct get_message_reply_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_message_reply_reply, result) == 8 ); diff --git a/server/trace.c b/server/trace.c index ad34cef118..16c35b93b5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2887,7 +2887,6 @@ static void dump_reply_message_request( const struct reply_message_request *req static void dump_accept_hardware_message_request( const struct accept_hardware_message_request *req ) { fprintf( stderr, " hw_id=%08x", req->hw_id ); - fprintf( stderr, ", remove=%d", req->remove ); } static void dump_get_message_reply_request( const struct get_message_reply_request *req )

1 0

Alistair Leslie-Hughes : wbemprox: Add more Win32_PhysicalMemory properties.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: fb7cc99f8a8c5a1594cfa780807d5e75f4b9539e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb7cc99f8a8c5a1594cfa780… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 7 17:54:22 2020 +1000 wbemprox: Add more Win32_PhysicalMemory properties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 11 ++++++++++- dlls/wbemprox/tests/query.c | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2ff3131936..a94d41bfc4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -270,12 +270,15 @@ static const struct column col_physicalmedia[] = }; static const struct column col_physicalmemory[] = { + { L"BankLabel", CIM_STRING }, { L"Capacity", CIM_UINT64 }, + { L"Caption", CIM_STRING }, { L"ConfiguredClockSpeed", CIM_UINT32 }, { L"DeviceLocator", CIM_STRING }, { L"FormFactor", CIM_UINT16 }, { L"MemoryType", CIM_UINT16 }, { L"PartNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING }, }; static const struct column col_pnpentity[] = { @@ -655,12 +658,15 @@ struct record_physicalmedia }; struct record_physicalmemory { + const WCHAR *banklabel; UINT64 capacity; + const WCHAR *caption; UINT32 configuredclockspeed; const WCHAR *devicelocator; UINT16 formfactor; UINT16 memorytype; const WCHAR *partnumber; + const WCHAR *serial; }; struct record_pnpentity { @@ -2905,12 +2911,15 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_physicalmemory *)table->data; + rec->banklabel = L"BANK 0"; rec->capacity = get_total_physical_memory(); - rec->configuredclockspeed = 0; + rec->caption = L"Physical Memory"; + rec->configuredclockspeed = 1600; rec->devicelocator = L"DIMM 0"; rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ rec->partnumber = NULL; + rec->serial = NULL; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 578e9308df..7dcfd35e93 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1159,10 +1159,14 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) if (count > 0) { + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); + check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); + check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); IWbemClassObject_Release( obj ); } IEnumWbemClassObject_Release( result );

1 0

Zebediah Figura : server: Remove no longer used snapshot requests.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 1ff8fe20bf87f0b60e2b1a185fd3f9ee383fe31c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ff8fe20bf87f0b60e2b1a18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 6 21:06:02 2020 -0500 server: Remove no longer used snapshot requests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 72 +------------ server/Makefile.in | 1 - server/process.c | 30 ------ server/process.h | 10 -- server/protocol.def | 41 -------- server/request.h | 32 ------ server/snapshot.c | 223 ----------------------------------------- server/thread.c | 24 ----- server/thread.h | 8 -- server/trace.c | 55 ---------- 10 files changed, 1 insertion(+), 495 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ff8fe20bf87f0b60e2b…

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020