wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Henri Verbeet : vkd3d-compiler: Reference --print-target-types in the help text for -b.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 0b293ceae7d2ec8ac3c76dcf9448e01fdcd069f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0b293ceae7d2ec8ac3c76dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:24 2021 +0200 vkd3d-compiler: Reference --print-target-types in the help text for -b. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 71f90f8..4c7a462 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -161,7 +161,8 @@ static void print_usage(const char *program_name) "[options...] [file]\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -b <type> Specify the target type.\n" + " -b <type> Specify the target type. Use --print-target-types to\n" + " list valid target types for a given source type.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n"

1 0

Henri Verbeet : vkd3d-shader: Use vkd3d_swizzle_get_component() in shader_dump_src_param().
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 5f4fc9cb06e386aabb83eb65fedba903e4c28d1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f4fc9cb06e386aabb83eb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:23 2021 +0200 vkd3d-shader: Use vkd3d_swizzle_get_component() in shader_dump_src_param(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index df0ebf0..26bc788 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1239,11 +1239,12 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_IMMCONST64 && param->reg.type != VKD3DSPR_SAMPLER) { + unsigned int swizzle_x = vkd3d_swizzle_get_component(swizzle, 0); + unsigned int swizzle_y = vkd3d_swizzle_get_component(swizzle, 1); + unsigned int swizzle_z = vkd3d_swizzle_get_component(swizzle, 2); + unsigned int swizzle_w = vkd3d_swizzle_get_component(swizzle, 3); + static const char swizzle_chars[] = "xyzw"; - DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_y = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(1)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_z = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(2)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_w = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(3)) & VKD3D_SHADER_SWIZZLE_MASK; if (swizzle_x == swizzle_y && swizzle_x == swizzle_z

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Cleanup HLSL context during error path.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 8b6db3d366b7110667ac03d0ce8a3b178253f33e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b6db3d366b7110667ac03d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Aug 30 08:53:35 2021 +0200 vkd3d-shader/hlsl: Cleanup HLSL context during error path. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fc9b425..7b246bf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1829,6 +1829,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entry_point); + hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_INVALID_SHADER; }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not swallow compilation errors.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 910aa4df01abfb2460d93e04cf398a946cc9f8e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=910aa4df01abfb2460d93e0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Aug 30 08:49:25 2021 +0200 vkd3d-shader/hlsl: Do not swallow compilation errors. There are cases where compilation fails, but no error message is recorded. They usually correspond to unimplemented features, but still failure should be forwarded to the caller, otherwise it will manifest itself later in more confusing ways (like not being able to find a function even though it was apparently correctly compiled). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d9186a..fc9b425 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1803,7 +1803,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d if (!hlsl_ctx_init(&ctx, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (hlsl_lexer_compile(&ctx, hlsl) == 2) + if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2) { hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_OUT_OF_MEMORY; @@ -1815,6 +1815,14 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return ctx.result; } + /* If parsing failed without an error condition being recorded, we + * plausibly hit some unimplemented feature. */ + if (ret) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + if (!(entry_func = hlsl_get_func_decl(&ctx, entry_point))) { const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name};

1 0

Michael Stefaniuc : quartz: Forward dsound_render_qc_Release() to a release method.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 21c4a25437969696cbf5ffecee191ba8302bb2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c4a25437969696cbf5ffec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Aug 29 14:00:17 2021 +0200 quartz: Forward dsound_render_qc_Release() to a release method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3a6b7764634..51a66ac5d30 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -955,7 +955,7 @@ static ULONG WINAPI dsound_render_qc_AddRef(IQualityControl *iface) static ULONG WINAPI dsound_render_qc_Release(IQualityControl *iface) { struct dsound_render *filter = impl_from_IQualityControl(iface); - return IUnknown_AddRef(filter->filter.outer_unk); + return IUnknown_Release(filter->filter.outer_unk); } static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface,

1 0

Connor McAdams : oleacc: Implement AccessibleObjectFromEvent.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 602a36a2538e356ae8e64b442e9a5ad7f3748bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602a36a2538e356ae8e64b44… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 30 11:27:41 2021 -0400 oleacc: Implement AccessibleObjectFromEvent. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f6b66a8bcab..beceb2ff1fb 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -331,6 +331,53 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V return E_NOTIMPL; } +static void variant_init_i4( VARIANT *v, int val ) +{ + V_VT(v) = VT_I4; + V_I4(v) = val; +} + +HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, + IAccessible **acc_out, VARIANT *child_id_out ) +{ + VARIANT child_id_variant; + IAccessible *acc = NULL; + IDispatch *child = NULL; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", hwnd, object_id, child_id, acc_out, child_id_out); + + if (!acc_out) + return E_INVALIDARG; + *acc_out = NULL; + VariantInit(child_id_out); + + hr = AccessibleObjectFromWindow(hwnd, object_id, &IID_IAccessible, (void **)&acc); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, child_id); + hr = IAccessible_get_accChild(acc, child_id_variant, &child); + if (FAILED(hr)) + TRACE("get_accChild failed with %#x!\n", hr); + + if (SUCCEEDED(hr) && child) + { + IAccessible_Release(acc); + hr = IDispatch_QueryInterface(child, &IID_IAccessible, (void **)&acc); + IDispatch_Release(child); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, CHILDID_SELF); + } + + *acc_out = acc; + *child_id_out = child_id_variant; + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 4cff0b8effc..9ad6e915965 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,5 +1,5 @@ @ stdcall AccessibleChildren(ptr long long ptr ptr) -@ stub AccessibleObjectFromEvent +@ stdcall AccessibleObjectFromEvent(ptr long long ptr ptr) @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr)

1 0

Francois Gouget : windowscodecs: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 7f1cd647f61fc0992ce9572784a7cf62a5705a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1cd647f61fc0992ce95727… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:22:44 2021 +0200 windowscodecs: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 89e352b8946..2c72cdfc1b5 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -565,7 +565,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetContainerFormat(IWICMetadataBl return S_OK; } -static HRESULT WINAPI CommonDecoderFrame_InitializeMetadata(CommonDecoderFrame *This) +static HRESULT CommonDecoderFrame_InitializeMetadata(CommonDecoderFrame *This) { HRESULT hr=S_OK;

1 0

Francois Gouget : quartz: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: e950ec2c3be88340f13904a7db62baf3f9ff650a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e950ec2c3be88340f13904a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:22:32 2021 +0200 quartz: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9ecdb280cc6..3a6b7764634 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -283,7 +283,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This, return S_OK; } -static HRESULT WINAPI DSoundRender_PrepareReceive(struct dsound_render *This, IMediaSample *pSample) +static HRESULT DSoundRender_PrepareReceive(struct dsound_render *This, IMediaSample *pSample) { HRESULT hr; AM_MEDIA_TYPE *amt; @@ -320,7 +320,7 @@ static HRESULT WINAPI DSoundRender_PrepareReceive(struct dsound_render *This, IM return S_OK; } -static HRESULT WINAPI DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSample *pSample) +static HRESULT DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSample *pSample) { LPBYTE pbSrcStream = NULL; LONG cbSrcStream = 0;

1 0

Francois Gouget : kerberos: Make accept_context() static.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: efe44b5702bb2dbc7ea56e8d50037f7e1d76a2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe44b5702bb2dbc7ea56e8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:24:20 2021 +0200 kerberos: Make accept_context() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 6f53609e2ed..cceb99b2b36 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -493,7 +493,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) return ret; } -NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, +static NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *expiry ) {

1 0

Francois Gouget : winex11.drv: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: e201c4f36e03b63e192af399c06e904f5a170e9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e201c4f36e03b63e192af399… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:19:06 2021 +0200 winex11.drv: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fd39b58bb3b..791787cfd3a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1539,7 +1539,7 @@ void destroy_gl_drawable( HWND hwnd ) * * Get the pixel-format descriptor associated to the given id */ -static int WINAPI describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) +static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) { /*XVisualInfo *vis;*/ int value;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
106
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021