June 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : evr: Implement stream managment methods for default mixer.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: d6e5b6ca0241bf0f70691e0c5cb0d6fe24b61ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e5b6ca0241bf0f70691e0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 14:43:44 2020 +0300 evr: Implement stream managment methods for default mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/evr/tests/evr.c | 114 +++++++++++++++++++++++++++++++++ 2 files changed, 276 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e5b6ca0241bf0f7069…

1 0

Nikolay Sivov : evr: Create attributes for input mixer streams.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 68374e43158590164e7038a951d8a8d3d12d136b URL: https://source.winehq.org/git/wine.git/?a=commit;h=68374e43158590164e7038a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 14:43:45 2020 +0300 evr: Create attributes for input mixer streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 1 + dlls/evr/mixer.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 16 ++++------------ 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index bf3048f62e..5671511f6a 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,6 +1,7 @@ MODULE = evr.dll IMPORTLIB = evr IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 +DELAYIMPORTS = mfplat EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index f9f1f4b0c3..d1529c015d 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "evr.h" #include "d3d9.h" +#include "mfapi.h" #include "mferror.h" #include "evr_classes.h" @@ -32,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct input_stream { unsigned int id; + IMFAttributes *attributes; }; struct video_mixer @@ -77,6 +79,12 @@ static struct input_stream * video_mixer_get_input(const struct video_mixer *mix return bsearch(&id, mixer->inputs, mixer->input_count, sizeof(*mixer->inputs), video_mixer_compare_input_id); } +static void video_mixer_init_input(struct input_stream *stream) +{ + if (SUCCEEDED(MFCreateAttributes(&stream->attributes, 1))) + IMFAttributes_SetUINT32(stream->attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, 1); +} + static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -121,11 +129,17 @@ static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) { struct video_mixer *mixer = impl_from_IMFTransform(iface); ULONG refcount = InterlockedDecrement(&mixer->refcount); + unsigned int i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { + for (i = 0; i < mixer->input_count; ++i) + { + if (mixer->inputs[i].attributes) + IMFAttributes_Release(mixer->inputs[i].attributes); + } DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -223,9 +237,26 @@ static HRESULT WINAPI video_mixer_transform_GetAttributes(IMFTransform *iface, I static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("%p, %u, %p.\n", iface, id, attributes); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream *input; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, id, attributes); + + EnterCriticalSection(&mixer->cs); + + if (!(input = video_mixer_get_input(mixer, id))) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + *attributes = input->attributes; + if (*attributes) + IMFAttributes_AddRef(*attributes); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, @@ -256,6 +287,8 @@ static HRESULT WINAPI video_mixer_transform_DeleteInputStream(IMFTransform *ifac idx = input - mixer->inputs; if (idx < mixer->input_count) { + if (mixer->inputs[idx].attributes) + IMFAttributes_Release(mixer->inputs[idx].attributes); memmove(&mixer->inputs[idx], &mixer->inputs[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->inputs)); memmove(&mixer->input_ids[idx], &mixer->input_ids[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->input_ids)); @@ -277,6 +310,7 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, { struct video_mixer *mixer = impl_from_IMFTransform(iface); struct input_stream inputs[MAX_MIXER_INPUT_STREAMS] = { {0} }; + struct input_stream *input; unsigned int i, len; HRESULT hr = S_OK; @@ -310,6 +344,11 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, if (SUCCEEDED(hr)) { + for (i = 0; i < count; ++i) + { + if ((input = bsearch(&ids[i], inputs, len, sizeof(*inputs), video_mixer_compare_input_id))) + video_mixer_init_input(input); + } memcpy(&mixer->input_ids[mixer->input_count], ids, count * sizeof(*ids)); memcpy(mixer->inputs, inputs, len * sizeof(*inputs)); mixer->input_count += count; @@ -552,6 +591,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->refcount = 1; object->input_count = 1; + video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); *out = &object->IMFTransform_iface; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db20fa7664..be004d9eae 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -406,7 +406,6 @@ static void test_default_mixer(void) ok(input_id == 0 && output_id == 0, "Unexpected stream ids.\n"); hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); -todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStreamAttributes(transform, 1, &attributes); @@ -444,29 +443,22 @@ todo_wine attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!attributes, "Unexpected attributes.\n"); -} + attributes2 = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes2); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(attributes == attributes2, "Unexpected instance.\n"); - if (attributes2) - IMFAttributes_Release(attributes2); - if (attributes) - IMFAttributes_Release(attributes); + IMFAttributes_Release(attributes2); + IMFAttributes_Release(attributes); attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!attributes, "Unexpected attributes.\n"); -} - if (attributes) - IMFAttributes_Release(attributes); + IMFAttributes_Release(attributes); hr = IMFTransform_DeleteInputStream(transform, 0); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr: Add IMFVideoMixerControl2 stub for the mixer.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 6548fc437192fd852c1a91130382c56e92e68ac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6548fc437192fd852c1a9113… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 14:43:46 2020 +0300 evr: Add IMFVideoMixerControl2 stub for the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ include/evr.idl | 38 +++++++++++++++++++++++ 3 files changed, 129 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d1529c015d..b651a56bff 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -41,6 +41,7 @@ struct video_mixer IMFTransform IMFTransform_iface; IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; + IMFVideoMixerControl2 IMFVideoMixerControl2_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -64,6 +65,11 @@ static struct video_mixer *impl_from_IMFTopologyServiceLookupClient(IMFTopologyS return CONTAINING_RECORD(iface, struct video_mixer, IMFTopologyServiceLookupClient_iface); } +static struct video_mixer *impl_from_IMFVideoMixerControl2(IMFVideoMixerControl2 *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerControl2_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -104,6 +110,11 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFTopologyServiceLookupClient_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoMixerControl2) || + IsEqualIID(riid, &IID_IMFVideoMixerControl)) + { + *obj = &mixer->IMFVideoMixerControl2_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -564,6 +575,81 @@ static const IMFTopologyServiceLookupClientVtbl video_mixer_service_client_vtbl video_mixer_service_client_ReleaseServicePointers, }; +static HRESULT WINAPI video_mixer_control_QueryInterface(IMFVideoMixerControl2 *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_control_AddRef(IMFVideoMixerControl2 *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_control_Release(IMFVideoMixerControl2 *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_control_SetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD stream_id, DWORD zorder) +{ + FIXME("%p, %u, %u.\n", iface, stream_id, zorder); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_GetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD stream_id, DWORD *zorder) +{ + FIXME("%p, %u, %p.\n", iface, stream_id, zorder); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerControl2 *iface, DWORD stream_id, + const MFVideoNormalizedRect *rect) +{ + FIXME("%p, %u, %p.\n", iface, stream_id, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_GetStreamOutputRect(IMFVideoMixerControl2 *iface, DWORD stream_id, + MFVideoNormalizedRect *rect) +{ + FIXME("%p, %u, %p.\n", iface, stream_id, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_SetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD flags) +{ + FIXME("%p, %#x.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_GetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static const IMFVideoMixerControl2Vtbl video_mixer_control_vtbl = +{ + video_mixer_control_QueryInterface, + video_mixer_control_AddRef, + video_mixer_control_Release, + video_mixer_control_SetStreamZOrder, + video_mixer_control_GetStreamZOrder, + video_mixer_control_SetStreamOutputRect, + video_mixer_control_GetStreamOutputRect, + video_mixer_control_SetMixingPrefs, + video_mixer_control_GetMixingPrefs, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -589,6 +675,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTransform_iface.lpVtbl = &video_mixer_transform_vtbl; object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; + object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index be004d9eae..9cf5d41919 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -362,6 +362,10 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/evr.idl b/include/evr.idl index 39b4853b2e..83603b92cc 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -160,4 +160,42 @@ interface IMFVideoDeviceID : IUnknown ); } +[ + object, + uuid(a5c6c53f-c202-4aa5-9695-175ba8c508a5) +] +interface IMFVideoMixerControl : IUnknown +{ + HRESULT SetStreamZOrder( + [in] DWORD stream_id, + [in] DWORD zorder + ); + HRESULT GetStreamZOrder( + [in] DWORD stream_id, + [out] DWORD *zorder + ); + HRESULT SetStreamOutputRect( + [in] DWORD stream_id, + [in] const MFVideoNormalizedRect *rect + ); + HRESULT GetStreamOutputRect( + [in] DWORD stream_id, + [out] MFVideoNormalizedRect *rect + ); +} + +[ + object, + uuid(8459616d-966e-4930-b658-54fa7e5a16d3) +] +interface IMFVideoMixerControl2 : IMFVideoMixerControl +{ + HRESULT SetMixingPrefs( + [in] DWORD flags + ); + HRESULT GetMixingPrefs( + [out] DWORD *flags + ); +} + cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);")

1 0

Alistair Leslie-Hughes : directmanipulation: Create DirectManipulationManager and DirectManipulationSharedManager objects.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 353442072ad39b33045f8ca9e5d9906e97342a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=353442072ad39b33045f8ca9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 17 16:33:21 2019 +1000 directmanipulation: Create DirectManipulationManager and DirectManipulationSharedManager objects. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/Makefile.in | 1 + dlls/directmanipulation/directmanipulation.c | 203 ++++++++++++++++++++++++++- 2 files changed, 203 insertions(+), 1 deletion(-) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in index 331c2a8420..d67a21eb77 100644 --- a/dlls/directmanipulation/Makefile.in +++ b/dlls/directmanipulation/Makefile.in @@ -1,4 +1,5 @@ MODULE = directmanipulation.dll +IMPORTS = uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index f808bc1a33..a1e508bac8 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -15,6 +15,7 @@ * 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 <stdarg.h> @@ -22,8 +23,11 @@ #include "winbase.h" #include "oleidl.h" #include "rpcproxy.h" +#include "wine/heap.h" #include "wine/debug.h" +#include "directmanipulation.h" + WINE_DEFAULT_DEBUG_CHANNEL(manipulation); static HINSTANCE dm_instance; @@ -60,8 +64,205 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } + +struct directmanipulation +{ + IDirectManipulationManager2 IDirectManipulationManager2_iface; + LONG ref; +}; + +static inline struct directmanipulation *impl_from_IDirectManipulationManager2(IDirectManipulationManager2 *iface) +{ + return CONTAINING_RECORD(iface, struct directmanipulation, IDirectManipulationManager2_iface); +} + +static HRESULT WINAPI direct_manip_QueryInterface(IDirectManipulationManager2 *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectManipulationManager) || + IsEqualGUID(riid, &IID_IDirectManipulationManager2)) { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + FIXME("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI direct_manip_AddRef(IDirectManipulationManager2 *iface) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI direct_manip_Activate(IDirectManipulationManager2 *iface, HWND window) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %p\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI direct_manip_Deactivate(IDirectManipulationManager2 *iface, HWND window) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %p\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI direct_manip_RegisterHitTestTarget(IDirectManipulationManager2 *iface, HWND window, + HWND hittest, DIRECTMANIPULATION_HITTEST_TYPE type) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %p, %p, %d\n", This, window, hittest, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI direct_manip_ProcessInput(IDirectManipulationManager2 *iface, const MSG *msg, BOOL *handled) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %p, %p\n", This, msg, handled); + return E_NOTIMPL; +} + +static HRESULT WINAPI direct_manip_GetUpdateManager(IDirectManipulationManager2 *iface, REFIID riid, void **obj) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %s, %p\n", This, debugstr_guid(riid), obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI direct_manip_CreateViewport(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame, + HWND window, REFIID riid, void **obj) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %p, %p, %s, %p\n", This, frame, window, debugstr_guid(riid), obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI direct_manip_CreateContent(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame, + REFCLSID clsid, REFIID riid, void **obj) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %p, %s, %p\n", This, frame, debugstr_guid(riid), obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI direct_manip_CreateBehavior(IDirectManipulationManager2 *iface, REFCLSID clsid, REFIID riid, void **obj) +{ + struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); + FIXME("%p, %s, %s, %p\n", This, debugstr_guid(clsid), debugstr_guid(riid), obj); + return E_NOTIMPL; +} + +static const struct IDirectManipulationManager2Vtbl directmanipVtbl = +{ + direct_manip_QueryInterface, + direct_manip_AddRef, + direct_manip_Release, + direct_manip_Activate, + direct_manip_Deactivate, + direct_manip_RegisterHitTestTarget, + direct_manip_ProcessInput, + direct_manip_GetUpdateManager, + direct_manip_CreateViewport, + direct_manip_CreateContent, + direct_manip_CreateBehavior +}; + +static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + struct directmanipulation *object; + HRESULT ret; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + *ppv = NULL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IDirectManipulationManager2_iface.lpVtbl = &directmanipVtbl; + object->ref = 1; + + ret = direct_manip_QueryInterface(&object->IDirectManipulationManager2_iface, riid, ppv); + direct_manip_Release(&object->IDirectManipulationManager2_iface); + + return ret; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl DirectFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + DirectManipulation_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory direct_factory = { &DirectFactoryVtbl }; + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(IsEqualGUID(&CLSID_DirectManipulationManager, rclsid) || + IsEqualGUID(&CLSID_DirectManipulationSharedManager, rclsid) ) { + TRACE("(CLSID_DirectManipulationManager %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&direct_factory, riid, ppv); + } + + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationManager2::GetUpdateManager.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: e498528bf9dba5c74747e1ddea505389927f90ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=e498528bf9dba5c74747e1dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 22 10:36:34 2019 +1000 directmanipulation: Implement IDirectManipulationManager2::GetUpdateManager. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 131 ++++++++++++++++++++++++++- 1 file changed, 129 insertions(+), 2 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index a1e508bac8..9389302008 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -68,6 +68,13 @@ HRESULT WINAPI DllCanUnloadNow(void) struct directmanipulation { IDirectManipulationManager2 IDirectManipulationManager2_iface; + IDirectManipulationUpdateManager *updatemanager; + LONG ref; +}; + +struct directupdatemanager +{ + IDirectManipulationUpdateManager IDirectManipulationUpdateManager_iface; LONG ref; }; @@ -76,6 +83,100 @@ static inline struct directmanipulation *impl_from_IDirectManipulationManager2(I return CONTAINING_RECORD(iface, struct directmanipulation, IDirectManipulationManager2_iface); } +static inline struct directupdatemanager *impl_from_IDirectManipulationUpdateManager(IDirectManipulationUpdateManager *iface) +{ + return CONTAINING_RECORD(iface, struct directupdatemanager, IDirectManipulationUpdateManager_iface); +} + +static HRESULT WINAPI update_manager_QueryInterface(IDirectManipulationUpdateManager *iface, REFIID riid,void **ppv) +{ + struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectManipulationUpdateManager)) { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + FIXME("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +ULONG WINAPI update_manager_AddRef(IDirectManipulationUpdateManager *iface) +{ + struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface) +{ + struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI update_manager_RegisterWaitHandleCallback(IDirectManipulationUpdateManager *iface, HANDLE handle, + IDirectManipulationUpdateHandler *handler, DWORD *cookie) +{ + struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); + FIXME("%p, %p, %p, %p\n", This, handle, handler, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_manager_UnregisterWaitHandleCallback(IDirectManipulationUpdateManager *iface, DWORD cookie) +{ + struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); + FIXME("%p, %x\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_manager_Update(IDirectManipulationUpdateManager *iface, IDirectManipulationFrameInfoProvider *provider) +{ + struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); + FIXME("%p, %p\n", This, provider); + return E_NOTIMPL; +} + +struct IDirectManipulationUpdateManagerVtbl updatemanagerVtbl = +{ + update_manager_QueryInterface, + update_manager_AddRef, + update_manager_Release, + update_manager_RegisterWaitHandleCallback, + update_manager_UnregisterWaitHandleCallback, + update_manager_Update +}; + +static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj) +{ + struct directupdatemanager *object; + + object = heap_alloc(sizeof(*object)); + if(!object) + return E_OUTOFMEMORY; + + object->IDirectManipulationUpdateManager_iface.lpVtbl = &updatemanagerVtbl; + object->ref = 1; + + *obj = &object->IDirectManipulationUpdateManager_iface; + + return S_OK; +} + static HRESULT WINAPI direct_manip_QueryInterface(IDirectManipulationManager2 *iface, REFIID riid, void **ppv) { if (IsEqualGUID(riid, &IID_IUnknown) || @@ -109,6 +210,8 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface) if (!ref) { + if(This->updatemanager) + IDirectManipulationUpdateManager_Release(This->updatemanager); heap_free(This); } return ref; @@ -146,8 +249,32 @@ static HRESULT WINAPI direct_manip_ProcessInput(IDirectManipulationManager2 *ifa static HRESULT WINAPI direct_manip_GetUpdateManager(IDirectManipulationManager2 *iface, REFIID riid, void **obj) { struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(riid), obj); - return E_NOTIMPL; + HRESULT hr = E_FAIL; + + TRACE("%p, %s, %p\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + if(IsEqualGUID(riid, &IID_IDirectManipulationUpdateManager)) + { + if(!This->updatemanager) + { + hr = create_update_manager(&This->updatemanager); + } + else + { + hr = S_OK; + } + + if(hr == S_OK) + { + IDirectManipulationUpdateManager_AddRef(This->updatemanager); + *obj = This->updatemanager; + } + } + else + FIXME("Interface %s currently not supported.\n", debugstr_guid(riid)); + + return hr; } static HRESULT WINAPI direct_manip_CreateViewport(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame,

1 0

Alistair Leslie-Hughes : directmanipulation/tests: Initial tests.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: e80df2d2d54a3f16389bea77f6863cc1c05d6251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e80df2d2d54a3f16389bea77… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 09:09:41 2019 +1000 directmanipulation/tests: Initial tests. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/directmanipulation/tests/Makefile.in | 5 +++ dlls/directmanipulation/tests/manipulation.c | 60 ++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+) diff --git a/configure b/configure index 3e28ac28cb..314ddb5ed3 100755 --- a/configure +++ b/configure @@ -20625,6 +20625,7 @@ wine_fn_config_makefile dlls/dinput/tests enable_tests wine_fn_config_makefile dlls/dinput8 enable_dinput8 wine_fn_config_makefile dlls/dinput8/tests enable_tests wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation +wine_fn_config_makefile dlls/directmanipulation/tests enable_tests wine_fn_config_makefile dlls/dispdib.dll16 enable_win16 wine_fn_config_makefile dlls/dispex enable_dispex wine_fn_config_makefile dlls/dispex/tests enable_tests diff --git a/configure.ac b/configure.ac index 8a76b74e83..9c5f76669d 100644 --- a/configure.ac +++ b/configure.ac @@ -3211,6 +3211,7 @@ WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) WINE_CONFIG_MAKEFILE(dlls/directmanipulation) +WINE_CONFIG_MAKEFILE(dlls/directmanipulation/tests) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/dispex) WINE_CONFIG_MAKEFILE(dlls/dispex/tests) diff --git a/dlls/directmanipulation/tests/Makefile.in b/dlls/directmanipulation/tests/Makefile.in new file mode 100644 index 0000000000..29ec0db511 --- /dev/null +++ b/dlls/directmanipulation/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = directmanipulation.dll +IMPORTS = uuid ole32 + +C_SRCS = \ + manipulation.c diff --git a/dlls/directmanipulation/tests/manipulation.c b/dlls/directmanipulation/tests/manipulation.c new file mode 100644 index 0000000000..93b692729b --- /dev/null +++ b/dlls/directmanipulation/tests/manipulation.c @@ -0,0 +1,60 @@ +/* + * + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 <stdarg.h> + +#include "windows.h" +#include "directmanipulation.h" + +#include "wine/test.h" + +static void test_IDirectManipulationManager2(void) +{ + IDirectManipulationManager2 *manager2; + IDirectManipulationUpdateManager *update; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_DirectManipulationManager, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDirectManipulationManager2, (void**)&manager2); + if(FAILED(hres)) + { + win_skip("Failed to create XMLView instance\n"); + return; + } + ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres); + + hres = IDirectManipulationManager2_GetUpdateManager(manager2, &IID_IDirectManipulationUpdateManager, (void**)&update); + ok(hres == S_OK, "returned %x, expected S_OK\n", hres); + + if(update) + IDirectManipulationUpdateManager_Release(update); + + IDirectManipulationManager2_Release(manager2); +} + +START_TEST(manipulation) +{ + CoInitialize(NULL); + + test_IDirectManipulationManager2(); + + CoUninitialize(); +}

1 0

André Hentschel : comctl32: Clarify a comment.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 9c11c636b38143a95e5e82ebba69b439006b40d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c11c636b38143a95e5e82eb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 13:34:29 2020 +0200 comctl32: Clarify a comment. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comboex.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index c3c39be305..61b6383136 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1379,9 +1379,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di } else { /* drawing combo/edit entry */ if (IsWindowVisible(infoPtr->hwndEdit)) { - /* if we have an edit control, the slave the - * selection state to the Edit focus state - */ + /* if we have an edit control, set the selection state from the edit focus state */ if (infoPtr->flags & WCBE_EDITFOCUSED) drawstate = ILD_SELECTED; } else

1 0

André Hentschel : ntdll: Change master/slave to more neutral words.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 5f9f827fd4effe08d544964db349b56519952da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9f827fd4effe08d544964d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 13:34:28 2020 +0200 ntdll: Change master/slave to more neutral words. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a0e66a92a2..b60a01df8f 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2029,7 +2029,7 @@ static NTSTATUS CDROM_GetAddress(int fd, SCSI_ADDRESS* address) address->PortNumber = portnum; /* primary=0 secondary=1 for ide */ address->PathId = busid; /* always 0 for ide */ - address->TargetId = targetid; /* master=0 slave=1 for ide */ + address->TargetId = targetid; /* device id 0/1 for ide */ address->Lun = lun; return STATUS_SUCCESS; }

1 0

André Hentschel : winex11.drv: Change slave to a more neutral word.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 9f974579b6ecf8d6cc2d6ee0ace477a3d546f0df URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f974579b6ecf8d6cc2d6ee0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 13:34:27 2020 +0200 winex11.drv: Change slave to a more neutral word. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index b1a43e48ea..dce4e6739e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -948,7 +948,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!output_info->crtc || !crtc_info->mode) detached = TRUE; - /* Ignore mirroring output slaves because mirrored monitors are under the same adapter */ + /* Ignore mirroring output replicas because mirrored monitors are under the same adapter */ mirrored = FALSE; if (!detached) { @@ -970,7 +970,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new continue; /* Some outputs may have the same coordinates, aka mirrored. Choose the output with - * the lowest value as primary and the rest will then be slaves in a mirroring set */ + * the lowest value as primary and the rest will then be replicas in a mirroring set */ if (crtc_info->x == enum_crtc_info->x && crtc_info->y == enum_crtc_info->y && crtc_info->width == enum_crtc_info->width && @@ -1079,7 +1079,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * goto done; } - /* Inactive but attached monitor, no need to check for mirrored/slave monitors */ + /* Inactive but attached monitor, no need to check for mirrored/replica monitors */ if (!output_info->crtc || !crtc_info->mode) { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW );

1 0

André Hentschel : krnl386.exe16: Simply clean a comment from master/slave.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: d593be3b4c3b00064ea709ab50030ec9e938e154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d593be3b4c3b00064ea709ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 15:29:00 2020 +0200 krnl386.exe16: Simply clean a comment from master/slave. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/int31.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index d5cf02896a..01c3102d98 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -446,7 +446,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context ) SET_AX( context, 0x005a ); /* DPMI version 0.90 */ SET_BX( context, 0x0005 ); /* Flags: 32-bit, virtual memory */ SET_CL( context, si.wProcessorLevel ); - SET_DX( context, 0x0870 ); /* Master/slave interrupt controller base */ + SET_DX( context, 0x0870 ); /* Interrupt controller base */ } break;

1 0