wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Hans Leidekker : taskschd: Implement ITaskSettings_put_Compatibility.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: c9c86fbc42e46de040529bb2d669d7bbe21bddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c86fbc42e46de040529bb2d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:32 2017 +0100 taskschd: Implement ITaskSettings_put_Compatibility. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 33ec2b4..32baaae 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1247,8 +1247,13 @@ static HRESULT WINAPI TaskSettings_get_Compatibility(ITaskSettings *iface, TASK_ static HRESULT WINAPI TaskSettings_put_Compatibility(ITaskSettings *iface, TASK_COMPATIBILITY level) { - FIXME("%p,%d: stub\n", iface, level); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, level); + + taskset->compatibility = level; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Hidden(ITaskSettings *iface, VARIANT_BOOL *hidden) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 74c3ae4..5d39766 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1144,6 +1144,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Compatibility(set, test->compatibility); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Hidden(set, test->hidden); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1153,9 +1156,6 @@ todo_wine return; } - hr = ITaskSettings_put_Hidden(set, test->hidden); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_Priority.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 484055e85130ca4a3e7ed1edddabd68c5438c030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484055e85130ca4a3e7ed1edd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:31 2017 +0100 taskschd: Implement ITaskSettings_put_Priority. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 894f4c4..33ec2b4 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1223,8 +1223,13 @@ static HRESULT WINAPI TaskSettings_get_Priority(ITaskSettings *iface, INT *prior static HRESULT WINAPI TaskSettings_put_Priority(ITaskSettings *iface, INT priority) { - FIXME("%p,%d: stub\n", iface, priority); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, priority); + + taskset->priority = priority; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Compatibility(ITaskSettings *iface, TASK_COMPATIBILITY *level) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f15e214..74c3ae4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1141,6 +1141,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Priority(set, test->priority); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Compatibility(set, test->compatibility); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1150,9 +1153,6 @@ todo_wine return; } - hr = ITaskSettings_put_Compatibility(set, test->compatibility); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Hidden(set, test->hidden); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_DeleteExpiredTaskAfter.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: f8483297a520761acdd4645718df8d5bd5ac2f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8483297a520761acdd464571… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:30 2017 +0100 taskschd: Implement ITaskSettings_put_DeleteExpiredTaskAfter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7c5dca3..894f4c4 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1196,8 +1196,16 @@ static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *ifa static HRESULT WINAPI TaskSettings_put_DeleteExpiredTaskAfter(ITaskSettings *iface, BSTR delay) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + WCHAR *str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(delay)); - return E_NOTIMPL; + + if (delay && !(str = heap_strdupW(delay))) return E_OUTOFMEMORY; + heap_free(taskset->delete_expired_task_after); + taskset->delete_expired_task_after = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Priority(ITaskSettings *iface, INT *priority) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index fe54bff..f15e214 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1138,6 +1138,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); else hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Priority(set, test->priority); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1147,9 +1150,6 @@ todo_wine return; } - hr = ITaskSettings_put_Priority(set, test->priority); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Compatibility(set, test->compatibility); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Alexandre Julliard : ntdll: Add a platform-specific helper for starting a thread.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 53e4c36ef8c0720b61b03bb40d5992225c2771f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e4c36ef8c0720b61b03bb40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 19:42:53 2017 +0100 ntdll: Add a platform-specific helper for starting a thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_arm64.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_i386.c | 35 +++++++++++++++++++++++++++++++++-- dlls/ntdll/signal_powerpc.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 23 +++-------------------- 7 files changed, 161 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index cab8d6d..d3a37e8 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -68,6 +68,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; +extern NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN; extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 2a68946..3ff8c91 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -62,6 +62,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); static pthread_key_t teb_key; @@ -1012,6 +1013,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /********************************************************************** * signal_start_process */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d1e4021..e0e424e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -59,6 +59,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); static pthread_key_t teb_key; @@ -883,6 +884,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /*********************************************************************** * start_process */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7914ff5..074ad3b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -69,6 +69,9 @@ #undef ERR /* Solaris needs to define this */ +WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); + /* not defined for x86, so copy the x86_64 definition */ typedef struct DECLSPEC_ALIGN(16) _M128A { @@ -468,8 +471,6 @@ typedef struct trapframe ucontext_t; #error You must define the signal context functions for your platform #endif /* linux */ -WINE_DEFAULT_DEBUG_CHANNEL(seh); - typedef int (*wine_signal_handler)(unsigned int sig); static const size_t teb_size = 4096; /* we reserve one page for the TEB */ @@ -2601,6 +2602,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /********************************************************************** * signal_start_process */ diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 209339a..c5b3fdb 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -59,6 +59,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); static pthread_key_t teb_key; @@ -1085,6 +1086,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /*********************************************************************** * start_process */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b81bfc0..024af8e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -73,6 +73,7 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); struct _DISPATCHER_CONTEXT; @@ -3143,6 +3144,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /********************************************************************** * signal_start_process */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 80f4780..18d0fe1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -47,7 +47,6 @@ #include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); -WINE_DECLARE_DEBUG_CHANNEL(relay); struct _KUSER_SHARED_DATA *user_shared_data = NULL; @@ -491,29 +490,13 @@ void exit_thread( int status ) /*********************************************************************** - * thread_startup - */ -static void thread_startup( void *param ) -{ - struct startup_info *info = param; - PRTL_THREAD_START_ROUTINE func = info->entry_point; - void *arg = info->entry_arg; - - attach_dlls( (void *)1 ); - - TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", func, arg ); - - call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); -} - - -/*********************************************************************** * start_thread * * Startup routine for a newly created thread. */ static void start_thread( struct startup_info *info ) { + NTSTATUS status; TEB *teb = info->teb; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; @@ -525,8 +508,8 @@ static void start_thread( struct startup_info *info ) signal_init_thread( teb ); server_init_thread( info->entry_point ); - - wine_switch_to_stack( thread_startup, info, teb->Tib.StackBase ); + status = signal_start_thread( (LPTHREAD_START_ROUTINE)info->entry_point, info->entry_arg ); + NtTerminateThread( GetCurrentThread(), status ); }

1 0

Alexandre Julliard : ntdll: Add a platform-specific helper for starting a process.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: afb16abc0f058df09a379020704e0f5553ddd7b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb16abc0f058df09a3790207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 17:11:10 2017 +0100 ntdll: Add a platform-specific helper for starting a process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 20 ++--------------- dlls/ntdll/ntdll_misc.h | 5 +++-- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/signal_arm.c | 32 +++++++++++++++++++++------- dlls/ntdll/signal_arm64.c | 36 ++++++++++++++++++++++++++++--- dlls/ntdll/signal_i386.c | 52 +++++++++++++++++++++++++++++++-------------- dlls/ntdll/signal_powerpc.c | 36 ++++++++++++++++++++++++++++--- dlls/ntdll/signal_x86_64.c | 42 ++++++++++++++++++++++++++---------- 8 files changed, 165 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afb16abc0f058df09a379…

1 0

Alexandre Julliard : ntdll: Put the initial pthread stack at the end of the Win32 stack.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: f8e0bd1b0d189d5950dc39082f439cd1fc9569d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e0bd1b0d189d5950dc39082… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 10:44:21 2017 +0100 ntdll: Put the initial pthread stack at the end of the Win32 stack. Create a separate view for it so that the main stack can be freed independently. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 4 +++- dlls/ntdll/thread.c | 15 ++++++++++++--- dlls/ntdll/virtual.c | 21 +++++++++++++++++++-- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c5cfdce..f7fd8da 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3144,7 +3144,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0 )) != STATUS_SUCCESS) goto error; + if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, 0 )) != STATUS_SUCCESS) goto error; if ((status = server_init_process_done( &context )) != STATUS_SUCCESS) goto error; status = wine_call_on_stack( attach_dlls, (void *)1, (char *)NtCurrentTeb()->Tib.StackBase - page_size ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e469afd..c8a870c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -165,7 +165,8 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S /* virtual memory */ extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, + SIZE_T commit_size, SIZE_T extra_size ) DECLSPEC_HIDDEN; extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; @@ -224,6 +225,7 @@ struct ntdll_thread_data WINE_VM86_TEB_INFO __vm86; /* FIXME: placeholder for vm86 data from struct x86_thread_data */ #endif struct debug_info *debug_info; /* info for debugstr functions */ + void *start_stack; /* stack for thread startup */ int request_fd; /* fd for sending server requests */ int reply_fd; /* fd for receiving server replies */ int wait_fd[2]; /* fd for sleeping server requests */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9c7cd13..80f4780 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -408,6 +408,7 @@ HANDLE thread_init(void) */ static void free_thread_data( TEB *teb ) { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; SIZE_T size; if (teb->DeallocationStack) @@ -415,6 +416,11 @@ static void free_thread_data( TEB *teb ) size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); } + if (thread_data->start_stack) + { + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), &thread_data->start_stack, &size, MEM_RELEASE ); + } signal_free_thread( teb ); } @@ -621,16 +627,19 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * info->entry_point = start; info->entry_arg = param; + if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit, PTHREAD_STACK_MIN ))) + goto error; + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = request_pipe[1]; thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; - - if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit ))) goto error; + thread_data->start_stack = (char *)teb->Tib.StackBase; pthread_attr_init( &attr ); - pthread_attr_setstacksize( &attr, PTHREAD_STACK_MIN ); + pthread_attr_setstack( &attr, teb->DeallocationStack, + (char *)teb->Tib.StackBase + PTHREAD_STACK_MIN - (char *)teb->DeallocationStack ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info )) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ab27077..8325b28 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1758,7 +1758,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) /*********************************************************************** * virtual_alloc_thread_stack */ -NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ) +NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T extra_size ) { struct file_view *view; NTSTATUS status; @@ -1778,7 +1778,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((status = map_view( &view, NULL, size, 0xffff, 0, + if ((status = map_view( &view, NULL, size + extra_size, 0xffff, 0, VPROT_READ | VPROT_WRITE | VPROT_COMMITTED )) != STATUS_SUCCESS) goto done; @@ -1793,6 +1793,23 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi mprotect_range( view->base, 2 * page_size, 0, 0 ); VIRTUAL_DEBUG_DUMP_VIEW( view ); + if (extra_size) + { + struct file_view *extra_view; + + /* shrink the first view and create a second one for the extra size */ + /* this allows the app to free the stack without freeing the thread start portion */ + view->size -= extra_size; + status = create_view( &extra_view, (char *)view->base + view->size, extra_size, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED ); + if (status != STATUS_SUCCESS) + { + unmap_area( (char *)view->base + view->size, extra_size ); + delete_view( view ); + goto done; + } + } + /* note: limit is lower than base since the stack grows down */ teb->DeallocationStack = view->base; teb->Tib.StackBase = (char *)view->base + view->size;

1 0

Alexandre Julliard : ntdll: Move freeing the thread stack to a common helper.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 93eceba03e8a29a622a3f145dd5c157062f37293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93eceba03e8a29a622a3f145d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 10:43:39 2017 +0100 ntdll: Move freeing the thread stack to a common helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 8 +------- dlls/ntdll/signal_arm64.c | 8 +------- dlls/ntdll/signal_i386.c | 10 ++-------- dlls/ntdll/signal_powerpc.c | 8 +------- dlls/ntdll/signal_x86_64.c | 8 +------- dlls/ntdll/thread.c | 20 ++++++++++++++++++-- 6 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index bbd6c59..2102dd0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -944,14 +944,8 @@ NTSTATUS signal_alloc_thread( TEB **teb ) */ void signal_free_thread( TEB *teb ) { - SIZE_T size; + SIZE_T size = 0; - if (teb->DeallocationStack) - { - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); - } - size = 0; NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5b3e887..7f2977d 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -817,14 +817,8 @@ NTSTATUS signal_alloc_thread( TEB **teb ) */ void signal_free_thread( TEB *teb ) { - SIZE_T size; + SIZE_T size = 0; - if (teb->DeallocationStack) - { - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); - } - size = 0; NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4038436..671c35f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2504,16 +2504,10 @@ NTSTATUS signal_alloc_thread( TEB **teb ) */ void signal_free_thread( TEB *teb ) { - SIZE_T size; + SIZE_T size = 0; struct x86_thread_data *thread_data = (struct x86_thread_data *)teb->SystemReserved2; - if (thread_data) wine_ldt_free_fs( thread_data->fs ); - if (teb->DeallocationStack) - { - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); - } - size = 0; + wine_ldt_free_fs( thread_data->fs ); NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index e5a009c..2d3bd0a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1023,14 +1023,8 @@ NTSTATUS signal_alloc_thread( TEB **teb ) */ void signal_free_thread( TEB *teb ) { - SIZE_T size; + SIZE_T size = 0; - if (teb->DeallocationStack) - { - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); - } - size = 0; NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 691ee1f..a052a48 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2983,14 +2983,8 @@ NTSTATUS signal_alloc_thread( TEB **teb ) */ void signal_free_thread( TEB *teb ) { - SIZE_T size; + SIZE_T size = 0; - if (teb->DeallocationStack) - { - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); - } - size = 0; NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 511fd94..9c7cd13 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -404,6 +404,22 @@ HANDLE thread_init(void) /*********************************************************************** + * free_thread_data + */ +static void free_thread_data( TEB *teb ) +{ + SIZE_T size; + + if (teb->DeallocationStack) + { + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); + } + signal_free_thread( teb ); +} + + +/*********************************************************************** * terminate_thread */ void terminate_thread( int status ) @@ -456,7 +472,7 @@ void exit_thread( int status ) if (thread_data->pthread_id) { pthread_join( thread_data->pthread_id, NULL ); - signal_free_thread( teb ); + free_thread_data( teb ); } } @@ -634,7 +650,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return STATUS_SUCCESS; error: - if (teb) signal_free_thread( teb ); + if (teb) free_thread_data( teb ); if (handle) NtClose( handle ); pthread_sigmask( SIG_SETMASK, &sigset, NULL ); close( request_pipe[1] );

1 0

Fabian Maurer : gdi32: In AddFaceToList allow fonts with long names and add tests.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 6f790606c0befdf5c683d4a20789470c43b6f6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f790606c0befdf5c683d4a20… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 26 14:33:17 2017 +0100 gdi32: In AddFaceToList allow fonts with long names and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 45 +++++++++++-------------- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2216 bytes 6 files changed, 143 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f790606c0befdf5c683d…

1 0

Piotr Caban : msvcrt: Set errno when close() is called on already closed fd.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 67926ec8c344db4250f1e74a5943d0b8a536e950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67926ec8c344db4250f1e74a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 19:48:33 2017 +0100 msvcrt: Set errno when close() is called on already closed fd. Based on a patch by Olly Betts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5eaee2b..1e662e9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1051,7 +1051,7 @@ int CDECL MSVCRT__close(int fd) if (fd == MSVCRT_NO_CONSOLE_FD) { *MSVCRT__errno() = MSVCRT_EBADF; ret = -1; - } else if (!(info->wxflag & WX_OPEN)) { + } else if (!MSVCRT_CHECK_PMT_ERR(info->wxflag & WX_OPEN, MSVCRT_EBADF)) { ret = -1; } else if (fd == MSVCRT_STDOUT_FILENO && info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 99ceb97..00f5e7e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2466,6 +2466,12 @@ static void test_close(void) ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); ok(close(fd2), "close(fd2) succeeded\n"); + /* test close on already closed fd */ + errno = 0xdeadbeef; + ret1 = close(fd1); + ok(ret1 == -1, "close(fd1) succeeded\n"); + ok(errno == 9, "errno = %d\n", errno); + /* test close on stdout and stderr that use the same handle */ h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);

1 0

Piotr Caban : msvcp90: Use correct locale in basic_ios:: narrow and basic_ios::widen.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 53bab55d303dd8ee8ce696b94c47718feb7bc3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bab55d303dd8ee8ce696b94… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 19:13:43 2017 +0100 msvcp90: Use correct locale in basic_ios::narrow and basic_ios::widen. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/tests/ios.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9ae9e65..3f85997 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5880,7 +5880,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_narrow, 12) char __thiscall basic_ios_char_narrow(basic_ios_char *this, char ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEPAV?$basic_streambuf@DU?$char_traits@D@std@@@2@PAV32@@Z */ @@ -5953,7 +5953,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_widen, 8) char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEXAAV12@@Z */ @@ -6161,7 +6161,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_narrow, 12) char __thiscall basic_ios_wchar_narrow(basic_ios_wchar *this, wchar_t ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QAEPAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@PAV32@@Z */ @@ -6248,7 +6248,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_widen, 8) wchar_t __thiscall basic_ios_wchar_widen(basic_ios_wchar *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios@GU?$char_traits@G@std@@@std@@QAEXAAV12@@Z */ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 90fa6b1..5dcb1d4 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -496,10 +496,14 @@ static basic_ostream_wchar* (*__thiscall p_basic_ostream_short_print_ushort)(bas /* basic_ios */ static locale* (*__thiscall p_basic_ios_char_imbue)(basic_ios_char*, locale*, const locale*); +static basic_ios_char* (*__thiscall p_basic_ios_char_ctor)(basic_ios_char*); +static char (*__thiscall p_basic_ios_char_widen)(basic_ios_char*, char); +static void (*__thiscall p_basic_ios_char_dtor)(basic_ios_char*); static locale* (*__thiscall p_basic_ios_wchar_imbue)(basic_ios_wchar*, locale*, const locale*); /* ios_base */ +static void (*__thiscall p_ios_base__Init)(ios_base*); static IOSB_iostate (*__thiscall p_ios_base_rdstate)(const ios_base*); static IOSB_fmtflags (*__thiscall p_ios_base_setf_mask)(ios_base*, IOSB_fmtflags, IOSB_fmtflags); static void (*__thiscall p_ios_base_unsetf)(ios_base*, IOSB_fmtflags); @@ -724,6 +728,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@AEBV?$complex@O@0@@Z"); + SET(p_ios_base__Init, + "?_Init@ios_base@std@@IEAAXXZ"); SET(p_ios_base_rdstate, "?rdstate@ios_base@std@@QEBAHXZ"); SET(p_ios_base_setf_mask, @@ -735,6 +741,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios@DU?$char_traits@D@std@@@std@@IEAA@XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios@DU?$char_traits@D@std@@@std@@QEBADD@Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios@DU?$char_traits@D@std@@@std@@UEAA@XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z"); @@ -856,6 +868,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$complex@O@0@@Z"); + SET(p_ios_base__Init, + "?_Init@ios_base@std@@IAAXXZ"); SET(p_ios_base_rdstate, "?rdstate@ios_base@std@@QBAHXZ"); SET(p_ios_base_setf_mask, @@ -867,6 +881,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QAA?AVlocale@2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios@DU?$char_traits@D@std@@@std@@IAA@XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios@DU?$char_traits@D@std@@@std@@QBADD@Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios@DU?$char_traits@D@std@@@std@@UAA@XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QAA?AVlocale@2@ABV32@@Z"); @@ -987,6 +1007,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$complex@O@0@@Z"); + SET(p_ios_base__Init, + "?_Init@ios_base@std@@IAEXXZ"); SET(p_ios_base_rdstate, "?rdstate@ios_base@std@@QBEHXZ"); SET(p_ios_base_setf_mask, @@ -998,6 +1020,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios@DU?$char_traits@D@std@@@std@@IAE@XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios@DU?$char_traits@D@std@@@std@@QBEDD@Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios@DU?$char_traits@D@std@@@std@@UAE@XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QAE?AVlocale@2@ABV32@@Z"); @@ -2331,6 +2359,20 @@ static void test_istream_read_complex_double(void) } } +static void test_basic_ios(void) +{ + basic_ios_char bi; + char c; + + call_func1(p_basic_ios_char_ctor, &bi); + call_func1(p_ios_base__Init, &bi.base); + + c = (UINT_PTR)call_func2(p_basic_ios_char_widen, &bi, 'a'); + ok(c == 'a', "basic_ios::widen('a') returned %x\n", c); + + call_func1(p_basic_ios_char_dtor, &bi); +} + START_TEST(ios) { if(!init()) @@ -2356,6 +2398,7 @@ START_TEST(ios) test_ostream_print_complex_double(); test_ostream_print_complex_ldouble(); test_istream_read_complex_double(); + test_basic_ios(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

← Newer
1
2
3
4
5
6
7
8
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2017