September 2020 - Wine-devel

[PATCH 2/3] dxgi/tests: Fix swapchain parameter test failures on Win10 1909.
by Zhiyi Zhang 09 Sep '20

09 Sep '20

Some of the invalid swapchain parameter tests crash on Win10 1909. And DXGI_USAGE_DISCARD_ON_PRESENT is a DXGI internal flag. It doesn't always get added if swap effect is DXGI_SWAP_EFFECT_DISCARD. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f5c5e3b786f..acbcadda354 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4293,66 +4293,79 @@ static void test_swapchain_parameters(void) } tests[] = { - {TRUE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 0 */ {TRUE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, - {TRUE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 2}, + /* 5 */ {TRUE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 10 */ {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + /* 15 */ {TRUE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, + /* 20 */ {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - - {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, - {FALSE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 25 */ {FALSE, 1, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 2}, {FALSE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 30 */ {FALSE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, + /* 35 */ {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 40 */ {FALSE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 45 */ + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* The following test fails on Nvidia with E_OUTOFMEMORY and leaks device references in the * process. Disable it for now. {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, */ + + /* The following tests crash on Win10 1909 + {TRUE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + */ }; static const DXGI_USAGE usage_tests[] = { @@ -4417,11 +4430,10 @@ static void test_swapchain_parameters(void) } expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; - if (tests[i].swap_effect == DXGI_SWAP_EFFECT_DISCARD) - expected_usage |= DXGI_USAGE_DISCARD_ON_PRESENT; hr = IDXGIResource_GetUsage(resource, &usage); ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u.\n", hr, i); - ok(usage == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); + ok((usage & expected_usage) == expected_usage, "Got usage %x, expected %x, test %u.\n", + usage, expected_usage, i); IDXGIResource_Release(resource); -- 2.25.1

3 2

[PATCH 1/3] dxgi/tests: Relax closest matching mode comparison.
by Zhiyi Zhang 09 Sep '20

09 Sep '20

On Windows, a DXGI output may support 1920x1440 and 2560x1080 display modes, both of which have the same pixel count. And when finding a mode closest to 2559x1079 or 2561x1081, 1920x1440 is returned. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 59b23918de3..f5c5e3b786f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -207,8 +207,9 @@ static unsigned int check_multisample_quality_levels(IDXGIDevice *dxgi_device, #define MODE_DESC_IGNORE_FORMAT 0x00000004u #define MODE_DESC_IGNORE_SCANLINE_ORDERING 0x00000008u #define MODE_DESC_IGNORE_SCALING 0x00000010u +#define MODE_DESC_IGNORE_EXACT_RESOLUTION 0x00000020u -#define MODE_DESC_CHECK_RESOLUTION (~MODE_DESC_IGNORE_RESOLUTION) +#define MODE_DESC_CHECK_RESOLUTION (~MODE_DESC_IGNORE_RESOLUTION & ~MODE_DESC_IGNORE_EXACT_RESOLUTION) #define MODE_DESC_CHECK_FORMAT (~MODE_DESC_IGNORE_FORMAT) #define check_mode_desc(a, b, c) check_mode_desc_(__LINE__, a, b, c) @@ -217,10 +218,16 @@ static void check_mode_desc_(unsigned int line, const DXGI_MODE_DESC *desc, { if (!(ignore_flags & MODE_DESC_IGNORE_RESOLUTION)) { - ok_(__FILE__, line)(desc->Width == expected_desc->Width - && desc->Height == expected_desc->Height, - "Got resolution %ux%u, expected %ux%u.\n", - desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); + if (ignore_flags & MODE_DESC_IGNORE_EXACT_RESOLUTION) + ok_(__FILE__, line)(desc->Width * desc->Height == + expected_desc->Width * expected_desc->Height, + "Got resolution %ux%u, expected %ux%u.\n", + desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); + else + ok_(__FILE__, line)(desc->Width == expected_desc->Width && + desc->Height == expected_desc->Height, + "Got resolution %ux%u, expected %ux%u.\n", + desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); } if (!(ignore_flags & MODE_DESC_IGNORE_REFRESH_RATE)) { @@ -1526,7 +1533,8 @@ static void test_find_closest_matching_mode(void) mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + check_mode_desc(&matching_mode, &modes[i], + (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); memset(&mode, 0, sizeof(mode)); mode.Width = modes[i].Width + 1; @@ -1534,7 +1542,8 @@ static void test_find_closest_matching_mode(void) mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + check_mode_desc(&matching_mode, &modes[i], + (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); } memset(&mode, 0, sizeof(mode)); -- 2.25.1

3 2

[PATCH] msvcrt: Handle rethrowing from nested try blocks on x64.
by Paul Gofman 09 Sep '20

09 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- MSVC testcase: https://gist.github.com/gofman/bc98c826eeb6c6d206fd377a0b2ce3cb dlls/msvcrt/except_x86_64.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 09eddfb9793..42283131e82 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -90,6 +90,7 @@ typedef struct { cxx_frame_info frame_info; BOOL rethrow; + EXCEPTION_RECORD *prev_rec; } cxx_catch_ctx; typedef struct @@ -306,14 +307,13 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) { EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; - thread_data_t *data = msvcrt_get_thread_data(); cxx_catch_ctx *ctx = c; if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) return EXCEPTION_EXECUTE_HANDLER; - if (rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]) + if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } @@ -340,6 +340,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) TRACE("calling handler %p\n", handler); ctx.rethrow = FALSE; + ctx.prev_rec = prev_rec; __CxxRegisterExceptionObject(&ep, &ctx.frame_info); msvcrt_get_thread_data()->processing_throw--; __TRY @@ -565,6 +566,12 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode == CXX_EXCEPTION) { + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + { + TRACE("rethrow detected.\n"); + *rec = *msvcrt_get_thread_data()->exc_record; + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh)) -- 2.26.2

2 1

[PATCH v6] quartz: Return E_POINTER from IVideoWindow::get_Visible() if "visible" is NULL.
by Zebediah Figura 09 Sep '20

09 Sep '20

From: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v6: Fix an accidental double space in the test message; make subject line clearer and more grammatical. dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/window.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c2b6271021a..448efe501b6 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2257,6 +2257,9 @@ static void test_video_window(void) hr = IBaseFilter_QueryInterface(filter, &IID_IVideoWindow, (void **)&window); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVideoWindow_get_Visible(window, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IVideoWindow_get_Caption(window, &caption); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 07e042eccdb..3983d43b08f 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -334,6 +334,9 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *visi TRACE("window %p, visible %p.\n", window, visible); + if (!visible) + return E_POINTER; + *visible = IsWindowVisible(window->hwnd) ? OATRUE : OAFALSE; return S_OK; } -- 2.28.0

2 1

[PATCH 1/4] combase: Implement CoCreateInstanceFromApp().
by Nikolay Sivov 09 Sep '20

09 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- CoGetClassObject() moved to helper to make it easier to get flags validation right later - CLSCTX_APPCONTAINER can't be used with it, and should return E_INVALIDARG, while it's usable for CoCreateInstance*. .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.c | 110 +++++++++------- dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 1 + dlls/ole32/tests/compobj.c | 122 ++++++++++++++++++ include/objbase.h | 2 + include/wtypes.idl | 41 +++--- 8 files changed, 217 insertions(+), 65 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index eb81d238550..f5be6d88c75 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -8,7 +8,7 @@ @ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx -@ stub CoCreateInstanceFromApp +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) ole32.CoCreateInstanceFromApp @ stub CoDecodeProxy @ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 6c3115d6007..f443592db3b 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -8,7 +8,7 @@ @ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx -@ stub CoCreateInstanceFromApp +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) ole32.CoCreateInstanceFromApp @ stub CoDecodeProxy @ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index c90cba6185c..66c99b53523 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1527,53 +1527,19 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out } /*********************************************************************** - * CoCreateInstanceEx (combase.@) + * CoCreateInstanceFromApp (combase.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, - COSERVERINFO *server_info, ULONG count, MULTI_QI *results) +HRESULT WINAPI CoCreateInstanceFromApp(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, + void *server_info, ULONG count, MULTI_QI *results) { - IClassFactory *factory; - IUnknown *unk = NULL; - CLSID clsid; - HRESULT hr; - - TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); - - if (!count || !results) - return E_INVALIDARG; - - if (server_info) - FIXME("Server info is not supported.\n"); - - init_multi_qi(count, results, E_NOINTERFACE); - - hr = CoGetTreatAsClass(rclsid, &clsid); - if (FAILED(hr)) - clsid = *rclsid; - - hr = CoGetClassObject(&clsid, cls_context, NULL, &IID_IClassFactory, (void **)&factory); - if (FAILED(hr)) - return hr; + TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, + count, results); - hr = IClassFactory_CreateInstance(factory, outer, results[0].pIID, (void **)&unk); - IClassFactory_Release(factory); - if (FAILED(hr)) - { - if (hr == CLASS_E_NOAGGREGATION && outer) - FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); - else - FIXME("no instance created for interface %s of class %s, hr %#x.\n", - debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); - return hr; - } - - return return_multi_qi(unk, count, results, TRUE); + return CoCreateInstanceEx(rclsid, outer, cls_context | CLSCTX_APPCONTAINER, server_info, + count, results); } -/*********************************************************************** - * CoGetClassObject (combase.@) - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscontext, +static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, COSERVERINFO *server_info, REFIID riid, void **obj) { struct class_reg_data clsreg = { 0 }; @@ -1581,8 +1547,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont IUnknown *registered_obj; struct apartment *apt; - TRACE("%s, %s\n", debugstr_guid(rclsid), debugstr_guid(riid)); - if (!obj) return E_INVALIDARG; @@ -1601,7 +1565,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont { if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler) || IsEqualCLSID(rclsid, &CLSID_GlobalOptions) || - IsEqualCLSID(rclsid, &CLSID_ManualResetEvent) || + (!(clscontext & CLSCTX_APPCONTAINER) && IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) || IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) { apartment_release(apt); @@ -1637,7 +1601,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont * First, try and see if we can't match the class ID with one of the * registered classes. */ - if ((registered_obj = com_get_registered_class_object(apt, rclsid, clscontext))) + if (!(clscontext & CLSCTX_APPCONTAINER) && (registered_obj = com_get_registered_class_object(apt, rclsid, clscontext))) { hr = IUnknown_QueryInterface(registered_obj, riid, obj); IUnknown_Release(registered_obj); @@ -1737,6 +1701,60 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont return hr; } +/*********************************************************************** + * CoCreateInstanceEx (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, + COSERVERINFO *server_info, ULONG count, MULTI_QI *results) +{ + IClassFactory *factory; + IUnknown *unk = NULL; + CLSID clsid; + HRESULT hr; + + TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); + + if (!count || !results) + return E_INVALIDARG; + + if (server_info) + FIXME("Server info is not supported.\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + clsid = *rclsid; + if (!(cls_context & CLSCTX_APPCONTAINER)) + CoGetTreatAsClass(rclsid, &clsid); + + if (FAILED(hr = com_get_class_object(&clsid, cls_context, NULL, &IID_IClassFactory, (void **)&factory))) + return hr; + + hr = IClassFactory_CreateInstance(factory, outer, results[0].pIID, (void **)&unk); + IClassFactory_Release(factory); + if (FAILED(hr)) + { + if (hr == CLASS_E_NOAGGREGATION && outer) + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); + else + FIXME("no instance created for interface %s of class %s, hr %#x.\n", + debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); + return hr; + } + + return return_multi_qi(unk, count, results, TRUE); +} + +/*********************************************************************** + * CoGetClassObject (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscontext, + COSERVERINFO *server_info, REFIID riid, void **obj) +{ + TRACE("%s, %#x, %s\n", debugstr_guid(rclsid), clscontext, debugstr_guid(riid)); + + return com_get_class_object(rclsid, clscontext, server_info, riid, obj); +} + /*********************************************************************** * CoFreeUnusedLibraries (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9d9b34640be..6e74cca1f24 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -82,7 +82,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) -@ stub CoCreateInstanceFromApp +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index a6f62ebfa99..8e73fdd16b4 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) combase.CoCreateInstanceFromApp @ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) combase.CoDisableCallCancellation @ stdcall CoDisconnectObject(ptr long) combase.CoDisconnectObject diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index eb172aac28d..98b3ef642b8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -80,6 +80,8 @@ static HRESULT (WINAPI * pCoIncrementMTAUsage)(CO_MTA_USAGE_COOKIE *cookie); static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); +static HRESULT (WINAPI * pCoCreateInstanceFromApp)(REFCLSID clsid, IUnknown *outer, DWORD clscontext, + void *reserved, DWORD count, MULTI_QI *results); static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); @@ -2244,6 +2246,23 @@ static void test_TreatAsClass(void) pIP = NULL; } + if (pCoCreateInstanceFromApp) + { + MULTI_QI mqi = { 0 }; + + mqi.pIID = &IID_IInternetProtocol; + hr = pCoCreateInstanceFromApp(&deadbeef, NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, &IID_IInternetProtocol, + (void **)&pIP); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pIP); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(pIP); + } + hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); @@ -3943,6 +3962,7 @@ static void init_funcs(void) pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage"); pCoDecrementMTAUsage = (void*)GetProcAddress(hOle32, "CoDecrementMTAUsage"); + pCoCreateInstanceFromApp = (void*)GetProcAddress(hOle32, "CoCreateInstanceFromApp"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); @@ -4075,6 +4095,107 @@ static void test_mta_usage(void) test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); } +static void test_CoCreateInstanceFromApp(void) +{ + static const CLSID *supported_classes[] = + { + &CLSID_InProcFreeMarshaler, + &CLSID_GlobalOptions, + &CLSID_StdGlobalInterfaceTable, + }; + static const CLSID *unsupported_classes[] = + { + &CLSID_ManualResetEvent, + }; + unsigned int i; + IUnknown *unk; + DWORD cookie; + MULTI_QI mqi; + HRESULT hr; + HANDLE handle; + ULONG_PTR actctx_cookie; + + if (!pCoCreateInstanceFromApp) + { + win_skip("CoCreateInstanceFromApp() is not available.\n"); + return; + } + + CoInitialize(NULL); + + for (i = 0; i < ARRAY_SIZE(supported_classes); ++i) + { + memset(&mqi, 0, sizeof(mqi)); + mqi.pIID = &IID_IUnknown; + hr = pCoCreateInstanceFromApp(supported_classes[i], NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(mqi.pItf); + + hr = CoCreateInstance(supported_classes[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + } + + for (i = 0; i < ARRAY_SIZE(unsupported_classes); ++i) + { + memset(&mqi, 0, sizeof(mqi)); + mqi.pIID = &IID_IUnknown; + hr = pCoCreateInstanceFromApp(unsupported_classes[i], NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(unsupported_classes[i], NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, + &IID_IUnknown, (void **)&unk); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(unsupported_classes[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + } + + /* Locally registered classes are filtered out. */ + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, NULL, + &IID_IClassFactory, (void **)&unk); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, + &IID_IUnknown, (void **)&unk); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + memset(&mqi, 0, sizeof(mqi)); + mqi.pIID = &IID_IUnknown; + hr = pCoCreateInstanceFromApp(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoRevokeClassObject(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Activation context */ + if ((handle = activate_context(actctx_manifest, &actctx_cookie))) + { + hr = CoCreateInstance(&IID_Testiface7, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&IID_Testiface7, NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, + &IID_IUnknown, (void **)&unk); + ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + + deactivate_context(handle, actctx_cookie); + } + + CoUninitialize(); +} + START_TEST(compobj) { init_funcs(); @@ -4124,6 +4245,7 @@ START_TEST(compobj) test_implicit_mta(); test_CoGetCurrentProcess(); test_mta_usage(); + test_CoCreateInstanceFromApp(); DeleteFileA( testlib ); } diff --git a/include/objbase.h b/include/objbase.h index e5a6b2a9faf..0a50d28e9d2 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -319,6 +319,8 @@ HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid, COSERVERINFO* pServerInfo, ULONG cmq, MULTI_QI* pResults); +HRESULT WINAPI CoCreateInstanceFromApp(REFCLSID clsid, IUnknown *outer, DWORD clscontext, void *reserved, + DWORD count, MULTI_QI *results); HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, DWORD grfMode, OLECHAR* pwszName, DWORD dwCount, MULTI_QI* pResults); HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults); diff --git a/include/wtypes.idl b/include/wtypes.idl index a6682212b5b..754258839d7 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -336,22 +336,31 @@ cpp_quote("#define ROTFLAGS_ALLOWANYCLIENT 0x2") cpp_quote("#endif") typedef enum tagCLSCTX { - CLSCTX_INPROC_SERVER = 0x1, - CLSCTX_INPROC_HANDLER = 0x2, - CLSCTX_LOCAL_SERVER = 0x4, - CLSCTX_INPROC_SERVER16 = 0x8, - CLSCTX_REMOTE_SERVER = 0x10, - CLSCTX_INPROC_HANDLER16 = 0x20, - CLSCTX_INPROC_SERVERX86 = 0x40, - CLSCTX_INPROC_HANDLERX86 = 0x80, - CLSCTX_ESERVER_HANDLER = 0x100, - CLSCTX_NO_CODE_DOWNLOAD = 0x400, - CLSCTX_NO_CUSTOM_MARSHAL = 0x1000, - CLSCTX_ENABLE_CODE_DOWNLOAD = 0x2000, - CLSCTX_NO_FAILURE_LOG = 0x4000, - CLSCTX_DISABLE_AAA = 0x8000, - CLSCTX_ENABLE_AAA = 0x10000, - CLSCTX_FROM_DEFAULT_CONTEXT = 0x20000 + CLSCTX_INPROC_SERVER = 0x00000001, + CLSCTX_INPROC_HANDLER = 0x00000002, + CLSCTX_LOCAL_SERVER = 0x00000004, + CLSCTX_INPROC_SERVER16 = 0x00000008, + CLSCTX_REMOTE_SERVER = 0x00000010, + CLSCTX_INPROC_HANDLER16 = 0x00000020, + CLSCTX_INPROC_SERVERX86 = 0x00000040, + CLSCTX_INPROC_HANDLERX86 = 0x00000080, + CLSCTX_ESERVER_HANDLER = 0x00000100, + CLSCTX_NO_CODE_DOWNLOAD = 0x00000400, + CLSCTX_NO_CUSTOM_MARSHAL = 0x00001000, + CLSCTX_ENABLE_CODE_DOWNLOAD = 0x00002000, + CLSCTX_NO_FAILURE_LOG = 0x00004000, + CLSCTX_DISABLE_AAA = 0x00008000, + CLSCTX_ENABLE_AAA = 0x00010000, + CLSCTX_FROM_DEFAULT_CONTEXT = 0x00020000, + CLSCTX_ACTIVATE_X86_SERVER = 0x00040000, + CLSCTX_ACTIVATE_32_BIT_SERVER = CLSCTX_ACTIVATE_X86_SERVER, + CLSCTX_ACTIVATE_64_BIT_SERVER = 0x00080000, + CLSCTX_ENABLE_CLOAKING = 0x00100000, + CLSCTX_APPCONTAINER = 0x00400000, + CLSCTX_ACTIVATE_AAA_AS_IU = 0x00800000, + CLSCTX_RESERVED6 = 0x01000000, + CLSCTX_ACTIVATE_ARM32_SERVER = 0x02000000, + CLSCTX_PS_DLL = 0x80000000, } CLSCTX; cpp_quote("#define CLSCTX_INPROC (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER)") -- 2.28.0

3 8

[PATCH] vcruntime140_1: Handle rethrowing from nested try blocks on x64.
by Paul Gofman 09 Sep '20

09 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Here is MSVC test program I made for testing it: https://gist.github.com/gofman/a7cc10c4b815f3d35396d669901d37ad dlls/vcruntime140_1/except_x86_64.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 0e27b02db13..f66ae43721f 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -103,6 +103,7 @@ typedef struct BOOL rethrow; INT search_state; INT unwind_state; + EXCEPTION_RECORD *prev_rec; } cxx_catch_ctx; typedef struct @@ -473,7 +474,7 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state); if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - if (rec->ExceptionInformation[1] == ((EXCEPTION_RECORD*)*__current_exception())->ExceptionInformation[1]) + if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } @@ -503,6 +504,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) __CxxRegisterExceptionObject(&ep, &ctx.frame_info); ctx.search_state = rec->ExceptionInformation[2]; ctx.unwind_state = rec->ExceptionInformation[3]; + ctx.prev_rec = prev_rec; (*__processing_throw())--; __TRY { @@ -685,6 +687,12 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode == CXX_EXCEPTION) { + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + { + TRACE("rethrow detected.\n"); + *rec = *(EXCEPTION_RECORD*)*__current_exception(); + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh)) -- 2.26.2

2 1

[PATCH] maintainers: Get rid of removed paths.
by Nikolay Sivov 09 Sep '20

09 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 46b3d40ec33..b57eb5a5363 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -198,8 +198,6 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c -F: dlls/ole32/rpc.c -F: dlls/ole32/stubmanager.c F: dlls/ole32/usrmarshal.c OLE Storage -- 2.28.0

1 0

[PATCH] evr/mixer: Add another set of attributes.
by Nikolay Sivov 09 Sep '20

09 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 355 +++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 25 ++- 2 files changed, 377 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c7dbf8ff975..70199f37a1c 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -60,6 +60,7 @@ struct video_mixer IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; IMFVideoProcessor IMFVideoProcessor_iface; + IMFAttributes IMFAttributes_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -73,6 +74,7 @@ struct video_mixer IDirect3DDeviceManager9 *device_manager; IMediaEventSink *event_sink; IMFAttributes *attributes; + IMFAttributes *internal_attributes; unsigned int mixing_flags; CRITICAL_SECTION cs; }; @@ -122,6 +124,11 @@ static struct video_mixer *impl_from_IMFVideoProcessor(IMFVideoProcessor *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoProcessor_iface); } +static struct video_mixer *impl_from_IMFAttributes(IMFAttributes *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFAttributes_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -206,6 +213,10 @@ static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID r { *obj = &mixer->IMFVideoProcessor_iface; } + else if (IsEqualIID(riid, &IID_IMFAttributes)) + { + *obj = &mixer->IMFAttributes_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -247,6 +258,8 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) IDirect3DDeviceManager9_Release(mixer->device_manager); if (mixer->attributes) IMFAttributes_Release(mixer->attributes); + if (mixer->internal_attributes) + IMFAttributes_Release(mixer->internal_attributes); DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -1326,6 +1339,337 @@ static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = video_mixer_processor_SetBackgroundColor, }; +static HRESULT WINAPI video_mixer_attributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, out); +} + +static ULONG WINAPI video_mixer_attributes_AddRef(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_attributes_Release(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_attributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetItem(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), type); + + return IMFAttributes_GetItemType(mixer->internal_attributes, key, type); +} + +static HRESULT WINAPI video_mixer_attributes_CompareItem(IMFAttributes *iface, REFGUID key, + REFPROPVARIANT value, BOOL *result) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, result); + + return IMFAttributes_CompareItem(mixer->internal_attributes, key, value, result); +} + +static HRESULT WINAPI video_mixer_attributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, + MF_ATTRIBUTES_MATCH_TYPE match_type, BOOL *ret) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p, %d, %p.\n", iface, theirs, match_type, ret); + + return IMFAttributes_Compare(mixer->internal_attributes, theirs, match_type, ret); +} + +static HRESULT WINAPI video_mixer_attributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT32(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT64(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetDouble(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetGUID(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetStringLength(IMFAttributes *iface, REFGUID key, UINT32 *length) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), length); + + return IMFAttributes_GetStringLength(mixer->internal_attributes, key, length); +} + +static HRESULT WINAPI video_mixer_attributes_GetString(IMFAttributes *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), value, size, length); + + return IMFAttributes_GetString(mixer->internal_attributes, key, value, size, length); +} + +static HRESULT WINAPI video_mixer_attributes_GetAllocatedString(IMFAttributes *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, length); + + return IMFAttributes_GetAllocatedString(mixer->internal_attributes, key, value, length); +} + +static HRESULT WINAPI video_mixer_attributes_GetBlobSize(IMFAttributes *iface, REFGUID key, UINT32 *size) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), size); + + return IMFAttributes_GetBlobSize(mixer->internal_attributes, key, size); +} + +static HRESULT WINAPI video_mixer_attributes_GetBlob(IMFAttributes *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), buf, bufsize, blobsize); + + return IMFAttributes_GetBlob(mixer->internal_attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI video_mixer_attributes_GetAllocatedBlob(IMFAttributes *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_GetAllocatedBlob(mixer->internal_attributes, key, buf, size); +} + +static HRESULT WINAPI video_mixer_attributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(key), debugstr_guid(riid), out); + + return IMFAttributes_GetUnknown(mixer->internal_attributes, key, riid, out); +} + +static HRESULT WINAPI video_mixer_attributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetItem(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_DeleteItem(IMFAttributes *iface, REFGUID key) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s.\n", iface, debugstr_guid(key)); + + return IMFAttributes_DeleteItem(mixer->internal_attributes, key); +} + +static HRESULT WINAPI video_mixer_attributes_DeleteAllItems(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_DeleteAllItems(mixer->internal_attributes); +} + +static HRESULT WINAPI video_mixer_attributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %u.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetUINT32(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); + + return IMFAttributes_SetUINT64(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetDouble(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_guid(value)); + + return IMFAttributes_SetGUID(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetString(IMFAttributes *iface, REFGUID key, const WCHAR *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_w(value)); + + return IMFAttributes_SetString(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetBlob(IMFAttributes *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %u.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_SetBlob(mixer->internal_attributes, key, buf, size); +} + +static HRESULT WINAPI video_mixer_attributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), unknown); + + return IMFAttributes_SetUnknown(mixer->internal_attributes, key, unknown); +} + +static HRESULT WINAPI video_mixer_attributes_LockStore(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_LockStore(mixer->internal_attributes); +} + +static HRESULT WINAPI video_mixer_attributes_UnlockStore(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_UnlockStore(mixer->internal_attributes); +} + +static HRESULT WINAPI video_mixer_attributes_GetCount(IMFAttributes *iface, UINT32 *count) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p.\n", iface, count); + + return IMFAttributes_GetCount(mixer->internal_attributes, count); +} + +static HRESULT WINAPI video_mixer_attributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, + GUID *key, PROPVARIANT *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return IMFAttributes_GetItemByIndex(mixer->internal_attributes, index, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_CopyAllItems(IMFAttributes *iface, IMFAttributes *dest) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p.\n", iface, dest); + + return IMFAttributes_CopyAllItems(mixer->internal_attributes, dest); +} + +static const IMFAttributesVtbl video_mixer_attributes_vtbl = +{ + video_mixer_attributes_QueryInterface, + video_mixer_attributes_AddRef, + video_mixer_attributes_Release, + video_mixer_attributes_GetItem, + video_mixer_attributes_GetItemType, + video_mixer_attributes_CompareItem, + video_mixer_attributes_Compare, + video_mixer_attributes_GetUINT32, + video_mixer_attributes_GetUINT64, + video_mixer_attributes_GetDouble, + video_mixer_attributes_GetGUID, + video_mixer_attributes_GetStringLength, + video_mixer_attributes_GetString, + video_mixer_attributes_GetAllocatedString, + video_mixer_attributes_GetBlobSize, + video_mixer_attributes_GetBlob, + video_mixer_attributes_GetAllocatedBlob, + video_mixer_attributes_GetUnknown, + video_mixer_attributes_SetItem, + video_mixer_attributes_DeleteItem, + video_mixer_attributes_DeleteAllItems, + video_mixer_attributes_SetUINT32, + video_mixer_attributes_SetUINT64, + video_mixer_attributes_SetDouble, + video_mixer_attributes_SetGUID, + video_mixer_attributes_SetString, + video_mixer_attributes_SetBlob, + video_mixer_attributes_SetUnknown, + video_mixer_attributes_LockStore, + video_mixer_attributes_UnlockStore, + video_mixer_attributes_GetCount, + video_mixer_attributes_GetItemByIndex, + video_mixer_attributes_CopyAllItems +}; + 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); @@ -1355,6 +1699,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; + object->IMFAttributes_iface.lpVtbl = &video_mixer_attributes_vtbl; object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; @@ -1366,10 +1711,20 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) IUnknown_Release(&object->IUnknown_inner); return hr; } + if (FAILED(hr = MFCreateAttributes(&object->internal_attributes, 0))) + { + IUnknown_Release(&object->IUnknown_inner); + return hr; + } + + /* Default attributes configuration. */ + rect.left = rect.top = 0.0f; rect.right = rect.bottom = 1.0f; IMFAttributes_SetBlob(object->attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&rect, sizeof(rect)); + IMFAttributes_SetUINT32(object->internal_attributes, &MF_SA_D3D_AWARE, 1); + *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 92810b516a7..ecf1f850c77 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -424,8 +424,8 @@ static void test_default_mixer(void) DWORD input_id, output_id; IMFTransform *transform; DXVA2_ValueRange range; - DXVA2_Fixed32 value; - DWORD flags, count; + DXVA2_Fixed32 dxva_value; + DWORD flags, value, count; IMFGetService *gs; COLORREF color; unsigned int i; @@ -487,7 +487,7 @@ static void test_default_mixer(void) todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); - hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &value); + hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &dxva_value); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); @@ -533,6 +533,25 @@ todo_wine ok(attributes == attributes2, "Unexpected attributes instance.\n"); IMFAttributes_Release(attributes2); + hr = IMFTransform_QueryInterface(transform, &IID_IMFAttributes, (void **)&attributes2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(attributes != attributes2, "Unexpected attributes instance.\n"); + + hr = IMFAttributes_QueryInterface(attributes2, &IID_IMFTransform, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFAttributes_GetCount(attributes2, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + value = 0; + hr = IMFAttributes_GetUINT32(attributes2, &MF_SA_D3D_AWARE, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected value %d.\n", value); + + IMFAttributes_Release(attributes2); + hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count == 1, "Unexpected attribute count %u.\n", count); -- 2.28.0

1 0

[PATCH] shell32: Make SHELL_translate_idlist() support url in PIDL.
by Haoyang Chen 09 Sep '20

09 Sep '20

1 0

[PATCH v5] quartz: Handle NULL visible in, IVideoWindow::get_Visible().
by Pengpeng Dong 09 Sep '20

09 Sep '20

2 1