July 2022 - Wine-commits - list.winehq.org

Paul Gofman : taskschd: Return SCHED_S_TASK_HAS_NOT_RUN from regtask_get_LastRunTime() stub.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 60a84d0e664ead23448c3297421c2f6717e3b9cd URL: https://gitlab.winehq.org/wine/wine/-/commit/60a84d0e664ead23448c3297421c2f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 15 18:59:00 2022 -0500 taskschd: Return SCHED_S_TASK_HAS_NOT_RUN from regtask_get_LastRunTime() stub. --- dlls/taskschd/regtask.c | 2 +- dlls/taskschd/tests/scheduler.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 4c0c9130c5e..69bec19027c 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -205,7 +205,7 @@ static HRESULT WINAPI regtask_GetInstances(IRegisteredTask *iface, LONG flags, I static HRESULT WINAPI regtask_get_LastRunTime(IRegisteredTask *iface, DATE *date) { FIXME("%p,%p: stub\n", iface, date); - return E_NOTIMPL; + return SCHED_S_TASK_HAS_NOT_RUN; } static HRESULT WINAPI regtask_get_LastTaskResult(IRegisteredTask *iface, LONG *result) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e2f985650e0..e6efd3aa1af 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -744,6 +744,7 @@ static void test_GetTask(void) ITaskService *service; ITaskFolder *root, *folder; IRegisteredTask *task1, *task2; + DATE date; IID iid; int i; @@ -840,6 +841,9 @@ static void test_GetTask(void) ok(hr == S_OK, "get_Enabled error %#lx\n", hr); ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + hr = IRegisteredTask_get_LastRunTime(task1, &date); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); + IRegisteredTask_Release(task1); hr = ITaskFolder_RegisterTask(folder, Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); @@ -865,6 +869,9 @@ static void test_GetTask(void) ok(hr == S_OK, "get_Enabled error %#lx\n", hr); ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + hr = IRegisteredTask_get_LastRunTime(task2, &date); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); + IRegisteredTask_Release(task2); hr = ITaskFolder_GetTask(root, NULL, &task1); @@ -891,6 +898,9 @@ static void test_GetTask(void) ok(hr == S_OK, "get_Enabled error %#lx\n", hr); ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + hr = IRegisteredTask_get_LastRunTime(task1, &date); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); + hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); ok(hr == S_OK, "put_Enabled error %#lx\n", hr); hr = IRegisteredTask_get_State(task1, &state); @@ -902,6 +912,9 @@ static void test_GetTask(void) todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + hr = IRegisteredTask_get_LastRunTime(task1, &date); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); + IRegisteredTask_Release(task1); hr = ITaskFolder_GetTask(folder, Task2, &task2); @@ -922,6 +935,9 @@ static void test_GetTask(void) ok(hr == S_OK, "get_Enabled error %#lx\n", hr); ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + hr = IRegisteredTask_get_LastRunTime(task2, &date); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); + hr = IRegisteredTask_get_State(task2, NULL); ok(hr == E_POINTER, "expected E_POINTER, got %#lx\n", hr); hr = IRegisteredTask_get_Enabled(task2, NULL);

1 0

Jinoh Kang : kernel32/tests: Test deletion of synchronization objects after handle close.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: e613992cee2310dc4485a00f00db8ace165d913b URL: https://gitlab.winehq.org/wine/wine/-/commit/e613992cee2310dc4485a00f00db8a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 19 00:00:18 2022 +0900 kernel32/tests: Test deletion of synchronization objects after handle close. --- dlls/kernel32/tests/sync.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 93cae1c84d5..60180194b7a 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -182,6 +182,51 @@ static void test_signalandwait(void) CloseHandle(file); } +static void test_temporary_objects(void) +{ + HANDLE handle; + + SetLastError(0xdeadbeef); + handle = CreateMutexA(NULL, FALSE, "WineTestMutex2"); + ok(handle != NULL, "CreateMutex failed with error %ld\n", GetLastError()); + CloseHandle(handle); + + SetLastError(0xdeadbeef); + handle = OpenMutexA(READ_CONTROL, FALSE, "WineTestMutex2"); + ok(!handle, "OpenMutex succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle = CreateSemaphoreA(NULL, 0, 1, "WineTestSemaphore2"); + ok(handle != NULL, "CreateSemaphore failed with error %ld\n", GetLastError()); + CloseHandle(handle); + + SetLastError(0xdeadbeef); + handle = OpenSemaphoreA(READ_CONTROL, FALSE, "WineTestSemaphore2"); + ok(!handle, "OpenSemaphore succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle = CreateEventA(NULL, FALSE, FALSE, "WineTestEvent2"); + ok(handle != NULL, "CreateEvent failed with error %ld\n", GetLastError()); + CloseHandle(handle); + + SetLastError(0xdeadbeef); + handle = OpenEventA(READ_CONTROL, FALSE, "WineTestEvent2"); + ok(!handle, "OpenEvent succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle = CreateWaitableTimerA(NULL, FALSE, "WineTestWaitableTimer2"); + ok(handle != NULL, "CreateWaitableTimer failed with error %ld\n", GetLastError()); + CloseHandle(handle); + + SetLastError(0xdeadbeef); + handle = OpenWaitableTimerA(READ_CONTROL, FALSE, "WineTestWaitableTimer2"); + ok(!handle, "OpenWaitableTimer succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %lu\n", GetLastError()); +} + static void test_mutex(void) { DWORD wait_ret; @@ -2825,6 +2870,7 @@ START_TEST(sync) test_QueueUserAPC(); test_signalandwait(); + test_temporary_objects(); test_mutex(); test_slist(); test_event();

1 0

Torge Matthies : msvcr100: Make all exception ctors with a string parameter trace the string.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 35a2206d079baad519352d49ae4d8115bdd94982 URL: https://gitlab.winehq.org/wine/wine/-/commit/35a2206d079baad519352d49ae4d81… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Fri Jul 15 21:52:00 2022 +0200 msvcr100: Make all exception ctors with a string parameter trace the string. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index c982e367749..e57aef34d2b 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -378,7 +378,7 @@ static void create_default_scheduler(void); DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8) improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str) { - TRACE("(%p %p)\n", this, str); + TRACE("(%p %s)\n", this, str); return __exception_ctor(this, str, &improper_lock_vtable); } @@ -403,7 +403,7 @@ DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_ctor_str, 8) improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor_str( improper_scheduler_attach *this, const char *str) { - TRACE("(%p %p)\n", this, str); + TRACE("(%p %s)\n", this, str); return __exception_ctor(this, str, &improper_scheduler_attach_vtable); } @@ -430,7 +430,7 @@ DEFINE_THISCALL_WRAPPER(improper_scheduler_detach_ctor_str, 8) improper_scheduler_detach* __thiscall improper_scheduler_detach_ctor_str( improper_scheduler_detach *this, const char *str) { - TRACE("(%p %p)\n", this, str); + TRACE("(%p %s)\n", this, str); return __exception_ctor(this, str, &improper_scheduler_detach_vtable); } @@ -457,7 +457,7 @@ DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_key_ctor_str, 8) invalid_scheduler_policy_key* __thiscall invalid_scheduler_policy_key_ctor_str( invalid_scheduler_policy_key *this, const char *str) { - TRACE("(%p %p)\n", this, str); + TRACE("(%p %s)\n", this, str); return __exception_ctor(this, str, &invalid_scheduler_policy_key_vtable); } @@ -484,7 +484,7 @@ DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_thread_specification_ctor_str, invalid_scheduler_policy_thread_specification* __thiscall invalid_scheduler_policy_thread_specification_ctor_str( invalid_scheduler_policy_thread_specification *this, const char *str) { - TRACE("(%p %p)\n", this, str); + TRACE("(%p %s)\n", this, str); return __exception_ctor(this, str, &invalid_scheduler_policy_thread_specification_vtable); } @@ -511,7 +511,7 @@ DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_value_ctor_str, 8) invalid_scheduler_policy_value* __thiscall invalid_scheduler_policy_value_ctor_str( invalid_scheduler_policy_value *this, const char *str) { - TRACE("(%p %p)\n", this, str); + TRACE("(%p %s)\n", this, str); return __exception_ctor(this, str, &invalid_scheduler_policy_value_vtable); }

1 0

Torge Matthies : msvcr100: Implement invalid_multiple_scheduling exception.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 013ba6aaa130e1135b58970764df44fc4f4f47ae URL: https://gitlab.winehq.org/wine/wine/-/commit/013ba6aaa130e1135b58970764df44… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Fri Jul 15 21:52:01 2022 +0200 msvcr100: Implement invalid_multiple_scheduling exception. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/concurrency.c | 38 +++++++++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 28 deletions(-)

1 0

Eric Pouech : msvcrt: Fix demangling of RTTI type descriptor.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: d89e7cd443cecbd178ca06832f5e2d957255417a URL: https://gitlab.winehq.org/wine/wine/-/commit/d89e7cd443cecbd178ca06832f5e2d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Jul 16 12:20:25 2022 +0200 msvcrt: Fix demangling of RTTI type descriptor. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 15105ca60dd..8c6b059e788 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1291,6 +1291,7 @@ static void test_demangle(void) "??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z"}, /* 130 */ {"??_E?$TStrArray@$$BY0BAA(a)D$0BA@@@UAEPAXI(a)Z", "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"}, +/* 131 */ {"??_R0?AVCC(a)DD@@@8", "class DD::CC `RTTI Type Descriptor'"}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index bee171de42f..d71738efd5f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1452,11 +1452,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case '0': { struct datatype_t ct; - struct array pmt; sym->current++; - str_array_init(&pmt); - demangle_datatype(sym, &ct, &pmt, FALSE); if (!demangle_datatype(sym, &ct, NULL, FALSE)) goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'",

1 0

Eric Pouech : msvcrt: Add support for C++11 operator "" in demangling.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: e0b6ceeaacc0846b1853689a7e50c643f46f6434 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0b6ceeaacc0846b1853689a7e50c6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Jul 16 12:20:25 2022 +0200 msvcrt: Add support for C++11 operator "" in demangling. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 13 +++++++++++++ dlls/ucrtbase/tests/cpp.c | 31 ++++++++++++++++++------------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index d71738efd5f..b07fbeb068e 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1488,6 +1488,19 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case 'V': function_name = "operator delete[]"; break; case 'X': function_name = "`placement delete closure'"; break; case 'Y': function_name = "`placement delete[] closure'"; break; + case '_': + switch (*++sym->current) + { + case 'K': + sym->current++; + function_name = str_printf(sym, "operator \"\" %s", get_literal_string(sym)); + --sym->current; + break; + default: + FIXME("Unknown operator: __%c\n", *sym->current); + return FALSE; + } + break; default: ERR("Unknown operator: _%c\n", *sym->current); return FALSE; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 77b06e7cd42..a22138889cb 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -192,19 +192,24 @@ static void test___std_type_info(void) static void test___unDName(void) { - char *name; - - name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", 0, malloc, free, 0); - ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " - "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"), - "unDName returned %s\n", wine_dbgstr_a(name)); - free(name); - - name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", 0, malloc, free, 0); - ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " - "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"), - "unDName returned %s\n", wine_dbgstr_a(name)); - free(name); + static struct {const char *in; const char *out; const char *broken;} und_tests[] = + { +/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", + "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"}, +/* 2 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", + "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"}, +/* 3 */ {"??__K_l@@YA?AUCC@@I(a)Z", "struct CC __cdecl operator \"\" _l(unsigned int)", + "??__K_l@@YA?AUCC@@I(a)Z" /* W10 1507 fails on this :-( */}, + }; + unsigned i; + for (i = 0; i < ARRAY_SIZE(und_tests); i++) + { + char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, 0); + ok(!strcmp(name, und_tests[i].out) || + (broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name))), + "unDName returned %s for #%u\n", wine_dbgstr_a(name), i); + free(name); + } } START_TEST(cpp)

1 0

Eric Pouech : msvcrt: Fix and cleanup undecoration of templatized functions and methods.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 464d049149a2bfb658c727bee86157f15fe35d96 URL: https://gitlab.winehq.org/wine/wine/-/commit/464d049149a2bfb658c727bee86157… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Jul 16 12:20:25 2022 +0200 msvcrt: Fix and cleanup undecoration of templatized functions and methods. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 8c6b059e788..c97669ffc72 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1292,6 +1292,7 @@ static void test_demangle(void) /* 130 */ {"??_E?$TStrArray@$$BY0BAA(a)D$0BA@@@UAEPAXI(a)Z", "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"}, /* 131 */ {"??_R0?AVCC(a)DD@@@8", "class DD::CC `RTTI Type Descriptor'"}, +/* 132 */ {"??$meth(a)FD@DD(a)CC@@QAE_NK(a)Z", "public: bool __thiscall CC::DD::meth<short,char>(unsigned long)"}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index b07fbeb068e..a19f374016a 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1368,13 +1368,13 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; /* Then function name or operator code */ - if (*sym->current == '?' && (sym->current[1] != '$' || sym->current[2] == '?')) + if (*sym->current == '?') { const char* function_name = NULL; - if (sym->current[1] == '$') + if (sym->current[1] == '$' && sym->current[2] == '?') { - do_after = 6; + do_after = 5; sym->current += 2; } @@ -1506,6 +1506,11 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) return FALSE; } break; + case '$': + sym->current++; + if (!(function_name = get_template_name(sym))) goto done; + --sym->current; + break; default: /* FIXME: Other operators */ ERR("Unknown operator: %c\n", *sym->current); @@ -1522,7 +1527,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->result = (char*)function_name; ret = TRUE; goto done; - case 6: + case 5: { char *args; struct array array_pmt; @@ -1547,8 +1552,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) ret = (sym->result = get_template_name(sym)) != NULL; goto done; } - else if (*sym->current == '?' && sym->current[1] == '$') - do_after = 5; /* Either a class name, or '@' if the symbol is not a class member */ switch (*sym->current) @@ -1577,9 +1580,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case 3: sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; - case 5: - sym->names.start++; - break; } /* Function/Data type and access level */

1 0

Eric Pouech : msvcrt: Add support for restrict and unaligned qualifiers in demangling.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: b02d5bb8c4a4012b97cbc0f899a9ec6da10a398d URL: https://gitlab.winehq.org/wine/wine/-/commit/b02d5bb8c4a4012b97cbc0f899a9ec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Jul 16 12:20:25 2022 +0200 msvcrt: Add support for restrict and unaligned qualifiers in demangling. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 166 +++++++++++++++++++++++++----------------------- 2 files changed, 89 insertions(+), 78 deletions(-)

1 0

Paul Gofman : ntdll: Support SOCK_RAW / IPPROTO_ICMP fallback over SOCK_DGRAM.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 1e35966eb57db7060d0c459bc7aaac2f6cad7442 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e35966eb57db7060d0c459bc7aaac… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 4 21:15:38 2022 -0500 ntdll: Support SOCK_RAW / IPPROTO_ICMP fallback over SOCK_DGRAM. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++- server/sock.c | 17 ++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ef3c8494c3d..53b4ac9dc48 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -115,6 +115,7 @@ struct async_recv_ioctl DWORD *ret_flags; int unix_flags; unsigned int count; + BOOL icmp_over_dgram; struct iovec iov[1]; }; @@ -566,6 +567,89 @@ static int wow64_translate_control( const WSABUF *control64, struct afd_wsabuf_3 return 1; } +struct ip_hdr +{ + BYTE v_hl; /* version << 4 | hdr_len */ + BYTE tos; + UINT16 tot_len; + UINT16 id; + UINT16 frag_off; + BYTE ttl; + BYTE protocol; + UINT16 checksum; + ULONG saddr; + ULONG daddr; +}; + +static ssize_t fixup_icmp_over_dgram( struct msghdr *hdr, union unix_sockaddr *unix_addr, + ssize_t recv_len, NTSTATUS *status ) +{ + unsigned int tot_len = sizeof(struct ip_hdr) + recv_len; + struct cmsghdr *cmsg; + struct ip_hdr ip_h; + size_t buf_len; + char *buf; + + if (hdr->msg_iovlen != 1) + { + FIXME( "Buffer count %zu is not supported for ICMP fixup.\n", (size_t)hdr->msg_iovlen ); + return recv_len; + } + + buf = hdr->msg_iov[0].iov_base; + buf_len = hdr->msg_iov[0].iov_len; + + if (recv_len + sizeof(ip_h) > buf_len) + *status = STATUS_BUFFER_OVERFLOW; + + if (buf_len < sizeof(ip_h)) + { + recv_len = buf_len; + } + else + { + recv_len = min( recv_len, buf_len - sizeof(ip_h) ); + memmove( buf + sizeof(ip_h), buf, recv_len ); + recv_len += sizeof(ip_h); + } + memset( &ip_h, 0, sizeof(ip_h) ); + ip_h.v_hl = (4 << 4) | (sizeof(ip_h) >> 2); + ip_h.tot_len = htons( tot_len ); + ip_h.protocol = 1; + ip_h.saddr = unix_addr->in.sin_addr.s_addr; + + for (cmsg = CMSG_FIRSTHDR( hdr ); cmsg; cmsg = CMSG_NXTHDR( hdr, cmsg )) + { + if (cmsg->cmsg_level != IPPROTO_IP) continue; + switch (cmsg->cmsg_type) + { +#if defined(IP_TTL) + case IP_TTL: + ip_h.ttl = *(BYTE *)CMSG_DATA( cmsg ); + break; +#endif +#if defined(IP_TOS) + case IP_TOS: + ip_h.tos = *(BYTE *)CMSG_DATA( cmsg ); + break; +#endif +#if defined(IP_PKTINFO) + case IP_PKTINFO: + { + struct in_pktinfo *info; + + info = (struct in_pktinfo *)CMSG_DATA( cmsg ); + ip_h.daddr = info->ipi_addr.s_addr; + break; + } +#endif + } + } + memcpy( buf, &ip_h, min( sizeof(ip_h), buf_len )); + + return recv_len; +} + static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *size ) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -577,7 +661,7 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz ssize_t ret; memset( &hdr, 0, sizeof(hdr) ); - if (async->addr) + if (async->addr || async->icmp_over_dgram) { hdr.msg_name = &unix_addr.addr; hdr.msg_namelen = sizeof(unix_addr); @@ -602,9 +686,14 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz } status = (hdr.msg_flags & MSG_TRUNC) ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; + if (async->icmp_over_dgram) + ret = fixup_icmp_over_dgram( &hdr, &unix_addr, ret, &status ); if (async->control) { + if (async->icmp_over_dgram) + FIXME( "May return extra control headers.\n" ); + if (in_wow64_call()) { char control_buffer64[512]; @@ -675,6 +764,23 @@ static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) return TRUE; } +static BOOL is_icmp_over_dgram( int fd ) +{ +#ifdef linux + socklen_t len; + int val; + + len = sizeof(val); + if (getsockopt( fd, SOL_SOCKET, SO_PROTOCOL, (char *)&val, &len ) || val != IPPROTO_ICMP) + return FALSE; + + len = sizeof(val); + return !getsockopt( fd, SOL_SOCKET, SO_TYPE, (char *)&val, &len ) && val == SOCK_DGRAM; +#else + return FALSE; +#endif +} + static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, struct async_recv_ioctl *async, int force_async ) { @@ -777,6 +883,7 @@ static NTSTATUS sock_ioctl_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap async->addr = addr; async->addr_len = addr_len; async->ret_flags = ret_flags; + async->icmp_over_dgram = is_icmp_over_dgram( fd ); return sock_recv( handle, event, apc, apc_user, io, fd, async, force_async ); } diff --git a/server/sock.c b/server/sock.c index fed8e3b3093..dbb6d231a46 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1618,6 +1618,23 @@ static int init_socket( struct sock *sock, int family, int type, int protocol ) } sockfd = socket( unix_family, unix_type, unix_protocol ); + +#ifdef linux + if (sockfd == -1 && errno == EPERM && unix_family == AF_INET + && unix_type == SOCK_RAW && unix_protocol == IPPROTO_ICMP) + { + sockfd = socket( unix_family, SOCK_DGRAM, unix_protocol ); + if (sockfd != -1) + { + const int val = 1; + + setsockopt( sockfd, IPPROTO_IP, IP_RECVTTL, (const char *)&val, sizeof(val) ); + setsockopt( sockfd, IPPROTO_IP, IP_RECVTOS, (const char *)&val, sizeof(val) ); + setsockopt( sockfd, IPPROTO_IP, IP_PKTINFO, (const char *)&val, sizeof(val) ); + } + } +#endif + if (sockfd == -1) { if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT );

1 0

Paul Gofman : ntdll: Fixup ICMP packet id if SOCK_DGRAM fallback is used.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 0f337f3d8e165764214c08239cf92aa65e4f5a57 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f337f3d8e165764214c08239cf92a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 5 14:07:29 2022 -0500 ntdll: Fixup ICMP packet id if SOCK_DGRAM fallback is used. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 98 +++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 2 +- include/wine/server_protocol.h | 39 ++++++++++++++++- server/protocol.def | 18 ++++++++ server/request.h | 14 ++++++ server/sock.c | 54 +++++++++++++++++++++++ server/trace.c | 24 +++++++++++ 7 files changed, 245 insertions(+), 4 deletions(-)

1 0