February 2021 - Wine-commits

Alexandre Julliard : ntdll: Relocate the PE ntdll if necessary.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 06b729f7773243a76fb2df3c1bfe53b39819da5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06b729f7773243a76fb2df3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 12:37:37 2021 +0100 ntdll: Relocate the PE ntdll if necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c4f897f3d0d..d03034f35fc 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -891,6 +891,98 @@ static void load_ntdll_functions( HMODULE module ) #undef SET_PTR } +/* reimplementation of LdrProcessRelocationBlock */ +static IMAGE_BASE_RELOCATION *process_relocation_block( void *module, IMAGE_BASE_RELOCATION *rel, + INT_PTR delta ) +{ + char *page = get_rva( module, rel->VirtualAddress ); + UINT count = (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT); + USHORT *relocs = (USHORT *)(rel + 1); + + while (count--) + { + USHORT offset = *relocs & 0xfff; + switch (*relocs >> 12) + { + case IMAGE_REL_BASED_ABSOLUTE: + break; + case IMAGE_REL_BASED_HIGH: + *(short *)(page + offset) += HIWORD(delta); + break; + case IMAGE_REL_BASED_LOW: + *(short *)(page + offset) += LOWORD(delta); + break; + case IMAGE_REL_BASED_HIGHLOW: + *(int *)(page + offset) += delta; + break; +#ifdef _WIN64 + case IMAGE_REL_BASED_DIR64: + *(INT_PTR *)(page + offset) += delta; + break; +#elif defined(__arm__) + case IMAGE_REL_BASED_THUMB_MOV32: + { + DWORD *inst = (DWORD *)(page + offset); + WORD lo = ((inst[0] << 1) & 0x0800) + ((inst[0] << 12) & 0xf000) + + ((inst[0] >> 20) & 0x0700) + ((inst[0] >> 16) & 0x00ff); + WORD hi = ((inst[1] << 1) & 0x0800) + ((inst[1] << 12) & 0xf000) + + ((inst[1] >> 20) & 0x0700) + ((inst[1] >> 16) & 0x00ff); + DWORD imm = MAKELONG( lo, hi ) + delta; + + lo = LOWORD( imm ); + hi = HIWORD( imm ); + inst[0] = (inst[0] & 0x8f00fbf0) + ((lo >> 1) & 0x0400) + ((lo >> 12) & 0x000f) + + ((lo << 20) & 0x70000000) + ((lo << 16) & 0xff0000); + inst[1] = (inst[1] & 0x8f00fbf0) + ((hi >> 1) & 0x0400) + ((hi >> 12) & 0x000f) + + ((hi << 20) & 0x70000000) + ((hi << 16) & 0xff0000); + break; + } +#endif + default: + FIXME("Unknown/unsupported relocation %x\n", *relocs); + return NULL; + } + relocs++; + } + return (IMAGE_BASE_RELOCATION *)relocs; /* return address of next block */ +} + +static void relocate_ntdll( void *module ) +{ + IMAGE_DOS_HEADER *dos = module; + IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); + IMAGE_DATA_DIRECTORY *relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + IMAGE_BASE_RELOCATION *rel, *end; + IMAGE_SECTION_HEADER *sec; + ULONG protect_old[96], i; + INT_PTR delta; + + ERR( "ntdll could not be mapped at preferred address (%p/%p), expect trouble\n", + module, (void *)nt->OptionalHeader.ImageBase ); + + if (!relocs->Size || !relocs->VirtualAddress) return; + + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &protect_old[i] ); + } + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - (char *)nt->OptionalHeader.ImageBase; + while (rel && rel < end - 1 && rel->SizeOfBlock) rel = process_relocation_block( module, rel, delta ); + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, protect_old[i], &protect_old[i] ); + } +} + static void *callback_module; @@ -1534,8 +1626,11 @@ static void load_ntdll(void) status = open_builtin_file( name, &attr, &mapping, &module, &info, &st, FALSE ); if (!status && !module) { - status = map_builtin_module( mapping, &module, &st ); - NtClose( mapping ); + SIZE_T len = 0; + status = NtMapViewOfSection( mapping, NtCurrentProcess(), &module, 0, 0, NULL, &len, + ViewShare, 0, PAGE_EXECUTE_READ ); + if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); + status = add_builtin_module( module, NULL, &st ); } if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name );

1 0

Alexandre Julliard : ntdll: Initialize the ShowDotFiles option on the Unix side.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 305cb8af27da11e71950005796ec74d319c7d12f URL: https://source.winehq.org/git/wine.git/?a=commit;h=305cb8af27da11e719500057… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 15:14:41 2021 +0100 ntdll: Initialize the ShowDotFiles option on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 39 ------------------------------ dlls/ntdll/loader.c | 1 - dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/unix/file.c | 62 +++++++++++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unixlib.h | 5 +--- 6 files changed, 54 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index fb2f25d35bc..4125170b509 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -40,45 +40,6 @@ #include "wine/debug.h" #include "wine/exception.h" -#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') - -static BOOL show_dot_files; - -/*********************************************************************** - * init_directories - */ -void init_directories(void) -{ - char tmp[80]; - HANDLE root, hkey; - DWORD dummy; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, L"Software\\Wine" ); - - /* @@ Wine registry key: HKCU\Software\Wine */ - if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) - { - RtlInitUnicodeString( &nameW, L"ShowDotFiles" ); - if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) - { - WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; - show_dot_files = IS_OPTION_TRUE( str[0] ); - } - NtClose( hkey ); - } - NtClose( root ); - unix_funcs->set_show_dot_files( show_dot_files ); -} - /****************************************************************** * RtlWow64EnableFsRedirection (NTDLL.@) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e609a0f77d4..8dbbb14f05d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3999,7 +3999,6 @@ static NTSTATUS process_init(void) #endif init_unix_codepage(); - init_directories(); init_user_process_params(); params = peb->ProcessParameters; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 67696f80db3..aebea12e6ba 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -84,8 +84,6 @@ extern const WCHAR syswow64_dir[] DECLSPEC_HIDDEN; extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) DECLSPEC_HIDDEN; extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN; -extern void init_directories(void) DECLSPEC_HIDDEN; - extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; /* locale */ diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 00ca2005f92..381805c0f04 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2726,11 +2726,46 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l #endif +#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + +static NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) +{ + NTSTATUS status; + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + UNICODE_STRING name; + OBJECT_ATTRIBUTES attr; + + status = NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len ); + if (status) return status; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + len += sprintf( buffer + len, "\\%s", path ); + + name.Buffer = bufferW; + name.Length = len * sizeof(WCHAR); + name.MaximumLength = name.Length + sizeof(WCHAR); + ascii_to_unicode( bufferW, buffer, len + 1 ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, 0, NULL ); + return NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ); +} + + /*********************************************************************** * init_files */ void init_files(void) { + HANDLE key; + #ifndef _WIN64 if (is_wow64) init_redirects(); #endif @@ -2744,6 +2779,24 @@ void init_files(void) /* retrieve initial umask */ start_umask = umask( 0777 ); umask( start_umask ); + + if (!open_hkcu_key( "Software\\Wine", &key )) + { + static WCHAR showdotfilesW[] = {'S','h','o','w','D','o','t','F','i','l','e','s',0}; + char tmp[80]; + DWORD dummy; + UNICODE_STRING nameW; + + nameW.MaximumLength = sizeof(showdotfilesW); + nameW.Length = nameW.MaximumLength - sizeof(WCHAR); + nameW.Buffer = showdotfilesW; + if (!NtQueryValueKey( key, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) + { + WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; + show_dot_files = IS_OPTION_TRUE( str[0] ); + } + NtClose( key ); + } } @@ -3522,15 +3575,6 @@ static NTSTATUS unmount_device( HANDLE handle ) } -/*********************************************************************** - * set_show_dot_files - */ -void CDECL set_show_dot_files( BOOL enable ) -{ - show_dot_files = enable; -} - - /****************************************************************************** * open_unix_file * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d03034f35fc..df8d99ce489 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1718,7 +1718,6 @@ static struct unix_funcs unix_funcs = get_unix_codepage_data, get_locales, virtual_release_address_space, - set_show_dot_files, load_so_dll, load_builtin_dll, unload_builtin_dll, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index c317784a3ea..bd2512030c2 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 112 +#define NTDLL_UNIXLIB_VERSION 113 struct unix_funcs { @@ -76,9 +76,6 @@ struct unix_funcs /* virtual memory functions */ void (CDECL *virtual_release_address_space)(void); - /* file functions */ - void (CDECL *set_show_dot_files)( BOOL enable ); - /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); NTSTATUS (CDECL *load_builtin_dll)( UNICODE_STRING *name, void **module, void **unix_entry,

1 0

Alexandre Julliard : ntdll: Fix rounding the length of the runtime info parameter.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 4dad4315d52d6125991bdd14d0a6c0ad71e7c24d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dad4315d52d6125991bdd14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 22:38:44 2021 +0100 ntdll: Fix rounding the length of the runtime info parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50723 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index c7870c6bb4e..c6037afafbc 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1622,8 +1622,14 @@ void init_startup_info(void) copy_unicode_string( &src, &dst, &params->WindowTitle, info->title_len ); copy_unicode_string( &src, &dst, &params->Desktop, info->desktop_len ); copy_unicode_string( &src, &dst, &params->ShellInfo, info->shellinfo_len ); - copy_unicode_string( &src, &dst, &params->RuntimeInfo, info->runtime_len ); - params->RuntimeInfo.MaximumLength = params->RuntimeInfo.Length; /* runtime info isn't a real string */ + /* runtime info isn't a real string */ + params->RuntimeInfo.MaximumLength = params->RuntimeInfo.Length = info->runtime_len; + params->RuntimeInfo.Buffer = dst; + memcpy( dst, src, info->runtime_len ); + src += (info->runtime_len + 1) / sizeof(WCHAR); + dst += (info->runtime_len + 1) / sizeof(WCHAR); + assert( (char *)src == (char *)info + info_size ); + params->Environment = dst; dst += copy_environment( dst, src ); memcpy( dst, dyn_env, dyn_size );

1 0

Rémi Bernon : include: Split Windows.Foundation.Collections parameterized types.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: e680cc53e004627cd4e0df6dc10b9ee226112e32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e680cc53e004627cd4e0df6d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 25 14:14:18 2021 +0100 include: Split Windows.Foundation.Collections parameterized types. To windows.foundation.collections.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.foundation.collections.idl | 74 ++++++++++++++++++++++++++++++ include/windows.foundation.idl | 45 +----------------- 3 files changed, 76 insertions(+), 44 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c1efee700fa..6c16e01a271 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -746,6 +746,7 @@ SOURCES = \ wincrypt.h \ windef.h \ windns.h \ + windows.foundation.collections.idl \ windows.foundation.idl \ windows.h \ windows.media.speechsynthesis.idl \ diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl new file mode 100644 index 00000000000..9f7a59ab907 --- /dev/null +++ b/include/windows.foundation.collections.idl @@ -0,0 +1,74 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +/* import "asyncinfo.idl"; */ +import "windowscontracts.idl"; +/* import "eventtoken.idl"; */ + +namespace Windows { + namespace Foundation { +#ifdef __WIDL__ + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(9de1c535-6ae1-11e0-84e1-18a905bcc53f) + ] + delegate HRESULT EventHandler<T>([in] IInspectable *sender, [in] T args); + + namespace Collections + { + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(6a79e863-4300-459a-9966-cbb660963ee1) + ] + interface IIterator<T> : IInspectable + { + [propget] HRESULT Current([out, retval] T *value); + [propget] HRESULT HasCurrent([out, retval] BOOL *value); + HRESULT MoveNext([out, retval] BOOL *value); + HRESULT GetMany([in] UINT32 count, [out] T *items, [out, retval] UINT32 *value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(faa585ea-6214-4217-afda-7f46de5869b3) + ] + interface IIterable<T> : IInspectable + { + HRESULT First([out, retval] Windows.Foundation.Collections.IIterator<T> **value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56) + ] + interface IVectorView<T> : IInspectable + { + HRESULT GetAt([in] ULONG index, [out, retval] T *value); + [propget] HRESULT Size([out, retval] ULONG *value); + HRESULT IndexOf([in, optional] T element, [out] ULONG *index, [out, retval] BOOLEAN *value); + HRESULT GetMany([in] ULONG start_index, [out] T *items, [out, retval] ULONG *value); + } + } +#endif + } +} diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index bb0fafcab77..3c60278cf05 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -25,6 +25,7 @@ import "inspectable.idl"; import "windowscontracts.idl"; /* import "eventtoken.idl"; */ /* import "ivectorchangedeventargs.idl"; */ +import "windows.foundation.collections.idl"; namespace Windows { namespace Foundation { @@ -111,49 +112,5 @@ namespace Windows { { HRESULT ToString([out, retval] HSTRING *value); } - -#ifdef __WIDL__ - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(9de1c535-6ae1-11e0-84e1-18a905bcc53f) - ] - delegate HRESULT EventHandler<T>([in] IInspectable *sender, [in] T args); - - namespace Collections - { - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(6a79e863-4300-459a-9966-cbb660963ee1) - ] - interface IIterator<T> : IInspectable - { - [propget] HRESULT Current([out, retval] T *value); - [propget] HRESULT HasCurrent([out, retval] BOOL *value); - HRESULT MoveNext([out, retval] BOOL *value); - HRESULT GetMany([in] UINT32 count, [out] T *items, [out, retval] UINT32 *value); - } - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(faa585ea-6214-4217-afda-7f46de5869b3) - ] - interface IIterable<T> : IInspectable - { - HRESULT First([out, retval] Windows.Foundation.Collections.IIterator<T> **value); - } - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56) - ] - interface IVectorView<T> : IInspectable - { - HRESULT GetAt([in] ULONG index, [out, retval] T *value); - [propget] HRESULT Size([out, retval] ULONG *value); - HRESULT IndexOf([in, optional] T element, [out] ULONG *index, [out, retval] BOOLEAN *value); - HRESULT GetMany([in] ULONG start_index, [out] T *items, [out, retval] ULONG *value); - } - } -#endif } }

1 0

Rémi Bernon : include: Add AggregateType / GetAbiType / GetLogicalType WinRT templates.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 2e262c59dfbd379232f9af93d5b1e79f3cf16b05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e262c59dfbd379232f9af93… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 25 14:14:23 2021 +0100 include: Add AggregateType / GetAbiType / GetLogicalType WinRT templates. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 9f7a59ab907..cf47adfa7e4 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -27,6 +27,19 @@ import "windowscontracts.idl"; namespace Windows { namespace Foundation { + +cpp_quote("#ifdef __cplusplus") +cpp_quote("} /* extern \"C\" */") +cpp_quote("namespace ABI { namespace Windows { namespace Foundation { namespace Internal {") +cpp_quote("template <class T> struct GetAbiType { typedef T type; };") +cpp_quote("template <class T> struct GetLogicalType { typedef T type; };") +cpp_quote("template <class L, class A> struct AggregateType {};") +cpp_quote("template <class L, class A> struct GetAbiType<AggregateType<L, A>> { typedef A type; };") +cpp_quote("template <class L, class A> struct GetLogicalType<AggregateType<L, A>> { typedef L type; };") +cpp_quote("}}}}") +cpp_quote("extern \"C\" {") +cpp_quote("#endif") + #ifdef __WIDL__ [ contract(Windows.Foundation.FoundationContract, 1.0),

1 0

Rémi Bernon : widl: Write C++ template declarations for parameterized types.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: ea9d98082aab5f50bf0203e36d0541da738bfdd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9d98082aab5f50bf0203e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 25 14:15:09 2021 +0100 widl: Write C++ template declarations for parameterized types. Based on a patch from Steve Lhomme. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ tools/widl/typetree.c | 5 +++++ 2 files changed, 50 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index 82aad0f11ca..8f8c66b2443 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -123,6 +123,25 @@ unsigned int get_attrv(const attr_list_t *list, enum attr_type t) return 0; } +static char *format_parameterized_type_args(const type_t *type, const char *prefix, const char *suffix) +{ + typeref_list_t *params; + typeref_t *ref; + size_t len = 0, pos = 0; + char *buf = NULL; + + params = type->details.parameterized.params; + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + { + assert(ref->type->type_type != TYPE_POINTER); + pos += strappend(&buf, &len, pos, "%s%s%s", prefix, ref->type->name, suffix); + if (list_next(params, &ref->entry)) pos += strappend(&buf, &len, pos, ", "); + } + + if (!buf) return xstrdup(""); + return buf; +} + static void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; @@ -1474,6 +1493,30 @@ static void write_function_proto(FILE *header, const type_t *iface, const var_t fprintf(header, ");\n\n"); } +static void write_parameterized_type_forward(FILE *header, type_t *type) +{ + type_t *iface = type->details.parameterized.type; + char *args; + + if (type_get_type(iface) == TYPE_DELEGATE) iface = type_delegate_get_iface(iface); + + fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); + write_namespace_start(header, type->namespace); + + args = format_parameterized_type_args(type, "class ", ""); + write_line(header, 0, "template <%s>", args); + write_line(header, 0, "struct %s_impl;\n", iface->name); + + write_line(header, 0, "template <%s>", args); + free(args); + args = format_parameterized_type_args(type, "", ""); + write_line(header, 0, "struct %s : %s_impl<%s> {};", iface->name, iface->name, args); + free(args); + + write_namespace_end(header, type->namespace); + fprintf(header, "#endif\n\n" ); +} + static void write_forward(FILE *header, type_t *iface) { fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", iface->c_name); @@ -1818,6 +1861,8 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) write_coclass_forward(header, stmt->u.type); else if (type_get_type(stmt->u.type) == TYPE_RUNTIMECLASS) write_runtimeclass_forward(header, stmt->u.type); + else if (type_get_type(stmt->u.type) == TYPE_PARAMETERIZED_TYPE) + write_parameterized_type_forward(header, stmt->u.type); break; case STMT_TYPEREF: case STMT_IMPORTLIB: diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 319dd4ae65a..4a10dd6c4a4 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -912,6 +912,8 @@ type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, ty iface->details.iface->async_iface = NULL; iface->details.iface->requires = requires; + iface->name = type->name; + type->defined = TRUE; return type; } @@ -952,6 +954,9 @@ type_t *type_parameterized_delegate_define(type_t *type, attr_list_t *attrs, sta iface->details.iface->async_iface = NULL; iface->details.iface->requires = NULL; + delegate->name = type->name; + compute_delegate_iface_names(delegate, type, type->details.parameterized.params); + type->defined = TRUE; return type; }

1 0

Rémi Bernon : widl: Write C++ template implementations for parameterized types.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 3556ecd5d7db97984f340d59769bca0f23232f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3556ecd5d7db97984f340d59… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 25 14:16:02 2021 +0100 widl: Write C++ template implementations for parameterized types. Based on a patch from Steve Lhomme. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++--- tools/widl/typetree.h | 8 ++++++ 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 8f8c66b2443..d81c66a3558 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -341,6 +341,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i { type_t *t = ds->type; const char *name; + char *args; if (!h) return; @@ -507,9 +508,19 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else write_type_left(h, ds, name_type, declonly, write_callconv); break; } - case TYPE_APICONTRACT: case TYPE_PARAMETERIZED_TYPE: + { + type_t *iface = type_parameterized_type_get_real_type(t); + if (type_get_type(iface) == TYPE_DELEGATE) iface = type_delegate_get_iface(iface); + args = format_parameterized_type_args(t, "", "_logical"); + fprintf(h, "%s<%s>", iface->name, args); + free(args); + break; + } case TYPE_PARAMETER: + fprintf(h, "%s_abi", t->name); + break; + case TYPE_APICONTRACT: /* shouldn't be here */ assert(0); break; @@ -576,10 +587,10 @@ void write_type_right(FILE *h, type_t *t, int is_field) case TYPE_INTERFACE: case TYPE_RUNTIMECLASS: case TYPE_DELEGATE: - break; - case TYPE_APICONTRACT: case TYPE_PARAMETERIZED_TYPE: case TYPE_PARAMETER: + break; + case TYPE_APICONTRACT: /* not supposed to be here */ assert(0); break; @@ -1517,6 +1528,58 @@ static void write_parameterized_type_forward(FILE *header, type_t *type) fprintf(header, "#endif\n\n" ); } +static void write_parameterized_implementation(FILE *header, type_t *type, int declonly) +{ + const statement_t *stmt; + typeref_list_t *params = params = type->details.parameterized.params; + typeref_t *ref; + type_t *iface = type->details.parameterized.type, *base; + char *args = NULL; + + fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); + write_line(header, 0, "} /* extern \"C\" */"); + write_namespace_start(header, type->namespace); + + if (type_get_type(iface) == TYPE_DELEGATE) iface = type_delegate_get_iface(iface); + base = type_iface_get_inherit(iface); + + args = format_parameterized_type_args(type, "class ", ""); + write_line(header, 0, "template <%s>", args); + free(args); + write_line(header, 0, "struct %s_impl%s", iface->name, base ? strmake(" : %s", base->name) : ""); + write_line(header, 0, "{"); + + write_line(header, 1, "private:"); + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + { + write_line(header, 0, "typedef typename Windows::Foundation::Internal::GetAbiType<%s>::type %s_abi;", ref->type->name, ref->type->name); + write_line(header, 0, "typedef typename Windows::Foundation::Internal::GetLogicalType<%s>::type %s_logical;", ref->type->name, ref->type->name); + } + indentation -= 1; + + write_line(header, 1, "public:"); + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + write_line(header, 0, "typedef %s %s_complex;", ref->type->name, ref->type->name); + + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *func = stmt->u.var; + if (is_callas(func->attrs)) continue; + indent(header, 1); + fprintf(header, "virtual "); + write_type_decl_left(header, &func->declspec); + fprintf(header, "%s(", get_name(func)); + write_args(header, type_function_get_args(func->declspec.type), NULL, 0, 0, NAME_DEFAULT); + fprintf(header, ") = 0;\n"); + indentation -= 1; + } + write_line(header, -1, "};"); + + write_namespace_end(header, type->namespace); + write_line(header, 0, "extern \"C\" {"); + write_line(header, 0, "#endif\n"); +} + static void write_forward(FILE *header, type_t *iface) { fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", iface->c_name); @@ -1924,6 +1987,12 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons write_runtimeclass(header, stmt->u.type); else if (type_get_type(stmt->u.type) != TYPE_PARAMETERIZED_TYPE) write_type_definition(header, stmt->u.type, stmt->declonly); + else + { + is_object_interface++; + write_parameterized_implementation(header, stmt->u.type, stmt->declonly); + is_object_interface--; + } break; case STMT_TYPEREF: /* FIXME: shouldn't write out forward declarations for undefined diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 805e96a9305..0b7cd385cc2 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -96,6 +96,14 @@ static inline type_t *type_get_real_type(const type_t *type) return (type_t *)type; } +static inline type_t *type_parameterized_type_get_real_type(const type_t *type) +{ + if (type->type_type == TYPE_PARAMETERIZED_TYPE) + return type_parameterized_type_get_real_type(type->details.parameterized.type); + else + return (type_t *)type; +} + static inline enum type_type type_get_type(const type_t *type) { return type_get_type_detect_alias(type_get_real_type(type));

1 0

Henri Verbeet : d3d10core/tests: Add a test for layered clears.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 54b2bb52eab16f3d843f1eed50bc706f2e6a24a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b2bb52eab16f3d843f1eed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 24 22:57:02 2021 +0100 d3d10core/tests: Add a test for layered clears. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 90 +++++++++++++++++++++++++++++++++------- 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f21431b2243..e8915aea8e7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -11104,17 +11104,19 @@ static void test_clear_render_target_view_1d(void) static void test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; - static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float clear_colour[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 0.5f}; + ID3D10RenderTargetView *rtv[3], *srgb_rtv; struct d3d10core_test_context test_context; ID3D10Texture2D *texture, *srgb_texture; - ID3D10RenderTargetView *rtv, *srgb_rtv; D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; struct resource_readback rb; ID3D10Device *device; unsigned int i, j; + DWORD colour; HRESULT hr; if (!init_test_context(&test_context)) @@ -11140,16 +11142,16 @@ static void test_clear_render_target_view_2d(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)srgb_texture, NULL, &srgb_rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, color); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, clear_colour); check_texture_color(test_context.backbuffer, expected_color, 1); - ID3D10Device_ClearRenderTargetView(device, rtv, color); + ID3D10Device_ClearRenderTargetView(device, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); if (is_d3d11_interface_available(device) && !enable_debug_layer) @@ -11158,11 +11160,11 @@ static void test_clear_render_target_view_2d(void) check_texture_color(texture, expected_color, 1); } - ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, clear_colour); check_texture_color(srgb_texture, expected_srgb_color, 1); ID3D10RenderTargetView_Release(srgb_rtv); - ID3D10RenderTargetView_Release(rtv); + ID3D10RenderTargetView_Release(rtv[0]); ID3D10Texture2D_Release(srgb_texture); ID3D10Texture2D_Release(texture); @@ -11179,30 +11181,88 @@ static void test_clear_render_target_view_2d(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; U(rtv_desc).Texture2D.MipSlice = 0; - hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D10Device_ClearRenderTargetView(device, rtv, color); + ID3D10Device_ClearRenderTargetView(device, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); - ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, clear_colour); get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); - DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); - ok(compare_color(color, expected_srgb_color, 1) - || broken(compare_color(color, expected_color, 1) && broken_device), - "Got unexpected color 0x%08x.\n", color); + colour = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); + ok(compare_color(colour, expected_srgb_color, 1) + || broken(compare_color(colour, expected_color, 1) && broken_device), + "Got unexpected colour 0x%08x.\n", colour); } } release_resource_readback(&rb); ID3D10RenderTargetView_Release(srgb_rtv); - ID3D10RenderTargetView_Release(rtv); + ID3D10RenderTargetView_Release(rtv[0]); ID3D10Texture2D_Release(texture); + + texture_desc.Width = 16; + texture_desc.Height = 16; + texture_desc.ArraySize = 5; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DARRAY; + U(rtv_desc).Texture2DArray.MipSlice = 0; + U(rtv_desc).Texture2DArray.FirstArraySlice = 0; + U(rtv_desc).Texture2DArray.ArraySize = 5; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[0]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 1; + U(rtv_desc).Texture2DArray.ArraySize = 3; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[1]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 2; + U(rtv_desc).Texture2DArray.ArraySize = 1; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv[2]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv[0], blue); + ID3D10Device_ClearRenderTargetView(device, rtv[1], green); + ID3D10Device_ClearRenderTargetView(device, rtv[2], clear_colour); + + get_texture_readback(texture, 0, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 1, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 2, &rb); + colour = get_readback_color(&rb, 8, 8); + ok(compare_color(colour, 0xbf4c7f19, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 3, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 4, &rb); + colour = get_readback_color(&rb, 8, 8); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + ID3D10RenderTargetView_Release(rtv[2]); + ID3D10RenderTargetView_Release(rtv[1]); + ID3D10RenderTargetView_Release(rtv[0]); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); }

1 0

Henri Verbeet : d3d11/tests: Add a test for layered clears.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 8c91486e75821f9bf8609b9caeb1d6a12d2fb7dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c91486e75821f9bf8609b9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 24 22:57:03 2021 +0100 d3d11/tests: Add a test for layered clears. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 90 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 32a9dc2e530..efbad45b35d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15434,18 +15434,20 @@ static void test_clear_render_target_view_1d(void) static void test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; - static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float clear_colour[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 0.5f}; + ID3D11RenderTargetView *rtv[3], *srgb_rtv; ID3D11Texture2D *texture, *srgb_texture; struct d3d11_test_context test_context; - ID3D11RenderTargetView *rtv, *srgb_rtv; D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; D3D11_TEXTURE2D_DESC texture_desc; ID3D11DeviceContext *context; struct resource_readback rb; ID3D11Device *device; unsigned int i, j; + DWORD colour; HRESULT hr; if (!init_test_context(&test_context, NULL)) @@ -15472,27 +15474,27 @@ static void test_clear_render_target_view_2d(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)srgb_texture, NULL, &srgb_rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, clear_colour); check_texture_color(test_context.backbuffer, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); if (!enable_debug_layer) ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, clear_colour); check_texture_color(srgb_texture, expected_srgb_color, 1); ID3D11RenderTargetView_Release(srgb_rtv); - ID3D11RenderTargetView_Release(rtv); + ID3D11RenderTargetView_Release(rtv[0]); ID3D11Texture2D_Release(srgb_texture); ID3D11Texture2D_Release(texture); @@ -15509,30 +15511,88 @@ static void test_clear_render_target_view_2d(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; U(rtv_desc).Texture2D.MipSlice = 0; - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, clear_colour); get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); - DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120, 0); - ok(compare_color(color, expected_srgb_color, 1) - || broken(compare_color(color, expected_color, 1) && broken_device), - "Got unexpected color 0x%08x.\n", color); + colour = get_readback_color(&rb, 80 + i * 160, 60 + j * 120, 0); + ok(compare_color(colour, expected_srgb_color, 1) + || broken(compare_color(colour, expected_color, 1) && broken_device), + "Got unexpected colour 0x%08x.\n", colour); } } release_resource_readback(&rb); ID3D11RenderTargetView_Release(srgb_rtv); - ID3D11RenderTargetView_Release(rtv); + ID3D11RenderTargetView_Release(rtv[0]); ID3D11Texture2D_Release(texture); + + texture_desc.Width = 16; + texture_desc.Height = 16; + texture_desc.ArraySize = 5; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY; + U(rtv_desc).Texture2DArray.MipSlice = 0; + U(rtv_desc).Texture2DArray.FirstArraySlice = 0; + U(rtv_desc).Texture2DArray.ArraySize = 5; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[0]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 1; + U(rtv_desc).Texture2DArray.ArraySize = 3; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[1]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 2; + U(rtv_desc).Texture2DArray.ArraySize = 1; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[2]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], blue); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[1], green); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[2], clear_colour); + + get_texture_readback(texture, 0, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 1, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 2, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + ok(compare_color(colour, 0xbf4c7f19, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 3, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 4, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + ID3D11RenderTargetView_Release(rtv[2]); + ID3D11RenderTargetView_Release(rtv[1]); + ID3D11RenderTargetView_Release(rtv[0]); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); }

1 0

Henri Verbeet : wined3d: Allow layered clears.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 25e07835a22aef93415ceb0e921deac25630f987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e07835a22aef93415ceb0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 24 22:57:04 2021 +0100 wined3d: Allow layered clears. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/wined3d/device.c | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e8915aea8e7..a5b2620d98a 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -11235,12 +11235,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 0, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 1, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 2, &rb); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index efbad45b35d..a331baf48a0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15565,12 +15565,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 0, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 1, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 2, &rb); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7405a38e13b..aaf91a03947 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5093,12 +5093,6 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3DERR_INVALIDCALL; } - if (view->layer_count != max(1, resource->depth >> view->desc.u.texture.level_idx)) - { - FIXME("Layered clears not implemented.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!rect) { SetRect(&r, 0, 0, view->width, view->height);

1 0