May 2022 - Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Properly fail on PDB files generated by MSVC compiler version 14.31.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 4643bb28528e2a10060e12b8544301c0be3d3060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4643bb28528e2a10060e12b8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 3 11:26:01 2022 +0200 dbghelp: Properly fail on PDB files generated by MSVC compiler version 14.31. Some internal bits of PDB files are different, so report & abort loading of such PDB file until it's properly understood & supported (instead of crashing). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 56c0f8b58e8..28b6bd12f2e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2856,7 +2856,7 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) HeapFree(GetProcessHeap(), 0, pdb_file->stream_dict); } -static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) +static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) { DWORD* pdw; DWORD* ok_bits; @@ -2869,7 +2869,7 @@ static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha count = *pdw++; pdb_file->stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); - if (!pdb_file->stream_dict) return; + if (!pdb_file->stream_dict) return FALSE; cpstr = (char*)(pdb_file->stream_dict + numok + 1); memcpy(cpstr, str, cb); @@ -2879,7 +2879,7 @@ static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha if (*pdw++ != 0) { FIXME("unexpected value\n"); - return; + return FALSE; } for (i = j = 0; i < count; i++) @@ -2895,6 +2895,7 @@ static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha /* add sentinel */ pdb_file->stream_dict[numok].name = NULL; pdb_file->fpoext_stream = -1; + return TRUE; } static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, const char* name) @@ -3169,8 +3170,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found JG for %s: age=%x timestamp=%x\n", pdb_lookup->filename, root->Age, root->TimeDateStamp); - pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); - + ret = pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); pdb_free(root); } else if (!memcmp(image, PDB_DS_IDENT, sizeof(PDB_DS_IDENT))) @@ -3206,7 +3206,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found DS for %s: age=%x guid=%s\n", pdb_lookup->filename, root->Age, debugstr_guid(&root->guid)); - pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); + ret = pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); pdb_free(root); } @@ -3377,7 +3377,8 @@ static BOOL pdb_process_internal(const struct process* pcs, break; default: FIXME("Unknown PDB_STREAM_INDEXES size (%u)\n", symbols.stream_index_size); - break; + pdb_free(symbols_image); + return FALSE; } files_image = pdb_read_strings(pdb_file); if (files_image) files_size = *(const DWORD*)(files_image + 8);

1 0

Gabriel Ivăncescu : jscript: Return proper error in Number.toLocaleString with invalid 'this' in ES5 mode.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 41782ec12eaa8e86330d8997096280b1f21c506b URL: https://source.winehq.org/git/wine.git/?a=commit;h=41782ec12eaa8e86330d8997… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 3 18:17:07 2022 +0300 jscript: Return proper error in Number.toLocaleString with invalid 'this' in ES5 mode. Note that, for example, Number.toFixed still returns JS_E_NUMBER_EXPECTED even in ES5 mode (this is already tested). 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/jscript.h | 2 +- dlls/jscript/jscript.rc | 2 +- dlls/jscript/number.c | 5 ++++- dlls/jscript/resource.h | 2 +- dlls/jscript/set.c | 4 ++-- dlls/mshtml/tests/es5.js | 3 --- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 90d8142e5e9..513f886509c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -524,7 +524,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) #define JS_E_OBJECT_NONEXTENSIBLE MAKE_JSERROR(IDS_OBJECT_NONEXTENSIBLE) #define JS_E_NONCONFIGURABLE_REDEFINED MAKE_JSERROR(IDS_NONCONFIGURABLE_REDEFINED) #define JS_E_NONWRITABLE_MODIFIED MAKE_JSERROR(IDS_NONWRITABLE_MODIFIED) -#define JS_E_MAP_EXPECTED MAKE_JSERROR(IDS_MAP_EXPECTED) +#define JS_E_WRONG_THIS MAKE_JSERROR(IDS_WRONG_THIS) #define JS_E_PROP_DESC_MISMATCH MAKE_JSERROR(IDS_PROP_DESC_MISMATCH) #define JS_E_INVALID_WRITABLE_PROP_DESC MAKE_JSERROR(IDS_INVALID_WRITABLE_PROP_DESC) diff --git a/dlls/jscript/jscript.rc b/dlls/jscript/jscript.rc index 2fd0b33ca12..de21a4aba0b 100644 --- a/dlls/jscript/jscript.rc +++ b/dlls/jscript/jscript.rc @@ -75,7 +75,7 @@ STRINGTABLE IDS_OBJECT_NONEXTENSIBLE "Cannot define property '|': object is not extensible" IDS_NONCONFIGURABLE_REDEFINED "Cannot redefine non-configurable property '|'" IDS_NONWRITABLE_MODIFIED "Cannot modify non-writable property '|'" - IDS_MAP_EXPECTED "'this' is not a | object" + IDS_WRONG_THIS "'this' is not a | object" IDS_PROP_DESC_MISMATCH "Property cannot have both accessors and a value" IDS_COMPILATION_ERROR "Microsoft JScript compilation error" diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 9470fbf15a0..90c1401bad3 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -416,8 +416,11 @@ static HRESULT Number_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flag TRACE("\n"); hres = numberval_this(vthis, &val); - if(FAILED(hres)) + if(FAILED(hres)) { + if(hres == JS_E_NUMBER_EXPECTED && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + return throw_error(ctx, JS_E_WRONG_THIS, L"Number"); return hres; + } if(r) { hres = localize_number(ctx, val, ctx->version >= SCRIPTLANGUAGEVERSION_ES5, &str); diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 1338ac58f6c..f84d77c198f 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -73,7 +73,7 @@ #define IDS_OBJECT_NONEXTENSIBLE 0x13D5 #define IDS_NONCONFIGURABLE_REDEFINED 0x13D6 #define IDS_NONWRITABLE_MODIFIED 0x13D7 -#define IDS_MAP_EXPECTED 0x13FC +#define IDS_WRONG_THIS 0x13FC /* FIXME: This is not compatible with native, but we would * conflict with IDS_UNSUPPORTED_ACTION otherwise */ #define IDS_PROP_DESC_MISMATCH 0x1F00 diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index dbb4a5dac8f..d1ea6637956 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -94,7 +94,7 @@ static HRESULT get_map_this(script_ctx_t *ctx, jsval_t vthis, MapInstance **ret) return JS_E_OBJECT_EXPECTED; if(!(jsdisp = to_jsdisp(get_object(vthis))) || !is_class(jsdisp, JSCLASS_MAP)) { WARN("not a Map object passed as 'this'\n"); - return throw_error(ctx, JS_E_MAP_EXPECTED, L"Map"); + return throw_error(ctx, JS_E_WRONG_THIS, L"Map"); } *ret = CONTAINING_RECORD(jsdisp, MapInstance, dispex); @@ -109,7 +109,7 @@ static HRESULT get_set_this(script_ctx_t *ctx, jsval_t vthis, MapInstance **ret) return JS_E_OBJECT_EXPECTED; if(!(jsdisp = to_jsdisp(get_object(vthis))) || !is_class(jsdisp, JSCLASS_SET)) { WARN("not a Set object passed as 'this'\n"); - return throw_error(ctx, JS_E_MAP_EXPECTED, L"Set"); + return throw_error(ctx, JS_E_WRONG_THIS, L"Set"); } *ret = CONTAINING_RECORD(jsdisp, MapInstance, dispex); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 43640543851..3ac099b23be 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -97,7 +97,6 @@ sync_test("Number toLocaleString", function() { ok(false, "expected exception calling it on string"); }catch(ex) { var n = ex.number >>> 0; - todo_wine. ok(n === JS_E_WRONG_THIS, "called on string threw " + n); } try { @@ -105,7 +104,6 @@ sync_test("Number toLocaleString", function() { ok(false, "expected exception calling it on undefined"); }catch(ex) { var n = ex.number >>> 0; - todo_wine. ok(n === JS_E_WRONG_THIS, "called on undefined threw " + n); } try { @@ -113,7 +111,6 @@ sync_test("Number toLocaleString", function() { ok(false, "expected exception calling it on nullDisp"); }catch(ex) { var n = ex.number >>> 0; - todo_wine. ok(n === JS_E_WRONG_THIS, "called on nullDisp threw " + n); } });

1 0

Zebediah Figura : ws2_32/tests: Test polling for AFD_POLL_READ while there is a pending WSARecv() call.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 0b7f9abc98d70966e3eacb035a855d7e19085f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7f9abc98d70966e3eacb03… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 22:02:26 2022 -0500 ws2_32/tests: Test polling for AFD_POLL_READ while there is a pending WSARecv() call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index e385715f102..9d1600a7f6a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -154,11 +154,14 @@ static void test_poll(void) struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; int large_buffer_size = 1024 * 1024; SOCKET client, server, listener; + OVERLAPPED overlapped = {0}; struct sockaddr_in addr; + DWORD size, flags = 0; char *large_buffer; IO_STATUS_BLOCK io; LARGE_INTEGER now; ULONG params_size; + WSABUF wsabuf; HANDLE event; int ret, len; @@ -166,6 +169,7 @@ static void test_poll(void) memset(in_buffer, 0, sizeof(in_buffer)); memset(out_buffer, 0, sizeof(out_buffer)); event = CreateEventW(NULL, TRUE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); @@ -329,6 +333,50 @@ static void test_poll(void) check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); check_poll(server, event, AFD_POLL_CONNECT); + /* Test sending data while there is a pending WSARecv(). */ + + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = server; + in_params->sockets[0].flags = AFD_POLL_READ; + + ret = NtDeviceIoControlFile((HANDLE)server, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + wsabuf.buf = large_buffer; + wsabuf.len = 1; + ret = WSARecv(server, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)server, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(size == 1, "got size %lu\n", size); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(event, 200); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == server, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_READ, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + + ret = recv(server, large_buffer, 1, 0); + ok(ret == 1, "got %d\n", ret); + /* Test sending out-of-band data. */ ret = send(client, "a", 1, MSG_OOB); @@ -745,6 +793,7 @@ static void test_poll(void) closesocket(client); closesocket(server); + CloseHandle(overlapped.hEvent); CloseHandle(event); free(large_buffer); }

1 0

Torge Matthies : sc: Allow using separate arguments for parameter name and value.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 2259cc34a8624a892b02270593bda94b796b72fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2259cc34a8624a892b022705… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Fri Apr 29 15:40:47 2022 +0200 sc: Allow using separate arguments for parameter name and value. In addition to using one argument for both parameter name and value. This fixes a regression from commit 8b38c91d83844dea882922055ced7cdeb79c1693. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 101 +++++++++++++++++++++++++++++++++---------------- programs/sc/tests/sc.c | 95 +++++++++++++++++++++++++--------------------- 2 files changed, 120 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2259cc34a8624a892b02…

1 0

Torge Matthies : sc/tests: Add tests.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: a2bc9e5f368a98af9e3f1569d515baa76898156a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2bc9e5f368a98af9e3f1569… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Fri Apr 29 15:40:46 2022 +0200 sc/tests: Add tests. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + programs/sc/tests/Makefile.in | 5 + programs/sc/tests/sc.c | 402 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 409 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2bc9e5f368a98af9e3f…

1 0

Gabriel Ivăncescu : jscript: Implement Array.prototype.every.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: eb80db6f8a5fffe917102f19cbf903a8f5b7c286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb80db6f8a5fffe917102f19… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 3 18:17:10 2022 +0300 jscript: Implement Array.prototype.every. 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/array.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index fae761a71cc..5373610294d 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1023,6 +1023,72 @@ static HRESULT Array_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags return hres; } +static HRESULT Array_every(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + IDispatch *context_obj = NULL, *callback; + jsval_t value, args[3], res; + BOOL boolval, ret = TRUE; + unsigned length, i; + jsdisp_t *jsthis; + HRESULT hres; + + TRACE("\n"); + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) + return hres; + + /* FIXME: check IsCallable */ + if(!argc || !is_object_instance(argv[0])) { + FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + hres = E_INVALIDARG; + goto done; + } + callback = get_object(argv[0]); + + if(argc > 1 && !is_undefined(argv[1])) { + if(!is_object_instance(argv[1])) { + FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); + hres = E_NOTIMPL; + goto done; + } + context_obj = get_object(argv[1]); + } + + for(i = 0; i < length; i++) { + hres = jsdisp_get_idx(jsthis, i, &value); + if(FAILED(hres)) { + if(hres == DISP_E_UNKNOWNNAME) + continue; + goto done; + } + args[0] = value; + args[1] = jsval_number(i); + args[2] = jsval_obj(jsthis); + hres = disp_call_value(ctx, callback, context_obj, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); + jsval_release(value); + if(FAILED(hres)) + goto done; + + hres = to_boolean(res, &boolval); + jsval_release(res); + if(FAILED(hres)) + goto done; + if(!boolval) { + ret = FALSE; + break; + } + } + + if(r) + *r = jsval_bool(ret); + hres = S_OK; +done: + jsdisp_release(jsthis); + return hres; +} + static HRESULT Array_filter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1439,6 +1505,7 @@ static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) static const builtin_prop_t Array_props[] = { {L"concat", Array_concat, PROPF_METHOD|1}, + {L"every", Array_every, PROPF_METHOD|PROPF_ES5|1}, {L"filter", Array_filter, PROPF_METHOD|PROPF_ES5|1}, {L"forEach", Array_forEach, PROPF_METHOD|PROPF_ES5|1}, {L"indexOf", Array_indexOf, PROPF_METHOD|PROPF_ES5|1},

1 0

Gabriel Ivăncescu : jscript: Implement Array.prototype.toLocaleString.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: a8057c2e14a6a6df695b1436d7cf2b1957ad3d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8057c2e14a6a6df695b1436… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 3 18:17:08 2022 +0300 jscript: Implement Array.prototype.toLocaleString. 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/array.c | 78 ++++++++++++++++++++++++++++++++++++++++++---- dlls/jscript/dispex.c | 27 ++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/tests/api.js | 1 + dlls/jscript/tests/run.c | 51 ++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 64 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/script.c | 29 +++++++++++++++++ 7 files changed, 245 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8057c2e14a6a6df695b…

1 0

Zebediah Figura : dinput/tests: Set the callback event after setting "impl->invoked".
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 887f6891e736f207956af2b1264559b6406b2967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887f6891e736f207956af2b1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 16:48:42 2022 -0500 dinput/tests: Set the callback event after setting "impl->invoked". Fixes an intermittent test failure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 2 +- dlls/dinput/tests/hotplug.c | 2 +- dlls/dinput/tests/joystick8.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index d9dad38446c..7fadd043656 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -4437,8 +4437,8 @@ static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); ok( sender == NULL, "got sender %p\n", sender ); - SetEvent( impl->event ); impl->invoked = TRUE; + SetEvent( impl->event ); return S_OK; } diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 2d000317c9f..97e9e69fa9f 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -526,8 +526,8 @@ static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); ok( sender == NULL, "got sender %p\n", sender ); - SetEvent( impl->event ); impl->invoked = TRUE; + SetEvent( impl->event ); return S_OK; } diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 32d03a603c3..890209cd5e0 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3845,8 +3845,8 @@ static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); ok( sender == NULL, "got sender %p\n", sender ); - SetEvent( impl->event ); impl->invoked = TRUE; + SetEvent( impl->event ); return S_OK; }

1 0

Rémi Bernon : dinput/tests: Remove racy controller removed handler check.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 846e94f03d4ec031f206905281e3496e9a9c4445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=846e94f03d4ec031f2069052… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 10:29:04 2022 +0200 dinput/tests: Remove racy controller removed handler check. It now consistently fails on w1064_tsign, and it's called concurrently with the handler invocation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 97e9e69fa9f..e68a6914684 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -923,7 +923,6 @@ static LRESULT CALLBACK windows_gaming_input_wndproc( HWND hwnd, UINT msg, WPARA { ok( wparam == DBT_DEVICEREMOVECOMPLETE, "got wparam %#Ix\n", wparam ); ok( controller_added.invoked, "controller added handler not invoked\n" ); - ok( controller_removed.invoked, "controller removed handler not invoked\n" ); } else {

1 0

Zebediah Figura : ws2_32/tests: Test polling for AFD_POLL_ACCEPT while there is a pending AcceptEx() call.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: c01c6fa67ae3647ebf9d5ff18ade7be31910a7ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=c01c6fa67ae3647ebf9d5ff1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 22:02:27 2022 -0500 ws2_32/tests: Test polling for AFD_POLL_ACCEPT while there is a pending AcceptEx() call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9d1600a7f6a..5152469f02f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -153,8 +153,10 @@ static void test_poll(void) struct afd_poll_params *in_params = (struct afd_poll_params *)in_buffer; struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; int large_buffer_size = 1024 * 1024; + GUID acceptex_guid = WSAID_ACCEPTEX; SOCKET client, server, listener; OVERLAPPED overlapped = {0}; + LPFN_ACCEPTEX pAcceptEx; struct sockaddr_in addr; DWORD size, flags = 0; char *large_buffer; @@ -180,6 +182,10 @@ static void test_poll(void) ret = getsockname(listener, (struct sockaddr *)&addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); + ret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(acceptex_guid), + &pAcceptEx, sizeof(pAcceptEx), &size, NULL, NULL); + ok(!ret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); + params_size = offsetof(struct afd_poll_params, sockets[1]); in_params->count = 1; @@ -673,6 +679,52 @@ static void test_poll(void) closesocket(client); + /* Test connecting while there is a pending AcceptEx(). */ + + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = listener; + in_params->sockets[0].flags = AFD_POLL_ACCEPT; + + ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = pAcceptEx(listener, server, large_buffer, 0, 0, sizeof(struct sockaddr_in) + 16, NULL, &overlapped); + ok(!ret, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)listener, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(!size, "got size %lu\n", size); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + closesocket(server); + closesocket(client); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(event, 200); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == listener, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_ACCEPT, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + + closesocket(client); closesocket(listener); /* Test UDP sockets. */

1 0