Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

console.obj :

Browse Source 
- better mechanism for killing the parent process.


git-svn-id: svn://kolibrios.org@9167 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2021-08-29 19:36:10 +00:00
parent f270456bab
commit d0336453fe
1 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
programs/develop/libraries/console_coff/console.asm
View File

@ -9,30 +9,30 @@ public EXPORTS
section '.flat' code readable align 16 section '.flat' code readable align 16
include 'font.inc' include 'font.inc'
include 'conscrl.inc' include 'conscrl.inc'
include '../../../struct.inc'
struc process_info struct process_info
{ cpu_usage dd ? ; +0
.cpu_usage dd ? ; +0 window_stack_position dw ? ; +4
.window_stack_position dw ? ; +4 window_stack_value dw ? ; +6
.window_stack_value dw ? ; +6 dw ? ; +8
dw ? ; +8 process_name rb 12 ; +10
.process_name rb 12 ; +10 memory_start dd ? ; +22
.memory_start dd ? ; +22 used_memory dd ? ; +26
.used_memory dd ? ; +26 PID dd ? ; +30
.PID dd ? ; +30 box.x dd ? ; +34
.box.x dd ? ; +34 box.y dd ? ; +38
.box.y dd ? ; +38 box.width dd ? ; +42
.box.width dd ? ; +42 box.height dd ? ; +46
.box.height dd ? ; +46 slot_state dw ? ; +50
.slot_state dw ? ; +50 dw ? ; +52
dw ? ; +52 client_box.x dd ? ; +54
.client_box.x dd ? ; +54 client_box.y dd ? ; +58
.client_box.y dd ? ; +58 client_box.width dd ? ; +62
.client_box.width dd ? ; +62 client_box.height dd ? ; +66
.client_box.height dd ? ; +66 wnd_state db ? ; +70
.wnd_state db ? ; +70
rb (1024-71) rb (1024-71)
} ends
OP_EXIT = 1 OP_EXIT = 1
OP_SET_TITLE = 2 OP_SET_TITLE = 2
@ -151,7 +151,26 @@ con_init:
pop edi pop edi
and byte [con_flags+1], not 2 and byte [con_flags+1], not 2
; create console thread ; Get parent TID
mov eax, 68 ; SF_SYS_MISC
mov ebx, 12 ; SSF_MEM_ALLOC
mov ecx, sizeof.process_info
int 0x40
mov ebx, eax
mov eax, 9 ; SF_THREAD_INFO
mov ecx, -1
int 0x40
mov eax, [ebx+process_info.PID]
mov [con.parent_tid], eax
mov eax, 68 ; SF_SYS_MISC
mov ecx, ebx
mov ebx, 13 ; SSF_MEM_FREE
int 0x40
; Create console thread
push 51 push 51
pop eax pop eax
xor ebx, ebx xor ebx, ebx
@ -2622,11 +2641,10 @@ con.msg_loop:
jmp con.mouse jmp con.mouse
con.button: con.button:
; we have only one button, close ; we have only one button, close
mov eax, 18 mov eax, 18 ; SF_SYSTEM
mov ebx, 18 mov ebx, 18 ; SSF_TERMINATE_THREAD_ID
mov ecx,[process_info_buffer+30] mov ecx, [con.parent_tid]
dec ecx int 0x40 ; (kill the parent thread)
int 0x40 ; kill parent process
con.thread_exit: con.thread_exit:
or byte [con_flags+1], 2 or byte [con_flags+1], 2
@ -3444,6 +3462,7 @@ con.bDownPressed_saved db ?
con.bScrollingUp_saved db ? con.bScrollingUp_saved db ?
con.bScrollingDown_saved db ? con.bScrollingDown_saved db ?
con.parent_tid dd ?
con.input_buffer rw 128 con.input_buffer rw 128
con.input_buffer_end = $ con.input_buffer_end = $