December 2022 - Wine-commits

Zebediah Figura : wined3d: Require tessellation shaders to create a feature level 11.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: bc6907ee5862a2536c8d07f75257c32c2dfaf01c URL: https://gitlab.winehq.org/wine/wine/-/commit/bc6907ee5862a2536c8d07f75257c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 13 19:00:57 2022 -0500 wined3d: Require tessellation shaders to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 45b29e8dd97..376f162cb8c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2261,6 +2261,12 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; } +static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) +{ + return shader_model >= 5 + && info->features2.features.tessellationShader; +} + static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info, const struct shader_caps *shader_caps) { @@ -2283,7 +2289,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (!feature_level_10_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_3; - if (shader_model <= 4) + if (!feature_level_11_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_10_1; return WINED3D_FEATURE_LEVEL_11_1;

1 0

Zebediah Figura : wined3d: Require texture cube array support to create a feature level 10.1 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: ca6bac9079d6a37e9c64edd9dd21243710d789fd URL: https://gitlab.winehq.org/wine/wine/-/commit/ca6bac9079d6a37e9c64edd9dd2124… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 13 20:24:20 2022 -0500 wined3d: Require texture cube array support to create a feature level 10.1 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 376f162cb8c..d5c21b06a53 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2261,6 +2261,11 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; } +static bool feature_level_10_1_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) +{ + return info->features2.features.imageCubeArray; +} + static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 5 @@ -2289,6 +2294,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (!feature_level_10_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_3; + if (!feature_level_10_1_supported(info, shader_model)) + return WINED3D_FEATURE_LEVEL_10; + if (!feature_level_11_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_10_1;

1 0

Zebediah Figura : wined3d: Require multiple indirect draw support to create a feature level 11.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: c59b674ed8d851fa4fe7425e5a78ea92a45735c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c59b674ed8d851fa4fe7425e5a78ea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 13 20:39:07 2022 -0500 wined3d: Require multiple indirect draw support to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d5c21b06a53..5a1a183ee0d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2269,6 +2269,7 @@ static bool feature_level_10_1_supported(const struct wined3d_physical_device_in static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 5 + && info->features2.features.multiDrawIndirect && info->features2.features.tessellationShader; }

1 0

Zebediah Figura : wined3d: Require indirect draw first instance support to create a feature level 11.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: d7f7790ae8bc783c7eee1c67ff8a53703d6b42c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7f7790ae8bc783c7eee1c67ff8a53… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:32:07 2022 -0600 wined3d: Require indirect draw first instance support to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5a1a183ee0d..da70a1b3183 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2270,6 +2270,7 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info { return shader_model >= 5 && info->features2.features.multiDrawIndirect + && info->features2.features.drawIndirectFirstInstance && info->features2.features.tessellationShader; }

1 0

Zebediah Figura : wined3d: Require depth clip control to create a feature level 10.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 5f89b343b06314c2b213f94b67b3ca90afec507b URL: https://gitlab.winehq.org/wine/wine/-/commit/5f89b343b06314c2b213f94b67b3ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:39:35 2022 -0600 wined3d: Require depth clip control to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index da70a1b3183..d38882ff5ab 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2257,6 +2257,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info return shader_model >= 4 && info->features2.features.multiViewport && info->features2.features.geometryShader + && info->features2.features.depthClamp && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Alexandre Julliard : include: Use proper dllimports for shlwapi functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 48aec0047751995b3b85fb659575aeb3ed00eec0 URL: https://gitlab.winehq.org/wine/wine/-/commit/48aec0047751995b3b85fb659575ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:42:29 2022 +0100 include: Use proper dllimports for shlwapi functions. --- dlls/kernelbase/Makefile.in | 2 +- dlls/shcore/main.c | 1 + dlls/shell32/shell32.spec | 8 +- dlls/shell32/shellord.c | 62 ----- dlls/shlwapi/Makefile.in | 1 + include/shlwapi.h | 658 ++++++++++++++++++++++---------------------- 6 files changed, 340 insertions(+), 392 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for rpcrt4 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 9fc9c91bf47948f2f35699fe2956955d609198d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9fc9c91bf47948f2f35699fe295695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:50:06 2022 +0100 include: Use proper dllimports for rpcrt4 functions. --- dlls/rpcrt4/Makefile.in | 2 +- include/rpc.h | 9 ++++++++- include/rpcproxy.h | 40 ++++++++++++++-------------------------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 822e6ded35d..2aa2a5376aa 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DMSWMSG +EXTRADEFS = -D_RPCRT4_ -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 diff --git a/include/rpc.h b/include/rpc.h index 9fa1c1ef161..0b029532655 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -38,9 +38,16 @@ #define __RPC_USER __stdcall #define __RPC_STUB __stdcall #define RPC_ENTRY __stdcall + +#ifndef RPCRTAPI +#if !defined(_RPCRT4_) && !defined(_KRPCENV_) +#define RPCRTAPI DECLSPEC_IMPORT +#else #define RPCRTAPI -typedef LONG RPC_STATUS; +#endif +#endif +typedef LONG RPC_STATUS; typedef void* I_RPC_HANDLE; #include <rpcdce.h> diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 34321d05064..87bb7022629 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -125,34 +125,22 @@ typedef struct tagCStdPSFactoryBuffer #define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction -ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This) DECLSPEC_HIDDEN; -ULONG STDMETHODCALLTYPE NdrCStdStubBuffer2_Release(IRpcStubBuffer *This, IPSFactoryBuffer *pPSF); - #define CStdStubBuffer_DELEGATING_METHODS 0, 0, CStdStubBuffer2_Release, 0, 0, 0, 0, 0, 0, 0 - -HRESULT WINAPI - CStdStubBuffer_QueryInterface( IRpcStubBuffer *This, REFIID riid, void **ppvObject ); -ULONG WINAPI - CStdStubBuffer_AddRef( IRpcStubBuffer *This ); -ULONG WINAPI - CStdStubBuffer_Release( IRpcStubBuffer *This ) DECLSPEC_HIDDEN; -ULONG WINAPI - NdrCStdStubBuffer_Release( IRpcStubBuffer *This, IPSFactoryBuffer *pPSF ); -HRESULT WINAPI - CStdStubBuffer_Connect( IRpcStubBuffer *This, IUnknown *pUnkServer ); -void WINAPI - CStdStubBuffer_Disconnect( IRpcStubBuffer *This ); -HRESULT WINAPI - CStdStubBuffer_Invoke( IRpcStubBuffer *This, RPCOLEMESSAGE *pRpcMsg, IRpcChannelBuffer *pRpcChannelBuffer ); -IRpcStubBuffer * WINAPI - CStdStubBuffer_IsIIDSupported( IRpcStubBuffer *This, REFIID riid ); -ULONG WINAPI - CStdStubBuffer_CountRefs( IRpcStubBuffer *This ); -HRESULT WINAPI - CStdStubBuffer_DebugServerQueryInterface( IRpcStubBuffer *This, void **ppv ); -void WINAPI - CStdStubBuffer_DebugServerRelease( IRpcStubBuffer *This, void *pv ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_QueryInterface( IRpcStubBuffer *This, REFIID riid, void **ppvObject ); +RPCRTAPI ULONG WINAPI CStdStubBuffer_AddRef( IRpcStubBuffer *This ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_Connect( IRpcStubBuffer *This, IUnknown *pUnkServer ); +RPCRTAPI void WINAPI CStdStubBuffer_Disconnect( IRpcStubBuffer *This ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_Invoke( IRpcStubBuffer *This, RPCOLEMESSAGE *pRpcMsg, IRpcChannelBuffer *pRpcChannelBuffer ); +RPCRTAPI IRpcStubBuffer * WINAPI CStdStubBuffer_IsIIDSupported( IRpcStubBuffer *This, REFIID riid ); +RPCRTAPI ULONG WINAPI CStdStubBuffer_CountRefs( IRpcStubBuffer *This ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface( IRpcStubBuffer *This, void **ppv ); +RPCRTAPI void WINAPI CStdStubBuffer_DebugServerRelease( IRpcStubBuffer *This, void *pv ); +RPCRTAPI ULONG WINAPI NdrCStdStubBuffer_Release( IRpcStubBuffer *This, IPSFactoryBuffer *pPSF ); +RPCRTAPI ULONG WINAPI NdrCStdStubBuffer2_Release(IRpcStubBuffer *This, IPSFactoryBuffer *pPSF); + +ULONG STDMETHODCALLTYPE CStdStubBuffer_Release( IRpcStubBuffer *This ) DECLSPEC_HIDDEN; +ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This) DECLSPEC_HIDDEN; #define CStdStubBuffer_METHODS \ CStdStubBuffer_QueryInterface, \

1 0

Alexandre Julliard : include: Use proper dllimports for OLE functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 3de15569fe71b0d64a4440f251bed9b02a1a81dd URL: https://gitlab.winehq.org/wine/wine/-/commit/3de15569fe71b0d64a4440f251bed9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 12:01:25 2022 +0100 include: Use proper dllimports for OLE functions. --- dlls/combase/Makefile.in | 1 + dlls/combase/errorinfo.c | 1 + dlls/ole32/Makefile.in | 1 + dlls/oleaut32/Makefile.in | 1 + include/objbase.h | 245 +++++++------- include/ole2.h | 178 +++++------ include/oleauto.h | 794 +++++++++++++++++++++++----------------------- 7 files changed, 606 insertions(+), 615 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for crypt32 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: f9ee565c23869ad279c6da53e80460b53cd8560f URL: https://gitlab.winehq.org/wine/wine/-/commit/f9ee565c23869ad279c6da53e80460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:07:52 2022 +0100 include: Use proper dllimports for crypt32 functions. --- dlls/crypt32/Makefile.in | 1 + include/wincrypt.h | 418 ++++++++++++++++++++++++----------------------- 2 files changed, 214 insertions(+), 205 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for comctl32 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: c63f485379f353a9f24591cbd16fd8eb0f66ed8a URL: https://gitlab.winehq.org/wine/wine/-/commit/c63f485379f353a9f24591cbd16fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:21:39 2022 +0100 include: Use proper dllimports for comctl32 functions. --- dlls/comctl32/Makefile.in | 1 + include/commctrl.h | 215 +++++++++++++++++++++++----------------------- include/prsht.h | 18 ++-- 3 files changed, 122 insertions(+), 112 deletions(-)

1 0