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

Jacek Caban : jscript: Support calling properties with getters.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 29d9659095fd76e303f204050ab4c85d0a0486e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d9659095fd76e303f20405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 31 20:05:26 2021 +0200 jscript: Support calling properties with getters. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 130 ++++++++++++++++++++++++++--------------------- dlls/mshtml/tests/es5.js | 13 +++++ 2 files changed, 85 insertions(+), 58 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a1a1af5a141..973ea4c7142 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -389,64 +389,6 @@ static HRESULT convert_params(const DISPPARAMS *dp, jsval_t *buf, unsigned *argc return S_OK; } -static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, WORD flags, - unsigned argc, jsval_t *argv, jsval_t *r, IServiceProvider *caller) -{ - HRESULT hres; - - switch(prop->type) { - case PROP_BUILTIN: { - if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { - WARN("%s is not a constructor\n", debugstr_w(prop->name)); - return E_INVALIDARG; - } - - if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { - vdisp_t vthis; - - if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - if(jsthis) - set_disp(&vthis, jsthis); - else - set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); - vdisp_release(&vthis); - }else { - /* Function object calls are special case */ - hres = Function_invoke(This, jsthis, flags, argc, argv, r); - } - return hres; - } - case PROP_PROTREF: - return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, - This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); - case PROP_JSVAL: { - if(!is_object_instance(prop->u.val)) { - FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); - return E_FAIL; - } - - TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); - - return disp_call_value(This->ctx, get_object(prop->u.val), - jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, - flags, argc, argv, r); - } - case PROP_ACCESSOR: - FIXME("accessor\n"); - return E_NOTIMPL; - case PROP_IDX: - FIXME("Invoking PROP_IDX not yet supported\n"); - return E_NOTIMPL; - case PROP_DELETED: - assert(0); - } - - assert(0); - return E_FAIL; -} - static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) { jsdisp_t *prop_obj = This; @@ -571,6 +513,78 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return S_OK; } +static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r, IServiceProvider *caller) +{ + HRESULT hres; + + switch(prop->type) { + case PROP_BUILTIN: { + if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { + WARN("%s is not a constructor\n", debugstr_w(prop->name)); + return E_INVALIDARG; + } + + if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { + vdisp_t vthis; + + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; + if(jsthis) + set_disp(&vthis, jsthis); + else + set_jsdisp(&vthis, This); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); + vdisp_release(&vthis); + }else { + /* Function object calls are special case */ + hres = Function_invoke(This, jsthis, flags, argc, argv, r); + } + return hres; + } + case PROP_PROTREF: + return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, + This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); + case PROP_JSVAL: { + if(!is_object_instance(prop->u.val) || !get_object(prop->u.val)) { + FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); + return E_FAIL; + } + + TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); + + return disp_call_value(This->ctx, get_object(prop->u.val), + jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, + flags, argc, argv, r); + } + case PROP_ACCESSOR: + case PROP_IDX: { + jsval_t val; + + hres = prop_get(This, prop, &val); + if(FAILED(hres)) + return hres; + + if(is_object_instance(val) && get_object(val)) { + hres = disp_call_value(This->ctx, get_object(val), + jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, + flags, argc, argv, r); + }else { + FIXME("invoke %s\n", debugstr_jsval(val)); + hres = E_NOTIMPL; + } + + jsval_release(val); + return hres; + } + case PROP_DELETED: + assert(0); + break; + } + + return E_FAIL; +} + HRESULT builtin_set_const(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { TRACE("%p %s\n", jsthis, debugstr_jsval(value)); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 09ea9e0d657..e8c523b0bf7 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -513,6 +513,19 @@ sync_test("defineProperty", function() { test_accessor_prop_desc(obj, "no_setter", desc); obj.no_setter = false; ok(obj.no_setter === true, "no_setter = " + obj.no_setter); + + /* call prop with getter */ + desc = { + get: function() { + return function(x) { + ok(x === 100, "x = " + x); + return 10; + }; + } + }; + Object.defineProperty(obj, "funcprop", desc); + test_accessor_prop_desc(obj, "funcprop", desc); + ok(obj.funcprop(100) === 10, "obj.funcprop() = " + obj.funcprop(100)); }); sync_test("defineProperties", function() {

1 0

Huw Davies : riched20: Add support for TXTBIT_ALLOWBEEP.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: ac6ddbc954e8f7e8c2e5fe7b7d9507476dbaa321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6ddbc954e8f7e8c2e5fe7b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:03 2021 +0100 riched20: Add support for TXTBIT_ALLOWBEEP. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fe05d1e7444..deb0a93c8dc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -279,6 +279,11 @@ ME_Paragraph *editor_end_para( ME_TextEditor *editor ) return &editor->pBuffer->pLast->member.para; } +static BOOL editor_beep( ME_TextEditor *editor, UINT type ) +{ + return editor->props & TXTBIT_ALLOWBEEP && MessageBeep( type ); +} + static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { WCHAR *pText; @@ -2281,7 +2286,7 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO /* Protect read-only edit control from modification */ if (editor->props & TXTBIT_READONLY) { - if (!check_only) MessageBeep(MB_ICONERROR); + if (!check_only) editor_beep( editor, MB_ICONERROR ); return FALSE; } @@ -2379,7 +2384,7 @@ static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) count -= offs; hr = editor_copy_or_cut( editor, cut, sel_start, count, NULL ); - if (FAILED( hr )) MessageBeep( MB_ICONERROR ); + if (FAILED( hr )) editor_beep( editor, MB_ICONERROR ); return SUCCEEDED( hr ); } @@ -2422,7 +2427,7 @@ static BOOL handle_enter(ME_TextEditor *editor) if (editor->props & TXTBIT_READONLY) { - MessageBeep(MB_ICONERROR); + editor_beep( editor, MB_ICONERROR ); return TRUE; } @@ -2683,7 +2688,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) if (editor->props & TXTBIT_READONLY) { - MessageBeep(MB_ICONERROR); + editor_beep( editor, MB_ICONERROR ); return 0; /* FIXME really 0 ? */ } @@ -2737,7 +2742,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) if (para_in_table( para ) && cursor.run->nFlags & MERF_ENDPARA && from == to) { /* Text should not be inserted at the end of the table. */ - MessageBeep(-1); + editor_beep( editor, -1 ); return 0; } } @@ -2951,7 +2956,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->total_rows = 0; ITextHost_TxGetPropertyBits( ed->texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | - TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_DISABLEDRAG, + TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_ALLOWBEEP | + TXTBIT_DISABLEDRAG, &ed->props ); ITextHost_TxGetScrollBars( ed->texthost, &ed->scrollbars ); ed->pBuffer = ME_MakeText();

1 0

Huw Davies : riched20: Merge the richole object with the text services object.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 43d377c260538847395a6844edec09727fc8d47e URL: https://source.winehq.org/git/wine.git/?a=commit;h=43d377c260538847395a6844… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:04 2021 +0100 riched20: Merge the richole object with the text services object. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 31 +- dlls/riched20/editor.h | 4 +- dlls/riched20/editstr.h | 26 +- dlls/riched20/richole.c | 897 +++++++++++++++++++++--------------------------- dlls/riched20/txtsrv.c | 29 +- 5 files changed, 444 insertions(+), 543 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43d377c260538847395a…

1 0

Huw Davies : riched20/tests: Add some object identity tests.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: f81805507e182519a6347128c1f4c92077890e9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81805507e182519a6347128… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:05 2021 +0100 riched20/tests: Add some object identity tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 9 +++++++++ dlls/riched20/tests/txtsrv.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 3cea9902620..e6329c5b1b6 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -149,6 +149,7 @@ static void test_Interfaces(void) LRESULT res; HWND w; ULONG refcount; + IUnknown *unk, *unk2; w = new_richedit(NULL); if (!w) { @@ -180,6 +181,14 @@ static void test_Interfaces(void) hres = ITextDocument_GetSelection(txtDoc, &txtSel); ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextDocument_QueryInterface(txtDoc, &IID_IUnknown, (void **)&unk); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextSelection_QueryInterface(txtSel, &IID_IUnknown, (void **)&unk2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(unk != unk2, "unknowns are the same\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + EXPECT_REF(txtDoc, 4); EXPECT_REF(txtSel, 2); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 6834e38b7f5..fe27be26edb 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -917,6 +917,7 @@ static void test_QueryInterface(void) IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; ITextDocument2Old *txtdoc2old, *txtsrv_txtdoc2old; + IUnknown *unk, *unk2; ULONG refcount; if(!init_texthost(&txtserv, &host)) @@ -933,6 +934,14 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtsrv_reole); ok(refcount == 2, "got wrong ref count: %d\n", refcount); + hres = ITextServices_QueryInterface( txtserv, &IID_IUnknown, (void **)&unk ); + ok( hres == S_OK, "got 0x%08x\n", hres ); + hres = IRichEditOle_QueryInterface( txtsrv_reole, &IID_IUnknown, (void **)&unk2 ); + ok( hres == S_OK, "got 0x%08x\n", hres ); + ok( unk == unk2, "unknowns differ\n" ); + IUnknown_Release( unk2 ); + IUnknown_Release( unk ); + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument, (void **)&txtdoc); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); refcount = get_refcount((IUnknown *)txtserv);

1 0

Huw Davies : riched20/tests: Silence the beeps.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: a412a4b9613fccbbdd8c6500ed961e49b9daed5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a412a4b9613fccbbdd8c6500… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:06 2021 +0100 riched20/tests: Silence the beeps. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8ef88bd1b21..3a6a072f1f8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -33,6 +33,8 @@ #include <ole2.h> #include <richedit.h> #include <richole.h> +#include <imm.h> +#include <textserv.h> #include <commdlg.h> #include <time.h> #include <wine/test.h> @@ -51,12 +53,38 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; static HMODULE hmoduleRichEdit; static BOOL is_lang_japanese; +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) +static void disable_beep( HWND hwnd ) +{ + /* don't attempt to disable beep if we don't have thiscall compiler support */ +} +#else +#define ITextServices_OnTxPropertyBitsChange(This,a,b) (This)->lpVtbl->OnTxPropertyBitsChange(This,a,b) +static void disable_beep( HWND hwnd ) +{ + IRichEditOle *richole; + ITextServices *services; + IID *pIID_ITextServices = (IID *)GetProcAddress( hmoduleRichEdit, "IID_ITextServices" ); + + if (SendMessageW( hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&richole )) + { + if (SUCCEEDED( IRichEditOle_QueryInterface( richole, pIID_ITextServices, (void **)&services ) )) + { + ITextServices_OnTxPropertyBitsChange( services, TXTBIT_ALLOWBEEP, 0 ); + ITextServices_Release( services ); + } + IRichEditOle_Release( richole ); + } +} +#endif + static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; hwnd = CreateWindowA(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); + disable_beep( hwnd ); return hwnd; } @@ -66,6 +94,7 @@ static HWND new_windowW(LPCWSTR lpClassName, DWORD dwStyle, HWND parent) { |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", wine_dbgstr_w(lpClassName), (int) GetLastError()); + disable_beep( hwnd ); return hwnd; } @@ -1862,6 +1891,7 @@ static void test_EM_SETOPTIONS(void) hmoduleRichEdit, NULL); ok(hwndRichEdit != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS20A, (int) GetLastError()); + disable_beep( hwndRichEdit ); options = SendMessageA(hwndRichEdit, EM_GETOPTIONS, 0, 0); /* WS_[VH]SCROLL cause the ECO_AUTO[VH]SCROLL options to be set */ ok(options == (ECO_AUTOVSCROLL|ECO_AUTOHSCROLL), @@ -6337,6 +6367,7 @@ static void test_WM_CHAR(void) hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, 0, 0, 200, 60, 0, 0, 0, 0); ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + disable_beep( hwnd ); p = char_list; while (*p != '\0') { @@ -6940,6 +6971,7 @@ static void test_undo_coalescing(void) hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP|ES_MULTILINE, 0, 0, 200, 60, 0, 0, 0, 0); ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + disable_beep( hwnd ); result = SendMessageA(hwnd, EM_CANUNDO, 0, 0); ok (result == FALSE, "Can undo after window creation.\n");

1 0

Hans Leidekker : dnsapi/tests: Don't fail on query timeouts.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: c511511e62d915986aa7c5a7ad9ab38248efb42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c511511e62d915986aa7c5a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 31 14:06:20 2021 +0200 dnsapi/tests: Don't fail on query timeouts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/query.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 74669005a33..d68e9383204 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -40,7 +40,12 @@ static void test_DnsQuery(void) rec = NULL; status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == ERROR_SUCCESS, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_TIMEOUT) + { + skip("query timed out\n"); + return; + } + ok(status == ERROR_SUCCESS, "got %d\n", status); DnsRecordListFree(rec, DnsFreeRecordList); status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL);

1 0

Esme Povirk : mscoree: Update Wine Mono to 6.1.1.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 2c94b7a609fe40a79ea30096bdb2dcac4198069e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c94b7a609fe40a79ea30096… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Mar 31 11:03:07 2021 -0500 mscoree: Update Wine Mono to 6.1.1. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b2e726422da..e3004c972f1 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.0.0" +#define MONO_VERSION "6.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" +#define MONO_SHA "ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 69c30e5e3e0..e396d855e71 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.0.0" +#define WINE_MONO_VERSION "6.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Paul Gofman : server: Do not cancel process sigkill in kill_process().
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: df066eabdc896eb3ea249ee639d703875214250f URL: https://source.winehq.org/git/wine.git/?a=commit;h=df066eabdc896eb3ea249ee6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:13 2021 +0300 server: Do not cancel process sigkill in kill_process(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server/process.c b/server/process.c index 7bc096a7b1f..9ca1eb64469 100644 --- a/server/process.c +++ b/server/process.c @@ -945,13 +945,7 @@ void kill_process( struct process *process, int violent_death ) process->msg_fd = NULL; } - if (process->sigkill_timeout) /* already waiting for it to die */ - { - remove_timeout_user( process->sigkill_timeout ); - process->sigkill_timeout = NULL; - process_died( process ); - return; - } + if (process->sigkill_timeout) return; /* already waiting for it to die */ if (violent_death) terminate_process( process, NULL, 1 ); else

1 0

Paul Gofman : server: Add sigkill timer even if msg_fd is closed.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 672df33f7d7b3a221d636bf561fa4c6052af7fb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=672df33f7d7b3a221d636bf5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:14 2021 +0300 server: Add sigkill timer even if msg_fd is closed. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 9ca1eb64469..433c0cbdd73 100644 --- a/server/process.c +++ b/server/process.c @@ -503,7 +503,7 @@ static void process_sigkill( void *private ) static void start_sigkill_timer( struct process *process ) { grab_object( process ); - if (process->unix_pid != -1 && process->msg_fd) + if (process->unix_pid != -1) process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); else process_died( process );

1 0

Paul Gofman : ntdll: Close server socket before calling exit().
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 51f7c9d15ed4af06f39f863c253252f77336d0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51f7c9d15ed4af06f39f863c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:15 2021 +0300 ntdll: Close server socket before calling exit(). So if a native exit handler hangs the process eventually gets killed by server. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 12 ++++++++++++ dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 3f446e8348a..50d89f79c0d 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1470,6 +1470,18 @@ static void init_teb64( TEB *teb ) #endif } +/*********************************************************************** + * process_exit_wrapper + * + * Close server socket and exit process normally. + */ +void process_exit_wrapper( int status ) +{ + close( fd_socket ); + exit( status ); +} + + /*********************************************************************** * server_init_process * diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00d29ae706b..1a882a99855 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -329,7 +329,7 @@ static void exit_thread( int status ) void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_thread( get_unix_exit_code( status ), exit ); + signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3987cc6c4d0..b49789b641e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -164,6 +164,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * apc_result_t *result ) DECLSPEC_HIDDEN; extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; +extern void process_exit_wrapper( int status ) DECLSPEC_HIDDEN; extern size_t server_init_process(void) DECLSPEC_HIDDEN; extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN;

1 0