wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Zebediah Figura : winebuild: Use segment prefixes in 16-bit stack switching code instead of writing out byte values.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 63a6f01a7092bbdefea49eec7046c4182b5f6c67 URL: https://gitlab.winehq.org/wine/wine/-/commit/63a6f01a7092bbdefea49eec7046c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 18 01:00:16 2023 -0500 winebuild: Use segment prefixes in 16-bit stack switching code instead of writing out byte values. Presumably at one point there were assemblers that choked on these. However, currently we use segment prefixes elsewhere in wine (namely, in the syscall dispatcher), and it seems fair to assume that a sane compiler should support them. --- tools/winebuild/relay.c | 60 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index b86a88aae24..c14a3a70b17 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -134,10 +134,10 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) { output( "\tcall 1f\n" ); output( "1:\tpopl %%ecx\n" ); - output( "\t.byte 0x2e\n\tmovl %s-1b(%%ecx),%%edx\n", asm_name("CallTo16_DataSelector") ); + output( "\tmovl %%cs:%s-1b(%%ecx),%%edx\n", asm_name("CallTo16_DataSelector") ); } else - output( "\t.byte 0x2e\n\tmovl %s,%%edx\n", asm_name("CallTo16_DataSelector") ); + output( "\tmovl %%cs:%s,%%edx\n", asm_name("CallTo16_DataSelector") ); /* Load 32-bit segment registers */ output( "\tmovw %%dx, %%ds\n" ); @@ -148,7 +148,7 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) else output( "\tmovw %s, %%fs\n", asm_name("CallTo16_TebSelector") ); - output( "\t.byte 0x64\n\tmov (%d),%%gs\n", GS_OFFSET ); + output( "\tmov %%fs:(%d),%%gs\n", GS_OFFSET ); /* Translate STACK16FRAME base to flat offset in %edx */ output( "\tmovw %%ss, %%dx\n" ); @@ -166,12 +166,12 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) if (reg_func) output( "\tpopl %%ecx\n" ); /* Get the 32-bit stack pointer from the TEB and complete STACK16FRAME */ - output( "\t.byte 0x64\n\tmovl (%d), %%ebp\n", STACKOFFSET ); + output( "\tmovl %%fs:(%d), %%ebp\n", STACKOFFSET ); output( "\tpushl %%ebp\n" ); /* Switch stacks */ - output( "\t.byte 0x64\n\tmovw %%ss, (%d)\n", STACKOFFSET + 2 ); - output( "\t.byte 0x64\n\tmovw %%sp, (%d)\n", STACKOFFSET ); + output( "\tmovw %%ss, %%fs:(%d)\n", STACKOFFSET + 2 ); + output( "\tmovw %%sp, %%fs:(%d)\n", STACKOFFSET ); output( "\tpushl %%ds\n" ); output( "\tpopl %%ss\n" ); output( "\tmovl %%ebp, %%esp\n" ); @@ -198,9 +198,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tcall *0x26(%%edx)\n"); /* FIELD_OFFSET(STACK16FRAME,entry_point) */ /* Switch stack back */ - output( "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); - output( "\t.byte 0x64\n\tmovzwl (%d), %%esp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d), %%ss\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%esp\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); /* Restore registers and return directly to caller */ output( "\taddl $8, %%esp\n" ); @@ -257,9 +257,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tmovzwl 0x2c(%%edx),%%eax\n"); /* FIELD_OFFSET(STACK16FRAME,ip) */ output( "\tmovl %%eax,0xb8(%%esp)\n" ); /* Eip */ - output( "\t.byte 0x64\n\tmovzwl (%d), %%eax\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%eax\n", STACKOFFSET+2 ); output( "\tmovl %%eax,0xc8(%%esp)\n" ); /* SegSs */ - output( "\t.byte 0x64\n\tmovzwl (%d), %%eax\n", STACKOFFSET ); + output( "\tmovzwl %%fs:(%d), %%eax\n", STACKOFFSET ); output( "\taddl $0x2c,%%eax\n"); /* FIELD_OFFSET(STACK16FRAME,ip) */ output( "\tmovl %%eax,0xc4(%%esp)\n" ); /* Esp */ #if 0 @@ -290,9 +290,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tleal -748(%%ebp),%%ebx\n" ); /* sizeof(CONTEXT) + FIELD_OFFSET(STACK32FRAME,ebp) */ /* Switch stack back */ - output( "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); - output( "\t.byte 0x64\n\tmovzwl (%d), %%esp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d), %%ss\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%esp\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); /* Get return address to CallFrom16 stub */ output( "\taddw $0x14,%%sp\n" ); /* FIELD_OFFSET(STACK16FRAME,callfrom_ip)-4 */ @@ -335,9 +335,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) else { /* Switch stack back */ - output( "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); - output( "\t.byte 0x64\n\tmovzwl (%d), %%esp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d), %%ss\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%esp\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); /* Restore registers */ output( "\tpopl %%edx\n" ); @@ -398,22 +398,22 @@ static void BuildCallTo16Core( int reg_func ) output_cfi( ".cfi_rel_offset %%esi,-8" ); output( "\tpushl %%edi\n" ); output_cfi( ".cfi_rel_offset %%edi,-12" ); - output( "\t.byte 0x64\n\tmov %%gs,(%d)\n", GS_OFFSET ); + output( "\tmov %%gs,%%fs:(%d)\n", GS_OFFSET ); /* Setup exception frame */ - output( "\t.byte 0x64\n\tpushl (%d)\n", STACKOFFSET ); + output( "\tpushl %%fs:(%d)\n", STACKOFFSET ); output( "\tpushl 16(%%ebp)\n" ); /* handler */ - output( "\t.byte 0x64\n\tpushl (0)\n" ); - output( "\t.byte 0x64\n\tmovl %%esp,(0)\n" ); + output( "\tpushl %%fs:(0)\n" ); + output( "\tmovl %%esp,%%fs:(0)\n" ); /* Call the actual CallTo16 routine (simulate a lcall) */ output( "\tpushl %%cs\n" ); output( "\tcall .L%s\n", name ); /* Remove exception frame */ - output( "\t.byte 0x64\n\tpopl (0)\n" ); + output( "\tpopl %%fs:(0)\n" ); output( "\taddl $4, %%esp\n" ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); if ( !reg_func ) { @@ -468,9 +468,9 @@ static void BuildCallTo16Core( int reg_func ) /* Switch to the 16-bit stack */ output( "\tmovl %%esp,%%edx\n" ); - output( "\t.byte 0x64\n\tmovw (%d),%%ss\n", STACKOFFSET + 2); - output( "\t.byte 0x64\n\tmovw (%d),%%sp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tmovl %%edx,(%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d),%%ss\n", STACKOFFSET + 2); + output( "\tmovw %%fs:(%d),%%sp\n", STACKOFFSET ); + output( "\tmovl %%edx,%%fs:(%d)\n", STACKOFFSET ); /* Make %bp point to the previous stackframe (built by CallFrom16) */ output( "\tmovzwl %%sp,%%ebp\n" ); @@ -541,20 +541,20 @@ static void BuildRet16Func(void) /* Restore 32-bit segment registers */ - output( "\t.byte 0x2e\n\tmovl %s", asm_name("CallTo16_DataSelector") ); + output( "\tmovl %%cs:%s", asm_name("CallTo16_DataSelector") ); output( "-%s,%%edi\n", asm_name("__wine_call16_start") ); output( "\tmovw %%di,%%ds\n" ); output( "\tmovw %%di,%%es\n" ); - output( "\t.byte 0x2e\n\tmov %s", asm_name("CallTo16_TebSelector") ); + output( "\tmov %%cs:%s", asm_name("CallTo16_TebSelector") ); output( "-%s,%%fs\n", asm_name("__wine_call16_start") ); - output( "\t.byte 0x64\n\tmov (%d),%%gs\n", GS_OFFSET ); + output( "\tmov %%fs:(%d),%%gs\n", GS_OFFSET ); /* Restore the 32-bit stack */ output( "\tmovw %%di,%%ss\n" ); - output( "\t.byte 0x64\n\tmovl (%d),%%esp\n", STACKOFFSET ); + output( "\tmovl %%fs:(%d),%%esp\n", STACKOFFSET ); /* Return to caller */

1 0

Paul Gofman : ws2_32: Test wait alertability in WSAGetOverlappedResult().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: a56e0ba4d401f4ec86dae51e2c7a9178156c86fe URL: https://gitlab.winehq.org/wine/wine/-/commit/a56e0ba4d401f4ec86dae51e2c7a91… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:37:56 2023 -0600 ws2_32: Test wait alertability in WSAGetOverlappedResult(). --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b47922c645a..cff4acb0b3c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12657,6 +12657,20 @@ static void test_WSAGetOverlappedResult(void) } } + overlapped.Internal = STATUS_PENDING; + overlapped.hEvent = CreateEventW(NULL, TRUE, TRUE, NULL); + + apc_count = 0; + ret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(ret, "QueueUserAPC returned %d\n", ret); + ret = WSAGetOverlappedResult(s, &overlapped, &size, TRUE, &flags); + ok(ret && (GetLastError() == ERROR_IO_PENDING || !WSAGetLastError()), + "Got ret %d, err %lu.\n", ret, GetLastError()); + ok(!apc_count, "got apc_count %d.\n", apc_count); + SleepEx(0, TRUE); + ok(apc_count == 1, "got apc_count %d.\n", apc_count); + + CloseHandle(overlapped.hEvent); closesocket(s); }

1 0

Paul Gofman : ws2_32: Make wait in WSAPoll() alertable.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 98cdd828b64ba0b30eddba3950a1005d3468544b URL: https://gitlab.winehq.org/wine/wine/-/commit/98cdd828b64ba0b30eddba3950a100… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:36:53 2023 -0600 ws2_32: Make wait in WSAPoll() alertable. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 267830cc88c..710ec8cbb26 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2994,7 +2994,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) params, params_size, params, params_size ); if (status == STATUS_PENDING) { - if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) + if (wait_event_alertable( sync_event ) == WAIT_FAILED) { free( params ); return -1; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 31e9baf31c8..b47922c645a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8122,7 +8122,11 @@ static void test_WSAPoll(void) fds[0].fd = client; fds[0].events = POLLRDNORM | POLLRDBAND; fds[0].revents = 0xdead; + apc_count = 0; + ret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(ret, "QueueUserAPC returned %d\n", ret); ret = pWSAPoll(fds, 1, 2000); + ok(apc_count == 1, "APC was called %u times\n", apc_count); ok(ret == 1, "got %d\n", ret); ok(fds[0].revents == POLLNVAL, "got events %#x\n", fds[0].revents); ret = WaitForSingleObject(thread_handle, 1000);

1 0

Paul Gofman : ws2_32: Make wait in connect() alertable.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 36d7bf9507360fddc3ac86cc9e827ccb2076cd59 URL: https://gitlab.winehq.org/wine/wine/-/commit/36d7bf9507360fddc3ac86cc9e827c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:35:57 2023 -0600 ws2_32: Make wait in connect() alertable. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 930a4000b4e..267830cc88c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1240,7 +1240,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) free( params ); if (status == STATUS_PENDING) { - if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) return -1; + if (wait_event_alertable( sync_event ) == WAIT_FAILED) return -1; status = io.u.Status; } if (status) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c029d3580..31e9baf31c8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8443,6 +8443,28 @@ static void test_connect(void) WSACloseEvent(overlapped.hEvent); closesocket(connector); + if (0) + { + /* Wait in connect() is alertable. This may take a very long time before connection fails, + * so disable the test. Testing with localhost is unreliable as that may avoid waiting in + * accept(). */ + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + address.sin_addr.s_addr = inet_addr("8.8.8.8"); + address.sin_port = htons(255); + + apc_count = 0; + SleepEx(0, TRUE); + ok(apc_count == 0, "got apc_count %d.\n", apc_count); + bret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(bret, "QueueUserAPC returned %d\n", bret); + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(apc_count == 1, "got apc_count %d.\n", apc_count); + ok(iret == -1 && (WSAGetLastError() == WSAECONNREFUSED || WSAGetLastError() == WSAETIMEDOUT), + "unexpected iret %d, error %d.\n", iret, WSAGetLastError()); + closesocket(connector); + } + /* Test connect after previous connect attempt failure. */ connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError());

1 0

Paul Gofman : ws2_32: Make wait in accept() alertable.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 157633229fa7b0bd076c72b8f42dbb7e6ec98912 URL: https://gitlab.winehq.org/wine/wine/-/commit/157633229fa7b0bd076c72b8f42dbb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:33:41 2023 -0600 ws2_32: Make wait in accept() alertable. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5eb926a408b..930a4000b4e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -765,7 +765,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { - if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) + if (wait_event_alertable( sync_event ) == WAIT_FAILED) return SOCKET_ERROR; status = io.u.Status; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 17d5f3993e5..60c029d3580 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4643,10 +4643,37 @@ static SOCKET setup_connector_socket(const struct sockaddr_in *addr, int len, BO return connector; } +struct connect_apc_func_param +{ + HANDLE event; + struct sockaddr_in addr; + SOCKET connector; + unsigned int apc_count; +}; + +static DWORD WINAPI test_accept_connect_thread(void *param) +{ + struct connect_apc_func_param *p = (struct connect_apc_func_param *)param; + + WaitForSingleObject(p->event, INFINITE); + p->connector = setup_connector_socket(&p->addr, sizeof(p->addr), FALSE); + ok(p->connector != INVALID_SOCKET, "failed connecting from APC func.\n"); + return 0; +} + +static void WINAPI connect_apc_func(ULONG_PTR param) +{ + struct connect_apc_func_param *p = (struct connect_apc_func_param *)param; + + ++p->apc_count; + SetEvent(p->event); +} + static void test_accept(void) { int ret; SOCKET server_socket, accepted = INVALID_SOCKET, connector; + struct connect_apc_func_param apc_param; struct sockaddr_in address; SOCKADDR_STORAGE ss, ss_empty; int socklen; @@ -4661,6 +4688,23 @@ static void test_accept(void) socklen = sizeof(address); server_socket = setup_server_socket(&address, &socklen); + memset(&apc_param, 0, sizeof(apc_param)); + apc_param.event = CreateEventW(NULL, FALSE, FALSE, NULL); + apc_param.addr = address; + /* Connecting directly from APC function randomly crashes on Windows for some reason, + * so do it from a thread and only signal it from the APC when we are in accept() call. */ + thread_handle = CreateThread(NULL, 0, test_accept_connect_thread, &apc_param, 0, NULL); + ret = QueueUserAPC(connect_apc_func, GetCurrentThread(), (ULONG_PTR)&apc_param); + ok(ret, "QueueUserAPC returned %d\n", ret); + accepted = accept(server_socket, NULL, NULL); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(apc_param.apc_count == 1, "APC was called %u times\n", apc_param.apc_count); + closesocket(accepted); + closesocket(apc_param.connector); + WaitForSingleObject(thread_handle, INFINITE); + CloseHandle(thread_handle); + CloseHandle(apc_param.event); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done;

1 0

Alex Henrie : bcrypt/tests: Don't allocate inside todo_wine and free outside of it.
by Alexandre Julliard 02 Jun '23

02 Jun '23

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 02 Jun '23

02 Jun '23

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 01 Jun '23

01 Jun '23

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 01 Jun '23

01 Jun '23

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 : wmvcore: Remove superfluous casts to self.
by Alexandre Julliard 01 Jun '23

01 Jun '23

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2023