wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Nikolay Sivov : wbemprox: Remove string duplication helper.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 22fa68bbd9c1f7e616f5c8845a33ba78346ef0a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22fa68bbd9c1f7e616f5c884… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 12 09:28:24 2022 +0300 wbemprox: Remove string duplication helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 142 +++++++++++++++++++-------------------- dlls/wbemprox/class.c | 4 +- dlls/wbemprox/qualifier.c | 4 +- dlls/wbemprox/query.c | 4 +- dlls/wbemprox/services.c | 6 +- dlls/wbemprox/table.c | 2 +- dlls/wbemprox/wbemprox_private.h | 8 --- 7 files changed, 81 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22fa68bbd9c1f7e616f5…

1 0

Nikolay Sivov : wbemprox: Use CRT memory allocation functions.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: c867e2daca6f7af3724f3a8918b3fd97d11926f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c867e2daca6f7af3724f3a89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 12 09:28:23 2022 +0300 wbemprox: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index a27cca798f3..df8c55c48fc 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -113,7 +113,7 @@ static HRESULT get_sd( SECURITY_DESCRIPTOR **sd, DWORD *size ) *size = GetSecurityDescriptorLength( &absolute_sd ); - *sd = HeapAlloc( GetProcessHeap(), 0, *size ); + *sd = malloc( *size ); if (!*sd) hr = E_OUTOFMEMORY; @@ -121,7 +121,7 @@ static HRESULT get_sd( SECURITY_DESCRIPTOR **sd, DWORD *size ) { if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) { - HeapFree( GetProcessHeap(), 0, *sd ); + free( *sd ); *sd = NULL; hr = E_FAIL; } @@ -162,7 +162,7 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemContext *context, IWbemClas if (SUCCEEDED(hr)) hr = IWbemClassObject_Put( out_params, L"SD", 0, &var_sd, CIM_UINT8|CIM_FLAG_ARRAY ); - HeapFree( GetProcessHeap(), 0, sd ); + free( sd ); VariantClear( &var_sd ); }

1 0

Zebediah Figura : tests: Introduce a Vulkan shader runner.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: vkd3d Branch: master Commit: e3f78706ec5059f2f7964b957b4d14a044c3bf5e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3f78706ec5059f2f7964b9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 11 12:18:31 2022 -0500 tests: Introduce a Vulkan shader runner. 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> --- Makefile.am | 5 +- tests/shader_runner.c | 2 + tests/shader_runner.h | 2 + tests/shader_runner_vulkan.c | 1160 ++++++++++++++++++++++++++++++++++++++++++ tests/vulkan_procs.h | 106 ++++ 5 files changed, 1273 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e3f78706ec5059f2f79…

1 0

Zebediah Figura : tests: Store samplers in a fixed-size array.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: vkd3d Branch: master Commit: 3e8b5a9fc31a41235adb2c55b74ff11a04c45e52 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e8b5a9fc31a41235adb2c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 11 12:18:30 2022 -0500 tests: Store samplers in a fixed-size array. We will need to allocate some structures in the Vulkan backend; this is easier if we don't need to worry about allocating them dynamically. 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> --- tests/shader_runner.c | 15 ++++++--------- tests/shader_runner.h | 3 ++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 2bdc6bd1..bf3bc0d8 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -725,17 +725,14 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { state = STATE_SAMPLER; - if ((current_sampler = get_sampler(runner, index))) + if (!(current_sampler = get_sampler(runner, index))) { - memset(current_sampler, 0, sizeof(*current_sampler)); - } - else - { - runner->samplers = realloc(runner->samplers, - ++runner->sampler_count * sizeof(*runner->samplers)); - current_sampler = &runner->samplers[runner->sampler_count - 1]; - memset(current_sampler, 0, sizeof(*current_sampler)); + if (runner->sampler_count == MAX_SAMPLERS) + fatal_error("Too many samplers declared.\n"); + + current_sampler = &runner->samplers[runner->sampler_count++]; } + memset(current_sampler, 0, sizeof(*current_sampler)); current_sampler->slot = index; current_sampler->filter = D3D12_FILTER_MIN_MAG_MIP_POINT; current_sampler->u_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 3bfbf48d..5d08206f 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -88,6 +88,7 @@ struct input_element }; #define MAX_RESOURCES 32 +#define MAX_SAMPLERS 32 struct shader_runner { @@ -103,7 +104,7 @@ struct shader_runner struct resource *resources[MAX_RESOURCES]; size_t resource_count; - struct sampler *samplers; + struct sampler samplers[MAX_SAMPLERS]; size_t sampler_count; struct input_element *input_elements;

1 0

Zebediah Figura : tests: Store resources in a fixed-size array.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: vkd3d Branch: master Commit: e208d87847e1d3e426a1a69755e8e0c6aaccc3c8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e208d87847e1d3e426a1a69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 11 12:18:29 2022 -0500 tests: Store resources in a fixed-size array. We will need to allocate some structures in the Vulkan backend; this is easier if we don't need to worry about allocating them dynamically. 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> --- tests/shader_runner.c | 5 +++-- tests/shader_runner.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 0aca7830..2bdc6bd1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -327,7 +327,9 @@ static void set_resource(struct shader_runner *runner, struct resource *resource } } - runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); + if (runner->resource_count == MAX_RESOURCES) + fatal_error("Too many resources declared.\n"); + runner->resources[runner->resource_count++] = resource; } @@ -846,7 +848,6 @@ out: if (runner->resources[i]) runner->ops->destroy_resource(runner, runner->resources[i]); } - free(runner->resources); fclose(f); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 8dc77673..3bfbf48d 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -87,6 +87,8 @@ struct input_element unsigned int index; }; +#define MAX_RESOURCES 32 + struct shader_runner { const struct shader_runner_ops *ops; @@ -98,7 +100,7 @@ struct shader_runner uint32_t *uniforms; size_t uniform_count, uniform_capacity; - struct resource **resources; + struct resource *resources[MAX_RESOURCES]; size_t resource_count; struct sampler *samplers;

1 0

Zebediah Figura : tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in d3d12_runner_probe_vec4().
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: vkd3d Branch: master Commit: 02182ce4f7efb6f552fb68b7abe82e561afce9e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02182ce4f7efb6f552fb68b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 11 12:18:28 2022 -0500 tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in d3d12_runner_probe_vec4(). 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> --- tests/shader_runner_d3d12.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 06221691..c3eb5686 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -296,8 +296,6 @@ static void d3d12_runner_draw(struct shader_runner *r, ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, test_context->rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0); - transition_resource_state(command_list, test_context->render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); /* Finish the command list so that we can destroy objects. */ hr = ID3D12GraphicsCommandList_Close(command_list); @@ -314,11 +312,15 @@ static void d3d12_runner_probe_vec4(struct shader_runner *r, struct test_context *test_context = &runner->test_context; struct resource_readback rb; + transition_resource_state(test_context->list, test_context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(test_context->render_target, 0, &rb, test_context->queue, test_context->list); check_readback_data_vec4(&rb, rect, v, ulps); release_resource_readback(&rb); reset_command_list(test_context->list, test_context->allocator); + transition_resource_state(test_context->list, test_context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } static const struct shader_runner_ops d3d12_runner_ops =

1 0

Alexandre Julliard : Wine release 6.0.4
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: website Branch: master Commit: 89f54ebdb3ac12ac152e8f2d773a4b8542bbfd1c URL: https://source.winehq.org/git/website.git/?a=commit;h=89f54ebdb3ac12ac152e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 20:38:25 2022 +0200 Wine release 6.0.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022041201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022041201.xml b/news/en/2022041201.xml new file mode 100644 index 00000000..b033ebcf --- /dev/null +++ b/news/en/2022041201.xml @@ -0,0 +1,13 @@ +<news> +<date>April 12, 2022</date> +<title>Wine 6.0.4 Released</title> +<body> + The Wine maintenance release 6.0.4 is now available. + <a href="{$root}/announce/6.0.4">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.0.4 : Alexandre Julliard : Release 6.0.4
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: refs/tags/wine-6.0.4 Tag: a9c10ea65bb2c9f869e17a7367725a4288a2c9fb URL: https://source.winehq.org/git/wine.git/?a=tag;h=a9c10ea65bb2c9f869e17a73677… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 20:36:27 2022 +0200 Release 6.0.4

1 0

Michael Stefaniuc : Release 6.0.4.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 270803bad7c7a584a1a71307e8d07df0d01e9110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=270803bad7c7a584a1a71307… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 3 23:26:59 2022 +0200 Release 6.0.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 340 +++++++++++++++++++++++++------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 149 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=270803bad7c7a584a1a7…

1 0

Matteo Bruni : combase: Add RoSetErrorReportingFlags() stub.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: ce5477ef02688e4f535c6916c26193743ab38f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5477ef02688e4f535c6916… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 14:05:32 2022 +0100 combase: Add RoSetErrorReportingFlags() stub. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 430583893e52a46eabca5056da3b73455501369a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 9 +++++++++ include/roerrorapi.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f01a93288c7..bb3df16b774 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -312,7 +312,7 @@ @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference @ stub RoRevokeActivationFactories -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) @ stub RoTransformError @ stub RoTransformErrorW @ stdcall RoUninitialize() diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 7d871fb885c..58c2cd59682 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -299,6 +299,15 @@ BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) return FALSE; } +/*********************************************************************** + * RoSetErrorReportingFlags (combase.@) + */ +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) +{ + FIXME("(%08x): stub\n", flags); + return S_OK; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */ diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..741347455b1 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -23,8 +23,18 @@ #include <restrictederrorinfo.h> #include <rpc.h> +typedef enum +{ + RO_ERROR_REPORTING_NONE = 0x0, + RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x1, + RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x2, + RO_ERROR_REPORTING_USESETERRORINFO = 0x4, + RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x8, +} RO_ERROR_REPORTING_FLAGS; + HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags); #endif /* _ROERROR_H */

1 0

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 April 2022