November 2019 - Wine-Commits

Jacek Caban : vbscript: Move detach_global_objects call to VBScript destructor.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: fcc01c30952a9dc75240b0ddaeaa631ac68d6741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc01c30952a9dc75240b0dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 19:30:28 2019 +0100 vbscript: Move detach_global_objects call to VBScript destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 938e517c23..47fa4562f4 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -188,7 +188,6 @@ static void release_script(script_ctx_t *ctx) IDispatchEx_Release(&script_obj->IDispatchEx_iface); } - detach_global_objects(ctx); heap_pool_free(&ctx->heap); heap_pool_init(&ctx->heap); } @@ -395,6 +394,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); + detach_global_objects(This->ctx); heap_free(This->ctx); heap_free(This); }

1 0

Conor McCarthy : kernelbase: Add stub for SetThreadDescription().
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: b4684bc561257de99ce2b3bef29cc9b622aab239 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4684bc561257de99ce2b3be… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 8 00:54:33 2019 +1000 kernelbase: Add stub for SetThreadDescription(). Used by Hitman 2. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-3.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec index 3b57e1c898..6f0c4fa752 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -5,6 +5,6 @@ @ stub GetThreadSelectedCpuSets @ stub SetProcessDefaultCpuSets @ stub SetProcessInformation -@ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr wstr) kernel32.SetThreadDescription @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor @ stub SetThreadSelectedCpuSets diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7acd..88708845df 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1447,6 +1447,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall -import SetThreadContext(long ptr) +@ stdcall -import SetThreadDescription(ptr wstr) @ stdcall -import SetThreadErrorMode(long ptr) @ stdcall SetThreadExecutionState(long) @ stdcall -import SetThreadGroupAffinity(long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c1fa479525..a86a3fe252 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1478,7 +1478,7 @@ @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long) kernel32.SetSystemTimeAdjustment @ stdcall SetThreadContext(long ptr) -# @ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr wstr) @ stdcall SetThreadErrorMode(long ptr) @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0cac2b6941..345f44dff7 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -387,6 +387,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadContext( HANDLE thread, const CONTEXT *co } +/*********************************************************************** + * SetThreadDescription (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ SetThreadDescription( HANDLE thread, PCWSTR description ) +{ + FIXME( "(%p %s): stub\n", thread, debugstr_w( description )); + return E_NOTIMPL; +} + + /*********************************************************************** * SetThreadErrorMode (kernelbase.@) */

1 0

Gabriel Ivăncescu : vbscript: Release the code list when the script is closed.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: d481efee3929a109cf484718ca09dfa2a13e4be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d481efee3929a109cf484718… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 19:30:22 2019 +0100 vbscript: Release the code list when the script is closed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 6d2bb54e52..938e517c23 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -193,13 +193,10 @@ static void release_script(script_ctx_t *ctx) heap_pool_init(&ctx->heap); } -static void destroy_script(script_ctx_t *ctx) +static void release_code_list(script_ctx_t *ctx) { while(!list_empty(&ctx->code_list)) release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); - - release_script(ctx); - heap_free(ctx); } static void decrease_state(VBScript *This, SCRIPTSTATE state) @@ -221,6 +218,8 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) break; release_script(This->ctx); This->thread_id = 0; + if(state == SCRIPTSTATE_CLOSED) + release_code_list(This->ctx); break; case SCRIPTSTATE_CLOSED: break; @@ -396,7 +395,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); - destroy_script(This->ctx); + heap_free(This->ctx); heap_free(This); }

1 0

Jacek Caban : scrrun: Add ITextStream::ReadLine implementation.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 14de44513f343ad0e9590df07a877a6d250964bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=14de44513f343ad0e9590df0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:32 2019 +0100 scrrun: Add ITextStream::ReadLine implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 33 ++++++++++++++++++++++++--------- dlls/scrrun/tests/filesystem.c | 6 ------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index b05a814593..5893435af7 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <limits.h> #include <assert.h> +#include <wchar.h> #include "windef.h" #include "winbase.h" @@ -499,10 +500,11 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); - VARIANT_BOOL eos; - HRESULT hr; + unsigned int skip = 0; + const WCHAR *nl; + HRESULT hr = S_OK; - FIXME("(%p)->(%p): stub\n", This, text); + TRACE("(%p)->(%p)\n", This, text); if (!text) return E_POINTER; @@ -511,15 +513,28 @@ static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) if (textstream_check_iomode(This, IORead)) return CTL_E_BADFILEMODE; - /* check for EOF */ - hr = ITextStream_get_AtEndOfStream(iface, &eos); - if (FAILED(hr)) - return hr; + while (!(nl = wmemchr(This->read_buf, '\n', This->read_buf_size)) && !This->eof) + { + if (FAILED(hr = read_more_data(This))) + return hr; + } - if (eos == VARIANT_TRUE) + if (This->eof && !This->read_buf_size) return CTL_E_ENDOFFILE; - return E_NOTIMPL; + if (!nl) + { + nl = This->read_buf + This->read_buf_size; + hr = S_FALSE; + } + else if (nl > This->read_buf && nl[-1] == '\r') + { + nl--; + skip = 2; + } + else skip = 1; + + return read_from_buffer(This, nl - This->read_buf, text, skip) ? hr : E_OUTOFMEMORY; } static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3b4af3c498..2d5c6e4138 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1732,10 +1732,8 @@ static void test_ReadAll(void) str = NULL; hr = ITextStream_ReadLine(stream, &str); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); -} SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -1743,7 +1741,6 @@ todo_wine { str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1880,10 +1877,8 @@ static void test_Read(void) str = NULL; hr = ITextStream_ReadLine(stream, &str); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); -} SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -1891,7 +1886,6 @@ todo_wine { str = NULL; hr = ITextStream_Read(stream, 100, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream);

1 0

Alexandre Julliard : ntdll: Load the main binary directly in ntdll when possible.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: b0199ea2fe8f9b77aee7ab4f68c9ae1755442586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0199ea2fe8f9b77aee7ab4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 18:54:21 2019 +0100 ntdll: Load the main binary directly in ntdll when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 8 +++---- dlls/ntdll/loader.c | 58 ++++++++++++++++++++++++++++++++----------------- dlls/ntdll/process.c | 6 ++--- 3 files changed, 45 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0199ea2fe8f9b77aee7…

1 0

Gabriel Ivăncescu : jscript/tests: Add tests for pending and executed code persistence.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: c01b4bdebeb96ca17c674b550bf0ed156eca857a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c01b4bdebeb96ca17c674b55… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:28 2019 +0100 jscript/tests: Add tests for pending and executed code persistence. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 254 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c01b4bdebeb96ca17c67…

1 0

Gabriel Ivăncescu : jscript: Implement script persistence.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: a42666f5905834e0ece351f1845b9ef0f3d34983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a42666f5905834e0ece351f1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:13 2019 +0100 jscript: Implement script persistence. Persistent code has to be re-executed if the script is uninitialized and then reinitialized and restarted. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.h | 1 + dlls/jscript/jscript.c | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1d76cf8f2f..955c315ff9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -169,6 +169,7 @@ local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; typedef struct _bytecode_t { LONG ref; + BOOL is_persistent; instr_t *instrs; heap_pool_t heap; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9a03f36b26..60711fce10 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -60,6 +60,7 @@ typedef struct { IActiveScriptSite *site; + struct list persistent_code; struct list queued_code; } JScript; @@ -120,6 +121,19 @@ static void clear_script_queue(JScript *This) { bytecode_t *iter = LIST_ENTRY(list_head(&This->queued_code), bytecode_t, entry); list_remove(&iter->entry); + if (iter->is_persistent) + list_add_tail(&This->persistent_code, &iter->entry); + else + release_bytecode(iter); + } +} + +static void clear_persistent_code_list(JScript *This) +{ + while(!list_empty(&This->queued_code)) + { + bytecode_t *iter = LIST_ENTRY(list_head(&This->persistent_code), bytecode_t, entry); + list_remove(&iter->entry); release_bytecode(iter); } } @@ -209,6 +223,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); + clear_script_queue(This); break; default: assert(0); @@ -463,6 +478,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s return E_UNEXPECTED; decrease_state(This, SCRIPTSTATE_UNINITIALIZED); + list_move_tail(&This->queued_code, &This->persistent_code); return S_OK; } @@ -515,6 +531,7 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) return E_UNEXPECTED; decrease_state(This, SCRIPTSTATE_CLOSED); + clear_persistent_code_list(This); return S_OK; } @@ -779,6 +796,8 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, return hres; } + code->is_persistent = (dwFlags & SCRIPTTEXT_ISPERSISTENT) != 0; + /* * Although pvarResult is not really used without SCRIPTTEXT_ISEXPRESSION flag, if it's not NULL, * script is executed immediately, even if it's not in started state yet. @@ -789,7 +808,12 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, } hres = exec_global_code(This, code); - release_bytecode(code); + + if(code->is_persistent) + list_add_tail(&This->persistent_code, &code->entry); + else + release_bytecode(code); + if(FAILED(hres)) return hres; @@ -1077,6 +1101,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX; ret->is_encode = is_encode; + list_init(&ret->persistent_code); list_init(&ret->queued_code); hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv);

1 0

Zhiyi Zhang : user32/tests: Fix test failures on multiple monitor setup.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 6b2b004c0ca0427a3337953efab4e59c0e67cd8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2b004c0ca0427a3337953e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 7 22:04:31 2019 +0800 user32/tests: Fix test failures on multiple monitor setup. The desktop window rectangle is the same as that of primary monitor for compatibility reasons. It equals to virtual screen rectangle only when there are no more than two active and non-mirrored monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index f74c9e7561..645c188008 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3225,6 +3225,7 @@ static void test_dpi_mapping(void) ULONG_PTR i, j, k; WINDOWPLACEMENT wpl_orig, wpl; HMONITOR monitor; + INT monitor_count; MONITORINFO mon_info; DPI_AWARENESS_CONTEXT context; @@ -3235,6 +3236,7 @@ static void test_dpi_mapping(void) } context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); GetWindowRect( GetDesktopWindow(), &desktop ); + monitor_count = GetSystemMetrics( SM_CMONITORS ); for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) { pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); @@ -3247,9 +3249,12 @@ static void test_dpi_mapping(void) SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN )); ok( EqualRect( &expect, &rect ), "%lu: wrong desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); - SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), GetSystemMetrics( SM_CYVIRTUALSCREEN )); - ok( EqualRect( &expect, &rect ), "%lu: wrong virt desktop rect %s expected %s\n", - i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + if (monitor_count < 2) + { + SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), GetSystemMetrics( SM_CYVIRTUALSCREEN )); + ok( EqualRect( &expect, &rect ), "%lu: wrong virt desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + } SetRect( &rect, 0, 0, 1, 1 ); monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); ok( monitor != 0, "failed to get monitor\n" );

1 0

Jacek Caban : winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 7c29f5a3b3177be955a3fcb1ff4a22b7843c851e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c29f5a3b3177be955a3fcb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 15:19:23 2019 +0100 winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize. miniaturize fails to minimize window when NSMiniaturizableWindowMask style is not set. The style will be restored on window restore (or earlier). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0bc4d38f4d..877653ea00 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1289,6 +1289,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } else { + [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; [super miniaturize:nil]; discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) | event_mask_for_type(WINDOW_GOT_FOCUS) | @@ -1763,6 +1764,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (pendingMinimize) { + [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; [super miniaturize:nil]; pendingMinimize = FALSE; }

1 0

Alexandre Julliard : ntdll: Move some initializations out of thread_init().
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 608d086f1b1bb7168e9322c65224c23f34e75f29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608d086f1b1bb7168e9322c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 17:00:39 2019 +0100 ntdll: Move some initializations out of thread_init(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 36 ++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 22 +++------------------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b16d646bdd..98c3f2d950 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4234,8 +4234,22 @@ void __wine_process_init(void) UNICODE_STRING nt_name; void * (CDECL *init_func)(void); INITIAL_TEB stack; + BOOL suspend; + SIZE_T info_size; + TEB *teb = thread_init(); + PEB *peb = teb->Peb; - thread_init(); + /* setup the server connection */ + server_init_process(); + info_size = server_init_thread( peb, &suspend ); + + peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); + peb->LoaderLock = &loader_section; + + init_directories(); + init_user_process_params( info_size ); + + NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); /* retrieve current umask */ FILE_umask = umask(0777); @@ -4263,7 +4277,7 @@ void __wine_process_init(void) kernel32_start_process = init_func(); - wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + wm = get_modref( peb->ImageBaseAddress ); assert( wm ); if (wm->ldr.Flags & LDR_IMAGE_IS_DLL) { @@ -4271,24 +4285,18 @@ void __wine_process_init(void) exit(1); } - NtCurrentTeb()->Peb->LoaderLock = &loader_section; virtual_set_large_address_space(); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); - InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); + InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); - InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); + InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( &stack, 0, 0, NULL )) != STATUS_SUCCESS) - { - ERR( "Main exe initialization for %s failed, status %x\n", - debugstr_w(wm->ldr.FullDllName.Buffer), status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - NtCurrentTeb()->Tib.StackBase = stack.StackBase; - NtCurrentTeb()->Tib.StackLimit = stack.StackLimit; - NtCurrentTeb()->DeallocationStack = stack.DeallocationStack; + virtual_alloc_thread_stack( &stack, 0, 0, NULL ); + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; server_init_process_done(); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 074792ff2a..eb31bb5bce 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -79,7 +79,7 @@ extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; -extern void thread_init(void) DECLSPEC_HIDDEN; +extern TEB *thread_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern void virtual_init_threading(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index be54f89082..621aaddfe3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -220,12 +220,11 @@ static void set_process_name( int argc, char *argv[] ) * * NOTES: The first allocated TEB on NT is at 0x7ffde000. */ -void thread_init(void) +TEB *thread_init(void) { TEB *teb; void *addr; - BOOL suspend; - SIZE_T size, info_size; + SIZE_T size; LARGE_INTEGER now; NTSTATUS status; struct ntdll_thread_data *thread_data; @@ -299,21 +298,7 @@ void thread_init(void) signal_init_thread( teb ); virtual_init_threading(); debug_init(); - - /* setup the server connection */ - server_init_process(); - info_size = server_init_thread( peb, &suspend ); - - /* create the process heap */ - if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) - { - MESSAGE( "wine: failed to create the process heap\n" ); - exit(1); - } - set_process_name( __wine_main_argc, __wine_main_argv ); - init_directories(); - init_user_process_params( info_size ); /* initialize time values in user_shared_data */ NtQuerySystemTime( &now ); @@ -323,10 +308,9 @@ void thread_init(void) user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time; user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart; user_shared_data->TickCountMultiplier = 1 << 24; - fill_cpu_info(); - NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); + return teb; }

1 0