Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-08 06:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibWebView: Implement stubbed out Process methods on Windows

Browse source
This commit is contained in:
ayeteadoe 2025-08-23 23:46:12 -07:00 • committed by Andrew Kaster
parent d299df24ac
commit 231336f137
Notes: github-actions[bot] 2025-10-30 03:09:38 +00:00
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Libraries/LibWebView/Process.cpp
View file

@ -9,6 +9,10 @@
#include <LibCore/Socket.h> #include <LibCore/Socket.h>
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>
#include <LibWebView/Process.h> #include <LibWebView/Process.h>
#if defined(AK_OS_WINDOWS)
# include <AK/ScopeGuard.h>
# include <AK/Windows.h>
#endif
namespace WebView { namespace WebView {
@ -50,18 +54,6 @@ ErrorOr<Process::ProcessAndIPCTransport> Process::spawn_and_connect_to_process(C
return ProcessAndIPCTransport { move(process), make<IPC::Transport>(move(ipc_socket)) }; return ProcessAndIPCTransport { move(process), make<IPC::Transport>(move(ipc_socket)) };
} }
#ifdef AK_OS_WINDOWS
// FIXME: Implement WebView::Process::get_process_pid on Windows
ErrorOr<Optional<pid_t>> Process::get_process_pid(StringView, StringView)
{
VERIFY(0 && "WebView::Process::get_process_pid is not implemented");
}
// FIXME: Implement WebView::Process::create_ipc_socket on Windows
ErrorOr<int> Process::create_ipc_socket(ByteString const&)
{
VERIFY(0 && "WebView::Process::create_ipc_socket is not implemented");
}
#else
ErrorOr<Optional<pid_t>> Process::get_process_pid(StringView process_name, StringView pid_path) ErrorOr<Optional<pid_t>> Process::get_process_pid(StringView process_name, StringView pid_path)
{ {
if (Core::System::stat(pid_path).is_error()) if (Core::System::stat(pid_path).is_error())
@ -89,7 +81,16 @@ ErrorOr<Optional<pid_t>> Process::get_process_pid(StringView process_name, Strin
TRY(Core::System::unlink(pid_path)); TRY(Core::System::unlink(pid_path));
return OptionalNone {}; return OptionalNone {};
} }
if (kill(*pid, 0) < 0) { bool const process_not_found = [&pid]() {
#if defined(AK_OS_WINDOWS)
HANDLE process_handle = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, *pid);
ScopeGuard handle_guard = [&process_handle] { CloseHandle(process_handle); };
return process_handle == nullptr;
#else
return kill(*pid, 0) < 0;
#endif
}();
if (process_not_found) {
warnln("{} PID file '{}' exists with PID {}, but process cannot be found", process_name, pid_path, *pid); warnln("{} PID file '{}' exists with PID {}, but process cannot be found", process_name, pid_path, *pid);
TRY(Core::System::unlink(pid_path)); TRY(Core::System::unlink(pid_path));
return OptionalNone {}; return OptionalNone {};
@ -104,6 +105,13 @@ ErrorOr<int> Process::create_ipc_socket(ByteString const& socket_path)
if (!Core::System::stat(socket_path).is_error()) if (!Core::System::stat(socket_path).is_error())
TRY(Core::System::unlink(socket_path)); TRY(Core::System::unlink(socket_path));
#if defined(AK_OS_WINDOWS)
auto socket_fd = TRY(Core::System::socket(AF_LOCAL, SOCK_STREAM, 0));
int option = 1;
TRY(Core::System::ioctl(socket_fd, FIONBIO, option));
if (SetHandleInformation(to_handle(socket_fd), HANDLE_FLAG_INHERIT, 0) == 0)
return Error::from_windows_error();
#else
# ifdef SOCK_NONBLOCK # ifdef SOCK_NONBLOCK
auto socket_fd = TRY(Core::System::socket(AF_LOCAL, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0)); auto socket_fd = TRY(Core::System::socket(AF_LOCAL, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0));
# else # else
@ -116,6 +124,7 @@ ErrorOr<int> Process::create_ipc_socket(ByteString const& socket_path)
# if !defined(AK_OS_BSD_GENERIC) && !defined(AK_OS_GNU_HURD) # if !defined(AK_OS_BSD_GENERIC) && !defined(AK_OS_GNU_HURD)
TRY(Core::System::fchmod(socket_fd, 0600)); TRY(Core::System::fchmod(socket_fd, 0600));
# endif
#endif #endif
auto socket_address = Core::SocketAddress::local(socket_path); auto socket_address = Core::SocketAddress::local(socket_path);
@ -126,7 +135,6 @@ ErrorOr<int> Process::create_ipc_socket(ByteString const& socket_path)
return socket_fd; return socket_fd;
} }
#endif
ErrorOr<Process::ProcessPaths> Process::paths_for_process(StringView process_name) ErrorOr<Process::ProcessPaths> Process::paths_for_process(StringView process_name)
{ {