WebSVN – Kolibri OS – Diff – /programs/develop/heed/trunk/heed.asm

 ; Shift+~               - á¬¥  ª®¤¨à®¢ª¨ (cp866 ¨«¨ cp1251,koi8-r)
 ;  ¬ïâì ¯¥à¥à á¯à¥¤¥«ï¥âáï   ã¢¥«¨ç¥¨¥ i umen'shenie.
 ;  ©« § £àã¦ ¥âáï æ¥«¨ª®¬.
-;  ªà®áë load_lib.mac, editbox_ex ¨ ¡¨¡«¨®â¥ªã box_lib.obj á®§¤ «¨:
+;  ªà®áë load_lib.mac ¨ ¡¨¡«¨®â¥ªã box_lib.obj á®§¤ «¨:
 ;  - Alexey Teplov / «¥ªá¥© ¥¯«®¢
 ; Mario79, Mario - Marat Zakiyanov /  à â  ª¨ï®¢
 ; Diamondz - Evgeny Grechnikov / ¢£¥¨© à¥ç¨ª®¢ ¨ ¤à.
+;
 ; staper@inbox.ru
 ; babalbes@yandex.ru
 ;--------------------------------------------------------------------
 use32
-	org	0x0
+	org	0
 	db	'MENUET01'
-	dd	0x1
+	dd	1
 	dd	START	;program start
 	dd	I_END	;program image	size
 	dd	(D_END+0x600) and not 3	;required amount of memory
 ;--------------------------------------------------------------------
 FIRST_HEX equ 0*65536+24
 scroll_width_size equ 15
 ;--------------------------------------------------------------------
 struct	f70
-	func_n	rd 1
+	Function	rd 1
-	param1	rd 1
+	Position	rd 1
-	param2	rd 1
+	Flags	rd 1
-	param3	rd 1
+	Count	rd 1
-	param4	rd 1
+	Buffer	rd 1
 	rezerv	rb 1
-	name	rd 1
+	FileName	rd 1
 ends
 ;--------------------------------------------------------------------
 START:
-	mcall	68,11
+	mcall	SF_SYS_MISC,SSF_HEAP_INIT
 load_libraries l_libs_start,end_l_libs
 ;--------------------------------------------------------------------
 ;OpenDialog	initialisation
 	lodsb
 	stosb
 	test	eax,eax
 	jnz	@b
-	mcall	40,0x27
+	mcall	SF_SET_EVENTS_MASK,0x27
-	mcall	68,12,32*1024	;áâà ¨çë© ¡ãä¥à
+	mcall	SF_SYS_MISC,SSF_MEM_ALLOC,32*1024	;áâà ¨çë© ¡ãä¥à
 	mov	[screen_table],eax
-	mcall	68,12,4*1024
+	mcall	SF_SYS_MISC,SSF_MEM_ALLOC,4*1024
 	mov	[file_buffer],eax
 	sub	esi,cur_dir_path
 	mov	[edit1.pos],esi
 	mov	[edit1.size],esi
 	;®¡é¥á¨áâ¥¬ë¥ ª« ¢¨è¨ ¤«ï Shift+ªãàá®àë
-;	mcall	66,4,75,1
+;	mcall	SF_KEYBOARD,SSF_SET_SYS_HOTKEY,75,1
-;	mcall	66,,77
+;	mcall	SF_KEYBOARD,,77
-;	mcall	66,,72
+;	mcall	SF_KEYBOARD,,72
-;	mcall	66,,80
+;	mcall	SF_KEYBOARD,,80
 	call	ready_screen_buffer
 ;	jmp	open_file
-	mcall	9,procinfo,-1
+	mcall	SF_THREAD_INFO,procinfo,-1
 	mov	ecx,[ebx+30]	; PID
-	mcall	18,21
+	mcall	SF_SYSTEM,SSF_GET_THREAD_SLOT
 	mov	[active_process],eax	; WINDOW SLOT
 ;--------------------------------------------------------------------
 ; open the file if program has a file path, when it was launched
 	cmp	[fname_buf],byte 0
 	jne	open_dialog.start
 ;--------------------------------------------------------------------
 redraw_all:
 	call	control_minimal_window_size
 	call	draw_window_1
 still:
-	mcall	10
+	mcall	SF_WAIT_EVENT
 	cmp	eax,6
 	jz	button
 	jmp	still
 ;---------------------------------------------------------------------
 control_minimal_window_size:
 	pusha
-	mcall	9,procinfo,-1
+	mcall	SF_THREAD_INFO,procinfo,-1
 	mov	eax,[ebx+70]
 	test	eax,10b
 	jnz	.end
 	test	eax,100b
 	jnz	.end
 	mov	eax,procinfo
 	mov	eax,[eax+46]
 	cmp	eax,299
 	jae	@f
 	mov	esi,299
-	mcall	67,-1,ebx,ebx
+	mcall	SF_CHANGE_WINDOW,-1,ebx,ebx
 @@:
 	mov	edx,-1
 	mov	eax,procinfo
 	mov	eax,[eax+42]
 	cmp	eax,399
 	jae	@f
 	mov	edx,399
-	mcall	67,-1,ebx,,ebx
+	mcall	SF_CHANGE_WINDOW,-1,ebx,,ebx
 @@:
 .end:
 	popa
 	ret
 ;---------------------------------------------------------------------
 	call	main_area
 .end:
 	ret
 ;---------------------------------------------------------------------
 key:
-	mcall	2
+	mcall	SF_GET_KEY
 	dec	al
 	jz	still
 	dec	al
 	jz	key.syst
 	cmp	ah,2
 	cmp	ah,77
 	cmp	ah,80
 	jmp	still
 ;--------------------------------------------------------------------
 button:
-	mcall	17
+	mcall	SF_GET_BUTTON
 	dec	ah
 	jnz	still
 	jmp	close_prog
 ;--------------------------------------------------------------------
 align	4
 mouse:
-	mcall	18,7
+	mcall	SF_SYSTEM,SSF_GET_ACTIVE_WINDOW
 	cmp	[active_process],eax
 	jne	still
-	mcall	37,7
+	mcall	SF_MOUSE_GET,SSF_SCROLL_DATA
 	test	eax,eax
 	jz	.menu_bar_1;.mouse
 	bt	eax,15
 	jne	still
 	call	create_help_window
 	jmp	still
 ;--------------------------------------------------------------------
 .scroll_bar:
-;	mcall	37,2
+;	mcall	SF_MOUSE_GET,SSF_BUTTON
 ;	test	eax,eax
 ;	jnz	@f
 ;	btr	[flags],5
 ;	btr	[flags],7
 ;	jmp	still
 .mouse:
 .vertical:
-	mcall	37,2
+	mcall	SF_MOUSE_GET,SSF_BUTTON
 	test	eax,eax
 	jnz	@f
 	btr	[flags],5
 	btr	[flags],7
 	bt	[flags],5
 	jc	@f
 	bt	[flags],7
 	jc	.horizontal_0
-	mcall	37,1
+	mcall	SF_MOUSE_GET,SSF_WINDOW_POSITION
 	shr	eax,16
 	cmp	ax,[scroll_bar_data_vertical.start_x]
 	jb	.horizontal
 	sub	ax,[scroll_bar_data_vertical.start_x]
 .horizontal:
 	mov	eax,[scroll_bar_data_horizontal.max_area]
 	cmp	eax,[scroll_bar_data_horizontal.cur_area]
 	jbe	.other
-	mcall	37,1
+	mcall	SF_MOUSE_GET,SSF_WINDOW_POSITION
 	cmp	ax,[scroll_bar_data_horizontal.start_y]
 	jb	still
 	sub	ax,[scroll_bar_data_horizontal.start_y]
 	cmp	ax,[scroll_bar_data_horizontal.size_y]
 	jge	still
 	; mouse event for Horizontal ScrollBar
 .horizontal_0:
-;	mcall	37,2
+;	mcall	SF_MOUSE_GET,SSF_BUTTON
 ;	test	eax,eax
 ;	jnz	@f
 ;	btr	[flags],5
 ;	btr	[flags],7
 ;	jmp	still
 ;@@:;	bt	[flags],7
 ;	jc	@f
-;	mcall	37,1
+;	mcall	SF_MOUSE_GET,SSF_WINDOW_POSITION
 ;	shr	eax,16
 ;	cmp	ax,[scroll_bar_data_vertical.start_x]
 	inc	ecx
 .5:
 	div	ecx
 	mov	[scroll_bar_data_vertical.position],eax
-	mcall	37,2	;ª¯®¯ª 	¬ëè¨  ¦ â  - ¥â á¬ëá«  ¯¥à¥à¨á®¢ë¢ âì ScrollBar
+	mcall	SF_MOUSE_GET,SSF_BUTTON	;ª¯®¯ª 	¬ëè¨  ¦ â  - ¥â á¬ëá«  ¯¥à¥à¨á®¢ë¢ âì ScrollBar
 	test	eax,eax
 	jnz	.4
 	push	dword scroll_bar_data_vertical
 	add	edi,palitra
 	shl	bx,4
 	add	ebx,font_buffer
 	mov	ecx,8*65536+16
 	mov	ebp,0
-	mcall	65
+	mcall	SF_PUT_IMAGE_EXT
 	pop	edi
 	add	edi,2
 	mov	ax,[scroll_bar_data_vertical.start_x]
 	sub	ax,bx
 	shl	ebx,16
 	mov	bx,ax
 	mov	cx,16
-	mcall	13,,,frgrd_color
+	mcall	SF_DRAW_RECT,,,frgrd_color
 .ls1:
 	popad
 	jmp	@f
 ;--------------------------------------------------------------------
 .loop_str:
 	jnz	.no_inc_ebx
 	inc	ebx
 .no_inc_ebx:
 	sub	ecx,2*65536
 	mov	cx,2
-	mcall	13
+	mcall	SF_DRAW_RECT
 	popad
 	pushad
 	mov	ecx,edx
 	mov	ax,[scroll_bar_data_vertical.size_x]
 	test	ax,ax
 	jnz	.no_inc_ebx_2
 	inc	ebx
 .no_inc_ebx_2:
-	mcall	13,,,frgrd_color
+	mcall	SF_DRAW_RECT,,,frgrd_color
 .10:
 	popad
 	jmp	@f
 ;--------------------------------------------------------------------
 .next_string:
 	xor	ebx,ebx
 	mov	bl,al
 	shl	ebx,4
 	add	ebx,font_buffer
 	push	eax
-	mcall	65
+	mcall	SF_PUT_IMAGE_EXT
 	pop	eax
 	sub	edx,8*65536
 	dec	dword [esp]
 	jnz	@b
 	add	esp,4
 	shl	eax,4
 	add	eax,font_buffer
 	xchg	eax,ebx
 	mov	edi,palitra.5
 	mov	ebp,0
-	mcall	65
+	mcall	SF_PUT_IMAGE_EXT
 	add	edx,8*65536
 	pop	edi
 	inc	edi
 	dec	dword [esp]
 	jnz	.2
 	mov	[prev_f_size_bl],eax
 	xor	edx,edx
 	mul	ecx
 	add	ecx,eax
 .1:
-	mcall	68,20,,[file_buffer]
+	mcall	SF_SYS_MISC,SSF_MEM_REALLOC,,[file_buffer]
 .ret:
 	popad
 	ret
 ;--------------------------------------------------------------------
 align	4
 ;---------------------------------------------------------------------
 align	4
 draw_window:
 	call	create_title
 	xor	esi,esi
-	mcall	0,100*65536+653,100*65536+360,((0x73 shl 24) + frgrd_color),,title_buf	;title
+	mcall	SF_CREATE_WINDOW,100*65536+653,100*65536+360,((0x73 shl 24) + frgrd_color),,title_buf	;title
-	mcall	9,threath_buf,-1
+	mcall	SF_THREAD_INFO,threath_buf,-1
 ;	cmp	byte [threath_buf+70],3	;®ª® á¢ñàãâ® ¢ § £®«®¢®ª?
 ;	jnae	@f
 	mov	eax,[threath_buf+70]
 	test	eax,10b
 	jnz	.@d
 	cmp	dword [threath_buf+66],(24*4)	;¯à®¢¥àª  ¬¨¨¬ «ì®© ¢ëá®âë
 	jae	@f
 	mov	esi,dword [threath_buf+46]
 	sub	esi,dword [threath_buf+66]
 	add	esi,24*4
-	mcall	67,-1,-1,-1,
+	mcall	SF_CHANGE_WINDOW,-1,-1,-1,
 	jmp	.@d
 ;--------------------------------------
 @@:
 	cmp	dword [threath_buf+62],(26*6)	;¯à®¢¥àª  ¬¨¨¬ «ì®© è¨à¨ë
 	jae	@f
 	mov	edx,dword [threath_buf+42]
 	sub	edx,dword [threath_buf+62]
 	add	edx,26*6
-	mcall	67,-1,-1,,-1
+	mcall	SF_CHANGE_WINDOW,-1,-1,,-1
 	jmp	.@d
 ;--------------------------------------
 @@:
 	mov	eax,[file_size]
 	mov	ebx,[bytes_per_line]
 	inc	ebx
 	mov	ecx,(FIRST_HEX-18)
 	ror	ecx,16
 	mov	cx,18
 	ror	ecx,16
-	mcall	13,,,frgrd_color	;¯®«®á  á¢¥àåã
+	mcall	SF_DRAW_RECT,,,frgrd_color	;¯®«®á  á¢¥àåã
 	mcall	,,18,panel_clr1	;¢¥àåïï ¯ ¥«ì
 	dec	ebx
-	mcall	38,,<18,18>,panel_clr2
+	mcall	SF_DRAW_LINE,,<18,18>,panel_clr2
 	mov	ecx,dword [threath_buf+66]
 	sub	cx,18
 	push	cx
 	shl	ecx,16
 	pop	cx
 	mcall	,,,panel_clr3	;¨¦ïï ¯ ¥«ì
 	inc	ebx
 	add	ecx,1*65536
 	mov	cx,18
-	mcall	13,,,panel_clr1
+	mcall	SF_DRAW_RECT,,,panel_clr1
 	shl	ecx,16
 	add	cx,dx
 	sub	ecx,1*65536
 	movzx	ebx,	word [scroll_bar_data_vertical.start_x]
 	inc	ebx
-	mcall	13,,,frgrd_color
+	mcall	SF_DRAW_RECT,,,frgrd_color
 	pop	eax
 	bts	[flags],6
 	ret
 ;--------------------------------------------------------------------
 align	4
 start_draw:
-	mcall	12,1
+	mcall	SF_REDRAW,SSF_BEGIN_DRAW
 	ret
 ;--------------------------------------------------------------------
 end_draw:
-	mcall	12,2
+	mcall	SF_REDRAW,SSF_END_DRAW
 	ret
 ;--------------------------------------------------------------------
 close_prog:
-	mcall	-1
+	mcall	SF_TERMINATE_PROCESS
 ;--------------------------------------------------------------------
 change_codepage:	;¬¥ï¥¬ ¢â®àãî ¯®«®¢¨ã â ¡«¨æë
 	test	ah,ah
 	jnz	@f
 	btc	[flags],4
 	push	edi
 	mov	bl,[edi]
 	shl	bx,4
 	add	ebx,font_buffer
 	mov	edi,palitra.5
-	mcall	65
+	mcall	SF_PUT_IMAGE_EXT
 	add	edx,8*65536
 	pop	edi
 	inc	edi
 	dec	dword [esp]
 	jnz	@b
 	mov	bl,[edi]
 	shl	bx,4
 .2:
 	add	ebx,font_buffer
 	mov	edi,palitra.5
-	mcall	65
+	mcall	SF_PUT_IMAGE_EXT
 	add	edx,8*65536
 	pop	edi
 	inc	edi
 	dec	dword [esp]
 	jnz	.1
 	;help window
 create_help_window:
 	pushad
         cmp	[help_is_open_already], 1
         jne	@f
-  	mov     ECX, [help_window_pid]
+  	mov     ecx, [help_window_pid]
-        mcall   18, 21
+        mcall   SF_SYSTEM, SSF_GET_THREAD_SLOT
-        xchg    EAX, ECX
+        xchg    eax, ecx
-        mcall   18, 3
+        mcall   SF_SYSTEM, SSF_FOCUS_WINDOW
 	popad
         ret
 ;---------------------------------------------------------------------
 @@:
-	mcall	51,1,.thread,(.threat_stack+16*4)
+	mcall	SF_CREATE_THREAD,1,.thread,(.threat_stack+16*4)
         mov     [help_is_open_already], 1
-        mov     [help_window_pid], EAX
+        mov     [help_window_pid], eax
 	popad
 	ret
 ;--------------------------------------------------------------------
 .thread:
 	call	.window
 ;--------------------------------------------------------------------
 .still:
-	mcall	10
+	mcall	SF_WAIT_EVENT
 	dec	al
 	jz	.red
 	dec	al
 	jz	.key
 	dec	al
 	jz	.button
 	jmp	.still
 ;--------------------------------------------------------------------
         and	[help_is_open_already], 0
-	mcall	-1
+	mcall	SF_TERMINATE_PROCESS
 .button:
-	mcall	17,1
+	mcall	SF_GET_BUTTON
 	cmp	ah,1
 	jne	@f
         and	[help_is_open_already], 0
-	mcall	-1
+	mcall	SF_TERMINATE_PROCESS
 @@:
 	cmp	ah,2
 	jne	@f
 	mov	edi,(help_end-help_text)/51
 	movzx	eax,[cur_help_string]
 	je	.still
 	dec	[cur_help_string]
 	jmp	.red
 ;--------------------------------------------------------------------
 .key:
-	mcall	2
+	mcall	SF_GET_KEY
 	jmp	.still
 ;--------------------------------------------------------------------
 .red:
 	call	.window
 	jmp	.still
 ;--------------------------------------------------------------------
 .window:
 	pushad
-	mcall	12,1
+	mcall	SF_REDRAW,SSF_BEGIN_DRAW
-	mcall	0,50*65536+320,0x70*65536+240,0x13000000,,help_but_text
+	mcall	SF_CREATE_WINDOW,50*65536+320,0x70*65536+240,0x13000000,,help_but_text
-	mcall	8,<130,20>,<6,12>,2,0xaaaaaa
+	mcall	SF_DEFINE_BUTTON,<130,20>,<6,12>,2,0xaaaaaa
 	mcall	,<150,20>,,3,
 	mov	ebx,8*65536+15
 	mov	ecx,0x00DDDDDD
 	xor	edx,edx
 	movzx	eax,byte [cur_help_string]
 	sub	edi,eax
 	mov	esi,51
 	mul	si
 	mov	edx,help_text
 	add	edx,eax
-	mov	eax,4
+	mov	eax,SF_DRAW_TEXT
 @@:
 	add	ebx,0x10
 	mcall
 	add	edx,51
 	dec	edi
 	jnz	@b
-	mcall	12,2
+	mcall	SF_REDRAW,SSF_END_DRAW
 	popad
 	ret
 ;--------------------------------------------------------------------
 .threat_stack:	times	16	dd	0
 ;--------------------------------------------------------------------
 open_file:
-	mov	[func_70.func_n],5
+	mov	[func_70.Function],SSF_GET_INFO
-	mov	[func_70.param1],0
+	mov	[func_70.Position],0
-	mov	[func_70.param2],0
+	mov	[func_70.Flags],0
-	mov	[func_70.param3],0
+	mov	[func_70.Count],0
-	mov	[func_70.param4],bufferfinfo
+	mov	[func_70.Buffer],bufferfinfo
 	mov	[func_70.rezerv],0
-	mov	[func_70.name],file_name
+	mov	[func_70.FileName],file_name
-	mcall	70,func_70
+	mcall	SF_FILE,func_70
 	test	al,al	;ä ©«  ©¤¥?
 	jz	@f
-	mcall	4,400*65536+31,0x80CC0000,error_open_file_string
+	mcall	SF_DRAW_TEXT,400*65536+31,0x80CC0000,error_open_file_string
 	jmp	open_file
 ;--------------------------------------------------------------------
-@@:
-;	mov	edx,[blocks_counter]
-;	mov	edi,[blocks_table]
-;	@@:	mov	ecx,[edi]	;¢ëá¢®¡®¦¤ ¥¬:
-;	mcall	68,13	;¡«®ª¨ ä ©«
-;	add	edi,8
-;	dec	edx
-;	jnz	@b
-;	mcall	68,13,[blocks_table]	;â ¡«¨æã
 @@:
 	mov	eax,	dword [bufferfinfo+32]	;ª®¯¨àã¥¬ à §¬¥à ä ©«
-	mov	[file_size],eax
-;	mov	ebx,65536	;64 ¡«®ª
-;	xor	edx,edx
-;	div	ebx
-;	push	dx	;¤«¨  ¯®á«¥¤¥£® ¡«®ª
-;	test	dx,dx
-;	jz	@f
-;	inc	eax
-;	@@:	test	eax,eax
-;	jnz	@f
-;	inc	eax
-;	@@:	mov	[blocks_counter],eax
-;	sal	eax,3;*8	;à §¬¥à â ¡«¨æë á ¨¤¥ªá ¬¨ ¡«®ª®¢
-;;	add	eax,32	;à¥è ¥¬	¯à®¡«¥¬ã á 32 ä ©« ¬¨
-;	mov	ecx,eax	;¢ë¤¥«ï¥¬ ¯ ¬ïâì:
-;	mcall	68,12	;¯®¤ â ¡«¨æã
-;	mov	[blocks_table],eax
-;	mov	edi,eax
-;	mov	ecx,[blocks_counter]
-;	@@:	mov	dword [edi+4],65536
-;	add	edi,8
-;	loop	@b
-;	xor	edx,edx
-;	pop	dx	;¤«¨  ¯®á«¥¤¥£® ¡«®ª
-;	mov	dword [edi-4],edx
-;	mov	edx,[blocks_counter]
-;	mov	edi,[blocks_table]
-;@@:	mcall	68,12,[edi+4]	;¯®¤ ¡«®ª
-;	mov	[edi],eax
-;	add	edi,8
-;	dec	edx
-;	jnz	@b
+	mov	[file_size],eax
-	mcall	68,13,[file_buffer]
+	mcall	SF_SYS_MISC,SSF_MEM_FREE,[file_buffer]
 	test	eax,eax
 	jnz	@f
 	;§¤¥áì ®è¨¡ª    ¥ ®á¢®¡®¦¤¥¨¥ ¡«®ª
+@@:
+	mov ecx,[file_size]
+	or ecx,ecx
+	jnz @f
+	inc ecx ;¥á«¨ à §¬¥à ä ©«  0 ¡ ©â
 @@:
-	mcall	68,12,[file_size]
+	mcall	SF_SYS_MISC,SSF_MEM_ALLOC
-	mov	[file_buffer],eax
-;;¨¬¥¥¬ â ¡«¨æã: [ DWORD ãª § â¥«ì   ¯¥à¢ë© í«¥¬¥â ¡«®ª  : DWORD ¤«¨  ¡«®ª  ]
+	mov	[file_buffer],eax
-;	mov	ecx,[blocks_counter]	;®âªàë¢ ¥¬ ä ©«
+;;¨¬¥¥¬ â ¡«¨æã: [ DWORD ãª § â¥«ì   ¯¥à¢ë© í«¥¬¥â ¡«®ª  : DWORD ¤«¨  ¡«®ª  ]
 ;	mov	edi,[blocks_table]
-	mov	[func_70.func_n],0
+	mov	[func_70.Function],SSF_READ_FILE
-	mov	[func_70.param1],0
-	mov	[func_70.param2],0
+	mov	[func_70.Position],0
-	mov	[func_70.rezerv],0
+	mov	[func_70.Flags],0
-	mov	[func_70.name],file_name
+	mov	[func_70.rezerv],0
-;@@:
+	mov	[func_70.FileName],file_name
 	push	dword [file_size];dword [edi+4]
-	pop	dword [func_70.param3]
-	push	dword [file_buffer];dword [edi]
-	pop	dword [func_70.param4]
-	mcall	70,func_70
+	pop	dword [func_70.Count]
-;	add	edi,8
+	push	dword [file_buffer];dword [edi]
-;	add	dword [func_70.param1],65536
+	pop	dword [func_70.Buffer]
-;	loop	@b
+	mcall	SF_FILE,func_70
 	push    dword OpenDialog_data
 	call    [OpenDialog_Start]
-;	cmp	[OpenDialog_data.status],2	; OpenDialog does not start
 ;;	je	.sysxtree	; some kind of alternative, instead OpenDialog
-;	je	save_file
+;	cmp	[OpenDialog_data.status],2	; OpenDialog does not start
 	cmp	[OpenDialog_data.status],1
 	jne	still
 	mov	esi,fname_buf
 	mov	[edit1.size],esi
 	mov	[edit1.pos],esi
 ;	jmp	save_file
 ;-------------------------------------------------------------------------------
 save_file:	;á®åà ï¥¬ ä ©«
-	mov	[func_70.func_n],2
+	mov	[func_70.Function],SSF_CREATE_FILE
-	mov	[func_70.param1],0
+	mov	[func_70.Position],0
-	mov	[func_70.param2],0
+	mov	[func_70.Flags],0
 	push	[file_size]
-	pop	[func_70.param3]
+	pop	[func_70.Count]
 	push	[file_buffer]
-	pop	[func_70.param4]
+	pop	[func_70.Buffer]
 	mov	[func_70.rezerv],0
-	mov	[func_70.name],file_name
+	mov	[func_70.FileName],file_name
-	mcall	70,func_70
+	mcall	SF_FILE,func_70
 	cmp	al,0	;á®åà ñ ã¤ ç®?
 	je	redraw_all
-	mcall	4,400*65536+31,0x80CC0000,error_save_file_string
+	mcall	SF_DRAW_TEXT,400*65536+31,0x80CC0000,error_save_file_string
 	jmp	save_file
 ;-------------------------------------------------------------------------------
 draw_ed_box:	;à¨á®¢ ¨¥ edit box'
 .1:
 	push	eax	ebx	ecx	edx
-	mcall	13,180*65536+220,25*65536+70,0xaaaaaa
+	mcall	SF_DRAW_RECT,180*65536+220,25*65536+70,0xaaaaaa
 	bt	[flags],9
 	jnc	@f
-	mcall	4,246*65536+35,0x80ffffff,sel_text
+	mcall	SF_DRAW_TEXT,246*65536+35,0x80ffffff,sel_text
 @@:
 	bt	[flags],2
 	jnc	@f
 	push	dword Option_boxs
 	call	[option_box_draw]
 	push	dword [eax]
 	call	[edit_box_draw]
 	loop	@b
 	pop	edx	ecx	ebx	eax
 .2:
-	mcall	10
+	mcall	SF_WAIT_EVENT
 	cmp	al,6
 	je	.mouse
 	cmp	al,3
 	je	.button
 	cmp	al,2
 	call	[option_box_mouse]
 @@:
 	jmp	.2
 ;--------------------------------------------------------------------
 .keys:
-	mcall	2
+	mcall	SF_GET_KEY
 	cmp	ah,13
 	je	.4
 	cmp	ah,27
 	je	.3
 	push	dword [ed_box_data+4];[esp]
 	call	[edit_box_key]
 	jmp	.2
 ;--------------------------------------------------------------------
 .button:
-	mcall	17
+	mcall	SF_GET_BUTTON
 	cmp	ah,1
 	jne	.2
 	jmp	close_prog
 .3:
 	btr	[flags],2
 	btr	[flags],3
 	add	esp,4
 	jmp	redraw_all
 .4:
-	mcall	13,180*65536+220,25*65536+70,frgrd_color
+	mcall	SF_DRAW_RECT,180*65536+220,25*65536+70,frgrd_color
 	ret
 ;--------------------------------------------------------------------
 strtohex:
 ;enter: edi - pointer to string,ebx - pointer to size of string; exit: eax in hex
 	mov	esi,hex8_string
 	mov	eax,[shblock_end]
 	sub	eax,[shblock_beg]
 	inc	eax
 	mov	ecx,eax
 	mov	[copy_len],eax
-	mcall	68,20,,[copy_buf]
+	mcall	SF_SYS_MISC,SSF_MEM_REALLOC,,[copy_buf]
 	mov	esi,[shblock_beg]
 	mov	edi,[copy_buf]
 	add	esi,[file_buffer]
 	mov	ecx,[copy_len]
 	cld
 	push    dword OpenDialog_data
 	call    [OpenDialog_Start]
 ;	cmp	[OpenDialog_data.status],2	; OpenDialog does not start
-;	je	.sysxtree	; some kind of alternative, instead OpenDialog
+;	cmp	[OpenDialog_data.status],2	; OpenDialog does not start
 	cmp	[OpenDialog_data.status],1
 	jne	still
 .start:

Subversion Repositories Kolibri OS

(root)/programs/develop/heed/trunk/heed.asm – Rev 8236 → 8255