February 2022 - Wine-Commits

Alexandre Julliard : include: Update __MSABI_LONG definition for WINE_NO_LONG_TYPES support.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: master Commit: 09e233790ee2d9773a914e2ad2689fa637e9c45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e233790ee2d9773a914e2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 12:02:52 2022 +0100 include: Update __MSABI_LONG definition for WINE_NO_LONG_TYPES support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/verrsrc.h | 2 +- include/winnt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/verrsrc.h b/include/verrsrc.h index fa5c26c94fd..e13165a7d2e 100644 --- a/include/verrsrc.h +++ b/include/verrsrc.h @@ -22,7 +22,7 @@ /* Macro to deal with LP64 <=> LLP64 differences in numeric constants with 'l' modifier */ #ifndef __MSABI_LONG -# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) # define __MSABI_LONG(x) x ## l # else # define __MSABI_LONG(x) x diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..079858d2f7d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -604,7 +604,7 @@ typedef DWORD FLONG; /* Macro to deal with LP64 <=> LLP64 differences in numeric constants with 'l' modifier */ #ifndef __MSABI_LONG -# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) # define __MSABI_LONG(x) x ## l # else # define __MSABI_LONG(x) x

1 0

Sven Baars : ntoskrnl.exe/tests: Let CertCloseStore() delete the certificate context.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: master Commit: d78f234a108acaf78674559de84bdc89c0937f52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d78f234a108acaf78674559d… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Feb 18 23:26:30 2022 +0100 ntoskrnl.exe/tests: Let CertCloseStore() delete the certificate context. This should fix test failures caused by ef437b41eebcb54a3576741fc52dbc29caa1590f. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6207ce00ccb..13d1af4e7cd 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -233,15 +233,11 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertFreeCertificateContext(ctx->cert); ok(ret, "Failed to free certificate, error %u\n", GetLastError()); - ret = CertDeleteCertificateFromStore(ctx->root_cert); - ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); ret = CertFreeCertificateContext(ctx->root_cert); ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); - ret = CertDeleteCertificateFromStore(ctx->publisher_cert); - ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); ret = CertFreeCertificateContext(ctx->publisher_cert); ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG);

1 0

Eric Pouech : dpnet/tests: Use correct integral type.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: master Commit: e32c74d85fa0c42f1454f7eb603754fae900e78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32c74d85fa0c42f1454f7eb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:20 2022 +0100 dpnet/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/dpnet/tests/server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 4314c69ccc1..3d59d746fba 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -418,7 +418,8 @@ done: /* taken from programs/winetest/main.c */ 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-shader: Add a function pointer type for vkd3d_shader_preprocess().
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

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

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

Feb. 25, 2022

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 Feb. 25, 2022

Feb. 25, 2022

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 Feb. 25, 2022

Feb. 25, 2022

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 Feb. 25, 2022

Feb. 25, 2022

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

Alexandre Julliard : Wine release 6.0.3
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

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

Hans Leidekker : wbemprox: Return an empty array for __DERIVATION.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: b5eebf644a56a8e4978b000df2cad398d06ee933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5eebf644a56a8e4978b000d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:44 2021 +0200 wbemprox: Return an empty array for __DERIVATION. Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51871 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2243229043b9af45376e27df55a3fa279590a9b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/query.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index ec2a43c3f5f..dc363475c71 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1001,6 +1001,19 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } + if (!wcsicmp( name, L"__DERIVATION" )) + { + if (ret) + { + SAFEARRAY *sa; + FIXME( "returning empty array for __DERIVATION\n" ); + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, 0 ))) return E_OUTOFMEMORY; + V_VT( ret ) = VT_BSTR | VT_ARRAY; + V_ARRAY( ret ) = sa; + } + if (type) *type = CIM_STRING | CIM_FLAG_ARRAY; + return S_OK; + } FIXME("system property %s not implemented\n", debugstr_w(name)); return WBEM_E_NOT_FOUND; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 2cb9e3c54bd..b2e2d815e2a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1514,6 +1514,7 @@ static void test_Win32_VideoController( IWbemServices *services ) if (hr != S_OK) break; check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__DERIVATION", VT_BSTR | VT_ARRAY, CIM_STRING | CIM_FLAG_ARRAY ); check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); check_property( obj, L"__PATH", VT_BSTR, CIM_STRING );

1 0