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

Henri Verbeet : wined3d: Implement depth/stencil clears in the Vulkan blitter.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: f793f4446c4e1f01afc2cc47354f65c7049eb38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f793f4446c4e1f01afc2cc47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 02:46:23 2020 +0430 wined3d: Implement depth/stencil clears in the Vulkan blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 54 +++++++++++++++++++++++++++++---- dlls/wined3d/texture.c | 68 +++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 5 +++- 3 files changed, 117 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f793f4446c4e1f01afc2…

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_D32_FLOAT_S8X24_UINT.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 3f6c629eccbb8c958a8ebfdfa76c594c73e1e53f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f6c629eccbb8c958a8ebfdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 02:46:27 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_D32_FLOAT_S8X24_UINT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 125 ++++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f6c629eccbb8c958a8e…

1 0

Zebediah Figura : quartz: Don't register the DirectSound renderer as a filter for autoplugging.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: c035cfa4bb93d69a64becddb5ccd05e8be48e865 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c035cfa4bb93d69a64becddb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 27 18:17:05 2020 -0500 quartz: Don't register the DirectSound renderer as a filter for autoplugging. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 7196f79a54..a5b52425b0 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -222,19 +222,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_DSoundRender, - &CLSID_LegacyAmFilterCategory, - L"Audio Renderer", - 0x800000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, -/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_AudioRender, &CLSID_LegacyAmFilterCategory, L"Audio Renderer",

1 0

Zebediah Figura : quartz/tests: Relax a test for PresentImage().
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 53a91bbd5cb78d0d8fe7f816ee4925eed9978877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53a91bbd5cb78d0d8fe7f816… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 27 22:29:31 2020 -0500 quartz/tests: Relax a test for PresentImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 35776e85ff..e78d20a411 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2704,12 +2704,12 @@ static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) thread = send_frame(input); hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : include: Add the missing SetStreamMediaType() method to IVMRImageCompositor9.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 549183fa66d68d32066d9c637ee44975f2e3a485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=549183fa66d68d32066d9c63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 27 22:29:32 2020 -0500 include: Add the missing SetStreamMediaType() method to IVMRImageCompositor9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vmr9.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vmr9.idl b/include/vmr9.idl index 98524b0e75..526cfbd8d9 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -518,6 +518,7 @@ interface IVMRImageCompositor9 : IUnknown { HRESULT InitCompositionDevice([in] IUnknown *d3ddev); HRESULT TermCompositionDevice([in] IUnknown *d3ddev); + HRESULT SetStreamMediaType([in] DWORD stream, [in] AM_MEDIA_TYPE *mt, [in] BOOL texture); HRESULT CompositeImage([in] IUnknown *d3ddev, [in] IDirect3DSurface9 *d3dtarget, [in] AM_MEDIA_TYPE *mttarget, [in] REFERENCE_TIME start, [in] REFERENCE_TIME stop, D3DCOLOR back, [in] VMR9VideoStreamInfo *info, [in] UINT streams);

1 0

Micah N Gorrell : advapi32: Replace usage of internal SERV_ functions with exported functions.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 2f2074a5a06c988d56102610a6ac4beef2d60074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2074a5a06c988d56102610… Author: Micah N Gorrell <mgorrell(a)codeweavers.com> Date: Mon Apr 27 22:35:30 2020 -0500 advapi32: Replace usage of internal SERV_ functions with exported functions. Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 3 -- dlls/advapi32/security.c | 70 ++++++++++++++++++++----------------------- dlls/advapi32/service.c | 6 ++-- 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4ced1e8a64..77b56420ba 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -32,9 +32,6 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; -DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4bea26d155..7315f9b51a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -415,16 +415,15 @@ static inline DWORD get_security_file( LPCWSTR full_file_name, DWORD access, HAN /* helper function for SE_SERVICE objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access, HANDLE *service ) { - SC_HANDLE manager = 0; - DWORD err; - - err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); - if (err == ERROR_SUCCESS) + SC_HANDLE manager = OpenSCManagerW( NULL, NULL, access ); + if (manager) { - err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); + *service = OpenServiceW( manager, full_service_name, access); CloseServiceHandle( manager ); + if (*service) + return ERROR_SUCCESS; } - return err; + return GetLastError(); } /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ @@ -1779,16 +1778,13 @@ BOOL WINAPI PrivilegedServiceAuditAlarmA( LPCSTR SubsystemName, LPCSTR ServiceNa * RETURNS * ERROR_SUCCESS if all's well, and a WIN32 error code otherwise. */ -DWORD WINAPI GetSecurityInfo( - HANDLE hObject, SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, PSID *ppsidOwner, - PSID *ppsidGroup, PACL *ppDacl, PACL *ppSacl, - PSECURITY_DESCRIPTOR *ppSecurityDescriptor -) +DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFORMATION SecurityInfo, + PSID *ppsidOwner, PSID *ppsidGroup, PACL *ppDacl, PACL *ppSacl, + PSECURITY_DESCRIPTOR *ppSecurityDescriptor ) { PSECURITY_DESCRIPTOR sd; NTSTATUS status; - ULONG n1, n2; + ULONG size; BOOL present, defaulted; /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ @@ -1802,35 +1798,33 @@ DWORD WINAPI GetSecurityInfo( || ((SecurityInfo & SACL_SECURITY_INFORMATION) && !ppSacl) )) return ERROR_INVALID_PARAMETER; - switch (ObjectType) + if (type == SE_SERVICE) { - case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1); - break; - default: - status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); - break; - } - if (status != STATUS_BUFFER_TOO_SMALL && status != STATUS_SUCCESS) - return RtlNtStatusToDosError(status); + if (!QueryServiceObjectSecurity( handle, SecurityInfo, NULL, 0, &size ) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return GetLastError(); - sd = LocalAlloc(0, n1); - if (!sd) - return ERROR_NOT_ENOUGH_MEMORY; + if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; - switch (ObjectType) - { - case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2); - break; - default: - status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); - break; + if (!QueryServiceObjectSecurity( handle, SecurityInfo, sd, size, &size )) + { + LocalFree(sd); + return GetLastError(); + } } - if (status != STATUS_SUCCESS) + else { - LocalFree(sd); - return RtlNtStatusToDosError(status); + status = NtQuerySecurityObject( handle, SecurityInfo, NULL, 0, &size ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + return RtlNtStatusToDosError( status ); + + if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; + + if ((status = NtQuerySecurityObject( handle, SecurityInfo, sd, size, &size ))) + { + LocalFree(sd); + return RtlNtStatusToDosError( status ); + } } if (ppsidOwner) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 231f0267e9..2781a12823 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -897,7 +897,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, * * See OpenSCManagerA. */ -DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, +static DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD r; @@ -1049,7 +1049,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, * * See OpenServiceA. */ -DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, +static DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD err; @@ -2484,7 +2484,7 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, return err == ERROR_SUCCESS; } -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, +static NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor, DWORD cbBufSize, LPDWORD pcbBytesNeeded)

1 0

Micah N Gorrell : advapi32: Replace SERV_dup() with strdupAW().
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 714b2219b8d5dd487a7c2668b86edd9db842e19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=714b2219b8d5dd487a7c2668… Author: Micah N Gorrell <mgorrell(a)codeweavers.com> Date: Mon Apr 27 22:35:31 2020 -0500 advapi32: Replace SERV_dup() with strdupAW(). Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 1 - dlls/advapi32/eventlog.c | 12 ++++----- dlls/advapi32/security.c | 22 ++++++++-------- dlls/advapi32/service.c | 60 +++++++++++++++---------------------------- 4 files changed, 38 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=714b2219b8d5dd487a7c…

1 0

Rémi Bernon : user32: Don't read preparsed data on non-HID devices.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 20399931da4f3e3888e6eb4b1b0671a38a17a3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20399931da4f3e3888e6eb4b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 27 14:36:03 2020 +0200 user32: Don't read preparsed data on non-HID devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2465262f74..dd2ac2e208 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -492,7 +492,8 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT case RIDI_PREPARSEDDATA: avail_bytes = *data_size; - if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE) + if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE || + device->info.dwType != RIM_TYPEHID) { to_copy_bytes = 0; *data_size = 0;

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_R9G9B9E5_SHAREDEXP.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 621f25fddd49ebb0a31729d31db18137abbd1e72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=621f25fddd49ebb0a31729d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 02:46:26 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_R9G9B9E5_SHAREDEXP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 06857f2284..12e8ed2c71 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4199,6 +4199,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, }, {WINED3DFMT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, }, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, + {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties;

1 0

Henri Verbeet : wined3d: Make the adapter responsible for compute dispatch.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: e46b69475b020cc91f6f93022b4e40e0b39abe4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e46b69475b020cc91f6f9302… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 02:46:24 2020 +0430 wined3d: Make the adapter responsible for compute dispatch. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 61 +++++++++++++++++++------------------- dlls/wined3d/adapter_vk.c | 67 +++++++++++++++++++++++------------------- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 67 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 108 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e46b69475b020cc91f6f…

1 0