wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : dplayx/tests: Enable compilation with long types.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 91b0ceefc7e6961c6390c543f7b2155098b31199 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b0ceefc7e6961c6390c543… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:14 2022 +0100 dplayx/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/Makefile.in | 1 - dlls/dplayx/tests/dplayx.c | 120 +++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91b0ceefc7e6961c6390…

1 0

Eric Pouech : dplayx/tests: Use function in checkFlags macro to handle integral conversion.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 72a5a29b6f39627cbfe368799c19948b8c81e8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a5a29b6f39627cbfe36879… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:08 2022 +0100 dplayx/tests: Use function in checkFlags macro to handle integral conversion. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 11d96706e9f..75c05cbb282 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -45,11 +45,15 @@ static HRESULT (WINAPI *pDirectPlayCreate)( GUID *GUID, LPDIRECTPLAY *lplpDP, IU ok( (result != NULL) && (!strcmp(expected, result)), \ "expected=%s got=%s\n", \ expected, result ); -#define checkFlags(expected, result, flags) \ - ok( (expected) == (result), \ - "expected=0x%08x(%s) got=0x%08x(%s)\n", \ - expected, dwFlags2str(expected, flags), \ +static LPCSTR dwFlags2str(DWORD dwFlags, DWORD flagType); +#define checkFlags(expected, result, flags) checkFlags_(__LINE__, expected, result, flags) +static void checkFlags_(unsigned line, DWORD expected, DWORD result, DWORD flags) +{ + ok_(__FILE__, line)( expected == result, + "expected=0x%08x(%s) got=0x%08x(%s)\n", + expected, dwFlags2str(expected, flags), result, dwFlags2str(result, flags) ); +} #define checkGuid(expected, result) \ ok( IsEqualGUID(expected, result), \ "expected=%s got=%s\n", \

1 0

Eric Pouech : dplayx/tests: Use correct integral type.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 8707eecfc236997c56334db66267a9161ad7af85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8707eecfc236997c56334db6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:02 2022 +0100 dplayx/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index d71df8838f7..11d96706e9f 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6864,7 +6864,8 @@ done: /* taken from programs/winetest/main.c */ static BOOL is_stub_dll(const char *filename) { - DWORD size, ver; + UINT size; + DWORD ver; BOOL isstub = FALSE; char *p, *data;

1 0

Henri Verbeet : vkd3d-utils: Set a value for the VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG option in D3DCompile2().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: 79ae688140375fb99f7acf8ee1d89102aaf627b5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=79ae688140375fb99f7acf8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:39 2022 +0100 vkd3d-utils: Set a value for the VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG option in D3DCompile2(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 26df283..ee3bfb4 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -160,6 +160,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct vkd3d_shader_hlsl_source_info hlsl_info; struct vkd3d_shader_compile_option options[1]; struct vkd3d_shader_compile_info compile_info; + struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; const D3D_SHADER_MACRO *macro; char *messages; @@ -215,7 +216,11 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen hlsl_info.secondary_code.size = secondary_data_size; if (!(flags & D3DCOMPILE_DEBUG)) - options[compile_info.option_count++].name = VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG; + { + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG; + option->value = true; + } ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); if (messages)

1 0

Henri Verbeet : vkd3d-utils: Return an ID3DBlob pointer from D3DCreateBlob().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: c07e6536a9b360e6b05ec40902a31b8e52d73500 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c07e6536a9b360e6b05ec40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:38 2022 +0100 vkd3d-utils: Return an ID3DBlob pointer from D3DCreateBlob(). ID3DBlob is a typedef for ID3D10Blob, so this isn't all that consequential, but we're using ID3DBlob for the other vkd3d-utils exports. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3dcompiler.h | 2 +- include/vkd3d_utils.h | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index c70a7d7..c934835 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -66,7 +66,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); -HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3D10Blob **blob); +HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index a81f229..5652478 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -70,7 +70,7 @@ VKD3D_UTILS_API HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, c const char *target, UINT flags, UINT effect_flags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); -VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); +VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); VKD3D_UTILS_API HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 7fb042c..26df283 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -471,7 +471,7 @@ void vkd3d_destroy_event(HANDLE event) #endif /* _WIN32 */ -HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob) +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) { HRESULT hr; void *data;

1 0

Henri Verbeet : vkd3d-shader: Callers of vkd3d_shader_get_supported_target_types() should ignore unrecognised target types.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: c97d7f5bff8e577c95a2bb14606677ac3f8a93c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c97d7f5bff8e577c95a2bb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:37 2022 +0100 vkd3d-shader: Callers of vkd3d_shader_get_supported_target_types() should ignore unrecognised target types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3c7cc4d..6ce9819 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1477,7 +1477,8 @@ VKD3D_SHADER_API const char *vkd3d_shader_get_version(unsigned int *major, unsig VKD3D_SHADER_API const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); /** * Returns the target types supported, with the given source type, by - * vkd3d_shader_compile(). + * vkd3d_shader_compile(). Future versions of the library may introduce + * additional target types; callers should ignore unrecognised target types. * * \param source_type Source type for which to enumerate supported target types. *

1 0

Henri Verbeet : vkd3d-shader: Callers of vkd3d_shader_get_supported_source_types() should ignore unrecognised source types.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: 63098ba8fa72db5d2bcb021c84c9cee12c2587fd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=63098ba8fa72db5d2bcb021… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:36 2022 +0100 vkd3d-shader: Callers of vkd3d_shader_get_supported_source_types() should ignore unrecognised source types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0e958b2..3c7cc4d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1461,7 +1461,8 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com VKD3D_SHADER_API const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); /** * Returns the source types supported, with any target type, by - * vkd3d_shader_compile(). + * vkd3d_shader_compile(). Future versions of the library may introduce + * additional source types; callers should ignore unrecognised source types. * * Use vkd3d_shader_get_supported_target_types() to determine which target types * are supported for each source type.

1 0

Henri Verbeet : vkd3d-shader: Add a function pointer type for vkd3d_shader_preprocess().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: 3a971932468aa80e54269b0eedea767b2f3ab51f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a971932468aa80e54269b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:35 2022 +0100 vkd3d-shader: Add a function pointer type for vkd3d_shader_preprocess(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5a60b37..0e958b2 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1822,6 +1822,10 @@ typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signatur /** Type of vkd3d_shader_free_shader_signature(). */ typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signature *signature); +/** Type of vkd3d_shader_preprocess(). \since 1.3 */ +typedef void (*PFN_vkd3d_shader_preprocess)(struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, char **messages); + #ifdef __cplusplus } #endif /* __cplusplus */

1 0

Alexandre Julliard : Wine release 6.0.3
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: website Branch: master Commit: fd14c502f5b66a22b5ca043622c622af7a074ab3 URL: https://source.winehq.org/git/website.git/?a=commit;h=fd14c502f5b66a22b5ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 14:32:27 2022 +0100 Wine release 6.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022022501.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022022501.xml b/news/en/2022022501.xml new file mode 100644 index 00000000..fe5bd44a --- /dev/null +++ b/news/en/2022022501.xml @@ -0,0 +1,13 @@ +<news> +<date>February 25, 2022</date> +<title>Wine 6.0.3 Released</title> +<body> + The Wine maintenance release 6.0.3 is now available. + <a href="{$root}/announce/6.0.3">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.3.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.3 : Alexandre Julliard : Release 6.0.3
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: refs/tags/wine-6.0.3 Tag: 647a79bde965f4383c0c27491e34b25a909e6775 URL: https://source.winehq.org/git/wine.git/?a=tag;h=647a79bde965f4383c0c27491e3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 14:28:42 2022 +0100 Release 6.0.3

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
150
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 February 2022