September 2020 - Wine-Commits

Alexandre Julliard : ntdll: Make the reserved area functions static.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 7b96e82fd569bc3b261be147abe49a822f14d4e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b96e82fd569bc3b261be147… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 16:29:35 2020 +0200 ntdll: Make the reserved area functions static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 59 +++--------------------------------------- dlls/ntdll/unix/unix_private.h | 5 ---- dlls/ntdll/unix/virtual.c | 12 +++++---- 3 files changed, 11 insertions(+), 65 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 73d4ceee14..dcbe4eff0f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1406,43 +1406,12 @@ static void start_main_thread(void) #ifdef __APPLE__ -struct apple_stack_info -{ - void *stack; - size_t desired_size; -}; - static void *apple_wine_thread( void *arg ) { start_main_thread(); return NULL; } -/*********************************************************************** - * apple_alloc_thread_stack - * - * Callback for mmap_enum_reserved_areas to allocate space for - * the secondary thread's stack. - */ -#ifndef _WIN64 -static int CDECL apple_alloc_thread_stack( void *base, size_t size, void *arg ) -{ - struct apple_stack_info *info = arg; - - /* For mysterious reasons, putting the thread stack at the very top - * of the address space causes subsequent execs to fail, even on the - * child side of a fork. Avoid the top 16MB. */ - char * const limit = (char*)0xff000000; - if ((char *)base >= limit) return 0; - if (size > limit - (char*)base) - size = limit - (char*)base; - if (size < info->desired_size) return 0; - info->stack = wine_anon_mmap( (char *)base + size - info->desired_size, - info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); - return (info->stack != (void *)-1); -} -#endif - /*********************************************************************** * apple_create_wine_thread * @@ -1453,33 +1422,13 @@ static int CDECL apple_alloc_thread_stack( void *base, size_t size, void *arg ) */ static void apple_create_wine_thread( void *arg ) { - int success = 0; pthread_t thread; pthread_attr_t attr; - if (!pthread_attr_init( &attr )) - { -#ifndef _WIN64 - struct apple_stack_info info; - - /* Try to put the new thread's stack in the reserved area. If this - * fails, just let it go wherever. It'll be a waste of space, but we - * can go on. */ - if (!pthread_attr_getstacksize( &attr, &info.desired_size ) && - mmap_enum_reserved_areas( apple_alloc_thread_stack, &info, 1 )) - { - mmap_remove_reserved_area( info.stack, info.desired_size ); - pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); - } -#endif - - if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && - !pthread_create( &thread, &attr, apple_wine_thread, NULL )) - success = 1; - - pthread_attr_destroy( &attr ); - } - if (!success) exit(1); + pthread_attr_init( &attr ); + pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ); + if (pthread_create( &thread, &attr, apple_wine_thread, NULL )) exit(1); + pthread_attr_destroy( &attr ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0a21a059b4..f71963f4a9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -103,11 +103,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), void *arg, - int top_down ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_startup_info( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 58c84caab5..3eba5c0a9d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -212,6 +212,8 @@ static inline BOOL is_inside_signal_stack( void *ptr ) } +static void mmap_add_reserved_area( void *addr, SIZE_T size ); + static void reserve_area( void *addr, void *end ) { #ifdef __APPLE__ @@ -351,7 +353,7 @@ static void mmap_init( const struct preload_info *preload_info ) #endif } -void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) +static void mmap_add_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; struct list *ptr; @@ -400,7 +402,7 @@ void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) } } -void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) +static void mmap_remove_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; struct list *ptr; @@ -460,7 +462,7 @@ void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) } } -int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) +static int mmap_is_in_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; struct list *ptr; @@ -477,8 +479,8 @@ int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) return 0; } -int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), - void *arg, int top_down ) +static int mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), + void *arg, int top_down ) { int ret = 0; struct list *ptr;

1 0

Paul Gofman : ntdll/tests: Add tests for capturing context with xstate.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 61f3b3dcdf759537fe83b86837e2ef341a2c8b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61f3b3dcdf759537fe83b868… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 14:30:32 2020 +0300 ntdll/tests: Add tests for capturing context with xstate. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 268 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 267 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61f3b3dcdf759537fe83…

1 0

Nikolay Sivov : combase: Implement local server registration via SCM.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: adfaa93877a2981b1a3f95bf6f193c96242a2ed6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adfaa93877a2981b1a3f95bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 2 14:14:49 2020 +0300 combase: Implement local server registration via SCM. Main point of this change is to get rid of auxiliary thread that is causing issues when CoRevokeClassObject() has to wait on it, potentially deadlocking when called from DllMain. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 33 +++-- dlls/combase/combase_private.h | 4 +- dlls/combase/rpc.c | 306 +++++++++++------------------------------ dlls/ole32/compobj.c | 2 - include/wine/irpcss.idl | 17 +++ programs/rpcss/rpcss_main.c | 100 ++++++++++++++ 6 files changed, 222 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adfaa93877a2981b1a3f…

1 0

Nikolay Sivov : combase: Move currently unimplemented COM API functions.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 02301d8fbc94773f87af87660ffcab8e7e74d4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02301d8fbc94773f87af8766… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 2 14:14:46 2020 +0300 combase: Move currently unimplemented COM API functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 89 ++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 20 ++++----- dlls/combase/rpc.c | 10 +++++ dlls/ole32/compobj.c | 108 ---------------------------------------------- dlls/ole32/ole2.c | 11 ----- dlls/ole32/ole32.spec | 20 ++++----- 6 files changed, 119 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02301d8fbc94773f87af…

1 0

Alexandre Julliard : ntdll: Move the NT path conversion for exec process to the Unix library.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 52e9baddbce3f6d8aa768379ec6d7e82b47545c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52e9baddbce3f6d8aa768379… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 14:31:00 2020 +0200 ntdll: Move the NT path conversion for exec process to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 23 +++++++++++--------- dlls/ntdll/unix/process.c | 55 +++++++++++++++++++++++++++++++---------------- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c0b36be38e..7afd2a40a5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -59,13 +59,13 @@ PEB * WINAPI RtlGetCurrentPeb(void) */ NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) { - static const WCHAR argsW[] = {'%','s','%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; + static const WCHAR argsW[] = {'%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; static const WCHAR winevdm[] = {'w','i','n','e','v','d','m','.','e','x','e',0}; static const WCHAR comW[] = {'.','c','o','m',0}; static const WCHAR pifW[] = {'.','p','i','f',0}; DWORD len; - WCHAR *p, *cmdline; + WCHAR *p, *appname, *cmdline; UNICODE_STRING pathW, cmdW; /* check for .com or .pif extension */ @@ -80,20 +80,23 @@ NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) case STATUS_NO_MEMORY: case STATUS_INVALID_IMAGE_FORMAT: case STATUS_INVALID_IMAGE_NOT_MZ: - if (!RtlDosPathNameToNtPathName_U( params->ImagePathName.Buffer, &pathW, NULL, NULL )) - return status; - status = unix_funcs->exec_process( &pathW, &params->CommandLine, status ); + status = unix_funcs->exec_process( &params->ImagePathName, &params->CommandLine, status ); break; case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT: - len = (wcslen(system_dir) + wcslen(winevdm) + 16 + wcslen(params->ImagePathName.Buffer) + - wcslen(params->CommandLine.Buffer)); + len = wcslen(system_dir) + wcslen(winevdm) + 1; + if (!(appname = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + wcscpy( appname, (is_win64 || is_wow64) ? syswow64_dir : system_dir ); + wcscat( appname, winevdm ); + + len += 16 + wcslen(params->ImagePathName.Buffer) + wcslen(params->CommandLine.Buffer); if (!(cmdline = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - swprintf( cmdline, len, argsW, (is_win64 || is_wow64) ? syswow64_dir : system_dir, - winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); - RtlInitUnicodeString( &pathW, winevdm ); + swprintf( cmdline, len, argsW, appname, params->ImagePathName.Buffer, params->CommandLine.Buffer ); + + RtlInitUnicodeString( &pathW, appname ); RtlInitUnicodeString( &cmdW, cmdline ); status = unix_funcs->exec_process( &pathW, &cmdW, status ); break; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6b41080cee..82c0452f8e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -474,35 +474,47 @@ static ULONG get_env_size( const RTL_USER_PROCESS_PARAMETERS *params, char **win /*********************************************************************** - * get_unix_curdir + * get_nt_pathname + * + * Simplified version of RtlDosPathNameToNtPathName_U. */ -static int get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) +static WCHAR *get_nt_pathname( const UNICODE_STRING *str ) { static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; static const WCHAR uncprefixW[] = {'U','N','C','\\',0}; - const UNICODE_STRING *curdir = &params->CurrentDirectory.DosPath; - const WCHAR *dir = curdir->Buffer; - UNICODE_STRING nt_name; - OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; - NTSTATUS status; - HANDLE handle; - int fd = -1; + const WCHAR *name = str->Buffer; + WCHAR *ret; - if (!(nt_name.Buffer = malloc( curdir->Length + 8 * sizeof(WCHAR) ))) return -1; + if (!(ret = malloc( str->Length + 8 * sizeof(WCHAR) ))) return NULL; - /* simplified version of RtlDosPathNameToNtPathName_U */ - wcscpy( nt_name.Buffer, ntprefixW ); - if (dir[0] == '\\' && dir[1] == '\\') + wcscpy( ret, ntprefixW ); + if (name[0] == '\\' && name[1] == '\\') { - if ((dir[2] == '.' || dir[2] == '?') && dir[3] == '\\') dir += 4; + if ((name[2] == '.' || name[2] == '?') && name[3] == '\\') name += 4; else { - wcscat( nt_name.Buffer, uncprefixW ); - dir += 2; + wcscat( ret, uncprefixW ); + name += 2; } } - wcscat( nt_name.Buffer, dir ); + wcscat( ret, name ); + return ret; +} + + +/*********************************************************************** + * get_unix_curdir + */ +static int get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) +{ + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; + int fd = -1; + + if (!(nt_name.Buffer = get_nt_pathname( &params->CurrentDirectory.DosPath ))) return -1; nt_name.Length = wcslen( nt_name.Buffer ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); @@ -616,9 +628,14 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST case STATUS_NO_MEMORY: case STATUS_INVALID_IMAGE_FORMAT: case STATUS_INVALID_IMAGE_NOT_MZ: + { + UNICODE_STRING image; if (getenv( "WINEPRELOADRESERVE" )) return status; - if ((status = get_pe_file_info( path, &handle, &pe_info ))) return status; + image.Buffer = get_nt_pathname( path ); + image.Length = wcslen( image.Buffer ) * sizeof(WCHAR); + if ((status = get_pe_file_info( &image, &handle, &pe_info ))) return status; break; + } case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT:

1 0

Rémi Bernon : bcrypt: Export ECDSA/ECDH blobs with the correct header magic.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 4ee4fffafa76e1b55c746cea50f50ac6b8b81be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee4fffafa76e1b55c746cea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 2 09:59:47 2020 +0200 bcrypt: Export ECDSA/ECDH blobs with the correct header magic. This fixes Flight Simulator XAL authentication error message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 54 +++++++++++++++++++++++++++++++--------------- dlls/bcrypt/tests/bcrypt.c | 8 +++++++ 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a80bce47f9..7acf819862 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -680,7 +680,8 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } -static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, UCHAR **pubkey, + ULONG *pubkey_len ) { BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; @@ -689,20 +690,29 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **p UCHAR *src, *dst; int ret; + switch (alg_id) + { + case ALG_ID_ECDH_P256: + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + size = 32; + break; + case ALG_ID_ECDSA_P256: + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + size = 32; + break; + default: + FIXME( "algorithm %u not supported\n", alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + if ((ret = pgnutls_privkey_export_ecc_raw( gnutls_key, &curve, &x, &y, NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - switch (curve) + if (curve != GNUTLS_ECC_CURVE_SECP256R1) { - case GNUTLS_ECC_CURVE_SECP256R1: - magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; - size = 32; - break; - - default: FIXME( "curve %u not supported\n", curve ); free( x.data ); free( y.data ); return STATUS_NOT_IMPLEMENTED; @@ -863,7 +873,7 @@ NTSTATUS key_asymmetric_generate( struct key *key ) break; case GNUTLS_PK_ECC: - status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ); + status = export_gnutls_pubkey_ecc( handle, key->alg_id, &key->u.a.pubkey, &key->u.a.pubkey_len ); break; case GNUTLS_PK_DSA: @@ -894,20 +904,30 @@ NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len UCHAR *src, *dst; int ret; + switch (key->alg_id) + { + case ALG_ID_ECDH_P256: + magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + size = 32; + break; + case ALG_ID_ECDSA_P256: + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + size = 32; + break; + + default: + FIXME( "algorithm %u does not yet support exporting ecc blob\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + if ((ret = pgnutls_privkey_export_ecc_raw( key->u.a.handle, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - switch (curve) + if (curve != GNUTLS_ECC_CURVE_SECP256R1) { - case GNUTLS_ECC_CURVE_SECP256R1: - magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; - size = 32; - break; - - default: FIXME( "curve %u not supported\n", curve ); free( x.data ); free( y.data ); free( d.data ); return STATUS_NOT_IMPLEMENTED; @@ -982,7 +1002,7 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) return STATUS_INTERNAL_ERROR; } - if ((status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ))) + if ((status = export_gnutls_pubkey_ecc( handle, key->alg_id, &key->u.a.pubkey, &key->u.a.pubkey_len ))) { pgnutls_privkey_deinit( handle ); return status; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3e5d5cf17f..7fdc0ac7fb 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1765,6 +1765,14 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + memset( buffer, 0, sizeof(buffer) ); + status = pBCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ecckey = (BCRYPT_ECCKEY_BLOB *)buffer; + ok(ecckey->dwMagic == BCRYPT_ECDSA_PRIVATE_P256_MAGIC, "got %08x\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 3, "got %u\n", size); + pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); }

1 0

Alexandre Julliard : ntdll: Move the reserved area functions to avoid forward declarations.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 5b4b8774888b58ed424c46383d709c8e39345112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b4b8774888b58ed424c4638… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 16:29:53 2020 +0200 ntdll: Move the reserved area functions to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 280 +++++++++++++++++++++++----------------------- 1 file changed, 139 insertions(+), 141 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b4b8774888b58ed424c…

1 0

Alexandre Julliard : ntdll: Use the process parameters directly in exec_process().
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: f51cd0a1b5383506c5b1a535f702acab42898d08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51cd0a1b5383506c5b1a535… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 14:48:05 2020 +0200 ntdll: Use the process parameters directly in exec_process(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 50 +++++++++++++++++++++++++++++++------ dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/process.c | 56 ------------------------------------------ dlls/ntdll/unix/process.c | 9 ++++--- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 4 +-- 6 files changed, 51 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f51cd0a1b5383506c5b1…

1 0

Zebediah Figura : include: Document struct vkd3d_shader_interface_info.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: vkd3d Branch: master Commit: 72984bddcdce65ea643e02a9a8d338c4e7473816 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=72984bddcdce65ea643e02a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 20:34:30 2020 -0500 include: Document struct vkd3d_shader_interface_info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 154 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7e011e3..cc5615c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -105,15 +105,23 @@ struct vkd3d_shader_compile_option unsigned int value; }; +/** Describes which shader stages a resource is visible to. */ enum vkd3d_shader_visibility { + /** The resource is visible to all shader stages. */ VKD3D_SHADER_VISIBILITY_ALL = 0, + /** The resource is visible only to the vertex shader. */ VKD3D_SHADER_VISIBILITY_VERTEX = 1, + /** The resource is visible only to the hull shader. */ VKD3D_SHADER_VISIBILITY_HULL = 2, + /** The resource is visible only to the domain shader. */ VKD3D_SHADER_VISIBILITY_DOMAIN = 3, + /** The resource is visible only to the geometry shader. */ VKD3D_SHADER_VISIBILITY_GEOMETRY = 4, + /** The resource is visible only to the pixel shader. */ VKD3D_SHADER_VISIBILITY_PIXEL = 5, + /** The resource is visible only to the compute shader. */ VKD3D_SHADER_VISIBILITY_COMPUTE = 1000000000, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), @@ -128,21 +136,51 @@ struct vkd3d_shader_code size_t size; }; +/** The type of a shader resource descriptor. */ enum vkd3d_shader_descriptor_type { - VKD3D_SHADER_DESCRIPTOR_TYPE_SRV = 0x0, /* t# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_UAV = 0x1, /* u# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_CBV = 0x2, /* cb# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER = 0x3, /* s# */ + /** + * The descriptor is a shader resource view. In Direct3D assembly, this is + * bound to a t# register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SRV = 0x0, + /** + * The descriptor is an unordered access view. In Direct3D assembly, this is + * bound to a u# register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_UAV = 0x1, + /** + * The descriptor is a constant buffer view. In Direct3D assembly, this is + * bound to a cb# register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_CBV = 0x2, + /** + * The descriptor is a sampler. In Direct3D assembly, this is bound to an s# + * register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER = 0x3, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_TYPE), }; +/** + * A common structure describing the bind point of a descriptor or descriptor + * array in the target environment. + */ struct vkd3d_shader_descriptor_binding { + /** + * The set of the descriptor. If the target environment does not support + * descriptor sets, this value must be set to 0. + */ unsigned int set; + /** The binding index of the descriptor. */ unsigned int binding; - unsigned int count; /* This must be 1 in this version of vkd3d-shader. */ + /** + * The size of this descriptor array. Descriptor arrays are not supported in + * this version of vkd3d-shader, and therefore this value must be 1. + */ + unsigned int count; }; enum vkd3d_shader_binding_flag @@ -203,67 +241,161 @@ struct vkd3d_shader_parameter } u; }; +/** + * Describes the mapping of a single resource or resource array to its binding + * point in the target environment. + * + * For example, to map a Direct3D SRV with register space 2, register "t3" to + * a Vulkan descriptor in set 4 and with binding 5, set the following members: + * - \a type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + * - \a register_space = 2 + * - \a register_index = 3 + * - \a binding.set = 4 + * - \a binding.binding = 5 + * - \a binding.count = 1 + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_resource_binding { + /** The type of this descriptor. */ enum vkd3d_shader_descriptor_type type; + /** + * Register space of the Direct3D resource. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int register_space; + /** Register index of the DXBC resource. */ unsigned int register_index; + /** Shader stage(s) to which the resource is visible. */ enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flag */ + /** A combination of zero or more elements of vkd3d_shader_binding_flag. */ + unsigned int flags; + /** The binding in the target environment. */ struct vkd3d_shader_descriptor_binding binding; }; #define VKD3D_SHADER_DUMMY_SAMPLER_INDEX ~0u +/** + * Describes the mapping of a Direct3D resource-sampler pair to a combined + * sampler (i.e. sampled image). + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_combined_resource_sampler { + /** + * Register space of the Direct3D resource. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int resource_space; + /** Register index of the Direct3D resource. */ unsigned int resource_index; + /** + * Register space of the Direct3D sampler. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int sampler_space; + /** Register index of the Direct3D sampler. */ unsigned int sampler_index; + /** Shader stage(s) to which the resource is visible. */ enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flag */ + /** A combination of zero or more elements of vkd3d_shader_binding_flag. */ + unsigned int flags; + /** The binding in the target environment. */ struct vkd3d_shader_descriptor_binding binding; }; +/** + * Describes the mapping of a single Direct3D UAV counter. + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_uav_counter_binding { + /** + * Register space of the Direct3D UAV descriptor. If the source format does + * not support multiple register spaces, this parameter must be set to 0. + */ unsigned int register_space; - unsigned int register_index; /* u# */ + /** Register index of the Direct3D UAV descriptor. */ + unsigned int register_index; + /** Shader stage(s) to which the UAV counter is visible. */ enum vkd3d_shader_visibility shader_visibility; + /** The binding in the target environment. */ struct vkd3d_shader_descriptor_binding binding; unsigned int offset; }; +/** + * Describes the mapping of a Direct3D constant buffer to a range of push + * constants in the target environment. + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_push_constant_buffer { + /** + * Register space of the Direct3D resource. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int register_space; + /** Register index of the Direct3D resource. */ unsigned int register_index; + /** Shader stage(s) to which the resource is visible. */ enum vkd3d_shader_visibility shader_visibility; - unsigned int offset; /* in bytes */ - unsigned int size; /* in bytes */ + /** Offset, in bytes, of the target push constants. */ + unsigned int offset; + /** Size, in bytes, of the target push constants. */ + unsigned int size; }; -/* Extends vkd3d_shader_compile_info. */ +/** + * A chained structure describing the interface between a compiled shader and + * the target environment. + * + * For example, when compiling Direct3D shader byte code to SPIR-V, this + * structure contains mappings from Direct3D descriptor registers to SPIR-V + * descriptor bindings. + * + * This structure is optional. If omitted, vkd3d_shader_compile() will use a + * default mapping, in which resources are mapped to sequential bindings in + * register set 0. + * + * This structure extends vkd3d_shader_compile_info. + * + * This structure contains only input parameters. + */ struct vkd3d_shader_interface_info { + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO. */ enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** Pointer to an array of bindings for shader resource descriptors. */ const struct vkd3d_shader_resource_binding *bindings; + /** Size, in elements, of \ref bindings. */ unsigned int binding_count; + /** Pointer to an array of bindings for push constant buffers. */ const struct vkd3d_shader_push_constant_buffer *push_constant_buffers; + /** Size, in elements, of \ref push_constant_buffers. */ unsigned int push_constant_buffer_count; + /** Pointer to an array of bindings for combined samplers. */ const struct vkd3d_shader_combined_resource_sampler *combined_samplers; + /** Size, in elements, of \ref combined_samplers. */ unsigned int combined_sampler_count; + /** Pointer to an array of bindings for UAV counters. */ const struct vkd3d_shader_uav_counter_binding *uav_counters; + /** Size, in elements, of \ref uav_counters. */ unsigned int uav_counter_count; };

1 0

Zebediah Figura : include: Add documentation for enum vkd3d_shader_structure_type.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: vkd3d Branch: master Commit: 73f1adfd22c26ac03d6136fe8b381b574889bd10 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73f1adfd22c26ac03d6136f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 20:34:27 2020 -0500 include: Add documentation for enum vkd3d_shader_structure_type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1f2a9c2..da05f2c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -27,14 +27,31 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d_shader.h + * + * \since 1.2 + * + * This file contains definitions for the vkd3d-shader library. + * + * The vkd3d-shader library provides multiple utilities related to the + * compilation, transformation, and reflection of GPU shaders. + */ + +/** The type of a chained structure. */ enum vkd3d_shader_structure_type { - /* 1.2 */ + /** The structure is a vkd3d_shader_compile_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO, + /** The structure is a vkd3d_shader_interface_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, + /** The structure is a vkd3d_shader_scan_descriptor_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO, + /** The structure is a vkd3d_shader_spirv_domain_shader_target_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, + /** The structure is a vkd3d_shader_spirv_target_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, + /** The structure is a vkd3d_shader_transform_feedback_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE),

1 0