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

Paul Gofman : netio.sys: Add stub for WskReleaseProviderNPI().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 8a9bbe4963fc480a3dad778a291df773ae9161f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9bbe4963fc480a3dad778a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:38 2020 +0300 netio.sys: Add stub for WskReleaseProviderNPI(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 5 +++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 539ea012e0..839a06d30d 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -43,6 +43,11 @@ NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG return STATUS_NOT_IMPLEMENTED; } +void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) +{ + FIXME("wsk_registration %p stub.\n", wsk_registration); +} + NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index 53891a7d27..facd8ab999 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -388,4 +388,4 @@ @ stdcall WskDeregister(ptr) @ stub WskQueryProviderCharacteristics @ stdcall WskRegister(ptr ptr) -@ stub WskReleaseProviderNPI +@ stdcall WskReleaseProviderNPI(ptr) diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index ead8f830a2..d19da999be 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -114,6 +114,7 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration); NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, WSK_PROVIDER_NPI *wsk_provider_npi); +void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration); #ifdef __cplusplus }

1 0

Jacek Caban : jscript: Support ES5 Array.prototype.sort arguments handling.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 6682290d17bffca101a8150a4427dcec9371852a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6682290d17bffca101a8150a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:03:27 2020 +0200 jscript: Support ES5 Array.prototype.sort arguments handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 33 ++++++++++++++++----------------- dlls/jscript/tests/api.js | 13 +++++++++++++ dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 55b7dd5d71..9d1014ec0b 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -685,23 +685,22 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne if(FAILED(hres)) return hres; - if(argc > 1) { - WARN("invalid arg_cnt %d\n", argc); - return E_FAIL; - } - - if(argc == 1) { - if(!is_object_instance(argv[0])) { - WARN("arg is not dispatch\n"); - return E_FAIL; - } - - cmp_func = iface_to_jsdisp(get_object(argv[0])); - if(!cmp_func || !is_class(cmp_func, JSCLASS_FUNCTION)) { - WARN("cmp_func is not a function\n"); - if(cmp_func) - jsdisp_release(cmp_func); - return E_FAIL; + if(argc >= 1) { + if(is_object_instance(argv[0])) { + if(argc > 1 && ctx->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("invalid arg_cnt %d\n", argc); + return JS_E_JSCRIPT_EXPECTED; + } + cmp_func = iface_to_jsdisp(get_object(argv[0])); + if(!cmp_func || !is_class(cmp_func, JSCLASS_FUNCTION)) { + WARN("cmp_func is not a function\n"); + if(cmp_func) + jsdisp_release(cmp_func); + return JS_E_JSCRIPT_EXPECTED; + } + }else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? !is_undefined(argv[0]) : !is_null(argv[0])) { + WARN("invalid arg %s\n", debugstr_jsval(argv[0])); + return JS_E_JSCRIPT_EXPECTED; } } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index df6ff785d0..74cf0ae357 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1039,6 +1039,19 @@ tmp = [5,3,"2.5",2,true,false,-1]; for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +tmp = [3,1,2].sort(function(x,y) { return y-x; }).join(); +ok(tmp === "3,2,1", "reverse sorted [3,1,2] = " + tmp); + +tmp = [3,1,2].sort(null).join(); +ok(tmp === "1,2,3", "null sorted [3,1,2] = " + tmp); + +try { + tmp = [3,1,2].sort(function(x,y) { return y-x; }, 1, 2, 3); + ok(false, "expected sort(undefined) exception"); +} catch(e) { + ok(e.name === "TypeError", "got exception " + e.name); +} + arr = [5,false,2,0,"abc",3,"a",-1]; tmp = arr.sort(); ok(tmp === arr, "tmp !== arr"); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index a24f61fcd5..533c35e861 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -188,6 +188,25 @@ function test_array_map() { next_test(); } +function test_array_sort() { + var r; + + r = [3,1,2].sort(function(x,y) { return y-x; }, 1, 2, 3, true, undefined ).join(); + ok(r === "3,2,1", "reverse sorted [3,1,2] = " + r); + + r = [3,1,2].sort(undefined).join(); + ok(r === "1,2,3", "null sorted [3,1,2] = " + r); + + try { + r = [3,1,2].sort(null); + ok(false, "expected sort(null) exception"); + }catch(e) { + ok(e.name === "TypeError", "got exception " + e.name); + } + + next_test(); +} + function test_identifier_keywords() { var o = { if: 1, @@ -883,6 +902,7 @@ var tests = [ test_array_forEach, test_isArray, test_array_map, + test_array_sort, test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty,

1 0

Jacek Caban : jscript: Support context argument in Array.prototype.forEach.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: f207ded345e5f6a5b834833c1f0de32c451196ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f207ded345e5f6a5b834833c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:03:47 2020 +0200 jscript: Support context argument in Array.prototype.forEach. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 11 ++++++++--- dlls/mshtml/tests/es5.js | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9d1014ec0b..f8ae12a7d8 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -949,6 +949,7 @@ static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flag static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + IDispatch *context_obj = NULL, *callback; jsval_t value, args[3], res; jsdisp_t *jsthis; unsigned length, i; @@ -965,10 +966,14 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); return E_INVALIDARG; } + callback = get_object(argv[0]); if(argc > 1 && !is_undefined(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; + if(!is_object_instance(argv[1]) || !get_object(argv[1])) { + FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); + return E_NOTIMPL; + } + context_obj = get_object(argv[1]); } for(i = 0; i < length; i++) { @@ -981,7 +986,7 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi args[0] = value; args[1] = jsval_number(i); args[2] = jsval_obj(jsthis); - hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); + hres = disp_call_value(ctx, callback, context_obj, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); jsval_release(value); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 533c35e861..2a8549ba1d 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -116,6 +116,12 @@ function test_array_forEach() { ok(this === window, "this != window"); }, undefined); + var o = new Object(), a = [1,2]; + a.forEach(function(value, index, array) { + ok(array === a, "array != a"); + ok(this === o, "this != o"); + }, o); + next_test(); }

1 0

Vijay Kiran Kamuju : winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 992a0ae7b90d92bcda52d82672ece1d3c7d4b0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=992a0ae7b90d92bcda52d826… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 3 09:42:49 2020 +0100 winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 593f091c2d..1a8d572f43 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5403,9 +5403,25 @@ BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo) BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, LPSTR pPrintProcessorName) { - FIXME("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), + UNICODE_STRING NameW, EnvW, PathW, ProcessorW; + BOOL ret; + + TRACE("(%s,%s,%s,%s)\n", debugstr_a(pName), debugstr_a(pEnvironment), debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); - return FALSE; + + asciitounicode(&NameW, pName); + asciitounicode(&EnvW, pEnvironment); + asciitounicode(&PathW, pPathName); + asciitounicode(&ProcessorW, pPrintProcessorName); + + ret = AddPrintProcessorW(NameW.Buffer, EnvW.Buffer, PathW.Buffer, ProcessorW.Buffer); + + RtlFreeUnicodeString(&ProcessorW); + RtlFreeUnicodeString(&PathW); + RtlFreeUnicodeString(&EnvW); + RtlFreeUnicodeString(&NameW); + + return ret; } /*****************************************************************************

1 0

Hans Leidekker : bcrypt: Add support for importing and exporting DSS private keys.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 7cf9a75dfa77de408261aef689c8f60fee17e46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cf9a75dfa77de408261aef6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 3 10:50:37 2020 +0200 bcrypt: Add support for importing and exporting DSS private keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 6 +++ dlls/bcrypt/bcrypt_main.c | 47 ++++++++++++++++++ dlls/bcrypt/gnutls.c | 112 ++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 36 ++++++++++++++ include/bcrypt.h | 12 +++++ 5 files changed, 213 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cf9a75dfa77de408261…

1 0

Daniel Lehman : vcruntime140_1: Support unwind handler with frame.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 7f0f3be020af5cf06d783cd11d92c63ba34bc9b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0f3be020af5cf06d783cd1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:07:45 2020 +0200 vcruntime140_1: Support unwind handler with frame. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index e1a39c0662..2c1ed63152 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -53,7 +53,7 @@ typedef struct typedef struct { - UINT flags; + UINT type; BYTE *prev; UINT handler; UINT object; @@ -77,6 +77,10 @@ typedef struct #define TYPE_FLAG_VOLATILE 2 #define TYPE_FLAG_REFERENCE 8 +#define UNWIND_TYPE_NO_HANDLER 0 +#define UNWIND_TYPE_DTOR_OBJ 1 +#define UNWIND_TYPE_FRAME 3 + typedef struct { UINT start_level; @@ -161,22 +165,25 @@ static BOOL read_unwind_info(BYTE **b, unwind_info *ui) BYTE *p = *b; memset(ui, 0, sizeof(*ui)); - ui->flags = decode_uint(b); - ui->prev = p - (ui->flags >> 2); - ui->flags &= 0x3; + ui->type = decode_uint(b); + ui->prev = p - (ui->type >> 2); + ui->type &= 0x3; - if (ui->flags & 0x1) + switch (ui->type) { + case UNWIND_TYPE_NO_HANDLER: + return TRUE; + case UNWIND_TYPE_DTOR_OBJ: ui->handler = read_rva(b); ui->object = decode_uint(b); /* frame offset */ - } - - if (ui->flags & 0x2) - { - FIXME("unknown flag: %x\n", ui->flags); + return TRUE; + case UNWIND_TYPE_FRAME: + ui->handler = read_rva(b); + return TRUE; + default: + FIXME("unknown type: %d\n", ui->type); return FALSE; } - return TRUE; } static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) @@ -270,8 +277,8 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT if (!read_unwind_info(&unwind_map, &ui)) return FALSE; if (ui.prev < (BYTE*)rva_to_ptr(descr->unwind_map, image_base)) ui.prev = NULL; - TRACE(" %d (%p): flags 0x%x prev %p func 0x%x(%p) object 0x%x\n", - i, entry, ui.flags, ui.prev, ui.handler, + TRACE(" %d (%p): type 0x%x prev %p func 0x%x(%p) object 0x%x\n", + i, entry, ui.type, ui.prev, ui.handler, rva_to_ptr(ui.handler, image_base), ui.object); } @@ -403,7 +410,7 @@ static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEX static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, int trylevel, int last_level) { - void (__cdecl *handler_dtor)(void *obj); + void (__cdecl *handler_dtor)(void *obj, ULONG64 frame); BYTE *unwind_data, *last; unwind_info ui; void *obj; @@ -442,7 +449,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, handler_dtor = rva_to_ptr(ui.handler, dispatch->ImageBase); obj = rva_to_ptr(ui.object, frame); TRACE("handler: %p object: %p\n", handler_dtor, obj); - handler_dtor(obj); + handler_dtor(obj, frame); } } }

1 0

Daniel Lehman : vcruntime140_1: Change pointer math in decode_uint.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 0f15bfee338d7926ad491969d23268f873c45cc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f15bfee338d7926ad491969… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:07:58 2020 +0200 vcruntime140_1: Change pointer math in decode_uint. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 2c1ed63152..48f824ae3f 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -117,34 +117,36 @@ typedef struct static UINT decode_uint(BYTE **b) { UINT ret; + BYTE *p = *b; - if ((**b & 1) == 0) + if ((*p & 1) == 0) { - ret = *b[0] >> 1; - *b += 1; + ret = p[0] >> 1; + p += 1; } - else if ((**b & 3) == 1) + else if ((*p & 3) == 1) { - ret = (*b[0] >> 2) + (*b[1] << 6); - *b += 2; + ret = (p[0] >> 2) + (p[1] << 6); + p += 2; } - else if ((**b & 7) == 3) + else if ((*p & 7) == 3) { - ret = (*b[0] >> 3) + (*b[1] << 5) + (*b[2] << 13); - *b += 3; + ret = (p[0] >> 3) + (p[1] << 5) + (p[2] << 13); + p += 3; } - else if ((**b & 15) == 7) + else if ((*p & 15) == 7) { - ret = (*b[0] >> 4) + (*b[1] << 4) + (*b[2] << 12) + (*b[3] << 20); - *b += 4; + ret = (p[0] >> 4) + (p[1] << 4) + (p[2] << 12) + (p[3] << 20); + p += 4; } else { FIXME("not implemented - expect crash\n"); ret = 0; - *b += 5; + p += 5; } + *b = p; return ret; }

1 0

Daniel Lehman : vcruntime140_1: Skip unwind if already at last level.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 94b25a47ba1c92eeb987a1ed6d251a12ce9a30e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b25a47ba1c92eeb987a1ed… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:09:19 2020 +0200 vcruntime140_1: Skip unwind if already at last level. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 48f824ae3f..42eab3b046 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -432,6 +432,8 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, terminate(); } + if (trylevel <= last_level) return; + unwind_data = rva_to_ptr(descr->unwind_map, dispatch->ImageBase); last = unwind_data; for (i = 0; i < trylevel; i++)

1 0

Daniel Lehman : vcruntime140_1: Don't terminate on state of -1.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 7d2675d19972ce294d37dc145f85ee8c0fc8d88d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2675d19972ce294d37dc14… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:09:31 2020 +0200 vcruntime140_1: Don't terminate on state of -1. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 42eab3b046..627e9694ec 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -426,7 +426,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, TRACE("current level: %d, last level: %d\n", trylevel, last_level); - if (trylevel<0 || trylevel>=descr->unwind_count) + if (trylevel<-1 || trylevel>=descr->unwind_count) { ERR("invalid trylevel %d\n", trylevel); terminate();

1 0

Daniel Lehman : vcruntime140_1: Unwind state 0.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: b33e1d4cb73cde216d00e15f041ffca3175162b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33e1d4cb73cde216d00e15f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:09:40 2020 +0200 vcruntime140_1: Unwind state 0. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 627e9694ec..4203373294 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -435,7 +435,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, if (trylevel <= last_level) return; unwind_data = rva_to_ptr(descr->unwind_map, dispatch->ImageBase); - last = unwind_data; + last = unwind_data - 1; for (i = 0; i < trylevel; i++) { BYTE *addr = unwind_data;

1 0