winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2020
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1016 discussions
Start a n
N
ew thread
Micah N Gorrell : advapi32: Replace SERV_dup() with strdupAW().
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Micah N Gorrell : advapi32: Replace usage of internal SERV_ functions with exported functions.
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Zebediah Figura : include: Add the missing SetStreamMediaType() method to IVMRImageCompositor9.
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Zebediah Figura : quartz/tests: Relax a test for PresentImage().
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Rémi Bernon : user32: Don't read preparsed data on non-HID devices.
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Zebediah Figura : quartz: Don't register the audio renderer as a filter for autoplugging.
by Alexandre Julliard
28 Apr '20
28 Apr '20
Module: wine Branch: master Commit: 406459ea9c8511717adab9885f1efeb92eb78b90 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=406459ea9c8511717adab988…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 27 18:17:06 2020 -0500 quartz: Don't register the audio 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 a5b52425b0..7bae46cb84 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -222,19 +222,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_AudioRender, - &CLSID_LegacyAmFilterCategory, - L"Audio Renderer", - 0x800000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, -/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_AVIDec, &CLSID_LegacyAmFilterCategory, L"AVI Decompressor",
1
0
0
0
Zebediah Figura : quartz: Don't register the DirectSound renderer as a filter for autoplugging.
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_D32_FLOAT_S8X24_UINT.
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_R9G9B9E5_SHAREDEXP.
by Alexandre Julliard
28 Apr '20
28 Apr '20
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
0
0
Henri Verbeet : wined3d: Make the adapter responsible for draws.
by Alexandre Julliard
28 Apr '20
28 Apr '20
Module: wine Branch: master Commit: 95b66030bbf044f0b1d4efb71e645580957b3244 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=95b66030bbf044f0b1d4efb7…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 02:46:25 2020 +0430 wined3d: Make the adapter responsible for draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 7 +++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 343dfff0ee..29496f2556 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5101,6 +5101,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = .adapter_create_query = adapter_gl_create_query, .adapter_destroy_query = adapter_gl_destroy_query, .adapter_flush_context = adapter_gl_flush_context, + .adapter_draw_primitive = draw_primitive, .adapter_dispatch_compute = dispatch_compute, .adapter_clear_uav = adapter_gl_clear_uav, }; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7c63562086..b6a0eea785 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1414,6 +1414,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_vk_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + FIXME("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_vk_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -1457,6 +1463,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = .adapter_create_query = adapter_vk_create_query, .adapter_destroy_query = adapter_vk_destroy_query, .adapter_flush_context = adapter_vk_flush_context, + .adapter_draw_primitive = adapter_vk_draw_primitive, .adapter_dispatch_compute = adapter_vk_dispatch_compute, .adapter_clear_uav = adapter_vk_clear_uav, }; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 930351d092..85e696d4d1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -888,7 +888,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } state->gl_patch_vertices = op->patch_vertex_count; - draw_primitive(cs->device, state, &op->parameters); + cs->device->adapter->adapter_ops->adapter_draw_primitive(cs->device, state, &op->parameters); if (op->parameters.indirect) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 40221ab7de..b6a9b502d8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2843,6 +2843,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_no3d_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + ERR("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_no3d_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -2886,6 +2892,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = .adapter_create_query = adapter_no3d_create_query, .adapter_destroy_query = adapter_no3d_destroy_query, .adapter_flush_context = adapter_no3d_flush_context, + .adapter_draw_primitive = adapter_no3d_draw_primitive, .adapter_dispatch_compute = adapter_no3d_dispatch_compute, .adapter_clear_uav = adapter_no3d_clear_uav, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5d2260001..a7983b31b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3031,6 +3031,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_draw_primitive)(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_draw_parameters *parameters); void (*adapter_dispatch_compute)(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters); void (*adapter_clear_uav)(struct wined3d_context *context,
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
12
...
102
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
Results per page:
10
25
50
100
200