- Wine-Commits - list.winehq.org

Alex Henrie : bcrypt/tests: Don't allocate inside todo_wine and free outside of it.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 36cf952664ea1c8e6bc0933180c346e47b51abf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/36cf952664ea1c8e6bc0933180c346… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 1 23:02:53 2023 -0600 bcrypt/tests: Don't allocate inside todo_wine and free outside of it. Fixes a warning on GCC 13. --- dlls/bcrypt/tests/bcrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 19518480ee0..4d7277c3152 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2492,8 +2492,8 @@ static void test_rsa_encrypt(void) decrypted = malloc(decrypted_size); BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_OAEP); ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); - } free(decrypted); + } free(encrypted_a); free(encrypted_b);

1 0

Alex Henrie : iphlpapi: Add GetPerTcpConnectionEStats stub.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 870a9fcb4cceeae0c9b96e9b2dc3ce43896c229a URL: https://gitlab.winehq.org/wine/wine/-/commit/870a9fcb4cceeae0c9b96e9b2dc3ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 1 22:09:38 2023 -0600 iphlpapi: Add GetPerTcpConnectionEStats stub. Based on a patch by Austin English. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52868 --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++++- include/iphlpapi.h | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 76701d686e0..ef2c576947d 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -130,7 +130,7 @@ @ stdcall GetPerAdapterInfo( long ptr ptr ) #@ stub GetPerTcp6ConnectionEStats #@ stub GetPerTcp6ConnectionStats -#@ stub GetPerTcpConnectionEStats +@ stdcall GetPerTcpConnectionEStats( ptr long ptr long long ptr long long ptr long long ) #@ stub GetPerTcpConnectionStats @ stdcall GetRTTAndHopCount( long ptr long ptr ) #@ stub GetSessionCompartmentId diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c4921d4a5ac..f8ecb89c328 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -32,7 +32,6 @@ #include "fltdefs.h" #include "ifdef.h" #include "netioapi.h" -#include "tcpestats.h" #include "ip2string.h" #include "netiodef.h" #include "icmpapi.h" @@ -4031,6 +4030,19 @@ DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow) return 0; } +/*********************************************************************** + * GetPerTcpConnectionEStats (IPHLPAPI.@) + */ +ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version, + ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version, + ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version, + ULONG ro_dynamic_size) +{ + FIXME( "(%p, %d, %p, %ld, %ld, %p, %ld, %ld, %p, %ld, %ld): stub\n", row, stats, rw, rw_version, rw_size, + ro_static, ro_static_version, ro_static_size, ro_dynamic, ro_dynamic_version, ro_dynamic_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /****************************************************************** * SetPerTcpConnectionEStats (IPHLPAPI.@) */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index da5819c8423..35e0f134899 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -25,6 +25,7 @@ extern "C" { #include <iprtrmib.h> #include <ipexport.h> #include <iptypes.h> +#include <tcpestats.h> #define NET_STRING_IPV4_ADDRESS 0x00000001 #define NET_STRING_IPV4_SERVICE 0x00000002 @@ -85,6 +86,11 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats); DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily); +ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version, + ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version, + ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version, + ULONG ro_dynamic_size); + DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats); DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily); @@ -99,6 +105,9 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute); DWORD WINAPI SetIpStatistics(PMIB_IPSTATS pIpStats); +DWORD WINAPI SetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE state, BYTE *rw, + ULONG version, ULONG size, ULONG offset); + DWORD WINAPI SetIpTTL(UINT nTTL); DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry);

1 0

Piotr Caban : msvcr100: Fix next writer unblocking in reader_writer_lock::unlock.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 0336d66ea1926f62dd303e266683fef7de6e9a87 URL: https://gitlab.winehq.org/wine/wine/-/commit/0336d66ea1926f62dd303e266683fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 22:31:12 2023 +0200 msvcr100: Fix next writer unblocking in reader_writer_lock::unlock. Fixes regression introduced by 256c344550fa27d82602232588b32e74a3a9a7f3. --- dlls/msvcrt/concurrency.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d0f029650ac..84ee0f1817a 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3302,7 +3302,7 @@ void __thiscall reader_writer_lock_unlock(reader_writer_lock *this) count = InterlockedDecrement(&this->count); if (count != WRITER_WAITING) return; - NtReleaseKeyedEvent(keyed_event, this->writer_head, 0, NULL); + call_Context_Unblock(this->writer_head->ctx); return; }

1 0

Michael Stefaniuc : dbghelp: Remove superfluous casts to self.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: cf3815dc598da52a6efb480143ff73713f1f2000 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3815dc598da52a6efb480143ff73… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 19 19:01:15 2023 +0200 dbghelp: Remove superfluous casts to self. --- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 46da2968dbb..5ab5cabecdf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2148,7 +2148,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, subpgm->current_block ? &subpgm->current_block->symt : &subpgm->current_func->symt, dwarf2_get_cpp_name(di, name.u.string), &sig_type->symt, num_ranges); - subpgm->current_func = (struct symt_function*)inlined; + subpgm->current_func = inlined; subpgm->current_block = NULL; if (!dwarf2_fill_ranges(di, inlined->ranges, num_ranges)) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 56a47ab7dac..c6dca22883a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2683,7 +2683,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, (const unsigned char*)sym + length); if (inlined) { - curr_func = (struct symt_function*)inlined; + curr_func = inlined; block = NULL; } else @@ -2704,7 +2704,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, (const unsigned char*)sym + length); if (inlined) { - curr_func = (struct symt_function*)inlined; + curr_func = inlined; block = NULL; } else

1 0

Michael Stefaniuc : ws2_32/tests: Remove superfluous casts to self.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 51f8c75cebfbe79bcab30edceb875393ec047c1a URL: https://gitlab.winehq.org/wine/wine/-/commit/51f8c75cebfbe79bcab30edceb8753… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 23 19:43:49 2023 +0200 ws2_32/tests: Remove superfluous casts to self. --- dlls/ws2_32/tests/afd.c | 18 +++++++++--------- dlls/ws2_32/tests/sock.c | 7 +------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d0191ba8dbf..1644a9dc4ff 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1429,7 +1429,7 @@ static void test_recv(void) ret = listen(listener, 1); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(listener, (struct sockaddr *)&addr, &len); + ret = getsockname(listener, &addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); memset(&io, 0, sizeof(io)); @@ -1439,7 +1439,7 @@ static void test_recv(void) ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ret = connect(client, &addr, sizeof(addr)); ok(!ret, "got error %u\n", WSAGetLastError()); server = accept(listener, NULL, NULL); ok(server != -1, "got error %u\n", WSAGetLastError()); @@ -1717,7 +1717,7 @@ static void test_recv(void) ret = bind(client, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(client, (struct sockaddr *)&addr, &len); + ret = getsockname(client, &addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); memset(buffer, 0xcc, sizeof(buffer)); @@ -1725,7 +1725,7 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ret = sendto(server, "data", 5, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "data", 5, 0, &addr, sizeof(addr)); ok(ret == 5, "got %d\n", ret); ret = WaitForSingleObject(event, 200); @@ -1741,7 +1741,7 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ret = sendto(server, "moredata", 9, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "moredata", 9, 0, &addr, sizeof(addr)); ok(ret == 9, "got %d\n", ret); ret = WaitForSingleObject(event, 200); @@ -1750,7 +1750,7 @@ static void test_recv(void) ok(io.Information == 6, "got %#Ix\n", io.Information); ok(!memcmp(buffer, "mo\xccreda\xcc", 7), "got %s\n", debugstr_an(buffer, io.Information)); - ret = sendto(server, "moredata", 9, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "moredata", 9, 0, &addr, sizeof(addr)); ok(ret == 9, "got %d\n", ret); /* wait for the data to be available */ @@ -2352,7 +2352,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(client, (struct sockaddr *)&addr2, &len); + ret = getsockname(client, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); @@ -2364,7 +2364,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(server, (struct sockaddr *)&addr2, &len); + ret = getsockname(server, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); @@ -2392,7 +2392,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(client, (struct sockaddr *)&addr2, &len); + ret = getsockname(client, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cddc4c125ff..17d5f3993e5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -836,12 +836,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) ((struct sockaddr_in*)&test)->sin_addr.s_addr = inet_addr("0.0.0.0"); /* Receive data echoed back & check it */ - n_recvd = do_synchronous_recvfrom ( mem->s, - mem->recv_buf, - n_expected, - 0, - (struct sockaddr *)&test, - &fromLen, + n_recvd = do_synchronous_recvfrom ( mem->s, mem->recv_buf, n_expected, 0, &test, &fromLen, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected );

1 0

Michael Stefaniuc : wmvcore: Remove superfluous casts to self.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 19cc1dbe56a3231577df110a0d9231ce501d7321 URL: https://gitlab.winehq.org/wine/wine/-/commit/19cc1dbe56a3231577df110a0d9231… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 19 18:57:09 2023 +0200 wmvcore: Remove superfluous casts to self. --- dlls/wmvcore/async_reader.c | 2 +- dlls/wmvcore/tests/wmvcore.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index 47de592c95c..95f617b5cf8 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -1932,7 +1932,7 @@ static HRESULT WINAPI async_reader_create(IWMReader **reader) list_init(&object->async_ops); TRACE("Created async reader %p.\n", object); - *reader = (IWMReader *)&object->IWMReader_iface; + *reader = &object->IWMReader_iface; return S_OK; failed: diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9f755859481..6071ac25ad7 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1920,7 +1920,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta callback->callback_tid = GetCurrentThreadId(); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_started, 100); ok(!ret, "Wait timed out.\n"); callback->end_of_streaming_count = callback->eof_count = callback->sample_count = 0; @@ -1933,7 +1933,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_stopped, 100); ok(!ret, "Wait timed out.\n"); SetEvent(callback->got_stopped); @@ -1942,7 +1942,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_CLOSED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ++callback->closed_count; break; @@ -1950,7 +1950,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ++callback->end_of_streaming_count; break; @@ -1958,7 +1958,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->sample_count == 0, "Got %u samples.\n", callback->sample_count); else @@ -1976,7 +1976,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(*(QWORD *)value == 3000, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->sample_count == 0, "Got %u samples.\n", callback->sample_count); else @@ -2082,7 +2082,7 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, if (stream) ok(stream->input_tid != GetCurrentThreadId(), "got wrong thread\n"); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2166,7 +2166,7 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced if (stream) ok(stream->input_tid != GetCurrentThreadId(), "got wrong thread\n"); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2191,7 +2191,7 @@ static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, todo_wine_if(time % 10000) ok(time == callback->expect_time, "Got time %I64u.\n", time); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_ontime, 100); ok(!ret, "Wait timed out.\n"); SetEvent(callback->got_ontime);

1 0

Paul Gofman : kernelbase: Don't modify non-volatile regs in RaiseException() on x64.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: e7845fc3305c9c170730b6b7375caadc853ada87 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7845fc3305c9c170730b6b7375caa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 30 14:40:53 2023 -0600 kernelbase: Don't modify non-volatile regs in RaiseException() on x64. --- dlls/kernelbase/debug.c | 46 ++++++++++++++++++++ dlls/ntdll/tests/exception.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 4eff7ad1cca..df1b9a63604 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -283,6 +283,51 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str ) /******************************************************************* * RaiseException (kernelbase.@) */ +#if defined(__x86_64__) +/* Some DRMs depend on RaiseException not altering non-volatile registers. */ +__ASM_GLOBAL_FUNC( RaiseException, + ".byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n\t" /* hotpatch prolog */ + "sub $0xc8,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0xc8\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0xc8\n\t") + "leaq 0x20(%rsp),%rax\n\t" + "movl %ecx,(%rax)\n\t" /* ExceptionCode */ + "and $1,%edx\n\t" + "movl %edx,4(%rax)\n\t" /* ExceptionFlags */ + "movq $0,8(%rax)\n\t" /* ExceptionRecord */ + "leaq " __ASM_NAME("RaiseException") "(%rip),%rcx\n\t" + "movq %rcx,0x10(%rax)\n\t" /* ExceptionAddress */ + "movq %rax,%rcx\n\t" + "movl $0,0x18(%rcx)\n\t" /* NumberParameters */ + "testl %r8d,%r8d\n\t" + "jz 2f\n\t" + "testq %r9,%r9\n\t" + "jz 2f\n\t" + "movl $15,%edx\n\t" + "cmp %edx,%r8d\n\t" + "cmovb %r8d,%edx\n\t" + "movl %edx,0x18(%rcx)\n\t" /* NumberParameters */ + "leaq 0x20(%rcx),%rax\n" /* ExceptionInformation */ + "1:\tmovq (%r9),%r8\n\t" + "movq %r8,(%rax)\n\t" + "decl %edx\n\t" + "jz 2f\n\t" + "addq $8,%rax\n\t" + "addq $8,%r9\n\t" + "jmp 1b\n" + "2:\tcall " __ASM_NAME("RtlRaiseException") "\n\t" + "add $0xc8,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0xc8\n\t") + "ret" ) + +C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionCode) == 0 ); +C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionFlags) == 4 ); +C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionRecord) == 8 ); +C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionAddress) == 0x10 ); +C_ASSERT( offsetof(EXCEPTION_RECORD, NumberParameters) == 0x18 ); +C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionInformation) == 0x20 ); +#else void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) { EXCEPTION_RECORD record; @@ -301,6 +346,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou RtlRaiseException( &record ); } +#endif __ASM_STDCALL_IMPORT(RaiseException,16) /******************************************************************* diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 128b2adde3b..f2ba16f4bae 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5031,6 +5031,104 @@ static void test_syscall_clobbered_regs(void) ok(regs.r11 == regs.eflags, "Expected r11 (%#I64x) to equal EFLAGS (%#x).\n", regs.r11, regs.eflags); } + +static CONTEXT test_raiseexception_regs_context; +static LONG CALLBACK test_raiseexception_regs_handle(EXCEPTION_POINTERS *exception_info) +{ + EXCEPTION_RECORD *rec = exception_info->ExceptionRecord; + unsigned int i; + + test_raiseexception_regs_context = *exception_info->ContextRecord; + ok(rec->NumberParameters == EXCEPTION_MAXIMUM_PARAMETERS, "got %lu.\n", rec->NumberParameters); + ok(rec->ExceptionCode == 0xdeadbeaf, "got %#lx.\n", rec->ExceptionCode); + ok(!rec->ExceptionRecord, "got %p.\n", rec->ExceptionRecord); + ok(!rec->ExceptionFlags, "got %#lx.\n", rec->ExceptionFlags); + for (i = 0; i < rec->NumberParameters; ++i) + ok(rec->ExceptionInformation[i] == i, "got %Iu, i %u.\n", rec->ExceptionInformation[i], i); + return EXCEPTION_CONTINUE_EXECUTION; +} + +static void test_raiseexception_regs(void) +{ + static const BYTE code[] = + { + 0xb8, 0x00, 0xb0, 0xad, 0xde, /* mov $0xdeadb000,%eax */ + 0x53, /* push %rbx */ + 0x48, 0x89, 0xc3, /* mov %rax,%rbx */ + 0x56, /* push %rsi */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x48, 0x89, 0xc6, /* mov %rax,%rsi */ + 0x57, /* push %rdi */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x48, 0x89, 0xc7, /* mov %rax,%rdi */ + 0x55, /* push %rbp */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x48, 0x89, 0xc5, /* mov %rax,%rbp */ + 0x41, 0x54, /* push %r12 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc4, /* mov %rax,%r12 */ + 0x41, 0x55, /* push %r13 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc5, /* mov %rax,%r13 */ + 0x41, 0x56, /* push %r14 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc6, /* mov %rax,%r14 */ + 0x41, 0x57, /* push %r15 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc7, /* mov %rax,%r15 */ + + 0x50, /* push %rax */ /* align stack */ + 0x48, 0x89, 0xc8, /* mov %rcx,%rax */ + 0xb9, 0xaf, 0xbe, 0xad, 0xde, /* mov $0xdeadbeaf,%ecx */ + 0xff, 0xd0, /* call *%rax */ + 0x58, /* pop %rax */ + + 0x41, 0x5f, /* pop %r15 */ + 0x41, 0x5e, /* pop %r14 */ + 0x41, 0x5d, /* pop %r13 */ + 0x41, 0x5c, /* pop %r12 */ + 0x5d, /* pop %rbp */ + 0x5f, /* pop %rdi */ + 0x5e, /* pop %rsi */ + 0x5b, /* pop %rbx */ + 0xc3, /* ret */ + }; + void (WINAPI *pRaiseException)( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) = RaiseException; + void (WINAPI *func)(void *raise_exception, DWORD flags, DWORD count, const ULONG_PTR *args); + void *vectored_handler; + ULONG_PTR args[20]; + ULONG64 expected; + unsigned int i; + + vectored_handler = AddVectoredExceptionHandler(TRUE, test_raiseexception_regs_handle); + ok(!!vectored_handler, "failed.\n"); + + memcpy(code_mem, code, sizeof(code)); + func = code_mem; + + for (i = 0; i < ARRAY_SIZE(args); ++i) + args[i] = i; + + func(pRaiseException, 0, ARRAY_SIZE(args), args); + expected = 0xdeadb000; + ok(test_raiseexception_regs_context.Rbx == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rbx); + ++expected; + ok(test_raiseexception_regs_context.Rsi == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rsi); + ++expected; + ok(test_raiseexception_regs_context.Rdi == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rdi); + ++expected; + ok(test_raiseexception_regs_context.Rbp == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rbp); + ++expected; + ok(test_raiseexception_regs_context.R12 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R12); + ++expected; + ok(test_raiseexception_regs_context.R13 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R13); + ++expected; + ok(test_raiseexception_regs_context.R14 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R14); + ++expected; + ok(test_raiseexception_regs_context.R15 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R15); + + RemoveVectoredExceptionHandler(vectored_handler); +} #elif defined(__arm__) #define UNW_FLAG_NHANDLER 0 @@ -10974,6 +11072,7 @@ START_TEST(exception) test_copy_context(); test_unwind_from_apc(); test_syscall_clobbered_regs(); + test_raiseexception_regs(); #elif defined(__aarch64__)

1 0

Alistair Leslie-Hughes : xactengine: IXACT3EngineImpl_CreateSoundBank isn't a stub.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 1db53cdcbbb9ff75a118d7139eb486b209b81975 URL: https://gitlab.winehq.org/wine/wine/-/commit/1db53cdcbbb9ff75a118d7139eb486… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 1 12:53:49 2023 +1000 xactengine: IXACT3EngineImpl_CreateSoundBank isn't a stub. --- dlls/xactengine3_7/xact_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 0b0af6dd3df..41d35e232df 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, UINT ret; HRESULT hr; - TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, + TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p)\n", This, pvBuffer, dwSize, dwFlags, dwAllocAttributes, ppSoundBank); ret = FACTAudioEngine_CreateSoundBank(This->fact_engine, pvBuffer, dwSize,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: c1588b1bfd817fbadd1539ef63a12210525fc6fe URL: https://gitlab.winehq.org/wine/wine/-/commit/c1588b1bfd817fbadd1539ef63a122… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Jun 1 00:24:13 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9477178d5a3..34912556d08 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-05-25 00:13+0300\n" +"PO-Revision-Date: 2023-06-01 00:23+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -4020,10 +4020,8 @@ msgid "Syntax error in regular expression" msgstr "Sintaksės klaida reguliariajame reiškinyje" #: dlls/jscript/jscript.rc:66 -#, fuzzy -#| msgid "Expected identifier" msgid "Unexpected quantifier" -msgstr "Tikėtasi identifikatoriaus" +msgstr "Netikėtas kvantorius" #: dlls/jscript/jscript.rc:67 msgid "Exception thrown and not caught"

1 0

Alistair Leslie-Hughes : krnl386.exe16: Don't overflow when calculating size.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 77e0aae7f3acae3f87ae38264b2edcbe3e227d6c URL: https://gitlab.winehq.org/wine/wine/-/commit/77e0aae7f3acae3f87ae38264b2edc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 1 17:51:00 2023 +1000 krnl386.exe16: Don't overflow when calculating size. The application again the bug, passed 1 as the elem parameter which doubled the memory being allocated. When it overflowed (became negative), the value was passed into GlobalAlloc16 which then failed. GlobalAlloc16 takes a DWORD parameter, so the value isn't going to be truncated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53092 Original patch by github user cracyc for winevdm. --- dlls/krnl386.exe16/ne_segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/ne_segment.c b/dlls/krnl386.exe16/ne_segment.c index 3eb8bae2ff3..e455b118e23 100644 --- a/dlls/krnl386.exe16/ne_segment.c +++ b/dlls/krnl386.exe16/ne_segment.c @@ -945,7 +945,7 @@ static WORD NE_Ne2MemFlags(WORD flags) */ DWORD WINAPI MyAlloc16( WORD wFlags, WORD wSize, WORD wElem ) { - WORD size = wSize << wElem; + DWORD size = wSize << wElem; HANDLE16 hMem = 0; if (wSize || (wFlags & NE_SEGFLAGS_MOVEABLE))

1 0