- Wine-Devel - list.winehq.org

[PATCH] ntdll: RtlConvertToAutoInheritSecurityObject is NTSTATUS, not BOOL
by Louis Lenders Aug. 31, 2020

Aug. 31, 2020

See (already closed) bug report 33279 As explained in comment #1 this is NTSTATUS : https://bugs.winehq.org/show_bug.cgi?id=33279#c1 but then erraneously the patch committed declares it as BOOL: https://source.winehq.org/git/wine.git/commitdiff/56057acdcddd91169c94c9961… Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntdll/sec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 70828a76c6..c0f962f056 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1707,7 +1707,7 @@ NTSTATUS WINAPI RtlQueryInformationAcl( return status; } -BOOL WINAPI RtlConvertToAutoInheritSecurityObject( +NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject( PSECURITY_DESCRIPTOR pdesc, PSECURITY_DESCRIPTOR cdesc, PSECURITY_DESCRIPTOR* ndesc, @@ -1717,5 +1717,5 @@ BOOL WINAPI RtlConvertToAutoInheritSecurityObject( { FIXME("%p %p %p %p %d %p - stub\n", pdesc, cdesc, ndesc, objtype, isdir, genmap); - return FALSE; + return STATUS_NOT_IMPLEMENTED; } -- 2.28.0

1 0

[PATCH v3 4/5] comsvcs: Implement ISharedPropertyGroupManager_get_Group().
by Jactry Zeng Aug. 30, 2020

Aug. 30, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v3: - Add more tests. v2: No changes. --- dlls/comsvcs/property.c | 19 +++++++++++++++++-- dlls/comsvcs/tests/property.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 045415e246..a73964d288 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -378,8 +378,23 @@ static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupMana static HRESULT WINAPI group_manager_get_Group(ISharedPropertyGroupManager *iface, BSTR name, ISharedPropertyGroup **group) { - FIXME("iface %p, name %s, group %p: stub.\n", iface, debugstr_w(name), group); - return E_NOTIMPL; + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + struct property_group *property_group; + + TRACE("iface %p, name %s, group %p.\n", iface, debugstr_w(name), group); + + if (!name || !group) + return E_POINTER; + + EnterCriticalSection(&manager->cs); + property_group = find_propery_group(manager, name); + LeaveCriticalSection(&manager->cs); + + if (!property_group) + return E_INVALIDARG; + + return ISharedPropertyGroup_QueryInterface(&property_group->ISharedPropertyGroup_iface, + &IID_ISharedPropertyGroup, (void **)group); } static HRESULT WINAPI group_manager_get__NewEnum(ISharedPropertyGroupManager *iface, IUnknown **retval) diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index 8ac5e522f5..7321bbcfe6 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -166,7 +166,7 @@ static void test_interfaces(void) static void test_property_group(void) { - ISharedPropertyGroup *group, *group1; + ISharedPropertyGroup *group, *group1, *group2; ISharedPropertyGroupManager *manager; ULONG refcount, expected_refcount; LONG isolation, release; @@ -284,6 +284,34 @@ static void test_property_group(void) TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedPropertyGroup); IDispatch_Release(dispatch); + hr = ISharedPropertyGroupManager_get_Group(manager, NULL, &group2); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + name = SysAllocString(L"nonexistgroup"); + hr = ISharedPropertyGroupManager_get_Group(manager, name, &group2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + SysFreeString(name); + + name = SysAllocString(L"testgroupname"); + hr = ISharedPropertyGroupManager_get_Group(manager, name, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + expected_refcount = get_refcount(manager); + hr = ISharedPropertyGroupManager_get_Group(manager, name, &group2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(group2 == group, "Got unexpected pointer %p.\n", group2); + refcount = get_refcount(group); + ok(refcount == 2, "Got unexpected refcount: %u.\n", refcount); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + ISharedPropertyGroup_Release(group2); + SysFreeString(name); + + name = SysAllocString(L"Testgroupname"); + hr = ISharedPropertyGroupManager_get_Group(manager, name, &group2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + SysFreeString(name); + expected_refcount = get_refcount(manager) - 1; ISharedPropertyGroup_Release(group); refcount = get_refcount(manager); -- 2.28.0

2 1

[PATCH v3 2/5] comsvcs: Add IDispatch support for ISharedPropertyGroupManager.
by Jactry Zeng Aug. 30, 2020

Aug. 30, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v3: - Fix some leaks. - Test reference count of ITypeInfo. v2: No changes. --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/comsvcs_private.h | 15 ++++++++ dlls/comsvcs/main.c | 68 ++++++++++++++++++++++++++++++++++ dlls/comsvcs/property.c | 45 ++++++++++++++++++---- dlls/comsvcs/tests/property.c | 59 +++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 9 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index b4a4244bce..82a496ea9c 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,6 +1,6 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs -IMPORTS = ole32 uuid +IMPORTS = ole32 oleaut32 uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h index 6d299d3a88..8a67bcffd8 100644 --- a/dlls/comsvcs/comsvcs_private.h +++ b/dlls/comsvcs/comsvcs_private.h @@ -33,6 +33,21 @@ #include "wine/heap.h" #include "wine/debug.h" +enum tid_t +{ + NULL_tid, + ISharedPropertyGroupManager_tid, + LAST_tid +}; + +static REFIID tid_ids[] = +{ + &IID_NULL, + &IID_ISharedPropertyGroupManager, +}; + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); + HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out); #endif diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 1d3f7db174..7d00084f8a 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -361,6 +361,71 @@ static HRESULT WINAPI dispenser_manager_cf_CreateInstance(IClassFactory *iface, return ret; } +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + if (typelib) + return S_OK; + + hr = LoadRegTypeLib(&LIBID_COMSVCSLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) + { + ERR("LoadRegTypeLib failed: %#x.\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + hr = load_typelib(); + if (FAILED(hr)) + return hr; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %#x.\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) @@ -371,6 +436,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) COMSVCS_hInstance = hinst; DisableThreadLibraryCalls(hinst); break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; } return TRUE; } diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 3c9917c926..44e111fe71 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -75,31 +75,60 @@ static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager *iface, UINT *info) { - FIXME("iface %p, info %p: stub.\n", iface, info); - return E_NOTIMPL; + TRACE("iface %p, info %p.\n", iface, info); + + if (!info) + return E_INVALIDARG; + *info = 1; + return S_OK; } static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); - return E_NOTIMPL; + TRACE("iface %p, index %u, lcid %u, info %p.\n", iface, index, lcid, info); + + if (index) + return DISP_E_BADINDEX; + + return get_typeinfo(ISharedPropertyGroupManager_tid, info); } static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); - return E_NOTIMPL; + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) { - FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p.\n", iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); - return E_NOTIMPL; + + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, member, flags, params, result, except, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupManager *iface, BSTR name, LONG *isolation, diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index adad7bd539..2cc7ff1d44 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -60,6 +60,57 @@ static const IUnknownVtbl outer_vtbl = static IUnknown test_outer = {&outer_vtbl}; +struct test_name_id +{ + const WCHAR *name; + DISPID id; +}; + +#define TEST_TYPEINFO(dispatch,test_name_ids,id_count,riid) _test_typeinfo(dispatch, test_name_ids, id_count, riid, __LINE__) +static void _test_typeinfo(IDispatch *dispatch, const struct test_name_id *test_name_ids, UINT id_count, REFIID riid, int line) +{ + static const LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + ITypeInfo *typeinfo; + TYPEATTR *typeattr; + ULONG refcount; + DISPID dispid; + UINT count; + BSTR names; + HRESULT hr; + int i; + + hr = IDispatch_GetTypeInfoCount(dispatch, NULL); + ok_(__FILE__,line)(hr == E_INVALIDARG, "GetTypeInfoCount got hr %#x.\n", hr); + + count = 0xdeadbeef; + hr = IDispatch_GetTypeInfoCount(dispatch, &count); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfoCount got hr %#x.\n", hr); + ok_(__FILE__,line)(count == 1, "Got unexpected count: %d.\n", count); + + hr = IDispatch_GetTypeInfo(dispatch, 1, english, &typeinfo); + ok_(__FILE__,line)(hr == DISP_E_BADINDEX, "GetTypeInfo got hr %#x.\n", hr); + + hr = IDispatch_GetTypeInfo(dispatch, 0, english, &typeinfo); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfo failed %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok_(__FILE__,line)(hr == S_OK, "GetTypeAttr got hr %#x.\n", hr); + ok_(__FILE__,line)(IsEqualGUID(&typeattr->guid, riid), + "Got unexpected type guid: %s.\n", wine_dbgstr_guid(&typeattr->guid)); + refcount = get_refcount(typeinfo); + ok_(__FILE__,line)(refcount == 2, "Got refcount: %u.\n", refcount); + ITypeInfo_Release(typeinfo); + + for (i = 0; i < id_count; i++) + { + names = SysAllocString(test_name_ids[i].name); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames(dispatch, &IID_NULL, &names, 1, english, &dispid); + SysFreeString(names); + ok_(__FILE__,line)(hr == S_OK, "tests[%d] got hr %#x.\n", i, hr); + ok_(__FILE__,line)(dispid == test_name_ids[i].id, "tests[%d] got wrong dispid %x.\n", i, dispid); + } +} + static void test_interfaces(void) { ISharedPropertyGroupManager *manager, *manager1; @@ -67,6 +118,12 @@ static void test_interfaces(void) IDispatch *dispatch; IUnknown *unk; HRESULT hr; + static const struct test_name_id test_name_ids[] = + { + {L"CreatePropertyGroup", 0x1}, + {L"Group", 0x2}, + {L"_NewEnum", DISPID_NEWENUM}, + }; hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, &test_outer, CLSCTX_INPROC_SERVER, &IID_ISharedPropertyGroupManager, (void **)&manager); @@ -100,6 +157,8 @@ static void test_interfaces(void) refcount = get_refcount(manager); ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedPropertyGroupManager); + IDispatch_Release(dispatch); IUnknown_Release(unk); ISharedPropertyGroupManager_Release(manager); -- 2.28.0

2 1

[PATCH] winex11.drv: use vkGetPhysicalDeviceProperties2KHR to get gpu properties.
by Georg Lehmann Aug. 30, 2020

Aug. 30, 2020

vkGetPhysicalDeviceProperties2 is a Vulkan 1.1 function but wine uses a 1.0 instance, so use the extension function instead. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winex11.drv/xrandr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index faeb4d98d9..6c16fb29ec 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -552,7 +552,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); - PFN_vkGetPhysicalDeviceProperties2 pvkGetPhysicalDeviceProperties2; + PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; @@ -587,7 +587,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro } LOAD_VK_FUNC(vkEnumeratePhysicalDevices) - LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2) + LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -624,7 +624,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; properties2.pNext = &id; - pvkGetPhysicalDeviceProperties2( vk_physical_devices[device_idx], &properties2 ); + pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) -- 2.28.0

2 1

Wine staging 5.16 release
by Alistair Leslie-Hughes Aug. 29, 2020

Aug. 29, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.16 (653 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until it can be rebased. Upstreamed (Either directly from staging or fixed with a similar patch). * ole32: Add a check for hglobal pointer to GetHGlobalFromStream. * winepulse: Don't rely on pulseaudio callbacks for timing * winepulse: fix segfault in pulse_rd_loop * winepulse: Fix up recording * winepulse.drv: Fix getting the same timing info. * winepulse: Update last time on underrun * winepulse: account for PA devices that fall way behind * winepulse: Fix local buffer offset wrapping * winepulse: Don't fake being one period behind in GetPosition Added: * [49689] xactengine3_7: Implement IXACT3Engine PrepareWave * [49739] Add netutils dll * [49739] Add srvcli dll * Added windows.gaming.input-dll for Death Stranding control support Updated: * mfplat-streaming-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] ntdll: Zero-initialize drive stack buffer.
by Jefferson Carpenter Aug. 29, 2020

Aug. 29, 2020

1 0

[PATCH 1/4] quartz/vmr9: Avoid leaking the presenter's reference to the d3d9 device.
by Zebediah Figura Aug. 29, 2020

Aug. 29, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3b42dd0ed52..8795995b849 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2670,6 +2670,8 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9_Release(surface); } + if (This->d3d9_dev) + IDirect3DDevice9_Release(This->d3d9_dev); free(This->d3d9_surfaces); This->d3d9_surfaces = NULL; This->num_surfaces = 0; -- 2.28.0

1 3

[PATCH v3 1/4] ntdll: Implement RtlGetExtendedContextLength().
by Paul Gofman Aug. 28, 2020

Aug. 28, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - define in ddk/wdm.h for x86/x64 only. .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 71 +++++++++ dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 147 +++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 7 +- 6 files changed, 227 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec index 36a1c8812f0..15126e5ddfe 100644 --- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub RtlCopyExtendedContext @ stdcall RtlGetEnabledExtendedFeatures(int64) ntdll.RtlGetEnabledExtendedFeatures -@ stub RtlGetExtendedContextLength +@ stdcall RtlGetExtendedContextLength(long ptr) ntdll.RtlGetExtendedContextLength @ stub RtlGetExtendedFeaturesMask @ stub RtlInitializeExtendedContext @ stub RtlLocateExtendedFeature diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3f7443bb45b..1b212cdee7f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -665,3 +665,74 @@ ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64 feature_mask) { return user_shared_data->XState.EnabledFeatures & feature_mask; } + +static const struct context_parameters +{ + ULONG arch_flag; + ULONG supported_flags; + ULONG context_size; /* sizeof(CONTEXT) */ + ULONG context_ex_size; /* sizeof(CONTEXT_EX) */ + ULONG alignment; +} +arch_context_paramaters[] = +{ + {0x00100000, 0xd810005f, 0x4d0, 0x20, 7}, + {0x00010000, 0xd801007f, 0x2cc, 0x18, 3}, +}; + +static const struct context_parameters *context_get_parameters( ULONG context_flags ) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + { + if (context_flags & arch_context_paramaters[i].arch_flag) + return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + } + return NULL; +} + + +/********************************************************************** + * RtlGetExtendedContextLength2 (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length, ULONG64 compaction_mask ) +{ + const struct context_parameters *p; + ULONG64 supported_mask; + ULONG64 size; + + TRACE( "context_flags %#x, length %p, compaction_mask %s.\n", context_flags, length, + wine_dbgstr_longlong(compaction_mask) ); + + if (!(p = context_get_parameters( context_flags ))) + return STATUS_INVALID_PARAMETER; + + if (!(context_flags & 0x40)) + { + *length = p->context_size + p->context_ex_size + p->alignment; + return STATUS_SUCCESS; + } + + if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) )) + return STATUS_NOT_SUPPORTED; + + compaction_mask &= supported_mask; + + size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63; + + if (compaction_mask & supported_mask & (1 << XSTATE_AVX)) + size += sizeof(YMMCONTEXT); + + *length = size; + return STATUS_SUCCESS; +} + + +/********************************************************************** + * RtlGetExtendedContextLength (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength( ULONG context_flags, ULONG *length ) +{ + return RtlGetExtendedContextLength2( context_flags, length, ~(ULONG64)0 ); +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index db2fab19ba4..0e13540332c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -695,6 +695,8 @@ # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) +@ stdcall -ret64 RtlGetExtendedContextLength(long ptr) +@ stdcall -ret64 RtlGetExtendedContextLength2(long ptr int64) # @ stub RtlGetFirstRange @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index fbe437dc1f1..16854c4984f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -45,6 +45,8 @@ static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static void (WINAPI *pRtlSetUnhandledExceptionFilter)(PRTL_EXCEPTION_FILTER filter); static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength)(ULONG context_flags, ULONG *length); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength2)(ULONG context_flags, ULONG *length, ULONG64 compaction_mask); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -6093,6 +6095,8 @@ done: return ExceptionContinueExecution; } +#define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) + static void test_extended_context(void) { static BYTE except_code_set_ymm0[] = @@ -6129,19 +6133,156 @@ static void test_extended_context(void) 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ 0xc3, /* ret */ }; - unsigned int i, address_offset; + static const struct + { + ULONG flag; + ULONG supported_flags; + ULONG broken_flags; + ULONG context_length; + ULONG context_ex_length; + ULONG align; + } + context_arch[] = + { + { + 0x00100000, /* CONTEXT_AMD64 */ + 0xd800005f, + 0xd8000000, + 0x4d0, /* sizeof(CONTEXT) */ + 0x20, /* sizeof(CONTEXT_EX) */ + 7, + }, + { + 0x00010000, /* CONTEXT_X86 */ + 0xd800007f, + 0xd8000000, + 0x2cc, /* sizeof(CONTEXT) */ + 0x18, /* sizeof(CONTEXT_EX) */ + 3, + }, + }; + ULONG expected_length, expected_length_xstate; + unsigned int i, address_offset, test; + ULONG64 enabled_features; + ULONG ret, length; unsigned data[8]; + ULONG flags; address_offset = sizeof(void *) == 8 ? 2 : 1; *(void **)(except_code_set_ymm0 + address_offset) = data; *(void **)(except_code_reset_ymm_state + address_offset) = data; - if (!pRtlGetEnabledExtendedFeatures || !(pRtlGetEnabledExtendedFeatures(~(ULONG64)0) & (1 << XSTATE_AVX))) + if (!pRtlGetEnabledExtendedFeatures) + { + skip("RtlGetEnabledExtendedFeatures is not available.\n"); + return; + } + + enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); + + /* Test context manipulation functions. */ + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(0, &length); + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (test = 0; test < ARRAY_SIZE(context_arch); ++test) + { + expected_length = context_arch[test].context_length + context_arch[test].context_ex_length + + context_arch[test].align; + expected_length_xstate = context_arch[test].context_length + context_arch[test].context_ex_length + + sizeof(XSTATE) + 63; + + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length); + ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (i = 0; i < 32; ++i) + { + if (i == 6) /* CONTEXT_XSTATE */ + continue; + + flags = context_arch[test].flag | (1 << i); + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if ((context_arch[test].supported_flags & flags) || flags == context_arch[test].flag) + { + ok((!ret && length == expected_length) + || broken((context_arch[test].broken_flags & (1 << i)) + && ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef), + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", + ret, length, flags); + } + else + { + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags); + } + } + + flags = context_arch[test].flag | 0x40; + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if (!enabled_features) + { + ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x.\n", ret, length); + continue; + } + + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + if (!pRtlGetExtendedContextLength2) + { + win_skip("RtlGetExtendedContextLength2 is not available.\n"); + continue; + } + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 7); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, ~0); + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 0); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 3); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 4); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + } + + if (0) + { + /* Crashes on Windows. */ + pRtlGetExtendedContextLength(CONTEXT_FULL, NULL); + } + + if (!(enabled_features & (1 << XSTATE_AVX))) { skip("AVX is not supported.\n"); return; } + /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, @@ -6206,6 +6347,8 @@ START_TEST(exception) X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); X(RtlGetEnabledExtendedFeatures); + X(RtlGetExtendedContextLength); + X(RtlGetExtendedContextLength2); #undef X pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0e8082fad26..45024a3a8da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1096,6 +1096,8 @@ @ stub RtlGetDefaultCodePage @ stub RtlGetElementGenericTable @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetExtendedContextLength(long ptr) +@ stdcall RtlGetExtendedContextLength2(long ptr int64) @ stub RtlGetFirstRange @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stub RtlGetNextRange diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cc841326979..691e519744f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1836,12 +1836,17 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +#if defined(__x86_64__) || defined(__i386__) +ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); +ULONG64 WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); +ULONG64 WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); +#endif + #ifdef __x86_64__ void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else #define RtlCopyMemoryNonTemporal RtlCopyMemory #endif -ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); -- 2.26.2

3 7

[PATCH 1/4] qcap/tests: Refactor interface testing.
by Jeff Smith Aug. 28, 2020

Aug. 28, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Supersede 191486 Based on Zebediah Figura's recommendations, I looked into how setting a pin's stream format would affect the media type enumeration. It turned out that it forces the enumeration down to the single format that was set. It remains this way until the filter is released. So it is necessary to track whether the stream format has been explicitly set, and respond to enumeration requests accordingly. dlls/qcap/tests/videocapture.c | 50 ++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 80d4899410..326601a398 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -174,7 +174,30 @@ static void test_stream_config(IPin *pin) IAMStreamConfig_Release(stream_config); } -static void test_capture(IBaseFilter *filter) +static void test_pin_interfaces(IPin *pin) +{ + todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); + check_interface(pin, &IID_IAMStreamConfig, TRUE); + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + todo_wine check_interface(pin, &IID_IKsPin, TRUE); + check_interface(pin, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(pin, &IID_IAMCrossbar, FALSE); + check_interface(pin, &IID_IAMDroppedFrames, FALSE); + check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); + check_interface(pin, &IID_IAMPushSource, FALSE); + check_interface(pin, &IID_IAMTVTuner, FALSE); + check_interface(pin, &IID_IAMVideoCompression, FALSE); + check_interface(pin, &IID_IAMVideoProcAmp, FALSE); + check_interface(pin, &IID_IPersistPropertyBag, FALSE); + check_interface(pin, &IID_IStreamBuilder, FALSE); +} + +static void test_pins(IBaseFilter *filter) { IEnumPins *enum_pins; IPin *pin; @@ -189,32 +212,18 @@ static void test_capture(IBaseFilter *filter) IPin_QueryDirection(pin, &pin_direction); if (pin_direction == PINDIR_OUTPUT) { + test_pin_interfaces(pin); test_media_types(pin); test_stream_config(pin); - - todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); - check_interface(pin, &IID_IAMStreamConfig, TRUE); - todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); - check_interface(pin, &IID_IKsPropertySet, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); - - check_interface(pin, &IID_IAMCrossbar, FALSE); - check_interface(pin, &IID_IAMDroppedFrames, FALSE); - check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); - check_interface(pin, &IID_IAMPushSource, FALSE); - check_interface(pin, &IID_IAMTVTuner, FALSE); - check_interface(pin, &IID_IAMVideoCompression, FALSE); - check_interface(pin, &IID_IAMVideoProcAmp, FALSE); - check_interface(pin, &IID_IPersistPropertyBag, FALSE); } IPin_Release(pin); } IEnumPins_Release(enum_pins); +} +static void test_filter_interfaces(IBaseFilter *filter) +{ check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); @@ -287,7 +296,8 @@ START_TEST(videocapture) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); if (hr == S_OK) { - test_capture(filter); + test_filter_interfaces(filter); + test_pins(filter); test_misc_flags(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.23.0

2 9

[PATCH] devenum: Correct the size of "name" in register_avicap_devices().
by Zebediah Figura Aug. 28, 2020

Aug. 28, 2020

Fixes: b6f2e9b130da6ba1513f29e6ec271e2470749d17 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index c72bb683f96..f7b53ad271f 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -726,7 +726,7 @@ static void register_avicap_devices(void) REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; - WCHAR name[6]; + WCHAR name[7]; VARIANT var; HRESULT hr; int i = 0; -- 2.28.0

1 0