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

Jacek Caban : dbghelp: Lookup real image paths in image_locate_debug_link.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 838de56e0ac5b91e2ffa27a696d33e0f09179b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=838de56e0ac5b91e2ffa27a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 17:22:07 2020 +0100 dbghelp: Lookup real image paths in image_locate_debug_link. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9c8fb662f0..0a90595b8c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -606,6 +606,7 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); path_len = strlenW(module->module.LoadedImageName); + if (module->real_path) path_len = max(path_len, strlenW(module->real_path)); p = HeapAlloc(GetProcessHeap(), 0, (globalDebugDirLen + path_len + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); if (!p) goto found; @@ -625,6 +626,16 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash + ARRAY_SIZE(dotDebugW), filename_len); if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (module->real_path) + { + strcpyW(p, module->real_path); + slash = p; + if ((slash2 = strrchrW(slash, '/'))) slash = slash2 + 1; + if ((slash2 = strrchrW(slash, '\\'))) slash = slash2 + 1; + MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); + if (image_check_debug_link(p, fmap_link, crc)) goto found; + } + /* testing globaldebugdir/execdir/filename */ memmove(p + globalDebugDirLen, p, (slash - p) * sizeof(WCHAR)); memcpy(p, globalDebugDirW, globalDebugDirLen * sizeof(WCHAR));

1 0

Gabriel Ivăncescu : jscript: Get rid of the variable_obj parameter to exec_source.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 7ad740cd29c6bd87238df6231689b861058bc5a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad740cd29c6bd87238df623… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 17 19:19:25 2020 +0100 jscript: Get rid of the variable_obj parameter to exec_source. 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.c | 32 ++++++++++++++++++++++++-------- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 11 +++-------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 6 +++--- 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index db0863c902..8914e760ed 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2990,8 +2990,9 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *function_instance, jsdisp_t *variable_obj, unsigned argc, jsval_t *argv, jsval_t *r) + IDispatch *this_obj, jsdisp_t *function_instance, unsigned argc, jsval_t *argv, jsval_t *r) { + jsdisp_t *variable_obj; call_frame_t *frame; unsigned i; HRESULT hres; @@ -3024,6 +3025,15 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi return hres; } + if((flags & EXEC_EVAL) && ctx->call_ctx) { + variable_obj = jsdisp_addref(ctx->call_ctx->variable_obj); + }else if(!(flags & (EXEC_GLOBAL | EXEC_EVAL))) { + hres = create_dispex(ctx, NULL, NULL, &variable_obj); + if(FAILED(hres)) return hres; + }else { + variable_obj = jsdisp_addref(ctx->global); + } + if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { BOOL lookup_globals = (flags & EXEC_GLOBAL) && !bytecode->named_item; @@ -3034,7 +3044,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_source_function(ctx, bytecode, function->funcs+function->variables[i].func_id, scope, &func_obj); if(FAILED(hres)) - return hres; + goto fail; hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); @@ -3043,7 +3053,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); if(FAILED(hres)) - return hres; + goto fail; } } } @@ -3063,12 +3073,14 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(ctx->call_ctx && (flags & EXEC_EVAL)) { hres = detach_variable_object(ctx, ctx->call_ctx, FALSE); if(FAILED(hres)) - return hres; + goto fail; } frame = heap_alloc_zero(sizeof(*frame)); - if(!frame) - return E_OUTOFMEMORY; + if(!frame) { + hres = E_OUTOFMEMORY; + goto fail; + } frame->function = function; frame->ret = jsval_undefined(); @@ -3080,7 +3092,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(FAILED(hres)) { release_bytecode(frame->bytecode); heap_free(frame); - return hres; + goto fail; } }else if(scope) { frame->base_scope = frame->scope = scope_addref(scope); @@ -3097,7 +3109,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->function_instance = jsdisp_addref(function_instance); frame->flags = flags; - frame->variable_obj = jsdisp_addref(variable_obj); + frame->variable_obj = variable_obj; frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; @@ -3113,4 +3125,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } return enter_bytecode(ctx, r); + +fail: + jsdisp_release(variable_obj); + return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fe6b2a06d0..2a8e405a28 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -281,7 +281,7 @@ typedef struct _call_frame_t { #define EXEC_EVAL 0x0008 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, - jsdisp_t*,jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; + jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 007aec0370..caca274a49 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -722,7 +722,7 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun unsigned argc, jsval_t *argv, jsval_t *r) { InterpretedFunction *function = (InterpretedFunction*)func; - jsdisp_t *var_disp, *new_obj = NULL; + jsdisp_t *new_obj = NULL; DWORD exec_flags = 0; HRESULT hres; @@ -744,15 +744,10 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun exec_flags |= EXEC_RETURN_TO_INTERP; if(flags & DISPATCH_CONSTRUCT) exec_flags |= EXEC_CONSTRUCTOR; - - hres = create_dispex(ctx, NULL, NULL, &var_disp); - if(SUCCEEDED(hres)) - hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, - &function->function.dispex, var_disp, argc, argv, r); + hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, + &function->function.dispex, argc, argv, r); if(new_obj) jsdisp_release(new_obj); - - jsdisp_release(var_disp); return hres; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2a1dcb2b84..64b910faa7 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -215,7 +215,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) exec_flags |= EXEC_RETURN_TO_INTERP; hres = exec_source(ctx, exec_flags, code, &code->global_code, frame ? frame->scope : NULL, - frame ? frame->this_obj : NULL, NULL, frame ? frame->variable_obj : ctx->global, 0, NULL, r); + frame ? frame->this_obj : NULL, NULL, 0, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index aabad7ef8b..f54c34ab5a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -408,7 +408,7 @@ static void exec_queued_code(JScript *This) LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) { enter_script(This->ctx, &ei); - hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, 0, NULL, NULL); leave_script(This->ctx, hres); if(FAILED(hres)) break; @@ -1053,7 +1053,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { jsval_t r; - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult); @@ -1072,7 +1072,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(!pvarResult && !is_started(This->ctx)) { list_add_tail(&This->queued_code, &code->entry); }else { - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, NULL); if(code->is_persistent) list_add_tail(&This->persistent_code, &code->entry); else

1 0

Hans Leidekker : webservices: Use wide character string literals.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: e1b74133b89ae3c63e0cd2fa7be4831647529288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1b74133b89ae3c63e0cd2fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:42 2020 +0100 webservices: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 7 ++----- dlls/webservices/listener.c | 3 +-- dlls/webservices/msg.c | 25 +++++++------------------ dlls/webservices/url.c | 41 +++++++++++++++++------------------------ 4 files changed, 27 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1b74133b89ae3c63e0c…

1 0

Hans Leidekker : webservices/tests: Use wide character string literals.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: f735ffbfe29cdd9763fe4c0575d8bd1ca616341c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f735ffbfe29cdd9763fe4c05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:43 2020 +0100 webservices/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 51 ++++------- dlls/webservices/tests/msg.c | 34 +++----- dlls/webservices/tests/proxy.c | 28 +++--- dlls/webservices/tests/reader.c | 57 +++++-------- dlls/webservices/tests/url.c | 178 +++++++++++++++++---------------------- dlls/webservices/tests/writer.c | 77 +++++++---------- 6 files changed, 172 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f735ffbfe29cdd9763fe…

1 0

Hans Leidekker : webservices: Handle WS_XML_TEXT_TYPE_INT32 in text_to_uint64.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 084d5ac2b1bc0b87e1f89fcdcca14dd14971096f URL: https://source.winehq.org/git/wine.git/?a=commit;h=084d5ac2b1bc0b87e1f89fcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:44 2020 +0100 webservices: Handle WS_XML_TEXT_TYPE_INT32 in text_to_uint64. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b328bb779e..bf29990923 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5051,6 +5051,13 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) hr = str_to_uint64( text_utf8->value.bytes, text_utf8->value.length, MAX_UINT64, val ); break; } + case WS_XML_TEXT_TYPE_INT32: + { + const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; + *val = text_int32->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_INT64: { const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text;

1 0

Hans Leidekker : webservices: Add support for WS_FIELD_NILLABLE_ITEM.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 0f911b7aa4555d8298e84be155648ec166978ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f911b7aa4555d8298e84be1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:45 2020 +0100 webservices: Add support for WS_FIELD_NILLABLE_ITEM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 61 ++++++++++++++++++++++++++++++++++++++--- dlls/webservices/writer.c | 7 +++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 4fb9f44733..d66c2e4319 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3050,12 +3050,12 @@ static void test_datetime(void) static void test_repeating_element(void) { - WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {0, NULL}; - WS_XML_STRING val = {3, (BYTE *)"val"}, wrapper = {7, (BYTE *)"wrapper"}; + WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {0, NULL}, data = {4, (BYTE *)"data"}; + WS_XML_STRING val = {3, (BYTE *)"val"}, wrapper = {7, (BYTE *)"wrapper"}, structval = {9, (BYTE *)"structval"}; HRESULT hr; WS_XML_WRITER *writer; - WS_STRUCT_DESCRIPTION s; - WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; WS_ITEM_RANGE range; struct test { @@ -3067,6 +3067,15 @@ static void test_repeating_element(void) INT32 *val; ULONG count; } *test2; + struct value + { + INT32 data; + } value; + struct test3 + { + const struct value **val; + ULONG count; + } *test3; hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3153,6 +3162,50 @@ static void test_repeating_element(void) check_output( writer, "<test><val>1</val><val>2</val></test>", __LINE__ ); HeapFree( GetProcessHeap(), 0, test2 ); + /* nillable item */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.localName = &data; + f2.ns = &ns; + f2.type = WS_INT32_TYPE; + fields2[0] = &f2; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(struct test3); + s2.alignment = TYPE_ALIGNMENT(struct test3); + s2.typeLocalName = &structval; + s2.typeNs = &ns; + s2.fields = fields2; + s2.fieldCount = 1; + + f.type = WS_STRUCT_TYPE; + f.typeDescription = &s2; + f.localName = &wrapper; + f.ns = &ns; + f.itemRange = NULL; + f.options = WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM; + + value.data = -1; + test3 = HeapAlloc( GetProcessHeap(), 0, sizeof(*test3) + 2 * sizeof(const struct value *) ); + test3->val = (const struct value **)(test3 + 1); + test3->val[0] = &value; + test3->val[1] = NULL; + test3->count = 2; + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test3, sizeof(test3), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<test><wrapper><val><data>-1</data></val><val a:nil=\"true\" " + "xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/></wrapper></test>", __LINE__ ); + HeapFree( GetProcessHeap(), 0, test3 ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 021c961c94..53489786cd 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3607,7 +3607,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) { if (options & WS_FIELD_POINTER) { - if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_POINTER; + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) return WS_WRITE_NILLABLE_POINTER; return WS_WRITE_REQUIRED_POINTER; } @@ -3754,7 +3754,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI ULONG count, size, field_options = desc->options; const char *ptr = buf + offset; - if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) + if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { FIXME( "options 0x%x not supported\n", desc->options ); return E_NOTIMPL; @@ -3771,7 +3771,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI if (is_nil_value( ptr, size )) { if (field_options & WS_FIELD_OPTIONAL) return S_OK; - if (field_options & WS_FIELD_NILLABLE) + if (field_options & (WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { if (field_options & WS_FIELD_POINTER) option = WS_WRITE_NILLABLE_POINTER; else option = WS_WRITE_NILLABLE_VALUE; @@ -3867,6 +3867,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping if (desc->structOptions) FIXME( "struct options 0x%x not supported\n", desc->structOptions ); if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); for (i = 0; i < desc->fieldCount; i++) {

1 0

Jacek Caban : ucrtbase/tests: Fix clock tests.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 618b0736fecd1367067a0b702361ab01ccb25d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=618b0736fecd1367067a0b70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:55:24 2020 +0100 ucrtbase/tests: Fix clock tests. crt_init_start no longer makes sense since ucrtbase.dll is directly linked to test executable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ada3a52eb6..46389edf25 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -131,7 +131,7 @@ typedef struct { typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static HMODULE module; -static LONGLONG crt_init_start, crt_init_end; +static LONGLONG crt_init_end; static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); @@ -485,16 +485,10 @@ static BOOL init(void) { FILETIME cur; - GetSystemTimeAsFileTime(&cur); - crt_init_start = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; - module = LoadLibraryA("ucrtbase.dll"); GetSystemTimeAsFileTime(&cur); crt_init_end = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; - if(!module) { - win_skip("ucrtbase.dll not available\n"); - return FALSE; - } + module = GetModuleHandleW(L"ucrtbase.dll"); p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); @@ -1384,17 +1378,16 @@ static void test__o_malloc(void) static void test_clock(void) { - static const int thresh = 100; - int c, expect_min, expect_max; + static const int thresh = 100, max_load_delay = 1000; + int c, expect_min; FILETIME cur; GetSystemTimeAsFileTime(&cur); c = clock(); expect_min = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_end) / 10000; - expect_max = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_start) / 10000; - ok(c > expect_min-thresh && c < expect_max+thresh, "clock() = %d, expected range [%d, %d]\n", - c, expect_min, expect_max); + ok(c >= expect_min - thresh && c < expect_min + max_load_delay, "clock() = %d, expected range [%d, %d]\n", + c, expect_min - thresh, expect_min + max_load_delay); } START_TEST(misc)

1 0

Jacek Caban : corecrt_startup.h: Add onexit table declarations.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 0a9ca2d3f23baa8b245a91993a27aebe81655fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a9ca2d3f23baa8b245a9199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:01:17 2020 +0100 corecrt_startup.h: Add onexit table declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_startup.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h index cd374ec10b..fd238b9757 100644 --- a/include/msvcrt/corecrt_startup.h +++ b/include/msvcrt/corecrt_startup.h @@ -22,6 +22,18 @@ typedef enum _crt_app_type _crt_gui_app } _crt_app_type; +typedef void (__cdecl *_PVFV)(void); +typedef int (__cdecl *_PIFV)(void); +typedef void (__cdecl *_PVFI)(int); + +typedef struct _onexit_table_t { + _PVFV *_first; + _PVFV *_last; + _PVFV *_end; +} _onexit_table_t; + +typedef int (__cdecl *_onexit_t)(void); + #ifdef __cplusplus extern "C" { #endif @@ -34,10 +46,13 @@ _ACRTIMP void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int * _ACRTIMP errno_t __cdecl _configure_narrow_argv(_crt_argv_mode); _ACRTIMP errno_t __cdecl _configure_wide_argv(_crt_argv_mode); +_ACRTIMP int __cdecl _execute_onexit_table(_onexit_table_t*); _ACRTIMP char **__cdecl _get_initial_narrow_environment(void); _ACRTIMP wchar_t **__cdecl _get_initial_wide_environment(void); _ACRTIMP int __cdecl _initialize_narrow_environment(void); +_ACRTIMP int __cdecl _initialize_onexit_table(_onexit_table_t*); _ACRTIMP int __cdecl _initialize_wide_environment(void); +_ACRTIMP int __cdecl _register_onexit_function(_onexit_table_t*,_onexit_t); _ACRTIMP void __cdecl _set_app_type(_crt_app_type); #ifdef __cplusplus

1 0

Jacek Caban : ucrtbase/tests: Use public onexit table declarations.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: aa16d0adf1aaa75e1e9c052786a18864ac07f91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16d0adf1aaa75e1e9c0527… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:01:37 2020 +0100 ucrtbase/tests: Use public onexit table declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 88 +++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa16d0adf1aaa75e1e9c…

1 0

Jacek Caban : msvcrt: Use public onexit table declarations in importlib.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 6735dcc376d783ec4052724148b55e7381e36d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6735dcc376d783ec40527241… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:01:54 2020 +0100 msvcrt: Use public onexit table declarations in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/onexit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/onexit.c b/dlls/msvcrt/onexit.c index 62d884f3ac..18b935b88d 100644 --- a/dlls/msvcrt/onexit.c +++ b/dlls/msvcrt/onexit.c @@ -24,6 +24,7 @@ #endif #define _CRTIMP +#include <process.h> #include "msvcrt.h" #include "mtdll.h" @@ -31,7 +32,7 @@ /********************************************************************* * _initialize_onexit_table (UCRTBASE.@) */ -int CDECL _initialize_onexit_table(MSVCRT__onexit_table_t *table) +int __cdecl _initialize_onexit_table(_onexit_table_t *table) { if (!table) return -1; @@ -45,7 +46,7 @@ int CDECL _initialize_onexit_table(MSVCRT__onexit_table_t *table) /********************************************************************* * _register_onexit_function (UCRTBASE.@) */ -int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func) +int __cdecl _register_onexit_function(_onexit_table_t *table, _onexit_t func) { if (!table) return -1; @@ -67,7 +68,7 @@ int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi if (table->_last == table->_end) { int len = table->_end - table->_first; - MSVCRT__onexit_t *tmp = HeapReAlloc(GetProcessHeap(), 0, table->_first, 2 * len * sizeof(void *)); + _PVFV *tmp = HeapReAlloc(GetProcessHeap(), 0, table->_first, 2 * len * sizeof(void *)); if (!tmp) { _munlock(_EXIT_LOCK1); @@ -78,7 +79,7 @@ int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi table->_last = table->_first + len; } - *table->_last = func; + *table->_last = (_PVFV)func; table->_last++; _munlock(_EXIT_LOCK1); return 0; @@ -88,10 +89,10 @@ int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi /********************************************************************* * _execute_onexit_table (UCRTBASE.@) */ -int CDECL _execute_onexit_table(MSVCRT__onexit_table_t *table) +int __cdecl _execute_onexit_table(_onexit_table_t *table) { - MSVCRT__onexit_t *func; - MSVCRT__onexit_table_t copy; + _PVFV *func; + _onexit_table_t copy; if (!table) return -1;

1 0