ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the need for temporary variables where possible

Browse Source
This commit is contained in:
gingerBill
2024-07-16 12:13:39 +01:00
parent 3a162de18f
commit 1afb10109e
1 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os2/process_windows.odin
+17 -37
View File
@@ -120,9 +120,8 @@ _process_info_by_pid :: proc(pid: int, selection: Process_Info_Fields, allocator
} }
} }
if need_snapmodule { if need_snapmodule {
exe_path := _process_exe_by_pid(pid, allocator) or_return info.executable_path = _process_exe_by_pid(pid, allocator) or_return
info.fields += {.Executable_Path} info.fields += {.Executable_Path}
info.executable_path = exe_path
} }
ph := win32.INVALID_HANDLE_VALUE ph := win32.INVALID_HANDLE_VALUE
if need_process_handle { if need_process_handle {
@@ -168,14 +167,12 @@ _process_info_by_pid :: proc(pid: int, selection: Process_Info_Fields, allocator
_ = read_memory_as_slice(ph, process_params.CommandLine.Buffer, cmdline_w) or_return _ = read_memory_as_slice(ph, process_params.CommandLine.Buffer, cmdline_w) or_return
if .Command_Line in selection { if .Command_Line in selection {
cmdline := win32.utf16_to_utf8(cmdline_w, allocator) or_return info.command_line = win32.utf16_to_utf8(cmdline_w, allocator) or_return
info.fields += {.Command_Line} info.fields += {.Command_Line}
info.command_line = cmdline
} }
if .Command_Args in selection { if .Command_Args in selection {
args := _parse_command_line(raw_data(cmdline_w), allocator) or_return info.command_args = _parse_command_line(raw_data(cmdline_w), allocator) or_return
info.fields += {.Command_Args} info.fields += {.Command_Args}
info.command_args = args
} }
} }
if .Environment in selection { if .Environment in selection {
@@ -184,27 +181,22 @@ _process_info_by_pid :: proc(pid: int, selection: Process_Info_Fields, allocator
envs_w := make([]u16, env_len, temp_allocator()) or_return envs_w := make([]u16, env_len, temp_allocator()) or_return
_ = read_memory_as_slice(ph, process_params.Environment, envs_w) or_return _ = read_memory_as_slice(ph, process_params.Environment, envs_w) or_return
envs := _parse_environment_block(raw_data(envs_w), allocator) or_return info.environment = _parse_environment_block(raw_data(envs_w), allocator) or_return
info.fields += {.Environment} info.fields += {.Environment}
info.environment = envs
} }
if .Working_Dir in selection { if .Working_Dir in selection {
TEMP_ALLOCATOR_GUARD() TEMP_ALLOCATOR_GUARD()
cwd_w := make([]u16, process_params.CurrentDirectoryPath.Length, temp_allocator()) or_return cwd_w := make([]u16, process_params.CurrentDirectoryPath.Length, temp_allocator()) or_return
_ = read_memory_as_slice(ph, process_params.CurrentDirectoryPath.Buffer, cwd_w) or_return _ = read_memory_as_slice(ph, process_params.CurrentDirectoryPath.Buffer, cwd_w) or_return
cwd := win32.utf16_to_utf8(cwd_w, allocator) or_return info.working_dir = win32.utf16_to_utf8(cwd_w, allocator) or_return
info.fields += {.Working_Dir} info.fields += {.Working_Dir}
info.working_dir = cwd
} }
} }
if .Username in selection { if .Username in selection {
username := _get_process_user(ph, allocator) or_return info.username = _get_process_user(ph, allocator) or_return
info.fields += {.Username} info.fields += {.Username}
info.username = username
} }
err = nil err = nil
return return
@@ -237,9 +229,8 @@ _process_info_by_handle :: proc(process: Process, selection: Process_Info_Fields
} }
} }
if need_snapmodule { if need_snapmodule {
exe_path := _process_exe_by_pid(pid, allocator) or_return info.executable_path = _process_exe_by_pid(pid, allocator) or_return
info.fields += {.Executable_Path} info.fields += {.Executable_Path}
info.executable_path = exe_path
} }
ph := win32.HANDLE(process.handle) ph := win32.HANDLE(process.handle)
if need_peb { if need_peb {
@@ -270,15 +261,12 @@ _process_info_by_handle :: proc(process: Process, selection: Process_Info_Fields
_ = read_memory_as_slice(ph, process_params.CommandLine.Buffer, cmdline_w) or_return _ = read_memory_as_slice(ph, process_params.CommandLine.Buffer, cmdline_w) or_return
if .Command_Line in selection { if .Command_Line in selection {
cmdline := win32.utf16_to_utf8(cmdline_w, allocator) or_return info.command_line = win32.utf16_to_utf8(cmdline_w, allocator) or_return
info.fields += {.Command_Line} info.fields += {.Command_Line}
info.command_line = cmdline
} }
if .Command_Args in selection { if .Command_Args in selection {
args := _parse_command_line(raw_data(cmdline_w), allocator) or_return info.command_args = _parse_command_line(raw_data(cmdline_w), allocator) or_return
info.fields += {.Command_Args} info.fields += {.Command_Args}
info.command_args = args
} }
} }
@@ -288,9 +276,8 @@ _process_info_by_handle :: proc(process: Process, selection: Process_Info_Fields
envs_w := make([]u16, env_len, temp_allocator()) or_return envs_w := make([]u16, env_len, temp_allocator()) or_return
_ = read_memory_as_slice(ph, process_params.Environment, envs_w) or_return _ = read_memory_as_slice(ph, process_params.Environment, envs_w) or_return
envs := _parse_environment_block(raw_data(envs_w), allocator) or_return info.environment = _parse_environment_block(raw_data(envs_w), allocator) or_return
info.fields += {.Environment} info.fields += {.Environment}
info.environment = envs
} }
if .Working_Dir in selection { if .Working_Dir in selection {
@@ -298,15 +285,13 @@ _process_info_by_handle :: proc(process: Process, selection: Process_Info_Fields
cwd_w := make([]u16, process_params.CurrentDirectoryPath.Length, temp_allocator()) or_return cwd_w := make([]u16, process_params.CurrentDirectoryPath.Length, temp_allocator()) or_return
_ = read_memory_as_slice(ph, process_params.CurrentDirectoryPath.Buffer, cwd_w) or_return _ = read_memory_as_slice(ph, process_params.CurrentDirectoryPath.Buffer, cwd_w) or_return
cwd := win32.utf16_to_utf8(cwd_w, allocator) or_return info.working_dir = win32.utf16_to_utf8(cwd_w, allocator) or_return
info.fields += {.Working_Dir} info.fields += {.Working_Dir}
info.working_dir = cwd
} }
} }
if .Username in selection { if .Username in selection {
username := _get_process_user(ph, allocator) or_return info.username = _get_process_user(ph, allocator) or_return
info.fields += {.Username} info.fields += {.Username}
info.username = username
} }
err = nil err = nil
return return
@@ -337,34 +322,29 @@ _current_process_info :: proc(selection: Process_Info_Fields, allocator: runtime
if .Executable_Path in selection { if .Executable_Path in selection {
exe_filename_w: [256]u16 exe_filename_w: [256]u16
path_len := win32.GetModuleFileNameW(nil, raw_data(exe_filename_w[:]), len(exe_filename_w)) path_len := win32.GetModuleFileNameW(nil, raw_data(exe_filename_w[:]), len(exe_filename_w))
exe_filename := win32.utf16_to_utf8(exe_filename_w[:path_len], allocator) or_return info.executable_path = win32.utf16_to_utf8(exe_filename_w[:path_len], allocator) or_return
info.fields += {.Executable_Path} info.fields += {.Executable_Path}
info.executable_path = exe_filename
} }
if .Command_Line in selection || .Command_Args in selection { if .Command_Line in selection || .Command_Args in selection {
command_line_w := win32.GetCommandLineW() command_line_w := win32.GetCommandLineW()
if .Command_Line in selection { if .Command_Line in selection {
command_line := win32.wstring_to_utf8(command_line_w, -1, allocator) or_return info.command_line = win32.wstring_to_utf8(command_line_w, -1, allocator) or_return
info.fields += {.Command_Line} info.fields += {.Command_Line}
info.command_line = command_line
} }
if .Command_Args in selection { if .Command_Args in selection {
args := _parse_command_line(command_line_w, allocator) or_return info.command_args = _parse_command_line(command_line_w, allocator) or_return
info.fields += {.Command_Args} info.fields += {.Command_Args}
info.command_args = args
} }
} }
if .Environment in selection { if .Environment in selection {
env_block := win32.GetEnvironmentStringsW() env_block := win32.GetEnvironmentStringsW()
envs := _parse_environment_block(env_block, allocator) or_return info.environment = _parse_environment_block(env_block, allocator) or_return
info.fields += {.Environment} info.fields += {.Environment}
info.environment = envs
} }
if .Username in selection { if .Username in selection {
process_handle := win32.GetCurrentProcess() process_handle := win32.GetCurrentProcess()
username := _get_process_user(process_handle, allocator) or_return info.username = _get_process_user(process_handle, allocator) or_return
info.fields += {.Username} info.fields += {.Username}
info.username = username
} }
if .Working_Dir in selection { if .Working_Dir in selection {
// TODO(flysand): Implement this by reading PEB // TODO(flysand): Implement this by reading PEB