November 2017 - Wine-Commits

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

Nov. 29, 2017

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

Zebediah Figura : explorer: Set the window title to the current directory.
by Alexandre Julliard Nov. 29, 2017

Nov. 29, 2017

Module: wine Branch: master Commit: c4c96383eb347d0ea23b091877bdb1f76f7a4a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c96383eb347d0ea23b09187… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 28 23:52:06 2017 -0600 explorer: Set the window title to the current directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 3571497..afb565f 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -259,10 +259,32 @@ static void update_path_box(explorer_info *info) static HRESULT WINAPI IExplorerBrowserEventsImpl_fnOnNavigationComplete(IExplorerBrowserEvents *iface, PCIDLIST_ABSOLUTE pidl) { IExplorerBrowserEventsImpl *This = impl_from_IExplorerBrowserEvents(iface); + IShellFolder *parent; + PCUITEMID_CHILD child_pidl; + HRESULT hres; + STRRET strret; + WCHAR *name; + ILFree(This->info->pidl); This->info->pidl = ILClone(pidl); update_path_box(This->info); - return S_OK; + + hres = SHBindToParent(pidl, &IID_IShellFolder, (void **)&parent, &child_pidl); + if (SUCCEEDED(hres)) + { + hres = IShellFolder_GetDisplayNameOf(parent, child_pidl, SHGDN_FORADDRESSBAR, &strret); + if (SUCCEEDED(hres)) + hres = StrRetToStrW(&strret, child_pidl, &name); + if (SUCCEEDED(hres)) + { + SetWindowTextW(This->info->main_window, name); + CoTaskMemFree(name); + } + + IShellFolder_Release(parent); + } + + return hres; } static HRESULT WINAPI IExplorerBrowserEventsImpl_fnOnNavigationFailed(IExplorerBrowserEvents *iface, PCIDLIST_ABSOLUTE pidl)

1 0

Zebediah Figura : explorer: Use the class name ExplorerWClass for the explorer browser.
by Alexandre Julliard Nov. 29, 2017

Nov. 29, 2017

Module: wine Branch: master Commit: 9e3399925e5ef16f7e0a2b71aa47a651b3e496bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3399925e5ef16f7e0a2b71a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 28 23:52:05 2017 -0600 explorer: Use the class name ExplorerWClass for the explorer browser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 9590027..3571497 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -51,7 +51,7 @@ static int default_width; static int default_height; -static const WCHAR EXPLORER_CLASS[] = {'W','I','N','E','_','E','X','P','L','O','R','E','R','\0'}; +static const WCHAR EXPLORER_CLASS[] = {'E','x','p','l','o','r','e','r','W','C','l','a','s','s',0}; static const WCHAR PATH_BOX_NAME[] = {'\0'}; HINSTANCE explorer_hInstance;

1 0

Huw Davies : ole32/tests: Show that the storage' s CLSID is not modified when saving.
by Alexandre Julliard Nov. 29, 2017

Nov. 29, 2017

Module: wine Branch: master Commit: 667ce5a29e1cf5aae4286b34ec8379bf50640cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667ce5a29e1cf5aae4286b34e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 29 09:28:46 2017 +0000 ole32/tests: Show that the storage's CLSID is not modified when saving. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 88ad207..ca6756a 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4194,7 +4194,7 @@ static void test_data_cache_save_data(void) }, 1, 1, &CLSID_WineTest, { - &CLSID_WineTest, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } } }, { @@ -4203,7 +4203,7 @@ static void test_data_cache_save_data(void) }, 1, 1, &CLSID_WineTest, { - &CLSID_WineTest, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } } }, { @@ -4238,7 +4238,7 @@ static void test_data_cache_save_data(void) hr = StgCreateDocfileOnILockBytes(ilb, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &doc); ok(hr == S_OK, "unexpected %#x\n", hr); ILockBytes_Release(ilb); - hr = IStorage_SetClass(doc, pdata->clsid); + hr = IStorage_SetClass(doc, &CLSID_WineTestOld); ok(hr == S_OK, "unexpected %#x\n", hr); hr = IOleCache2_QueryInterface(cache, &IID_IPersistStorage, (void **)&persist);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_Hidden.
by Alexandre Julliard Nov. 29, 2017

Nov. 29, 2017

Module: wine Branch: master Commit: 5a7f0bedf21259a6499081b53e60c9cb301e37c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7f0bedf21259a6499081b53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:33 2017 +0100 taskschd: Implement ITaskSettings_put_Hidden. 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 32baaae..d2b5d58 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1271,8 +1271,13 @@ static HRESULT WINAPI TaskSettings_get_Hidden(ITaskSettings *iface, VARIANT_BOOL static HRESULT WINAPI TaskSettings_put_Hidden(ITaskSettings *iface, VARIANT_BOOL hidden) { - FIXME("%p,%d: stub\n", iface, hidden); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, hidden); + + taskset->hidden = hidden ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_IdleSettings(ITaskSettings *iface, IIdleSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5d39766..a2acda3 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1147,6 +1147,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) 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); + + hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1156,9 +1159,6 @@ todo_wine return; } - hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

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

Nov. 29, 2017

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

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

Nov. 29, 2017

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 : kernel32: Don' t return a parent locale for neutral locales in GetLocaleInfoEx.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: c63a08586f19af7e6a65a064696743f648006fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63a08586f19af7e6a65a0646… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 19:36:16 2017 +0100 kernel32: Don't return a parent locale for neutral locales in GetLocaleInfoEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 20 +++++++++++++------- dlls/kernel32/tests/locale.c | 8 ++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 53bd8a4..e4c323e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1807,16 +1807,22 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) if (!lcid) return 0; /* special handling for neutral locale names */ - if (info == LOCALE_SNAME && locale && strlenW(locale) == 2) + if (locale && strlenW(locale) == 2) { - if (len && len < 3) + switch (info) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; + case LOCALE_SNAME: + if (len && len < 3) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if (len) strcpyW(buffer, locale); + return 3; + case LOCALE_SPARENT: + if (len) buffer[0] = 0; + return 1; } - - if (len) strcpyW(buffer, locale); - return 3; } return GetLocaleInfoW(lcid, info, buffer, len); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 97ed6fa..2af4946 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4483,6 +4483,14 @@ static void test_GetLocaleInfoEx(void) ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); ok(!lstrcmpW(bufferW, enuW), "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enusW, LOCALE_SPARENT, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); + ok(!lstrcmpW(bufferW, enW), "got %s\n", wine_dbgstr_w(bufferW)); + + ret = pGetLocaleInfoEx(enW, LOCALE_SPARENT, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == 1, "got %d\n", ret); + ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||

1 0

Alex Henrie : wevtapi: Add EvtNextChannelPath stub.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: a061af820f4da9c8fa4dd375c0c3e87524f9bdc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a061af820f4da9c8fa4dd375c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:50 2017 -0700 wevtapi: Add EvtNextChannelPath stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 50696ba..0dfe522 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -86,6 +86,12 @@ EVT_HANDLE WINAPI EvtOpenChannelEnum(EVT_HANDLE session, DWORD flags) return NULL; } +BOOL WINAPI EvtNextChannelPath(EVT_HANDLE channel_enum, DWORD buffer_len, WCHAR *buffer, DWORD *used) +{ + FIXME("(%p %u %p %p) stub\n", channel_enum, buffer_len, buffer, used); + return FALSE; +} + EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 070fd09..9f3edbf 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -26,7 +26,7 @@ @ stub EvtIntSysprepCleanup @ stub EvtIntWriteXmlEventToLocalLogfile @ stub EvtNext -@ stub EvtNextChannelPath +@ stdcall EvtNextChannelPath(ptr long ptr ptr) @ stub EvtNextEventMetadata @ stub EvtNextPublisherId @ stdcall EvtOpenChannelConfig(ptr wstr long)

1 0

Alex Henrie : wevtapi: Add EvtQuery stub.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: a3ea8b6c12d3fac9cfbbc2a8d60a31c7b9ede913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ea8b6c12d3fac9cfbbc2a8d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:48 2017 -0700 wevtapi: Add EvtQuery stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index aa23c77..e4cf995 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -86,6 +86,12 @@ EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, return NULL; } +EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, DWORD flags) +{ + FIXME("(%p %s %s %u) stub\n", session, debugstr_w(path), debugstr_w(query), flags); + return NULL; +} + BOOL WINAPI EvtClose(EVT_HANDLE handle) { FIXME("(%p) stub\n", handle); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 149fe25..fef3ec0 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -36,7 +36,7 @@ @ stub EvtOpenPublisherEnum @ stub EvtOpenPublisherMetadata @ stub EvtOpenSession -@ stub EvtQuery +@ stdcall EvtQuery(ptr wstr wstr long) @ stub EvtRender @ stub EvtSaveChannelConfig @ stub EvtSeek

1 0