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

Paul Gofman : ntoskrnl.exe/tests: Avoid race condition in test driver.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: d0d1601e6c08116d9813f9899aafdde2df40209a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0d1601e6c08116d9813f989… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 14:29:44 2020 +0300 ntoskrnl.exe/tests: Avoid race condition in test driver. Might fix random driver crash on testbot Win8 machine. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f51064986b..beac9c2c25 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2194,7 +2194,9 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st main_test_work_item = IoAllocateWorkItem(lower_device); ok(main_test_work_item != NULL, "main_test_work_item = NULL\n"); + IoMarkIrpPending(irp); IoQueueWorkItem(main_test_work_item, main_test_task, DelayedWorkQueue, irp); + return STATUS_PENDING; } @@ -2380,7 +2382,6 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT); } - else IoMarkIrpPending(irp); return status; }

1 0

Jacek Caban : jscript: Support ES5 Array.prototype.sort arguments handling.
by Alexandre Julliard June 3, 2020

June 3, 2020

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 June 3, 2020

June 3, 2020

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

Rémi Bernon : dxgi/tests: Fix signed integral cast warning.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: abced34e67587a4441b61e1f8d3b8ca0e9bec31e URL: https://source.winehq.org/git/wine.git/?a=commit;h=abced34e67587a4441b61e1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:33 2020 +0200 dxgi/tests: Fix signed integral cast warning. First cast to LONG, then to DWORD. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e8dfa036e0..8f52e1d9e7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1103,7 +1103,7 @@ static void test_check_interface_support(void) hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, NULL); ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); - driver_version.HighPart = driver_version.LowPart = 0xdeadbeef; + driver_version.LowPart = driver_version.HighPart = 0xdeadbeef; hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, &driver_version); ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); ok(driver_version.HighPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.HighPart);

1 0

Daniel Lehman : vcruntime140_1: Change pointer math in decode_uint.
by Alexandre Julliard June 3, 2020

June 3, 2020

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

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 4616867798788f47624292031a1b906e2a119eaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4616867798788f4762429203… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:06 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bef2c4ec30..f0b25ce90d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -769,11 +769,10 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_device *device = texture->resource.device; DWORD map_binding = texture->update_map_binding; - struct wined3d_context *context = NULL; + struct wined3d_context *context; unsigned int i; - if (device->d3d_initialized) - context = context_acquire(device, NULL, 0); + context = context_acquire(device, NULL, 0); for (i = 0; i < sub_count; ++i) { @@ -784,8 +783,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)->gl_info); } - if (context) - context_release(context); + context_release(context); texture->resource.map_binding = map_binding; texture->update_map_binding = 0;

1 0

Daniel Lehman : vcruntime140_1: Support unwind handler with frame.
by Alexandre Julliard June 3, 2020

June 3, 2020

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: Skip unwind if already at last level.
by Alexandre Julliard June 3, 2020

June 3, 2020

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

Rémi Bernon : crypt32/tests: Fix signed integral cast warning.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 4e94e2106099a008d64fef0ed3566aab35361534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e94e2106099a008d64fef0e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:32 2020 +0200 crypt32/tests: Fix signed integral cast warning. First cast to int, then to DWORD. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 880ae720a4..7d6d07fe02 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2909,7 +2909,7 @@ static void testGetValidUsages(void) ret = pCertGetValidUsages(0, NULL, NULL, NULL, &size); */ contexts[0] = NULL; - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pCertGetValidUsages(1, &contexts[0], &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %d\n", GetLastError()); @@ -2921,12 +2921,12 @@ static void testGetValidUsages(void) sizeof(certWithUsage)); contexts[2] = CertCreateCertificateContext(X509_ASN_ENCODING, cert2WithUsage, sizeof(cert2WithUsage)); - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; ret = pCertGetValidUsages(0, NULL, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); ok(size == 0, "Expected size 0, got %d\n", size); - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; ret = pCertGetValidUsages(1, contexts, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs);

1 0

Rémi Bernon : sxs: Fix uninitialized variable warning.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 2c9c20c0a6c55daf234318cb529a08646d410e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c9c20c0a6c55daf234318cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:36 2020 +0200 sxs: Fix uninitialized variable warning. Reported by MinGW GCC 10 with -Wmaybe-uninitialized, this seems to be a typo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/name.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index a76510a9fe..6b3ae5197a 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -135,7 +135,6 @@ static HRESULT WINAPI name_GetDisplayName( { static const WCHAR fmtW[] = {',','%','s','=','\"','%','s','\"',0}; struct name *name = impl_from_IAssemblyName( iface ); - WCHAR version[30]; unsigned int len; TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); @@ -146,7 +145,7 @@ static HRESULT WINAPI name_GetDisplayName( if (name->arch) len += lstrlenW( archW ) + lstrlenW( name->arch ) + 4; if (name->token) len += lstrlenW( tokenW ) + lstrlenW( name->token ) + 4; if (name->type) len += lstrlenW( typeW ) + lstrlenW( name->type ) + 4; - if (name->version) len += lstrlenW( versionW ) + lstrlenW( version ) + 4; + if (name->version) len += lstrlenW( versionW ) + lstrlenW( name->version ) + 4; if (len > *buflen) { *buflen = len;

1 0