Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-25 18:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors.

Browse Source
This commit is contained in:
Relintai 2023-09-10 15:03:32 +02:00
parent c380bd6587
commit 84ccfb340a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platform/windows/sub_process_windows.cpp
View File

@ -33,13 +33,13 @@
#include "core/containers/local_vector.h" #include "core/containers/local_vector.h"
// TODO clean these up // TODO clean these up
#include <wchar.h>
#include <avrt.h> #include <avrt.h>
#include <direct.h> #include <direct.h>
#include <knownfolders.h> #include <knownfolders.h>
#include <process.h> #include <process.h>
#include <regstr.h> #include <regstr.h>
#include <shlobj.h> #include <shlobj.h>
#include <wchar.h>
Error SubProcessWindows::start() { Error SubProcessWindows::start() {
if (_executable_path.empty()) { if (_executable_path.empty()) {
@ -50,10 +50,10 @@ Error SubProcessWindows::start() {
return ERR_BUSY; return ERR_BUSY;
} }
String path = p_path.replace("/", "\\"); String path = _executable_path.replace("/", "\\");
String cmdline = _quote_command_line_argument(path); String cmdline = _quote_command_line_argument(path);
const List<String>::Element *I = p_arguments.front(); const List<String>::Element *I = _arguments.front();
while (I) { while (I) {
cmdline += " " + _quote_command_line_argument(I->get()); cmdline += " " + _quote_command_line_argument(I->get());
I = I->next(); I = I->next();
@ -149,11 +149,9 @@ Error SubProcessWindows::start() {
WaitForSingleObject(_process_info.pi.hProcess, INFINITE); WaitForSingleObject(_process_info.pi.hProcess, INFINITE);
if (r_exitcode) { DWORD ret2;
DWORD ret2; GetExitCodeProcess(_process_info.pi.hProcess, &ret2);
GetExitCodeProcess(_process_info.pi.hProcess, &ret2); _exitcode = ret2;
_exitcode = ret2;
}
CloseHandle(_process_info.pi.hProcess); CloseHandle(_process_info.pi.hProcess);
CloseHandle(_process_info.pi.hThread); CloseHandle(_process_info.pi.hThread);
@ -326,7 +324,9 @@ void SubProcessWindows::_append_to_pipe(char *p_bytes, int p_size) {
SubProcessWindows::SubProcessWindows() : SubProcessWindows::SubProcessWindows() :
SubProcess() { SubProcess() {
_pipe_handles = { NULL, NULL };
_pipe_handles[0] = NULL;
_pipe_handles[1] = NULL;
_process_started = false; _process_started = false;