July 2021 - Wine-Commits - list.winehq.org

Ziqing Hui : d2d1/tests: Add an effects test.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: f41d2d7b44c9d717fbe5a0bd19967b733f31f58c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41d2d7b44c9d717fbe5a0bd… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 20 16:16:07 2021 +0200 d2d1/tests: Add an effects test. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e60128b38f2..41203f85019 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9678,6 +9678,47 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } +static void test_effect(BOOL d3d11) +{ + ID2D1Image *image_a, *image_b = NULL; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + ID2D1Factory1 *factory; + ID2D1Effect *effect; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr != S_OK) + goto done; + ID2D1Effect_GetOutput(effect, &image_b); + todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + if (image_b) + ID2D1Image_Release(image_b); + ID2D1Image_Release(image_a); + +done: + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9739,6 +9780,7 @@ START_TEST(d2d1) queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); queue_test(test_mt_factory); + queue_test(test_effect); run_queued_tests(); }

1 0

Tag wine-6.13 : Alexandre Julliard : Release 6.13
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: refs/tags/wine-6.13 Tag: 30a7fbc6bfddba3fab2f494855d2a13661e3b6bb URL: https://source.winehq.org/git/wine.git/?a=tag;h=30a7fbc6bfddba3fab2f494855d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 22:09:28 2021 +0200 Release 6.13

1 0

Alexandre Julliard : Release 6.13.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: feb088b2247e1722b848ac0d67483596d33758ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb088b2247e1722b848ac0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 22:09:28 2021 +0200 Release 6.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 847 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 394 insertions(+), 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=feb088b2247e1722b848…

1 0

Nikolay Sivov : mfmediaengine: Update network state when loading the media source.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: f56c12c8477c0deec92440ab809259602d84c2fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f56c12c8477c0deec92440ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 20 21:11:56 2021 +0300 mfmediaengine: Update network state when loading the media source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 17 ++++++++++++++--- include/mfmediaengine.idl | 8 ++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 36365f2a3cc..bd3fd04aabd 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -126,6 +126,7 @@ struct media_engine double default_playback_rate; double volume; double duration; + MF_MEDIA_ENGINE_NETWORK network_state; MF_MEDIA_ENGINE_ERR error_code; HRESULT extended_code; MF_MEDIA_ENGINE_READY ready_state; @@ -1190,6 +1191,7 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, EnterCriticalSection(&engine->cs); + engine->network_state = MF_MEDIA_ENGINE_NETWORK_LOADING; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADSTART, 0, 0); if (FAILED(hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object))) @@ -1205,8 +1207,13 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IUnknown_Release(object); } - if (FAILED(hr)) + if (SUCCEEDED(hr)) { + engine->network_state = MF_MEDIA_ENGINE_NETWORK_IDLE; + } + else + { + engine->network_state = MF_MEDIA_ENGINE_NETWORK_NO_SOURCE; engine->error_code = MF_MEDIA_ENGINE_ERR_SRC_NOT_SUPPORTED; engine->extended_code = hr; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_ERROR, engine->error_code, @@ -1365,6 +1372,8 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + engine->network_state = MF_MEDIA_ENGINE_NETWORK_NO_SOURCE; + if (url) { IPropertyStore *props = NULL; @@ -1410,9 +1419,11 @@ static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + + TRACE("%p.\n", iface); - return 0; + return engine->network_state; } static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index c00e364116e..aaf3bb55e4d 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -50,6 +50,14 @@ cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID, 0x1e7 cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TRACK_ID, 0x65bea312, 0x4043, 0x4815, 0x8e, 0xab, 0x44, 0xdc, 0xe2, 0xef, 0x8f, 0x2a);") cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, 0x5066893c, 0x8cf9, 0x42bc, 0x8b, 0x8a, 0x47, 0x22, 0x12, 0xe5, 0x27, 0x26);") +typedef enum MF_MEDIA_ENGINE_NETWORK +{ + MF_MEDIA_ENGINE_NETWORK_EMPTY, + MF_MEDIA_ENGINE_NETWORK_IDLE, + MF_MEDIA_ENGINE_NETWORK_LOADING, + MF_MEDIA_ENGINE_NETWORK_NO_SOURCE +} MF_MEDIA_ENGINE_NETWORK; + typedef enum MF_MEDIA_ENGINE_ERR { MF_MEDIA_ENGINE_ERR_NOERROR,

1 0

Georg Lehmann : winevulkan: Enable VK_HUAWEI_subpass_shading.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 176da9a5b63821c83028c4e042f77b2b24380a02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=176da9a5b63821c83028c4e0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jul 20 15:04:49 2021 +0200 winevulkan: Enable VK_HUAWEI_subpass_shading. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 12 ++++++++++++ dlls/winevulkan/loader_thunks.h | 2 ++ dlls/winevulkan/make_vulkan | 3 --- dlls/winevulkan/vulkan_thunks.c | 31 +++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 4 ++++ include/wine/vulkan.h | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=176da9a5b63821c83028…

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in SetSource().
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 04547b424d4002e1312d36a5099204f7eb4cf1a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04547b424d4002e1312d36a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 20 21:11:55 2021 +0300 mfmediaengine: Handle shutdown state in SetSource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 46 ++++++++++++++++++-------------- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index e4263febe5e..36365f2a3cc 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1352,29 +1352,35 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) EnterCriticalSection(&engine->cs); - SysFreeString(engine->current_source); - engine->current_source = NULL; - if (url) - engine->current_source = SysAllocString(url); - - engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; - - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - - if (url) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - IPropertyStore *props = NULL; - unsigned int flags; + SysFreeString(engine->current_source); + engine->current_source = NULL; + if (url) + engine->current_source = SysAllocString(url); + + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; - flags = MF_RESOLUTION_MEDIASOURCE; - if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) - flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, - &IID_IPropertyStore, (void **)&props); - hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, &engine->load_handler, NULL); - if (props) - IPropertyStore_Release(props); + if (url) + { + IPropertyStore *props = NULL; + unsigned int flags; + + flags = MF_RESOLUTION_MEDIASOURCE; + if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) + flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; + + IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, + &IID_IPropertyStore, (void **)&props); + hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, + &engine->load_handler, NULL); + if (props) + IPropertyStore_Release(props); + } } LeaveCriticalSection(&engine->cs); diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 66984595d3b..096f6e3f2a5 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -253,7 +253,6 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_SetSource(media_engine, NULL); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str);

1 0

Ziqing Hui : d2d1: Add a ID2D1Image interface for effects.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 0408225fd6377bc4458238512f5059c09cf9b6cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0408225fd6377bc445823851… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 20 16:16:08 2021 +0200 d2d1: Add a ID2D1Image interface for effects. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 5 +++- dlls/d2d1/device.c | 3 ++- dlls/d2d1/effect.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 5 +--- 4 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f25a7809b17..ce99e7c3432 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -568,10 +568,13 @@ void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDev struct d2d_effect { ID2D1Effect ID2D1Effect_iface; + ID2D1Image ID2D1Image_iface; LONG refcount; + + ID2D1Factory *factory; }; -void d2d_effect_init(struct d2d_effect *effect) DECLSPEC_HIDDEN; +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 44840f0010f..0647bc57fc3 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1885,6 +1885,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, REFCLSID effect_id, ID2D1Effect **effect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); @@ -1892,7 +1893,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object); + d2d_effect_init(object, context->factory); TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index fb1e66a3d9b..7487c4c4539 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -27,6 +27,7 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_ID2D1Effect) @@ -38,6 +39,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, R return S_OK; } + if (IsEqualGUID(iid, &IID_ID2D1Image) + || IsEqualGUID(iid, &IID_ID2D1Resource)) + { + ID2D1Image_AddRef(&effect->ID2D1Image_iface); + *out = &effect->ID2D1Image_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; @@ -62,7 +71,10 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(effect->factory); heap_free(effect); + } return refcount; } @@ -204,8 +216,59 @@ static const ID2D1EffectVtbl d2d_effect_vtbl = d2d_effect_GetOutput, }; -void d2d_effect_init(struct d2d_effect *effect) +static inline struct d2d_effect *impl_from_ID2D1Image(ID2D1Image *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Image_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_image_QueryInterface(ID2D1Image *iface, REFIID iid, void **out) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d2d_effect_QueryInterface(&effect->ID2D1Effect_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_AddRef(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_AddRef(&effect->ID2D1Effect_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_Release(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_Release(&effect->ID2D1Effect_iface); +} + +static void STDMETHODCALLTYPE d2d_effect_image_GetFactory(ID2D1Image *iface, ID2D1Factory **factory) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = effect->factory); +} + +static const ID2D1ImageVtbl d2d_effect_image_vtbl = +{ + d2d_effect_image_QueryInterface, + d2d_effect_image_AddRef, + d2d_effect_image_Release, + d2d_effect_image_GetFactory, +}; + +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; + effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + ID2D1Factory_AddRef(effect->factory = factory); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 41203f85019..5ac4aed7c4c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9703,16 +9703,13 @@ static void test_effect(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr != S_OK) - goto done; + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); if (image_b) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); -done: ID2D1Effect_Release(effect); ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory);

1 0

Ziqing Hui : include: Add the D2D12DAffineTransform definitions.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 1a731229437c0d27d1e0aaf6a8fd47b3c868e2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a731229437c0d27d1e0aaf6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 20 16:16:06 2021 +0200 include: Add the D2D12DAffineTransform definitions. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d2d1_1.idl | 1 + include/d2d1effects.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 61a74a210c9..46cb0f53a5e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ SOURCES = \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ + d2d1effects.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 257a970968f..fdec8ae5f9c 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -17,6 +17,7 @@ */ import "d2d1.idl"; +import "d2d1effects.idl"; interface ID2D1DeviceContext; interface ID2D1PathGeometry1; diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl new file mode 100644 index 00000000000..ee1dbe94728 --- /dev/null +++ b/include/d2d1effects.idl @@ -0,0 +1,46 @@ +/* + * Copyright 2021 Ziqing Hui for CodeWeavers + * + * 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 + */ + +cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") + +typedef enum D2D1_BORDER_MODE +{ + D2D1_BORDER_MODE_SOFT = 0x0, + D2D1_BORDER_MODE_HARD = 0x1, + D2D1_BORDER_MODE_FORCE_DWORD = 0xffffffff +} D2D1_BORDER_MODE; + +typedef enum D2D1_2DAFFINETRANSFORM_PROP +{ + D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE = 0x0, + D2D1_2DAFFINETRANSFORM_PROP_BORDER_MODE = 0x1, + D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX = 0x2, + D2D1_2DAFFINETRANSFORM_PROP_SHARPNESS = 0x3, + D2D1_2DAFFINETRANSFORM_PROP_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_PROP; + +typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE +{ + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE;

1 0

Huw Davies : nsiproxy: Implement IP unicast get_all_parameters.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 4c7c7d07d4dd30b0751c7ad0bbc1db5577807b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c7c7d07d4dd30b0751c7ad0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 20 08:43:25 2021 +0100 nsiproxy: Implement IP unicast get_all_parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 14 +++++++++---- dlls/nsiproxy.sys/ip.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/ndis.c | 21 +++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 1 + 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 3408dfae58f..c07653c2ede 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -415,11 +415,11 @@ static void test_ip_unicast( int family ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[0]), FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[1]), sizeof(struct nsi_ip_unicast_rw) }; - struct nsi_ipv4_unicast_key *key_tbl, *key4; + struct nsi_ipv4_unicast_key *key_tbl, *key4, get_key; struct nsi_ipv6_unicast_key *key6; - struct nsi_ip_unicast_rw *rw_tbl, *rw; - struct nsi_ip_unicast_dynamic *dyn_tbl, *dyn; - struct nsi_ip_unicast_static *stat_tbl, *stat; + struct nsi_ip_unicast_rw *rw_tbl, *rw, get_rw; + struct nsi_ip_unicast_dynamic *dyn_tbl, *dyn, get_dyn; + struct nsi_ip_unicast_static *stat_tbl, *stat, get_stat; MIB_UNICASTIPADDRESS_TABLE *table; const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; DWORD err, count, i, rw_size, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); @@ -475,6 +475,12 @@ todo_wine winetest_pop_context(); } + get_key.luid.Value = ~0u; + get_key.addr.s_addr = 0; + err = NsiGetAllParameters( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, &get_key, sizeof(get_key), + &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); + ok( err == ERROR_NOT_FOUND, "got %d\n", err ); + FreeMibTable( table ); NsiFreeTable( key_tbl, rw_tbl, dyn_tbl, stat_tbl ); winetest_pop_context(); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index d5fcc689fc4..ab1b6294bea 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -180,6 +180,43 @@ static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void * return status; } +static NTSTATUS ip_unicast_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + int family = (key_size == sizeof(struct nsi_ipv4_unicast_key)) ? AF_INET : AF_INET6; + NTSTATUS status = STATUS_NOT_FOUND; + const struct nsi_ipv6_unicast_key *key6 = key; + const struct nsi_ipv4_unicast_key *key4 = key; + struct ifaddrs *addrs, *entry; + const char *unix_name; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + if (!convert_luid_to_unix_name( &key6->luid, &unix_name )) return STATUS_NOT_FOUND; + + if (getifaddrs( &addrs )) return STATUS_NO_MORE_ENTRIES; + + for (entry = addrs; entry; entry = entry->ifa_next) + { + if (!entry->ifa_addr || entry->ifa_addr->sa_family != family) continue; + if (strcmp( entry->ifa_name, unix_name )) continue; + + if (family == AF_INET && + memcmp( &key4->addr, &((struct sockaddr_in *)entry->ifa_addr)->sin_addr, sizeof(key4->addr) )) continue; + if (family == AF_INET6 && + memcmp( &key6->addr, &((struct sockaddr_in6 *)entry->ifa_addr)->sin6_addr, sizeof(key6->addr) )) continue; + + unicast_fill_entry( entry, NULL, rw_data, dynamic_data, static_data ); + status = STATUS_SUCCESS; + break; + } + + freeifaddrs( addrs ); + return status; +} + static struct module_table ipv4_tables[] = { { @@ -189,6 +226,7 @@ static struct module_table ipv4_tables[] = sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, ip_unicast_enumerate_all, + ip_unicast_get_all_parameters, }, { ~0u @@ -210,6 +248,7 @@ static struct module_table ipv6_tables[] = sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, ip_unicast_enumerate_all, + ip_unicast_get_all_parameters, }, { ~0u diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index b08d5bbcc79..40a60e45c46 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -634,6 +634,27 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) return ret; } +BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) +{ + struct if_entry *entry; + BOOL ret = FALSE; + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) + if (entry->if_luid.Value == luid->Value) + { + *unix_name = entry->if_unix_name; + ret = TRUE; + + } + LeaveCriticalSection( &if_list_cs ); + + return ret; +} + static const struct module_table tables[] = { { diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 1c62a3df038..0f6e7b05c59 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -22,6 +22,7 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HI NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; +BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) DECLSPEC_HIDDEN; BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; struct module_table

1 0

Huw Davies : iphlpapi: Implement GetUnicastIpAddressTable() on top of nsi.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 2f3ab0b242321a044ca68794f811165a8f748a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f3ab0b242321a044ca68794… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 20 08:43:26 2021 +0100 iphlpapi: Implement GetUnicastIpAddressTable() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 132 ++++++++++++++++++++++++------------------ dlls/nsi/tests/nsi.c | 1 - 2 files changed, 76 insertions(+), 57 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4ff9feb57f2..f4e6ea1a504 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -77,6 +77,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); +static const NPI_MODULEID *ip_module_id( USHORT family ) +{ + if (family == WS_AF_INET) return &NPI_MS_IPV4_MODULEID; + if (family == WS_AF_INET6) return &NPI_MS_IPV6_MODULEID; + return NULL; +} + DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len ) { if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; @@ -2651,6 +2658,42 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, return ret; } +static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *key, struct nsi_ip_unicast_rw *rw, + struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) +{ + struct nsi_ipv4_unicast_key *key4 = (struct nsi_ipv4_unicast_key *)key; + struct nsi_ipv6_unicast_key *key6 = (struct nsi_ipv6_unicast_key *)key; + + if (fam == WS_AF_INET) + { + row->Address.Ipv4.sin_family = fam; + row->Address.Ipv4.sin_port = 0; + row->Address.Ipv4.sin_addr = key4->addr; + memset( row->Address.Ipv4.sin_zero, 0, sizeof(row->Address.Ipv4.sin_zero) ); + row->InterfaceLuid.Value = key4->luid.Value; + } + else + { + row->Address.Ipv6.sin6_family = fam; + row->Address.Ipv6.sin6_port = 0; + row->Address.Ipv6.sin6_flowinfo = 0; + row->Address.Ipv6.sin6_addr = key6->addr; + row->Address.Ipv6.sin6_scope_id = dyn->scope_id; + row->InterfaceLuid.Value = key6->luid.Value; + } + + ConvertInterfaceLuidToIndex( &row->InterfaceLuid, &row->InterfaceIndex ); + row->PrefixOrigin = rw->prefix_origin; + row->SuffixOrigin = rw->suffix_origin; + row->ValidLifetime = rw->valid_lifetime; + row->PreferredLifetime = rw->preferred_lifetime; + row->OnLinkPrefixLength = rw->on_link_prefix; + row->SkipAsSource = 0; + row->DadState = dyn->dad_state; + row->ScopeId.u.Value = dyn->scope_id; + row->CreationTimeStamp.QuadPart = stat->creation_time; +} + DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) { IP_ADAPTER_ADDRESSES *aa, *ptr; @@ -2720,80 +2763,57 @@ DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY family, MIB_UNICASTIPADDRESS_TABLE **table) { - IP_ADAPTER_ADDRESSES *aa, *ptr; - MIB_UNICASTIPADDRESS_TABLE *data; - DWORD ret, count = 0; - ULONG size, flags; + void *key[2] = { NULL, NULL }; + struct nsi_ip_unicast_rw *rw[2] = { NULL, NULL }; + struct nsi_ip_unicast_dynamic *dyn[2] = { NULL, NULL }; + struct nsi_ip_unicast_static *stat[2] = { NULL, NULL }; + static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_unicast_key), sizeof(struct nsi_ipv6_unicast_key) }; + DWORD err, i, size, count[2] = { 0, 0 }; - TRACE("%u, %p\n", family, table); + TRACE( "%u, %p\n", family, table ); if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) return ERROR_INVALID_PARAMETER; - flags = GAA_FLAG_SKIP_ANYCAST | - GAA_FLAG_SKIP_MULTICAST | - GAA_FLAG_SKIP_DNS_SERVER | - GAA_FLAG_SKIP_FRIENDLY_NAME; - - ret = GetAdaptersAddresses(family, flags, NULL, NULL, &size); - if (ret != ERROR_BUFFER_OVERFLOW) - return ret; - if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) - return ERROR_OUTOFMEMORY; - if ((ret = GetAdaptersAddresses(family, flags, NULL, ptr, &size))) + for (i = 0; i < 2; i++) { - HeapFree(GetProcessHeap(), 0, ptr); - return ret; + if (family != WS_AF_UNSPEC && family != fam[i]) continue; + + err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_UNICAST_TABLE, key + i, key_size[i], + (void **)rw + i, sizeof(**rw), (void **)dyn + i, sizeof(**dyn), + (void **)stat + i, sizeof(**stat), count + i, 0 ); + if (err) goto err; } - for (aa = ptr; aa; aa = aa->Next) + size = FIELD_OFFSET(MIB_UNICASTIPADDRESS_TABLE, Table[ count[0] + count[1] ]); + *table = heap_alloc( size ); + if (!*table) { - IP_ADAPTER_UNICAST_ADDRESS *ua = aa->FirstUnicastAddress; - while (ua) - { - count++; - ua = ua->Next; - } + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } - if (!(data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + (count - 1) * sizeof(data->Table[0])))) + (*table)->NumEntries = count[0] + count[1]; + for (i = 0; i < count[0]; i++) { - HeapFree(GetProcessHeap(), 0, ptr); - return ERROR_OUTOFMEMORY; + MIB_UNICASTIPADDRESS_ROW *row = (*table)->Table + i; + struct nsi_ipv4_unicast_key *key4 = (struct nsi_ipv4_unicast_key *)key[0]; + + unicast_row_fill( row, fam[0], (void *)(key4 + i), rw[0] + i, dyn[0] + i, stat[0] + i ); } - data->NumEntries = 0; - for (aa = ptr; aa; aa = aa->Next) + for (i = 0; i < count[1]; i++) { - IP_ADAPTER_UNICAST_ADDRESS *ua = aa->FirstUnicastAddress; - while (ua) - { - MIB_UNICASTIPADDRESS_ROW *row = &data->Table[data->NumEntries]; - memcpy(&row->Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); - memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); - row->InterfaceIndex = aa->u.s.IfIndex; - row->PrefixOrigin = ua->PrefixOrigin; - row->SuffixOrigin = ua->SuffixOrigin; - row->ValidLifetime = ua->ValidLifetime; - row->PreferredLifetime = ua->PreferredLifetime; - row->OnLinkPrefixLength = ua->OnLinkPrefixLength; - row->SkipAsSource = 0; - row->DadState = ua->DadState; - if (row->Address.si_family == WS_AF_INET6) - row->ScopeId.u.Value = row->Address.Ipv6.sin6_scope_id; - else - row->ScopeId.u.Value = 0; - NtQuerySystemTime(&row->CreationTimeStamp); + MIB_UNICASTIPADDRESS_ROW *row = (*table)->Table + count[0] + i; + struct nsi_ipv6_unicast_key *key6 = (struct nsi_ipv6_unicast_key *)key[1]; - data->NumEntries++; - ua = ua->Next; - } + unicast_row_fill( row, fam[1], (void *)(key6 + i), rw[1] + i, dyn[1] + i, stat[1] + i ); } - HeapFree(GetProcessHeap(), 0, ptr); - - *table = data; - return ret; +err: + for (i = 0; i < 2; i++) NsiFreeTable( key[i], rw[i], dyn[i], stat[i] ); + return err; } /****************************************************************** diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index c07653c2ede..869fa255bb2 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -470,7 +470,6 @@ static void test_ip_unicast( int family ) /* SkipAsSource */ ok( row->DadState == dyn->dad_state, "mismatch\n" ); ok( row->ScopeId.Value == dyn->scope_id, "mismatch\n" ); -todo_wine ok( row->CreationTimeStamp.QuadPart == stat->creation_time, "mismatch\n" ); winetest_pop_context(); }

1 0