diff --git a/src/MaaCore/Controller.cpp b/src/MaaCore/Controller.cpp index 8439517c58..7b42d28338 100644 --- a/src/MaaCore/Controller.cpp +++ b/src/MaaCore/Controller.cpp @@ -1361,13 +1361,12 @@ std::optional asst::Controller::call_command_win32(const std::string& cmd, asst::platform::single_page_buffer pipe_buffer; asst::platform::single_page_buffer sock_buffer; - - DWORD err = 0; + HANDLE pipe_parent_read = INVALID_HANDLE_VALUE, pipe_child_write = INVALID_HANDLE_VALUE; SECURITY_ATTRIBUTES sa_inherit { .nLength = sizeof(SECURITY_ATTRIBUTES), .bInheritHandle = TRUE }; if (!asst::win32::CreateOverlappablePipe(&pipe_parent_read, &pipe_child_write, nullptr, &sa_inherit, (DWORD)pipe_buffer.size(), true, false)) { - err = GetLastError(); + DWORD err = GetLastError(); Log.error("CreateOverlappablePipe failed, err", err); return std::nullopt; } @@ -1386,7 +1385,7 @@ std::optional asst::Controller::call_command_win32(const std::string& cmd, BOOL create_ret = CreateProcessW(nullptr, cmdline_osstr.data(), nullptr, nullptr, TRUE, 0, nullptr, nullptr, &si, &process_info); if (!create_ret) { - auto err = GetLastError(); + DWORD err = GetLastError(); Log.error("Call `", cmd, "` create process failed, ret", create_ret, "error code:", err); return std::nullopt; } @@ -1415,7 +1414,7 @@ std::optional asst::Controller::call_command_win32(const std::string& cmd, if (!m_server_accept_ex(m_server_sock, client_socket, sock_buffer.get(), (DWORD)sock_buffer.size() - ((sizeof(sockaddr_in) + 16) * 2), sizeof(sockaddr_in) + 16, sizeof(sockaddr_in) + 16, &dummy, &sockov)) { - err = WSAGetLastError(); + DWORD err = WSAGetLastError(); if (err == ERROR_IO_PENDING) { accept_pending = true; } @@ -1474,7 +1473,7 @@ std::optional asst::Controller::call_command_win32(const std::string& cmd, } else { // something bad happened - err = GetLastError(); + DWORD err = GetLastError(); // throw std::system_error(std::error_code(err, std::system_category())); Log.error(__FUNCTION__, "A fatal error occurred", err); break; @@ -1491,7 +1490,7 @@ std::optional asst::Controller::call_command_win32(const std::string& cmd, (void)ReadFile(pipe_parent_read, pipe_buffer.get(), (DWORD)pipe_buffer.size(), nullptr, &pipeov); } else { - err = GetLastError(); + DWORD err = GetLastError(); if (err == ERROR_HANDLE_EOF || err == ERROR_BROKEN_PIPE) { pipe_eof = true; } diff --git a/src/MaaCore/Utils/Platform/PlatformWin32.cpp b/src/MaaCore/Utils/Platform/PlatformWin32.cpp index dcf691b235..5cfc8c6cf7 100644 --- a/src/MaaCore/Utils/Platform/PlatformWin32.cpp +++ b/src/MaaCore/Utils/Platform/PlatformWin32.cpp @@ -126,12 +126,11 @@ std::string asst::platform::call_command(const std::string& cmdline, bool* exit_ auto pipe_buffer = std::make_unique(PipeBuffSize); std::string pipe_str; - DWORD err = 0; HANDLE pipe_parent_read = INVALID_HANDLE_VALUE, pipe_child_write = INVALID_HANDLE_VALUE; SECURITY_ATTRIBUTES sa_inherit { .nLength = sizeof(SECURITY_ATTRIBUTES), .bInheritHandle = TRUE }; if (!asst::win32::CreateOverlappablePipe(&pipe_parent_read, &pipe_child_write, nullptr, &sa_inherit, PipeBuffSize, true, false)) { - err = GetLastError(); + DWORD err = GetLastError(); asst::Log.error("CreateOverlappablePipe failed, err", err); return {}; } @@ -150,7 +149,7 @@ std::string asst::platform::call_command(const std::string& cmdline, bool* exit_ BOOL create_ret = CreateProcessW(nullptr, cmdline_osstr.data(), nullptr, nullptr, TRUE, 0, nullptr, nullptr, &si, &process_info); if (!create_ret) { - auto err = GetLastError(); + DWORD err = GetLastError(); Log.error("Call `", cmdline, "` create process failed, ret", create_ret, "error code:", err); return {}; } @@ -181,7 +180,7 @@ std::string asst::platform::call_command(const std::string& cmdline, bool* exit_ } else { // something bad happened - err = GetLastError(); + DWORD err = GetLastError(); // throw std::system_error(std::error_code(err, std::system_category())); Log.error(__FUNCTION__, "A fatal error occurred", err); break; @@ -198,7 +197,7 @@ std::string asst::platform::call_command(const std::string& cmdline, bool* exit_ (void)ReadFile(pipe_parent_read, pipe_buffer.get(), PipeBuffSize, nullptr, &pipeov); } else { - err = GetLastError(); + DWORD err = GetLastError(); if (err == ERROR_HANDLE_EOF || err == ERROR_BROKEN_PIPE) { pipe_eof = true; }