October 2022 - Wine-Commits

Zebediah Figura : ntdll: Fill the IOSB in sock_transmit() only inside the "if (alerted)" block.
by Alexandre Julliard Oct. 21, 2022

Oct. 21, 2022

Module: wine Branch: master Commit: 0c848768c172d6ccf1893284600c1c3e8b83fdd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c848768c172d6ccf1893284600c1c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:33:31 2022 -0500 ntdll: Fill the IOSB in sock_transmit() only inside the "if (alerted)" block. We can only get a successful status that way. This matches sock_recv(). Also combine the if (alerted) blocks. Unlike the previous commits, this cannot be separated, as it causes warnings with some versions of gcc. --- dlls/ntdll/unix/socket.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e53ad4b76be..b502d3a03cb 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1335,9 +1335,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, socklen_t addr_len; HANDLE wait_handle; NTSTATUS status; - ULONG_PTR information; ULONG options; - BOOL alerted; addr_len = sizeof(addr); if (getpeername( fd, &addr.addr, &addr_len ) != 0) @@ -1389,37 +1387,38 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, } SERVER_END_REQ; - alerted = status == STATUS_ALERTED; - if (alerted) + /* the server currently will never succeed immediately */ + assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); + + if (status == STATUS_ALERTED) { + ULONG_PTR information; + status = try_transmit( fd, file_fd, async ); if (status == STATUS_DEVICE_NOT_READY) status = STATUS_PENDING; - } - if (status != STATUS_PENDING) - { information = async->head_cursor + async->file_cursor + async->tail_cursor; - if (!NT_ERROR(status) || wait_handle) + if (!NT_ERROR(status) && status != STATUS_PENDING) { io->Status = status; io->Information = information; } - release_fileio( &async->io ); + + set_async_direct_result( &wait_handle, status, information, TRUE ); } - else information = 0; - if (alerted) + if (status != STATUS_PENDING) + release_fileio( &async->io ); + + if (!status && !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) { - set_async_direct_result( &wait_handle, status, information, TRUE ); - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) - { - /* Pretend we always do async I/O. The client can always retrieve - * the actual I/O status via the IO_STATUS_BLOCK. - */ - status = STATUS_PENDING; - } + /* Pretend we always do async I/O. The client can always retrieve + * the actual I/O status via the IO_STATUS_BLOCK. + */ + status = STATUS_PENDING; } + if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; }

1 0

Zebediah Figura : ntdll: Combine the "if (alerted)" blocks in sock_send().
by Alexandre Julliard Oct. 21, 2022

Oct. 21, 2022

Module: wine Branch: master Commit: 8bf295fd1a7aa4138baa9caa71d4f3cae5416add URL: https://gitlab.winehq.org/wine/wine/-/commit/8bf295fd1a7aa4138baa9caa71d4f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 22:04:51 2022 -0500 ntdll: Combine the "if (alerted)" blocks in sock_send(). There is no need to release the async_fileio structure before calling set_async_direct_result(). --- dlls/ntdll/unix/socket.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index cc3c898d464..e53ad4b76be 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1099,9 +1099,8 @@ static void sock_save_icmp_id( struct async_send_ioctl *async ) static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, struct async_send_ioctl *async, int force_async ) { - BOOL nonblocking, alerted; - ULONG_PTR information; HANDLE wait_handle; + BOOL nonblocking; NTSTATUS status; ULONG options; @@ -1122,9 +1121,10 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi if (!NT_ERROR(status) && is_icmp_over_dgram( fd )) sock_save_icmp_id( async ); - alerted = status == STATUS_ALERTED; - if (alerted) + if (status == STATUS_ALERTED) { + ULONG_PTR information; + status = try_send( fd, async ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; @@ -1142,12 +1142,13 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi io->Status = status; io->Information = information; } + + set_async_direct_result( &wait_handle, status, information, FALSE ); } if (status != STATUS_PENDING) release_fileio( &async->io ); - if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; }

1 0

Zebediah Figura : ntdll: Fill the IOSB in sock_send() only inside the "if (alerted)" block.
by Alexandre Julliard Oct. 21, 2022

Oct. 21, 2022

Module: wine Branch: master Commit: d3c8842a6ef539bde7bc8132343f82673235c83a URL: https://gitlab.winehq.org/wine/wine/-/commit/d3c8842a6ef539bde7bc8132343f82… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:32:25 2022 -0500 ntdll: Fill the IOSB in sock_send() only inside the "if (alerted)" block. We can only get a successful status that way. This matches sock_recv(). --- dlls/ntdll/unix/socket.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 44694f8c404..cc3c898d464 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1116,6 +1116,9 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } SERVER_END_REQ; + /* the server currently will never succeed immediately */ + assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); + if (!NT_ERROR(status) && is_icmp_over_dgram( fd )) sock_save_icmp_id( async ); @@ -1132,19 +1135,17 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi * and returns EWOULDBLOCK, but we have no way of doing that. */ if (status == STATUS_DEVICE_NOT_READY && async->sent_len) status = STATUS_SUCCESS; - } - if (status != STATUS_PENDING) - { information = async->sent_len; - if (!NT_ERROR(status) || (wait_handle && !alerted)) + if (!NT_ERROR(status) && status != STATUS_PENDING) { io->Status = status; io->Information = information; } - release_fileio( &async->io ); } - else information = 0; + + if (status != STATUS_PENDING) + release_fileio( &async->io ); if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT );

1 0

Zebediah Figura : ntdll: Fill the IOSB in sock_recv() only inside the "if (alerted)" block.
by Alexandre Julliard Oct. 21, 2022

Oct. 21, 2022

Module: wine Branch: master Commit: f994e0a653f15bc19523d08cbf9aea93f577bc02 URL: https://gitlab.winehq.org/wine/wine/-/commit/f994e0a653f15bc19523d08cbf9aea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:29:27 2022 -0500 ntdll: Fill the IOSB in sock_recv() only inside the "if (alerted)" block. We can only get a successful status that way. This avoids an uninitialized variable warning with gcc 12.2. --- dlls/ntdll/unix/socket.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f8ed9f6f854..8ff58f7566e 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -23,6 +23,7 @@ #endif #include "config.h" +#include <assert.h> #include <errno.h> #include <sys/types.h> #include <sys/socket.h> @@ -879,24 +880,25 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } SERVER_END_REQ; + /* the server currently will never succeed immediately */ + assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); + alerted = status == STATUS_ALERTED; if (alerted) { status = try_recv( fd, async, &information ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; - } - - if (status != STATUS_PENDING) - { - if (!NT_ERROR(status) || (wait_handle && !alerted)) + if (!NT_ERROR(status) && status != STATUS_PENDING) { io->Status = status; io->Information = information; } - release_fileio( &async->io ); } + if (status != STATUS_PENDING) + release_fileio( &async->io ); + if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status;

1 0

Zebediah Figura : ntdll: Combine the "if (alerted)" blocks in sock_recv().
by Alexandre Julliard Oct. 21, 2022

Oct. 21, 2022

Module: wine Branch: master Commit: 3905af7c446ba201c7ebf15169c4c1fb52a67078 URL: https://gitlab.winehq.org/wine/wine/-/commit/3905af7c446ba201c7ebf15169c4c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 22:03:21 2022 -0500 ntdll: Combine the "if (alerted)" blocks in sock_recv(). There is no need to release the async_fileio structure before calling set_async_direct_result(). --- dlls/ntdll/unix/socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8ff58f7566e..44694f8c404 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -852,9 +852,8 @@ static BOOL is_icmp_over_dgram( int fd ) 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 ) { - BOOL nonblocking, alerted; - ULONG_PTR information; HANDLE wait_handle; + BOOL nonblocking; NTSTATUS status; unsigned int i; ULONG options; @@ -883,9 +882,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi /* the server currently will never succeed immediately */ assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); - alerted = status == STATUS_ALERTED; - if (alerted) + if (status == STATUS_ALERTED) { + ULONG_PTR information; + status = try_recv( fd, async, &information ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; @@ -894,12 +894,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi io->Status = status; io->Information = information; } + set_async_direct_result( &wait_handle, status, information, FALSE ); } if (status != STATUS_PENDING) release_fileio( &async->io ); - if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; }

1 0

Zebediah Figura : ws2_32/tests: Add more tests for iosb contents while a recv is pending.
by Alexandre Julliard Oct. 21, 2022

Oct. 21, 2022

Module: wine Branch: master Commit: da8defe5df1558e5086a364a98e55a7fae1fb0d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/da8defe5df1558e5086a364a98e55a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 16 12:51:22 2022 -0500 ws2_32/tests: Add more tests for iosb contents while a recv is pending. --- dlls/ws2_32/tests/afd.c | 7 ++++--- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 21e7a50aef3..3215ddaef62 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1466,13 +1466,14 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params) - 1, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - memset(&io, 0, sizeof(io)); + io.Status = 0xdeadbeef; + io.Information = 0xdeadbeef; memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ok(!io.Status, "got status %#lx\n", io.Status); - ok(!io.Information, "got information %#Ix\n", io.Information); + ok(io.Status == 0xdeadbeef, "got status %#lx\n", io.Status); + ok(io.Information == 0xdeadbeef, "got information %#Ix\n", io.Information); /* These structures need not remain valid. */ memset(&params, 0xcc, sizeof(params)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4f430a29d2..adf16012951 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12208,11 +12208,15 @@ static void test_nonblocking_async_recv(void) memset(buffer, 0, sizeof(buffer)); WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); ret = WaitForSingleObject((HANDLE)client, 0); ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + ok(overlapped.Internal == STATUS_PENDING, "got status %#lx\n", (NTSTATUS)overlapped.Internal); + ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); ret = send(server, "data", 4, 0); ok(ret == 4, "got %d\n", ret);

1 0

Zebediah Figura : ntdll: The async handle passed to set_async_direct_result() cannot be NULL.
by Alexandre Julliard Oct. 21, 2022

Oct. 21, 2022

Module: wine Branch: master Commit: 6b16ead607ed9426ec38d3db123bc732c309b90e URL: https://gitlab.winehq.org/wine/wine/-/commit/6b16ead607ed9426ec38d3db123bc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 16 12:55:18 2022 -0500 ntdll: The async handle passed to set_async_direct_result() cannot be NULL. --- dlls/ntdll/unix/sync.c | 9 +++++---- dlls/ntdll/unix/unix_private.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1194ee514b5..821a1f08311 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2533,21 +2533,22 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG /* Notify direct completion of async and close the wait handle if it is no longer needed. * This function is a no-op (returns status as-is) if the supplied handle is NULL. */ -void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) +void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) { NTSTATUS ret; - if (!*optional_handle) return; + /* if we got STATUS_ALERTED, we must have a valid async handle */ + assert( *async_handle ); SERVER_START_REQ( set_async_direct_result ) { - req->handle = wine_server_obj_handle( *optional_handle ); + req->handle = wine_server_obj_handle( *async_handle ); req->status = status; req->information = information; req->mark_pending = mark_pending; ret = wine_server_call( req ); if (ret == STATUS_SUCCESS) - *optional_handle = wine_server_ptr_handle( reply->handle ); + *async_handle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 47f0f9c56a9..73b9ed76de0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -278,7 +278,7 @@ extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *inf extern void init_files(void) DECLSPEC_HIDDEN; extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN; -extern void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ); +extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) DECLSPEC_HIDDEN; extern void dbg_init(void) DECLSPEC_HIDDEN;

1 0

Fabian Maurer : ntdll: Prevent double free (Coverity).
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 173ffe5011d91e945d4e9ee8ed9619d7982a957c URL: https://gitlab.winehq.org/wine/wine/-/commit/173ffe5011d91e945d4e9ee8ed9619… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 16 18:39:35 2022 +0200 ntdll: Prevent double free (Coverity). The fd gets overwritten, therefore we need to close it before doing so. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e203ff6c41d..c7ba12a5c13 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4417,12 +4417,12 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, if (size > 0x10000) size = 0x10000; if ((tmpbuf = malloc( size ))) { + if (needs_close) close( fd ); if (!server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { int res = recv( fd, tmpbuf, size, MSG_PEEK ); info->MessagesAvailable = (res > 0); info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; - if (needs_close) close( fd ); } free( tmpbuf ); }

1 0

Hugh McMaster : kernel32/tests: Add tests for GetConsoleOriginalTitleA/W().
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 03f5f72c13aea7f677d1a2bb7f96f00eb4490d26 URL: https://gitlab.winehq.org/wine/wine/-/commit/03f5f72c13aea7f677d1a2bb7f96f0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 17 23:43:06 2022 +1100 kernel32/tests: Add tests for GetConsoleOriginalTitleA/W(). --- dlls/kernel32/tests/console.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9eabd887f2c..c2b7eb63a1e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4194,6 +4194,77 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) CloseHandle(std_input); } +static void test_GetConsoleOriginalTitleA(void) +{ + char buf[64]; + DWORD ret; + char title[] = "Original Console Title"; + + ret = GetConsoleOriginalTitleA(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + + ret = SetConsoleTitleA("test"); + ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); +} + +static void test_GetConsoleOriginalTitleW(void) +{ + WCHAR buf[64]; + DWORD ret; + WCHAR title[] = L"Original Console Title"; + + ret = GetConsoleOriginalTitleW(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + buf[ret] = 0; + todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + + ret = SetConsoleTitleW(L"test"); + ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + + ret = GetConsoleOriginalTitleW(buf, 5); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + todo_wine ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); +} + +static void test_GetConsoleOriginalTitle(void) +{ + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + char title[] = "Original Console Title"; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" console title_test", argv[0]); + si.lpTitle = title; + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); + ok(ret, "CreateProcess failed: %lu\n", GetLastError()); + CloseHandle(info.hThread); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); +} + static void test_GetConsoleTitleA(void) { char buf[64], str[] = "test"; @@ -4837,6 +4908,13 @@ START_TEST(console) ExitProcess(exit_code); } + if (argc == 3 && !strcmp(argv[2], "title_test")) + { + test_GetConsoleOriginalTitleA(); + test_GetConsoleOriginalTitleW(); + return; + } + test_current = argc >= 3 && !strcmp(argv[2], "--current"); using_pseudo_console = argc >= 3 && !strcmp(argv[2], "--pseudo-console"); @@ -5020,6 +5098,7 @@ START_TEST(console) test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); test_file_info(hConIn, hConOut); + test_GetConsoleOriginalTitle(); test_GetConsoleTitleA(); test_GetConsoleTitleW(); if (!test_current)

1 0

Hugh McMaster : kernelbase: Add stubs for GetConsoleOriginalTitleA/W().
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 4951ab64365aa701a8177c2e75fd532311427625 URL: https://gitlab.winehq.org/wine/wine/-/commit/4951ab64365aa701a8177c2e75fd53… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Oct 11 23:20:41 2022 +1100 kernelbase: Add stubs for GetConsoleOriginalTitleA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/console.c | 22 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7c5fb8ed74f..a4bba1c6848 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -610,8 +610,8 @@ @ stdcall GetConsoleKeyboardLayoutNameW(ptr) @ stdcall -import GetConsoleMode(long ptr) @ stub GetConsoleNlsMode -# @ stub GetConsoleOriginalTitleA -# @ stub GetConsoleOriginalTitleW +@ stdcall -import GetConsoleOriginalTitleA(ptr long) +@ stdcall -import GetConsoleOriginalTitleW(ptr long) @ stdcall -import GetConsoleOutputCP() @ stdcall -import GetConsoleProcessList(ptr long) @ stdcall -import GetConsoleScreenBufferInfo(long ptr) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 434399b073a..e3b0ebead9e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -886,6 +886,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) } +/*********************************************************************** + * GetConsoleOriginalTitleA (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleA( LPSTR title, DWORD size ) +{ + FIXME( ": (%p, %lu) stub!\n", title, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} + + +/*********************************************************************** + * GetConsoleOriginalTitleW (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleW( LPWSTR title, DWORD size ) +{ + FIXME( ": (%p, %lu) stub!\n", title, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} + + /*********************************************************************** * GetConsoleOutputCP (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c9b8649c800..cbce448d3e9 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -466,6 +466,8 @@ @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleMode(long ptr) +@ stdcall GetConsoleOriginalTitleA(ptr long) +@ stdcall GetConsoleOriginalTitleW(ptr long) @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) @ stdcall GetConsoleScreenBufferInfo(long ptr)

1 0