October 2019 - Wine-commits

Jacek Caban : vbscript: Store entire EXCEPINFO in script context.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 8277c24806cfd174617bc35d06a7cb7a7284e44c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8277c24806cfd174617bc35d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:18:37 2019 +0200 vbscript: Store entire EXCEPINFO in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 4 ++-- dlls/vbscript/interp.c | 12 ++++++++++-- dlls/vbscript/vbscript.c | 1 + dlls/vbscript/vbscript.h | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e09099ecaf..98bcc516d7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2477,7 +2477,7 @@ static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI return E_NOTIMPL; } - hres = This->desc->ctx->err_number; + hres = This->desc->ctx->ei.scode; return return_int(res, HRESULT_FACILITY(hres) == FACILITY_VBS ? HRESULT_CODE(hres) : hres); } @@ -2494,7 +2494,7 @@ static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIA if(!This->desc) return E_UNEXPECTED; - This->desc->ctx->err_number = S_OK; + clear_ei(&This->desc->ctx->ei); return S_OK; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 6b9fd60a75..9c561826fa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -247,6 +247,14 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, return S_OK; } +void clear_ei(EXCEPINFO *ei) +{ + SysFreeString(ei->bstrSource); + SysFreeString(ei->bstrDescription); + SysFreeString(ei->bstrHelpFile); + memset(ei, 0, sizeof(*ei)); +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -1321,7 +1329,7 @@ static HRESULT interp_errmode(exec_ctx_t *ctx) TRACE("%d\n", err_mode); ctx->resume_next = err_mode; - ctx->script->err_number = S_OK; + clear_ei(&ctx->script->ei); return S_OK; } @@ -2158,7 +2166,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP op = exec.instr->op; hres = op_funcs[op](&exec); if(FAILED(hres)) { - ctx->err_number = hres = map_hres(hres); + ctx->ei.scode = hres = map_hres(hres); if(exec.resume_next) { unsigned stack_off; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index aa768a57e7..69dc1a151b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -153,6 +153,7 @@ static void release_script(script_ctx_t *ctx) class_desc_t *class_desc; collect_objects(ctx); + clear_ei(&ctx->ei); release_dynamic_vars(ctx->global_vars); ctx->global_vars = NULL; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c9018c4648..003d759046 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -192,7 +192,7 @@ struct _script_ctx_t { class_desc_t err_desc; vbdisp_t *err_obj; - HRESULT err_number; + EXCEPINFO ei; dynamic_var_t *global_vars; function_t *global_funcs; @@ -358,6 +358,7 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t** HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; +void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Jacek Caban : vbscript: Add err.description implementation.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 0d9f024d6a6813647b6b2fa42562ef1546c745b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d9f024d6a6813647b6b2fa4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:18:51 2019 +0200 vbscript: Add err.description implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/interp.c | 9 ++++++++- dlls/vbscript/tests/api.vbs | 4 ++++ dlls/vbscript/vbscript.h | 35 ++++------------------------------- dlls/vbscript/vbscript.rc | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript_defs.h | 36 ++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript_main.c | 15 +++++++++++++++ 7 files changed, 127 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d9f024d6a6813647b6b…

1 0

Jacek Caban : vbscript: Add err.source implementation.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 707f7eb2a17ccb49a1b7a12ae8f1955002664abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=707f7eb2a17ccb49a1b7a12a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:19:03 2019 +0200 vbscript: Add err.source implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 4 ++-- dlls/vbscript/interp.c | 1 + dlls/vbscript/tests/api.vbs | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 41a91b6a27..5fa38815c2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2500,8 +2500,8 @@ static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return !This->desc ? E_UNEXPECTED : err_string_prop(&This->desc->ctx->ei.bstrSource, args, args_cnt, res); } static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3ffbbb1c15..0fb628c59a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2170,6 +2170,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP clear_ei(&ctx->ei); ctx->ei.scode = hres = map_hres(hres); + ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); ctx->ei.bstrDescription = get_vbscript_error_string(hres); }else { hres = ctx->ei.scode; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 5c59a9a4b3..1b5c38cdd9 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -134,6 +134,7 @@ sub testCStrError() Error.clear() CStr(null) call ok(Err.number = 94, "Err.number = " & Err.number) + if isEnglishLang then call ok(Err.source = "Microsoft VBScript runtime error", "Err.source = " & Err.source) if isEnglishLang then call ok(Err.description = "Invalid use of Null", "Err.description = " & Err.description) end sub call testCStrError()

1 0

Jacek Caban : vbscript: Add err.helpfile and err.helpcontext implementation.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: c65a809f48428b4c67b1e860ea51c541d0e7e204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c65a809f48428b4c67b1e860… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:19:11 2019 +0200 vbscript: Add err.helpfile and err.helpcontext implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5fa38815c2..7a28739bf9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2470,14 +2470,23 @@ static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!This->desc) + return E_UNEXPECTED; + + if(args_cnt) { + FIXME("setter not implemented\n"); + return E_NOTIMPL; + } + + return return_int(res, This->desc->ctx->ei.dwHelpContext); } static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return !This->desc ? E_UNEXPECTED : err_string_prop(&This->desc->ctx->ei.bstrHelpFile, args, args_cnt, res); } static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)

1 0

Jacek Caban : vbscript: Add err.raise function implementation.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: f41c2db014522ddc0c1e8f27aedbb03d2c0af166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41c2db014522ddc0c1e8f27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:19:24 2019 +0200 vbscript: Add err.raise function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7a28739bf9..e533940f21 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2526,8 +2526,60 @@ static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIA static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR source = NULL, description = NULL, helpfile = NULL; + int code, helpcontext = 0; + HRESULT hres, error; + + TRACE("%s %u...\n", debugstr_variant(args), args_cnt); + + hres = to_int(args, &code); + if(FAILED(hres)) + return hres; + if(code > 0 && code > 0xffff) + return E_INVALIDARG; + + if(args_cnt >= 2) + hres = to_string(args + 1, &source); + if(args_cnt >= 3 && SUCCEEDED(hres)) + hres = to_string(args + 2, &description); + if(args_cnt >= 4 && SUCCEEDED(hres)) + hres = to_string(args + 3, &helpfile); + if(args_cnt >= 5 && SUCCEEDED(hres)) + hres = to_int(args + 4, &helpcontext); + + if(SUCCEEDED(hres) && This->desc) { + script_ctx_t *ctx = This->desc->ctx; + + error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); + + if(source) { + if(ctx->ei.bstrSource) SysFreeString(ctx->ei.bstrSource); + ctx->ei.bstrSource = source; + } + if(!ctx->ei.bstrSource) + ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); + if(description) { + if(ctx->ei.bstrDescription) SysFreeString(ctx->ei.bstrDescription); + ctx->ei.bstrDescription = description; + } + if(!ctx->ei.bstrDescription) + ctx->ei.bstrDescription = get_vbscript_error_string(error); + if(helpfile) { + if(ctx->ei.bstrHelpFile) SysFreeString(ctx->ei.bstrHelpFile); + ctx->ei.bstrHelpFile = helpfile; + } + if(args_cnt >= 5) + ctx->ei.dwHelpContext = helpcontext; + + ctx->ei.scode = error; + hres = SCRIPT_E_RECORDED; + }else { + SysFreeString(source); + SysFreeString(description); + SysFreeString(helpfile); + } + + return hres; } static const builtin_prop_t err_props[] = { @@ -2537,7 +2589,7 @@ static const builtin_prop_t err_props[] = { {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, {DISPID_ERR_CLEAR, Err_Clear}, - {DISPID_ERR_RAISE, Err_Raise, 0, 5}, + {DISPID_ERR_RAISE, Err_Raise, 0, 1, 5}, }; HRESULT init_global(script_ctx_t *ctx)

1 0

Jacek Caban : vbscript/tests: Add err.raise tests.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: ea130e12c3fa071b905020f86cc7ca5c05370a81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea130e12c3fa071b905020f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:19:34 2019 +0200 vbscript/tests: Add err.raise tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1b5c38cdd9..12e9f475f5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1522,4 +1522,92 @@ call testAsc(Chr(0), 0) if isEnglishLang then testAsc true, 84 call testAscError() +sub testErrNumber(n) + call ok(err.number = n, "err.number = " & err.number & " expected " & n) +end sub + +sub testErrRaise() + on error resume next + call ok(err.number = 0, "err.number = " & err.number) + err.raise 1 + call ok(err.number = 1, "err.number = " & err.number) + err.raise + call ok(err.number = 450, "err.number = " & err.number) + call testErrNumber(450) + err.raise &h10000& + call ok(err.number = 5, "err.number = " & err.number) + + err.clear + call ok(getVT(err.source) = "VT_BSTR", "err.source = " & err.source) + call ok(getVT(err.description) = "VT_BSTR", "err.description = " & err.description) + call ok(getVT(err.helpfile) = "VT_BSTR", "err.helpfile = " & err.helpfile) + call ok(getVT(err.helpcontext) = "VT_I4", "err.helpcontext = " & err.helpcontext) + call ok(err.source = "", "err.source = " & err.source) + call ok(err.description = "", "err.description = " & err.description) + call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) + call ok(err.helpcontext = 0, "err.helpcontext = " & err.helpcontext) + + err.raise 1, "abc" + call ok(err.number = 1, "err.number = " & err.number) + call ok(err.source = "abc", "err.source = " & err.source) + if isEnglishLang then call ok(err.description = "Unknown runtime error", "err.description = " & err.description) + call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) + + err.raise 1, 2, "desc", "hf", 1 + call ok(err.number = 1, "err.number = " & err.number) + call ok(getVT(err.source) = "VT_BSTR", "err.source = " & err.source) + call ok(err.source = "2", "err.source = " & err.source) + call ok(err.description = "desc", "err.description = " & err.description) + call ok(err.helpfile = "hf", "err.helpfile = " & err.helpfile) + call ok(getVT(err.helpcontext) = "VT_I4", "err.helpcontext = " & err.helpcontext) + call ok(err.helpcontext = 1, "err.helpcontext = " & err.helpcontext) + + err.raise 5 + call ok(err.number = 5, "err.number = " & err.number) + call ok(err.source = "2", "err.source = " & err.source) + call ok(err.description = "desc", "err.description = " & err.description) + call ok(err.helpfile = "hf", "err.helpfile = " & err.helpfile) + call ok(getVT(err.helpcontext) = "VT_I4", "err.helpcontext = " & err.helpcontext) + call ok(err.helpcontext = 1, "err.helpcontext = " & err.helpcontext) + + err.clear + err.raise &h8007000E& + call ok(err.number = 7, "err.number = " & err.number) + if isEnglishLang then call ok(err.source = "Microsoft VBScript runtime error", "err.source = " & err.source) + if isEnglishLang then call ok(err.description = "Out of memory", "err.description = " & err.description) + call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) + call ok(err.helpcontext = 0, "err.helpcontext = " & err.helpcontext) + + err.clear + err.raise 1, "test" + err.raise &h8007000E& + call ok(err.number = 7, "err.number = " & err.number) + call ok(err.source = "test", "err.source = " & err.source) + if isEnglishLang then call ok(err.description = "Unknown runtime error", "err.description = " & err.description) + call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) + call ok(err.helpcontext = 0, "err.helpcontext = " & err.helpcontext) + + err.raise 1, 2, "desc", "hf", 1 + err.unknownIdent + call ok(err.number = 438, "err.number = " & err.number) + if isEnglishLang then call ok(err.source = "Microsoft VBScript runtime error", "err.source = " & err.source) + if isEnglishLang then call ok(err.description = "Object doesn't support this property or method", _ + "err.description = " & err.description) + call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) + call ok(err.helpcontext = 0, "err.helpcontext = " & err.helpcontext) + + e = err + call ok(getVT(e) = "VT_I4*", "getVT(e) = " & getVT(e)) + call ok(e = 438, "e = " & e) + + err.raise 1, 2, "desc", "hf", 1 + on error goto 0 + call ok(err.number = 0, "err.number = " & err.number) + call ok(err.source = "", "err.source = " & err.source) + call ok(err.description = "", "err.description = " & err.description) + call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) + call ok(err.helpcontext = 0, "err.helpcontext = " & err.helpcontext) +end sub +call testErrRaise() + Call reportSuccess()

1 0

Hans Leidekker : winhttp/tests: Fix more test failures.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 2a0a34cc74456f1e4c8bbe27ee0af859e6007ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0a34cc74456f1e4c8bbe27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 3 14:56:25 2019 +0200 winhttp/tests: Fix more test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 552f6ce778..2cf6f6a87d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3578,7 +3578,12 @@ static void test_passport_auth( int port ) ok( ret, "got %u\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret || broken(!ret && GetLastError() == ERROR_WINHTTP_LOGIN_FAILURE) /* winxp */, "got %u\n", GetLastError() ); + if (!ret && GetLastError() == ERROR_WINHTTP_LOGIN_FAILURE) + { + win_skip("no support for Passport redirects\n"); + goto cleanup; + } status = 0xdeadbeef; size = sizeof(status); @@ -3602,6 +3607,7 @@ static void test_passport_auth( int port ) ok( !lstrcmpW(headersW, buf), "got %s\n", wine_dbgstr_w(buf) ); } +cleanup: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses );

1 0

João Diogo Ferreira : winnls.h: Add element GEOCLASS_ALL to enum SYSGEOCLASS.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: b711b5feae26c8c58185df0f41ad078fb27861d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b711b5feae26c8c58185df0f… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Thu Oct 3 04:39:45 2019 +0000 winnls.h: Add element GEOCLASS_ALL to enum SYSGEOCLASS. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index e790da4832..e810c44af7 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -833,6 +833,7 @@ enum SYSGEOTYPE enum SYSGEOCLASS { + GEOCLASS_ALL = 0, GEOCLASS_REGION = 14, GEOCLASS_NATION = 16 };

1 0

Akihiro Sagawa : ntdll: Add exception handling around DbgBreakPoint.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: aade0bf7e3f58431f20566733881716cb3075d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aade0bf7e3f58431f2056673… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 30 22:08:00 2019 +0900 ntdll: Add exception handling around DbgBreakPoint. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47509 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 31 +++++++++++++++++++++++-------- dlls/ntdll/process.c | 14 +++++++++++++- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 8148c396d0..4a1b1d4076 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -399,7 +399,7 @@ static void wait_for_breakpoint_(unsigned line, struct debugger_context *ctx) ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); } -static void process_attach_events(struct debugger_context *ctx) +static void process_attach_events(struct debugger_context *ctx, BOOL pass_exception) { DEBUG_EVENT ev; BOOL ret; @@ -445,6 +445,13 @@ static void process_attach_events(struct debugger_context *ctx) ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddress != DbgBreakPoint\n"); + if (pass_exception) + { + ret = ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx->ev.dwDebugEventCode = -1; + } + /* flush debug events */ do next_event(ctx, POLL_EVENT_TIMEOUT); while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT @@ -477,7 +484,7 @@ static void doDebugger(int argc, char** argv) if (strstr(myARGV[2], "process")) { strcat(buf, "processing debug messages\n"); - process_attach_events(&ctx); + process_attach_events(&ctx, FALSE); } debug_event=(argc >= 6 ? (HANDLE)(INT_PTR)atol(argv[5]) : NULL); @@ -1023,7 +1030,7 @@ static void doChildren(int argc, char **argv) HeapFree(GetProcessHeap(), 0, cmd); } -static void test_debug_children(char *name, DWORD flag, BOOL debug_child) +static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, BOOL pass_exception) { const char *arguments = "debugger children"; struct child_blackbox blackbox; @@ -1096,7 +1103,7 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) { DWORD last_thread; - process_attach_events(&ctx); + process_attach_events(&ctx, pass_exception); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.pid); ret = DebugBreakProcess(pi.hProcess); @@ -1118,6 +1125,13 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) ret = SetEvent(event_attach); ok(ret, "SetEvent failed, last error %d.\n", GetLastError()); + + if (pass_exception) + { + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx.ev.dwDebugEventCode = -1; + } } do next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1487,10 +1501,11 @@ START_TEST(debugger) test_ExitCode(); test_RemoteDebugger(); test_debug_loop(myARGC, myARGV); - test_debug_children(myARGV[0], DEBUG_PROCESS, TRUE); - test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE); - test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE); - test_debug_children(myARGV[0], 0, FALSE); + test_debug_children(myARGV[0], DEBUG_PROCESS, TRUE, FALSE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); + test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); + test_debug_children(myARGV[0], 0, FALSE, FALSE); + test_debug_children(myARGV[0], 0, FALSE, TRUE); test_debugger(myARGV[0]); } } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index e3c2ba5ccb..02ae4404fd 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -46,6 +46,7 @@ #include "windef.h" #include "winternl.h" #include "ntdll_misc.h" +#include "wine/exception.h" #include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" @@ -1372,7 +1373,18 @@ done: void WINAPI DbgUiRemoteBreakin( void *arg ) { TRACE( "\n" ); - if (NtCurrentTeb()->Peb->BeingDebugged) DbgBreakPoint(); + if (NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + } RtlExitUserThread( STATUS_SUCCESS ); }

1 0

Piotr Caban : ntdll: Try to handle write watches while we're on the signal stack (x86_64).
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: fd60406e91aab94033ad62dc3e00fe9a1a2d6aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd60406e91aab94033ad62dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 3 20:54:26 2019 +0200 ntdll: Try to handle write watches while we're on the signal stack (x86_64). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d8fcc54743..6508654e77 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2876,6 +2876,15 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct stack_layout *stack; ucontext_t *ucontext = sigcontext; + stack = (struct stack_layout *)(RSP_sig(ucontext) & ~15); + + /* check for exceptions on the signal stack caused by write watches */ + if (TRAP_sig(ucontext) == TRAP_x86_PAGEFLT && is_inside_signal_stack( stack ) && + !virtual_handle_fault( siginfo->si_addr, (ERROR_sig(ucontext) >> 1) & 0x09, TRUE )) + { + return; + } + /* check for page fault inside the thread stack */ if (TRAP_sig(ucontext) == TRAP_x86_PAGEFLT) {

1 0