June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Avoid some Unix dependencies.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 38c78a968259963d29559096dda575237039c561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c78a968259963d29559096… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:40:28 2020 +0200 ntdll: Avoid some Unix dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +- dlls/ntdll/signal_arm.c | 16 +---- dlls/ntdll/signal_x86_64.c | 144 --------------------------------------------- dlls/ntdll/thread.c | 2 - 4 files changed, 4 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=38c78a968259963d2955…

1 0

Alexandre Julliard : ntdll: Avoid a compiler warning when fetching the return address.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 716cf7d342466235d3117db5da788704cbf2853d URL: https://source.winehq.org/git/wine.git/?a=commit;h=716cf7d342466235d3117db5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:46:04 2020 +0200 ntdll: Avoid a compiler warning when fetching the return address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d91d19f043..ac722bef55 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -360,7 +360,7 @@ NTSTATUS CDECL DECLSPEC_HIDDEN __regs_NtGetContextThread( DWORD edi, DWORD esi, { context->Ebp = ebp; context->Esp = (DWORD)&retaddr; - context->Eip = *(&edi - 1); + context->Eip = (DWORD)NtGetContextThread + 12; context->EFlags = eflags; } return unix_funcs->NtGetContextThread( handle, context );

1 0

Alexandre Julliard : ntdll: Reimplement the ctype functions to avoid depending on libc.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: bc8745851e3005fd98c45fe06fc9d4d92c68fa53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc8745851e3005fd98c45fe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:42:28 2020 +0200 ntdll: Reimplement the ctype functions to avoid depending on libc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 78 ++++++++++++++++++++++++++++++++++------------- dlls/ntdll/tests/string.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc8745851e3005fd98c4…

1 0

Alexandre Julliard : ntdll: Reimplement the string functions to avoid depending on libc.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 067648cd2bdc4776cb69c6554ee9d799e0b201c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=067648cd2bdc4776cb69c655… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:43:42 2020 +0200 ntdll: Reimplement the string functions to avoid depending on libc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 20 +++++ dlls/ntdll/string.c | 212 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 206 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=067648cd2bdc4776cb69…

1 0

Alexandre Julliard : include: Fix _memccpy, _memicmp and _memicmp_l prototypes.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 635593a01c2590168324b5a9477f63597535bdeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=635593a01c2590168324b5a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:44:56 2020 +0200 include: Fix _memccpy, _memicmp and _memicmp_l prototypes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstring.h | 6 +++--- include/msvcrt/memory.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 10ab894328..53537185f4 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -19,9 +19,9 @@ _ACRTIMP int __cdecl memcmp(const void*,const void*,size_t); _ACRTIMP void* __cdecl memcpy(void*,const void*,size_t); _ACRTIMP errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); _ACRTIMP void* __cdecl memset(void*,int,size_t); -_ACRTIMP void* __cdecl _memccpy(void*,const void*,int,unsigned int); -_ACRTIMP int __cdecl _memicmp(const void*,const void*,unsigned int); -_ACRTIMP int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); +_ACRTIMP void* __cdecl _memccpy(void*,const void*,int,size_t); +_ACRTIMP int __cdecl _memicmp(const void*,const void*,size_t); +_ACRTIMP int __cdecl _memicmp_l(const void*,const void*,size_t,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h index 21198e8f8b..ebdd2bee93 100644 --- a/include/msvcrt/memory.h +++ b/include/msvcrt/memory.h @@ -22,9 +22,9 @@ int __cdecl memcmp(const void*,const void*,size_t); void* __cdecl memcpy(void*,const void*,size_t); errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); void* __cdecl memset(void*,int,size_t); -void* __cdecl _memccpy(void*,const void*,int,unsigned int); -int __cdecl _memicmp(const void*,const void*,unsigned int); -int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); +void* __cdecl _memccpy(void*,const void*,int,size_t); +int __cdecl _memicmp(const void*,const void*,size_t); +int __cdecl _memicmp_l(const void*,const void*,size_t,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); }

1 0

Alexandre Julliard : ntdll: Stop sharing the thread counter with the Unix library.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 2334f4e64582a518e4d5a7627472a0d817b147ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2334f4e64582a518e4d5a762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:09:25 2020 +0200 ntdll: Stop sharing the thread counter with the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 9 +++++---- dlls/ntdll/unix/thread.c | 18 +++++++++--------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 4 ++-- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index eaf2f1a45b..4de562b994 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2670,6 +2670,36 @@ static void test_thread_lookup(void) "NtOpenThread returned %#x\n", status); } +static void test_thread_info(void) +{ + NTSTATUS status; + ULONG len, data; + + len = 0xdeadbeef; + data = 0xcccccccc; + status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, + &data, sizeof(data), &len ); + ok( !status, "failed %x\n", status ); + ok( data == 0 || data == 1, "wrong data %x\n", data ); + ok( len == sizeof(data), "wrong len %u\n", len ); + + len = 0xdeadbeef; + data = 0xcccccccc; + status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, + &data, sizeof(data) - 1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status ); + ok( data == 0xcccccccc, "wrong data %x\n", data ); + ok( len == 0xdeadbeef, "wrong len %u\n", len ); + + len = 0xdeadbeef; + data = 0xcccccccc; + status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, + &data, sizeof(data) + 1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status ); + ok( data == 0xcccccccc, "wrong data %x\n", data ); + ok( len == 0xdeadbeef, "wrong len %u\n", len ); +} + START_TEST(info) { char **argv; @@ -2827,4 +2857,5 @@ START_TEST(info) test_query_data_alignment(); test_thread_lookup(); + test_thread_info(); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ec94338f3f..7b8a717241 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -45,7 +45,6 @@ static PEB_LDR_DATA ldr; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; -static int nb_threads = 1; struct ldt_copy *__wine_ldt_copy = NULL; @@ -105,7 +104,7 @@ int __cdecl __wine_dbg_output( const char *str ) TEB *thread_init( SIZE_T *info_size ) { ULONG_PTR val; - TEB *teb = unix_funcs->init_threading( &nb_threads, &__wine_ldt_copy, info_size ); + TEB *teb = unix_funcs->init_threading( &__wine_ldt_copy, info_size ); peb = teb->Peb; peb->FastPebLock = &peb_lock; @@ -147,6 +146,8 @@ TEB *thread_init( SIZE_T *info_size ) */ void WINAPI RtlExitUserThread( ULONG status ) { + ULONG last; + if (status) /* send the exit code to the server (0 is already the default) */ { SERVER_START_REQ( terminate_thread ) @@ -158,12 +159,12 @@ void WINAPI RtlExitUserThread( ULONG status ) SERVER_END_REQ; } - if (InterlockedDecrement( &nb_threads ) <= 0) + NtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &last, sizeof(last), NULL ); + if (last) { LdrShutdownProcess(); unix_funcs->exit_process( status ); } - LdrShutdownThread(); RtlFreeThreadActivationContextStack(); for (;;) unix_funcs->exit_thread( status ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index c583a08c05..2be8d2d3e2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #define PTHREAD_STACK_MIN 16384 #endif -static int *nb_threads; +static int nb_threads = 1; static inline int get_unix_exit_code( NTSTATUS status ) { @@ -86,7 +86,7 @@ static void pthread_exit_wrapper( int status ) /*********************************************************************** * init_threading */ -TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZE_T *size ) +TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) { TEB *teb; BOOL suspend; @@ -95,7 +95,6 @@ TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZ extern struct ldt_copy __wine_ldt_copy; *ldt_copy = &__wine_ldt_copy; #endif - nb_threads = nb_threads_ptr; teb = virtual_alloc_first_teb(); @@ -290,10 +289,10 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT (char *)teb->Tib.StackBase + extra_stack - (char *)teb->DeallocationStack ); pthread_attr_setguardsize( &pthread_attr, 0 ); pthread_attr_setscope( &pthread_attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ - InterlockedIncrement( nb_threads ); + InterlockedIncrement( &nb_threads ); if (pthread_create( &pthread_id, &pthread_attr, (void * (*)(void *))start_thread, teb )) { - InterlockedDecrement( nb_threads ); + InterlockedDecrement( &nb_threads ); virtual_free_teb( teb ); status = STATUS_NO_MEMORY; } @@ -319,7 +318,7 @@ done: void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - if (InterlockedDecrement( nb_threads ) <= 0) abort_process( status ); + if (InterlockedDecrement( &nb_threads ) <= 0) abort_process( status ); signal_exit_thread( status, pthread_exit_wrapper ); } @@ -987,6 +986,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadAmILastThread: { + if (length != sizeof(ULONG)) return STATUS_INFO_LENGTH_MISMATCH; SERVER_START_REQ( get_thread_info ) { req->handle = wine_server_obj_handle( handle ); @@ -994,9 +994,9 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, status = wine_server_call( req ); if (status == STATUS_SUCCESS) { - BOOLEAN last = reply->last; - if (data) memcpy( data, &last, min( length, sizeof(last) )); - if (ret_len) *ret_len = min( length, sizeof(last) ); + ULONG last = reply->last; + if (data) memcpy( data, &last, sizeof(last) ); + if (ret_len) *ret_len = sizeof(last); } } SERVER_END_REQ; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d6a15d5f7b..1f4c2da0c6 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,7 +117,7 @@ extern NTSTATUS CDECL server_handle_to_fd( HANDLE handle, unsigned int access, i unsigned int *options ) DECLSPEC_HIDDEN; extern void CDECL server_release_fd( HANDLE handle, int unix_fd ) DECLSPEC_HIDDEN; extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; -extern TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZE_T *size ) DECLSPEC_HIDDEN; +extern TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_process( int status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 88010b695e..19e532da47 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -29,7 +29,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 65 +#define NTDLL_UNIXLIB_VERSION 66 struct unix_funcs { @@ -319,7 +319,7 @@ struct unix_funcs void (CDECL *virtual_set_large_address_space)(void); /* thread/process functions */ - TEB * (CDECL *init_threading)( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZE_T *size ); + TEB * (CDECL *init_threading)( struct ldt_copy **ldt_copy, SIZE_T *size ); void (CDECL *exit_thread)( int status ); void (CDECL *exit_process)( int status ); NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status );

1 0

Alexandre Julliard : ntdll: Update the __wine_ldt_copy pointer directly from the Unix library.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: f1ff598e2aca810c3a0540d6a764787d31890741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ff598e2aca810c3a0540d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:10:00 2020 +0200 ntdll: Update the __wine_ldt_copy pointer directly from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 ++ dlls/ntdll/thread.c | 4 +--- dlls/ntdll/unix/loader.c | 7 +++++++ dlls/ntdll/unix/server.c | 3 --- dlls/ntdll/unix/thread.c | 6 +----- dlls/ntdll/unix/unix_private.h | 6 ++++-- dlls/ntdll/unixlib.h | 5 ++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ac722bef55..7567a5e5d1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -95,6 +95,8 @@ static inline struct x86_thread_data *x86_thread_data(void) return (struct x86_thread_data *)NtCurrentTeb()->SystemReserved2; } +struct ldt_copy *__wine_ldt_copy = NULL; + /* Exception record for handling exceptions happening inside exception handlers */ typedef struct { diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7b8a717241..027b72d3be 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -46,8 +46,6 @@ static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; -struct ldt_copy *__wine_ldt_copy = NULL; - static RTL_CRITICAL_SECTION peb_lock; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -104,7 +102,7 @@ int __cdecl __wine_dbg_output( const char *str ) TEB *thread_init( SIZE_T *info_size ) { ULONG_PTR val; - TEB *teb = unix_funcs->init_threading( &__wine_ldt_copy, info_size ); + TEB *teb = unix_funcs->init_threading( info_size ); peb = teb->Peb; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 892ff10c35..600a2b0e39 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -838,6 +838,13 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) GET_FUNC( LdrInitializeThunk ); GET_FUNC( RtlUserThreadStart ); GET_FUNC( __wine_set_unix_funcs ); +#ifdef __i386__ + { + struct ldt_copy **p__wine_ldt_copy; + GET_FUNC( __wine_ldt_copy ); + *p__wine_ldt_copy = &__wine_ldt_copy; + } +#endif #undef GET_FUNC } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index f02d1ed8a2..c311665267 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1461,9 +1461,6 @@ void server_init_process(void) */ void CDECL server_init_process_done( void *relay ) { -#ifdef __i386__ - extern struct ldt_copy __wine_ldt_copy; -#endif PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); void *entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 2be8d2d3e2..129410f8d7 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -86,15 +86,11 @@ static void pthread_exit_wrapper( int status ) /*********************************************************************** * init_threading */ -TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) +TEB * CDECL init_threading( SIZE_T *size ) { TEB *teb; BOOL suspend; SIZE_T info_size; -#ifdef __i386__ - extern struct ldt_copy __wine_ldt_copy; - *ldt_copy = &__wine_ldt_copy; -#endif teb = virtual_alloc_first_teb(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1f4c2da0c6..54254632e7 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -73,7 +73,6 @@ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; - extern NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; @@ -117,7 +116,7 @@ extern NTSTATUS CDECL server_handle_to_fd( HANDLE handle, unsigned int access, i unsigned int *options ) DECLSPEC_HIDDEN; extern void CDECL server_release_fd( HANDLE handle, int unix_fd ) DECLSPEC_HIDDEN; extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; -extern TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) DECLSPEC_HIDDEN; +extern TEB * CDECL init_threading( SIZE_T *size ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_process( int status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; @@ -149,6 +148,9 @@ extern sigset_t server_block_set DECLSPEC_HIDDEN; extern SIZE_T signal_stack_size DECLSPEC_HIDDEN; extern SIZE_T signal_stack_mask DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; +#ifdef __i386__ +extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; +#endif extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HIDDEN; extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 19e532da47..c8bcac3836 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -24,12 +24,11 @@ #include "wine/server.h" #include "wine/debug.h" -struct ldt_copy; struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 66 +#define NTDLL_UNIXLIB_VERSION 67 struct unix_funcs { @@ -319,7 +318,7 @@ struct unix_funcs void (CDECL *virtual_set_large_address_space)(void); /* thread/process functions */ - TEB * (CDECL *init_threading)( struct ldt_copy **ldt_copy, SIZE_T *size ); + TEB * (CDECL *init_threading)( SIZE_T *size ); void (CDECL *exit_thread)( int status ); void (CDECL *exit_process)( int status ); NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status );

1 0

Alexandre Julliard : ntdll: Move retrieving the startup info to the Unix library.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 15c3eaafbb3a376998e9c5eb36cb24816dad5447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15c3eaafbb3a376998e9c5eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:10:58 2020 +0200 ntdll: Move retrieving the startup info to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 20 +++++--------------- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/unix/env.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 2 ++ dlls/ntdll/unix/thread.c | 5 ++--- dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unixlib.h | 3 ++- 9 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index a68ef5786e..89c0fcac7f 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1247,16 +1247,16 @@ wait: * * Fill the initial RTL_USER_PROCESS_PARAMETERS structure from the server. */ -void init_user_process_params( SIZE_T data_size ) +void init_user_process_params(void) { WCHAR *src, *load_path, *dummy; - SIZE_T info_size, env_size; - NTSTATUS status; + SIZE_T info_size, env_size, data_size = 0; startup_info_t *info = NULL; RTL_USER_PROCESS_PARAMETERS *params = NULL; UNICODE_STRING curdir, dllpath, imagepath, cmdline, title, desktop, shellinfo, runtime; WCHAR **wargv; + unix_funcs->get_startup_info( NULL, &data_size, &info_size ); if (!data_size) { RTL_USER_PROCESS_PARAMETERS initial_params = {0}; @@ -1296,18 +1296,7 @@ void init_user_process_params( SIZE_T data_size ) if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, data_size ))) return; - SERVER_START_REQ( get_startup_info ) - { - wine_server_set_reply( req, info, data_size ); - if (!(status = wine_server_call( req ))) - { - data_size = wine_server_reply_size( reply ); - info_size = reply->info_size; - env_size = data_size - info_size; - } - } - SERVER_END_REQ; - if (status) goto done; + if (unix_funcs->get_startup_info( info, &data_size, &info_size )) goto done; src = (WCHAR *)(info + 1); get_unicode_string( &curdir, &src, info->curdir_len ); @@ -1344,6 +1333,7 @@ void init_user_process_params( SIZE_T data_size ) params->wShowWindow = info->show; /* environment needs to be a separate memory block */ + env_size = data_size - info_size; if ((params->Environment = RtlAllocateHeap( GetProcessHeap(), 0, max( env_size, sizeof(WCHAR) )))) { if (env_size) memcpy( params->Environment, (char *)info + info_size, env_size ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 76df995581..aa7b58b732 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3960,7 +3960,7 @@ void __wine_process_init(void) init_unix_codepage(); init_directories(); - init_user_process_params( info_size ); + init_user_process_params(); params = peb->ProcessParameters; load_global_options(); @@ -4000,7 +4000,7 @@ void __wine_process_init(void) } else { - if (!info_size) status = restart_process( params, status ); + status = restart_process( params, status ); switch (status) { case STATUS_INVALID_IMAGE_WIN_64: diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3691d338d0..d3aa0eb145 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -69,7 +69,7 @@ extern void actctx_init(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_unix_codepage(void) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; -extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; +extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; /* server support */ diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 1ffe45ea3b..e260e5c338 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -66,6 +66,7 @@ extern char **__wine_main_environ; extern WCHAR **__wine_main_wargv; USHORT *uctable = NULL, *lctable = NULL; +SIZE_T startup_info_size = 0; int main_argc = 0; char **main_argv = NULL; @@ -903,6 +904,32 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char } +/************************************************************************* + * get_startup_info + * + * Get the startup information from the server. + */ +NTSTATUS CDECL get_startup_info( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ) +{ + NTSTATUS status; + + if (*total_size < startup_info_size) + { + *total_size = startup_info_size; + return STATUS_BUFFER_TOO_SMALL; + } + SERVER_START_REQ( get_startup_info ) + { + wine_server_set_reply( req, info, *total_size ); + status = wine_server_call( req ); + *total_size = wine_server_reply_size( reply ); + *info_size = reply->info_size; + } + SERVER_END_REQ; + return status; +} + + /************************************************************************* * get_dynamic_environment * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 600a2b0e39..10b483a95a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1497,6 +1497,7 @@ static struct unix_funcs unix_funcs = ntdll_sqrt, ntdll_tan, get_initial_environment, + get_startup_info, get_dynamic_environment, get_initial_console, get_initial_directory, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 758f47a1e9..578c79bf89 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -591,6 +591,8 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST char **argv; HANDLE handle; + if (startup_info_size) return status; /* started from another Win32 process */ + switch (status) { case STATUS_CONFLICTING_ADDRESSES: diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 129410f8d7..2a8801457d 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -90,7 +90,6 @@ TEB * CDECL init_threading( SIZE_T *size ) { TEB *teb; BOOL suspend; - SIZE_T info_size; teb = virtual_alloc_first_teb(); @@ -99,14 +98,14 @@ TEB * CDECL init_threading( SIZE_T *size ) signal_init_thread( teb ); dbg_init(); server_init_process(); - info_size = server_init_thread( teb->Peb, &suspend ); + startup_info_size = server_init_thread( teb->Peb, &suspend ); virtual_map_user_shared_data(); virtual_create_builtin_view( ntdll_module ); init_cpu_info(); init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); - if (size) *size = info_size; + if (size) *size = startup_info_size; return teb; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 54254632e7..713cd4145e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -96,6 +96,7 @@ 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; extern void CDECL get_initial_directory( UNICODE_STRING *dir ) DECLSPEC_HIDDEN; extern void CDECL get_initial_console( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err ) DECLSPEC_HIDDEN; @@ -137,6 +138,7 @@ extern const char **dll_paths DECLSPEC_HIDDEN; extern HMODULE ntdll_module DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; +extern SIZE_T startup_info_size DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index c8bcac3836..71d8ffba1b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 67 +#define NTDLL_UNIXLIB_VERSION 68 struct unix_funcs { @@ -298,6 +298,7 @@ struct unix_funcs /* environment functions */ NTSTATUS (CDECL *get_initial_environment)( WCHAR **wargv[], WCHAR *env, SIZE_T *size ); + NTSTATUS (CDECL *get_startup_info)( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ); NTSTATUS (CDECL *get_dynamic_environment)( WCHAR *env, SIZE_T *size ); void (CDECL *get_initial_console)( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err );

1 0

Zebediah Figura : d3dcompiler: Create the expression in append_binop().
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 6083b1dd39d9946c35799272f780015e94a5260f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6083b1dd39d9946c35799272… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:47:18 2020 -0500 d3dcompiler: Create the expression in append_binop(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 139 ++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 76 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 96a27d6a30..43ffa43a02 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1193,12 +1193,14 @@ static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) return list; } -static struct list *append_binop(struct list *first, struct list *second, struct hlsl_ir_node *node) +static struct list *add_binary_expr(struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct source_location loc) { - list_move_tail(first, second); - d3dcompiler_free(second); - list_add_tail(first, &node->entry); - return first; + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + list_move_tail(list1, list2); + d3dcompiler_free(list2); + list_add_tail(list1, &new_binary_expr(op, arg1, arg2, loc)->entry); + return list1; } static struct list *make_list(struct hlsl_ir_node *node) @@ -2578,40 +2580,33 @@ unary_op: '+' $$ = UNARY_OP_BITNOT; } -mul_expr: unary_expr - { - $$ = $1; - } - | mul_expr '*' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MUL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | mul_expr '/' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_DIV, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | mul_expr '%' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MOD, - node_from_list($1), node_from_list($3), get_location(&@2))); - } +mul_expr: -add_expr: mul_expr - { - $$ = $1; - } - | add_expr '+' mul_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_ADD, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | add_expr '-' mul_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_SUB, - node_from_list($1), node_from_list($3), get_location(&@2))); - } + unary_expr + | mul_expr '*' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MUL, get_location(&@2)); + } + | mul_expr '/' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_DIV, get_location(&@2)); + } + | mul_expr '%' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MOD, get_location(&@2)); + } + +add_expr: + + mul_expr + | add_expr '+' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_ADD, get_location(&@2)); + } + | add_expr '-' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_SUB, get_location(&@2)); + } shift_expr: add_expr { @@ -2626,45 +2621,37 @@ shift_expr: add_expr FIXME("Right shift\n"); } -relational_expr: shift_expr - { - $$ = $1; - } - | relational_expr '<' shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LESS, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr '>' shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GREATER, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr OP_LE shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr OP_GE shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } +relational_expr: -equality_expr: relational_expr - { - $$ = $1; - } - | equality_expr OP_EQ relational_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_EQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | equality_expr OP_NE relational_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_NEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } + shift_expr + | relational_expr '<' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LESS, get_location(&@2)); + } + | relational_expr '>' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GREATER, get_location(&@2)); + } + | relational_expr OP_LE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LEQUAL, get_location(&@2)); + } + | relational_expr OP_GE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GEQUAL, get_location(&@2)); + } + +equality_expr: + + relational_expr + | equality_expr OP_EQ relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_EQUAL, get_location(&@2)); + } + | equality_expr OP_NE relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_NEQUAL, get_location(&@2)); + } bitand_expr: equality_expr {

1 0

Zebediah Figura : quartz: Try to create the VMR7 in video_renderer_default_create().
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: f7265d97ee12b67adc82cff63b70ee9d70e01b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7265d97ee12b67adc82cff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 25 17:57:40 2020 -0500 quartz: Try to create the VMR7 in video_renderer_default_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f6eebc9ef9..f635d9eaac 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -542,6 +542,10 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) HRESULT video_renderer_default_create(IUnknown *outer, IUnknown **out) { - /* TODO: Attempt to use the VMR-7 renderer instead when possible */ + HRESULT hr; + + if (SUCCEEDED(hr = vmr7_create(outer, out))) + return hr; + return video_renderer_create(outer, out); }

1 0