June 2023 - Wine-commits - list.winehq.org

Alex Henrie : iphlpapi/tests: Use ~0u instead of ~0ul in testGetIpNetTable.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 75de502ba4861b03e98714f1bebcb41adadb51d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/75de502ba4861b03e98714f1bebcb4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 2 09:43:27 2023 -0600 iphlpapi/tests: Use ~0u instead of ~0ul in testGetIpNetTable. Fixes warnings on GCC 13. --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8002afc0a89..b9ca9e569b3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -419,12 +419,12 @@ static void testGetIpNetTable(void) } igmp3_found = ssdp_found = FALSE; - prev_idx = ~0ul; + prev_idx = ~0u; for (i = 0; i < buf->dwNumEntries; ++i) { if (buf->table[i].dwIndex != prev_idx) { - if (prev_idx != ~0ul) + if (prev_idx != ~0u) { ok( igmp3_found, "%s not found, iface index %lu.\n", ntoa( igmp3_addr ), prev_idx); ok( ssdp_found || broken(!ssdp_found) /* 239.255.255.250 is always present since Win10 */,

1 0

Shaun Ren : sapi: Implement ISpObjectToken::CreateKey.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: e071a70ba870cee586d28beca8f8965f63378eef URL: https://gitlab.winehq.org/wine/wine/-/commit/e071a70ba870cee586d28beca8f896… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu May 25 23:35:28 2023 -0400 sapi: Implement ISpObjectToken::CreateKey. --- dlls/sapi/tests/token.c | 4 ++++ dlls/sapi/token.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 3629a86b126..287c74a3e58 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -513,6 +513,10 @@ static void test_object_token(void) hr = ISpObjectToken_SetId( token, NULL, test_token_id, TRUE ); ok( hr == S_OK, "got %08lx\n", hr ); + hr = ISpObjectToken_CreateKey( token, L"Attributes", &sub_key ); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpDataKey_Release( sub_key ); + hr = ISpObjectToken_SetStringValue( token, L"CLSID", TESTCLASS_CLSID ); ok( hr == S_OK, "got %08lx\n", hr ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 6cc7ccd6d73..dbbc14b6e56 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -1117,8 +1117,11 @@ static HRESULT WINAPI token_OpenKey( ISpObjectToken *iface, static HRESULT WINAPI token_CreateKey( ISpObjectToken *iface, LPCWSTR name, ISpDataKey **sub_key ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + + TRACE( "%p, %s, %p\n", iface, debugstr_w(name), sub_key ); + + return ISpRegDataKey_CreateKey( This->data_key, name, sub_key ); } static HRESULT WINAPI token_DeleteKey( ISpObjectToken *iface,

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

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

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 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: 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

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

Zebediah Figura : winebuild: Use the lretw mnemonic in wine_call_to_16().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 6bcfab4ca66350a2f603218f12d76f3b99e752dc URL: https://gitlab.winehq.org/wine/wine/-/commit/6bcfab4ca66350a2f603218f12d76f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 18 01:02:00 2023 -0500 winebuild: Use the lretw mnemonic in wine_call_to_16(). We already use it in the __wine_spec_callfrom16_* functions. --- tools/winebuild/relay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index c14a3a70b17..d06be8fc371 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -519,8 +519,7 @@ static void BuildCallTo16Core( int reg_func ) } /* Jump to the called routine */ - output( "\t.byte 0x66\n" ); - output( "\tlret\n" ); + output( "\tlretw\n" ); /* Function footer */ output_function_size( func_name );

1 0

Alexandre Julliard : ntdll: Use the sysv ABI for the %fs allocation function.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: e2fac05854736e1d2b2a353af0f1382b7eda4fad URL: https://gitlab.winehq.org/wine/wine/-/commit/e2fac05854736e1d2b2a353af0f138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 09:32:59 2023 +0200 ntdll: Use the sysv ABI for the %fs allocation function. --- dlls/ntdll/unix/signal_x86_64.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 508a3a5b323..87ecec252e7 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -88,17 +88,17 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } -extern int CDECL alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; +extern int alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( alloc_fs_sel, /* switch to 32-bit stack */ "pushq %rbx\n\t" - "pushq %rdi\n\t" - "movq %rsp,%rdi\n\t" - "movl 0x4(%rdx),%esp\n\t" /* Tib.StackBase */ + "pushq %r12\n\t" + "movq %rsp,%r12\n\t" + "movl 0x4(%rsi),%esp\n\t" /* Tib.StackBase */ "subl $0x20,%esp\n\t" /* setup modify_ldt struct on 32-bit stack */ - "movl %ecx,(%rsp)\n\t" /* entry_number */ - "movl %edx,4(%rsp)\n\t" /* base */ + "movl %edi,(%rsp)\n\t" /* entry_number */ + "movl %esi,4(%rsp)\n\t" /* base */ "movl $~0,8(%rsp)\n\t" /* limit */ "movl $0x41,12(%rsp)\n\t" /* seg_32bit | usable */ /* invoke 32-bit syscall */ @@ -107,8 +107,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, "int $0x80\n\t" /* restore stack */ "movl (%rsp),%eax\n\t" /* entry_number */ - "movq %rdi,%rsp\n\t" - "popq %rdi\n\t" + "movq %r12,%rsp\n\t" + "popq %r12\n\t" "popq %rbx\n\t" "ret" );

1 0