October 2020 - Wine-Commits

Paul Gofman : ntdll: Reimplement FLS data management on top of up to date structures.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 905deff5da48c085bb4213d3c67ecf1cfae45564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905deff5da48c085bb4213d3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 13:04:47 2020 +0300 ntdll: Reimplement FLS data management on top of up to date structures. Win10 18132 introduced increased FLS data limit and entirely changed underlying structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 6 +- dlls/ntdll/ntdll_misc.h | 3 + dlls/ntdll/thread.c | 227 ++++++++++++++++++++++++++++++++++++++--------- include/winternl.h | 28 +++++- 5 files changed, 216 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=905deff5da48c085bb42…

1 0

Huw Davies : riched20: Store a ME_Paragraph ptr in the wrap context.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 94e34fa8ee3779c0b62b2f0669d6b2c99224426b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e34fa8ee3779c0b62b2f06… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 8 11:10:46 2020 +0100 riched20: Store a ME_Paragraph ptr in the wrap context. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 5 +++- dlls/riched20/para.c | 9 ++----- dlls/riched20/run.c | 4 +-- dlls/riched20/wrap.c | 68 +++++++++++++++++++++++--------------------------- 4 files changed, 39 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94e34fa8ee3779c0b62b…

1 0

Huw Davies : riched20: Pass a ME_Paragraph ptr to shape_para().
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 749c80bdafa9890b9fbe8f1964e2f198d671e3bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=749c80bdafa9890b9fbe8f19… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 8 11:10:49 2020 +0100 riched20: Pass a ME_Paragraph ptr to shape_para(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 48db31f4ff..4853eefcab 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -795,21 +795,17 @@ end: } -static HRESULT shape_para( ME_Context *c, ME_DisplayItem *p ) +static HRESULT shape_para( ME_Context *c, ME_Paragraph *para ) { - ME_DisplayItem *di; ME_Run *run; HRESULT hr; - for (di = p->next; di != p->member.para.next_para; di = di->next) + for (run = para_first_run( para ); run; run = run_next( run )) { - if (di->type != diRun) continue; - run = &di->member.run; - hr = shape_run( c, run ); if (FAILED( hr )) { - run->para->nFlags &= ~MEPF_COMPLEX; + para->nFlags &= ~MEPF_COMPLEX; return hr; } } @@ -835,7 +831,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */) { if (SUCCEEDED( itemize_para( c, para ) )) - shape_para( c, para_get_di( para ) ); + shape_para( c, para ); } wc.context = c;

1 0

Nikolay Sivov : mf/evr: Partially implement InitializeRenderer().
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: bdbae2ff5a9db01fc109fa0a8ad5500124bf6242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdbae2ff5a9db01fc109fa0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 14:44:13 2020 +0300 mf/evr: Partially implement InitializeRenderer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 333 ++++++++++++++++++++++++++++++++--------------------- dlls/mf/tests/mf.c | 8 +- 2 files changed, 208 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdbae2ff5a9db01fc109…

1 0

Nikolay Sivov : mf/evr: Add IMFGetService stub for the streams.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: bcee4fbb9486dbc511e458f262f87cfdbfa0234e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcee4fbb9486dbc511e458f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 14:44:15 2020 +0300 mf/evr: Add IMFGetService stub for the streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index dc2b20ddf7..af5c5d3103 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -41,6 +41,7 @@ struct video_stream { IMFStreamSink IMFStreamSink_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; + IMFGetService IMFGetService_iface; LONG refcount; unsigned int id; struct video_renderer *parent; @@ -123,6 +124,11 @@ static struct video_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *i return CONTAINING_RECORD(iface, struct video_stream, IMFMediaTypeHandler_iface); } +static struct video_stream *impl_from_stream_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_stream, IMFGetService_iface); +} + static void video_renderer_release_services(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; @@ -162,6 +168,10 @@ static HRESULT WINAPI video_stream_sink_QueryInterface(IMFStreamSink *iface, REF { *obj = &stream->IMFMediaTypeHandler_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &stream->IMFGetService_iface; + } if (*obj) { @@ -415,6 +425,39 @@ static const IMFMediaTypeHandlerVtbl video_stream_type_handler_vtbl = video_stream_typehandler_GetMajorType, }; +static HRESULT WINAPI video_stream_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_stream *stream = impl_from_stream_IMFGetService(iface); + return IMFStreamSink_QueryInterface(&stream->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI video_stream_get_service_AddRef(IMFGetService *iface) +{ + struct video_stream *stream = impl_from_stream_IMFGetService(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) +{ + struct video_stream *stream = impl_from_stream_IMFGetService(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_stream_get_service_vtbl = +{ + video_stream_get_service_QueryInterface, + video_stream_get_service_AddRef, + video_stream_get_service_Release, + video_stream_get_service_GetService, +}; + static HRESULT video_renderer_stream_create(struct video_renderer *renderer, unsigned int id, struct video_stream **ret) { @@ -426,6 +469,7 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; stream->IMFMediaTypeHandler_iface.lpVtbl = &video_stream_type_handler_vtbl; + stream->IMFGetService_iface.lpVtbl = &video_stream_get_service_vtbl; stream->refcount = 1; if (FAILED(hr = MFCreateEventQueue(&stream->event_queue)))

1 0

Nikolay Sivov : evr/allocator: Implement SetCallback().
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 4fa62d40dcde49557b306c731fb534673ec1036f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fa62d40dcde49557b306c73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 14:44:17 2020 +0300 evr/allocator: Implement SetCallback(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 21 +++++++++++++++++++-- dlls/evr/tests/evr.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index f371d92076..31e3ff4333 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -30,6 +30,9 @@ struct sample_allocator IMFVideoSampleAllocator IMFVideoSampleAllocator_iface; IMFVideoSampleAllocatorCallback IMFVideoSampleAllocatorCallback_iface; LONG refcount; + + IMFVideoSampleAllocatorNotify *callback; + CRITICAL_SECTION cs; }; static struct sample_allocator *impl_from_IMFVideoSampleAllocator(IMFVideoSampleAllocator *iface) @@ -87,6 +90,9 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) if (!refcount) { + if (allocator->callback) + IMFVideoSampleAllocatorNotify_Release(allocator->callback); + DeleteCriticalSection(&allocator->cs); heap_free(allocator); } @@ -156,9 +162,19 @@ static ULONG WINAPI sample_allocator_callback_Release(IMFVideoSampleAllocatorCal static HRESULT WINAPI sample_allocator_callback_SetCallback(IMFVideoSampleAllocatorCallback *iface, IMFVideoSampleAllocatorNotify *callback) { - FIXME("%p, %p.\n", iface, callback); + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorCallback(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, callback); + + EnterCriticalSection(&allocator->cs); + if (allocator->callback) + IMFVideoSampleAllocatorNotify_Release(allocator->callback); + allocator->callback = callback; + if (allocator->callback) + IMFVideoSampleAllocatorNotify_AddRef(allocator->callback); + LeaveCriticalSection(&allocator->cs); + + return S_OK; } static HRESULT WINAPI sample_allocator_callback_GetFreeSampleCount(IMFVideoSampleAllocatorCallback *iface, @@ -191,6 +207,7 @@ HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) object->IMFVideoSampleAllocator_iface.lpVtbl = &sample_allocator_vtbl; object->IMFVideoSampleAllocatorCallback_iface.lpVtbl = &sample_allocator_callback_vtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); hr = IMFVideoSampleAllocator_QueryInterface(&object->IMFVideoSampleAllocator_iface, riid, obj); IMFVideoSampleAllocator_Release(&object->IMFVideoSampleAllocator_iface); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 3ae36d9b5d..3951b813a0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1147,8 +1147,47 @@ static void test_MFCreateVideoMixerAndPresenter(void) IUnknown_Release(presenter); } +static HRESULT WINAPI test_notify_callback_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_notify_callback_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + return 2; +} + +static ULONG WINAPI test_notify_callback_Release(IMFVideoSampleAllocatorNotify *iface) +{ + return 1; +} + +static HRESULT WINAPI test_notify_callback_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorNotifyVtbl test_notify_callback_vtbl = +{ + test_notify_callback_QueryInterface, + test_notify_callback_AddRef, + test_notify_callback_Release, + test_notify_callback_NotifyRelease, +}; + static void test_MFCreateVideoSampleAllocator(void) { + IMFVideoSampleAllocatorNotify test_notify = { &test_notify_callback_vtbl }; IMFVideoSampleAllocatorCallback *allocator_cb; IMFVideoSampleAllocator *allocator; IMFVideoMediaType *video_type; @@ -1171,6 +1210,15 @@ static void test_MFCreateVideoSampleAllocator(void) hr = IMFVideoSampleAllocator_QueryInterface(allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, &test_notify); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + count = 10; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); todo_wine {

1 0

Nikolay Sivov : evr/allocator: Implement GetFreeSampleCount().
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: d136c7554cc5f78bfefb5da9559bcec78030247d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d136c7554cc5f78bfefb5da9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 14:44:18 2020 +0300 evr/allocator: Implement GetFreeSampleCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 12 ++++++++++-- dlls/evr/tests/evr.c | 14 ++++++++------ dlls/mf/tests/mf.c | 1 - 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 31e3ff4333..2887a37e8d 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -32,6 +32,7 @@ struct sample_allocator LONG refcount; IMFVideoSampleAllocatorNotify *callback; + unsigned int free_samples; CRITICAL_SECTION cs; }; @@ -180,9 +181,16 @@ static HRESULT WINAPI sample_allocator_callback_SetCallback(IMFVideoSampleAlloca static HRESULT WINAPI sample_allocator_callback_GetFreeSampleCount(IMFVideoSampleAllocatorCallback *iface, LONG *count) { - FIXME("%p, %p.\n", iface, count); + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorCallback(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, count); + + EnterCriticalSection(&allocator->cs); + if (count) + *count = allocator->free_samples; + LeaveCriticalSection(&allocator->cs); + + return S_OK; } static const IMFVideoSampleAllocatorCallbackVtbl sample_allocator_callback_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 3951b813a0..7ad011d2a0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1219,12 +1219,14 @@ static void test_MFCreateVideoSampleAllocator(void) hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + count = 10; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!count, "Unexpected count %d.\n", count); -} + hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1256,10 +1258,10 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine ok(count == 1, "Unexpected count %d.\n", count); -} + sample = NULL; hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); todo_wine @@ -1279,10 +1281,10 @@ todo_wine ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine ok(count == 4, "Unexpected count %d.\n", count); -} + if (sample) { hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bd6e66a513..a63c353a4b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3308,7 +3308,6 @@ static void test_evr(void) sample_count = 0; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_callback, &sample_count); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!sample_count, "Unexpected sample count %d.\n", sample_count);

1 0

Michael Stefaniuc : progman: Use wide-char string literals.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: e5b3b4aa517e6324e44e873eae40485086358a04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b3b4aa517e6324e44e873e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 23:34:32 2020 +0200 progman: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/progman.h | 8 ++++---- programs/progman/string.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 8fd823ac7d..cc9b301354 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -190,10 +190,10 @@ VOID DIALOG_Execute(void); VOID STRING_LoadMenus(VOID); /* Class names */ -extern WCHAR STRING_MAIN_WIN_CLASS_NAME[]; -extern WCHAR STRING_MDI_WIN_CLASS_NAME[]; -extern WCHAR STRING_GROUP_WIN_CLASS_NAME[]; -extern WCHAR STRING_PROGRAM_WIN_CLASS_NAME[]; +extern const WCHAR STRING_MAIN_WIN_CLASS_NAME[]; +extern const WCHAR STRING_MDI_WIN_CLASS_NAME[]; +extern const WCHAR STRING_GROUP_WIN_CLASS_NAME[]; +extern const WCHAR STRING_PROGRAM_WIN_CLASS_NAME[]; /* Resource names */ #define IDD_MAIN 1 diff --git a/programs/progman/string.c b/programs/progman/string.c index fb27b54a55..6a78bf3a98 100644 --- a/programs/progman/string.c +++ b/programs/progman/string.c @@ -26,10 +26,10 @@ /* Class names */ -WCHAR STRING_MAIN_WIN_CLASS_NAME[] = {'P','M','M','a','i','n',0}; -WCHAR STRING_MDI_WIN_CLASS_NAME[] = {'M','D','I','C','L','I','E','N','T',0}; -WCHAR STRING_GROUP_WIN_CLASS_NAME[] = {'P','M','G','r','o','u','p',0}; -WCHAR STRING_PROGRAM_WIN_CLASS_NAME[] = {'P','M','P','r','o','g','r','a','m',0}; +const WCHAR STRING_MAIN_WIN_CLASS_NAME[] = L"PMMain"; +const WCHAR STRING_MDI_WIN_CLASS_NAME[] = L"MDICLIENT"; +const WCHAR STRING_GROUP_WIN_CLASS_NAME[] = L"PMGroup"; +const WCHAR STRING_PROGRAM_WIN_CLASS_NAME[] = L"PMProgram"; VOID STRING_LoadMenus(VOID) {

1 0

Nikolay Sivov : mf/evr: Provide device manager to the mixer.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 29aecbef64b19bf8faee163d7a30fb414a730874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29aecbef64b19bf8faee163d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 14:44:14 2020 +0300 mf/evr: Provide device manager to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index e90cf686f2..dc2b20ddf7 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -21,6 +21,9 @@ #include "mf_private.h" #include "uuids.h" #include "evr.h" +#include "d3d9.h" +#include "initguid.h" +#include "dxva2api.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -903,6 +906,7 @@ static HRESULT video_renderer_create_presenter(IMFAttributes *attributes, IMFVid static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; + IMFAttributes *attributes; HRESULT hr; if (SUCCEEDED(hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFTopologyServiceLookupClient, @@ -947,6 +951,24 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) } } + /* Set device manager that presenter should have created. */ + if (SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, &IID_IMFAttributes, (void **)&attributes))) + { + IDirect3DDeviceManager9 *device_manager; + unsigned int value; + + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value)) && value) + { + if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, + &IID_IDirect3DDeviceManager9, (void **)&device_manager))) + { + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); + IDirect3DDeviceManager9_Release(device_manager); + } + } + IMFAttributes_Release(attributes); + } + return hr; }

1 0

Michael Stefaniuc : bcrypt/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: d541f5cffead2adc08f8b2200d6465dd1a8a35ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d541f5cffead2adc08f8b220… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 23:34:28 2020 +0200 bcrypt/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7fdc0ac7fb..d499ce65a6 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -99,33 +99,20 @@ static void test_BCryptGenRandom(void) static void test_BCryptGetFipsAlgorithmMode(void) { - static const WCHAR policyKeyVistaW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'L','s','a','\\', - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; - static const WCHAR policyValueVistaW[] = {'E','n','a','b','l','e','d',0}; - static const WCHAR policyKeyXPW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'L','s','a',0}; - static const WCHAR policyValueXPW[] = { - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; HKEY hkey = NULL; BOOLEAN expected; BOOLEAN enabled; DWORD value, count[2] = {sizeof(value), sizeof(value)}; NTSTATUS ret; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueVistaW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"Enabled", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } - else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueXPW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Lsa", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"FIPSAlgorithmPolicy", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } @@ -2173,13 +2160,12 @@ static void test_ECDH(void) static void test_BCryptEnumContextFunctions(void) { - static const WCHAR sslW[] = {'S','S','L',0}; CRYPT_CONTEXT_FUNCTIONS *buffer; NTSTATUS status; ULONG buflen; buffer = NULL; - status = pBCryptEnumContextFunctions( CRYPT_LOCAL, sslW, NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); + status = pBCryptEnumContextFunctions( CRYPT_LOCAL, L"SSL", NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); }

1 0