apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

wind: Move more fallible operations before window creation

Browse Source
This commit is contained in:
apio 2023-09-02 14:02:06 +02:00
parent 06f3affc71
commit 669e2747a7
Signed by: apio
GPG Key ID: B8A7D06E42258954
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wind/IPC.cpp
View File

@ -11,6 +11,7 @@
auto _expr_rc = (expr); \ auto _expr_rc = (expr); \
if (!_expr_rc.has_value()) \ if (!_expr_rc.has_value()) \
{ \ { \
g_windows.remove(window); \
delete window; \ delete window; \
os::IPC::send_error(client.conn, _expr_rc.error()); \ os::IPC::send_error(client.conn, _expr_rc.error()); \
return {}; \ return {}; \
@ -65,6 +66,8 @@ static Result<void> handle_create_window_message(Client& client)
auto name = TRY(String::from_cstring("Window")); auto name = TRY(String::from_cstring("Window"));
auto shm_path = TRY(String::format("/wind-shm-%d-%lu"_sv, client.conn.fd(), time(NULL)));
auto* window = new (std::nothrow) Window(request.rect, move(name), request.decorated); auto* window = new (std::nothrow) Window(request.rect, move(name), request.decorated);
if (!window) if (!window)
{ {
@ -72,8 +75,6 @@ static Result<void> handle_create_window_message(Client& client)
return {}; return {};
} }
auto shm_path = TRY_OR_IPC_ERROR(String::format("/wind-shm-%d-%lu"_sv, client.conn.fd(), time(NULL)));
window->pixels = (u32*)TRY_OR_IPC_ERROR( window->pixels = (u32*)TRY_OR_IPC_ERROR(
os::SharedMemory::create(shm_path.view(), window->contents.height * window->contents.width * 4)); os::SharedMemory::create(shm_path.view(), window->contents.height * window->contents.width * 4));