WebSVN – Kolibri OS – Diff – /programs/media/log_el/trunk/log_el.asm

 use32
-	org 0x0
+	org 0
 	db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
 	dd 1,start,i_end,mem,stacktop,0,sys_path
 ini_def_c_bkgnd equ 0
 include '../../../macros.inc'
 include '../../../proc32.inc'
 include '../../../KOSfuncs.inc'
+include '../../../load_img.inc'
-include '../../../load_img.inc'
+include '../../../load_lib.mac'
 include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
 include 'le_pole.inc'
 include 'le_signal.inc'
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
+@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 caption db '®£¨ç¥áª¨¥ í«¥¬¥âë 13.02.16',0 ;¯®¤¯¨áì ®ª
 , 1,-1, 0,\
 	  -1, 0, 0,-1,\
 ,-1, 1, 0
-IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-image_data_toolbar dd 0
-icon_tl_sys dd 0 ;ãª § â¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï á¨áâ¥¬ëå ¨ª®®ª
-icon_toolbar dd 0 ;ãª § â¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï ¨ª®®ª ®¡ê¥ªâ®¢
-image_data_gray dd 0 ;¯ ¬ïâì á ¢à¥¬¥ë¬¨ á¥àë¬¨ ¨§®¡à ¦¥¨ï¬¨ ¢ ä®à¬ â¥ 24-bit, ¨§ ª®â®àëå ¡ã¤ãâ á®§¤ ¢ âìáï âà ä à¥âë
+IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
 cursors_count equ 4
 align 4
 start:
 	load_libraries l_libs_start,l_libs_end
 	;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨« áì ¡¨¡«¨®â¥ª
-	mov	ebp,lib_7
+	mov	ebp,lib4
 	cmp	dword [ebp+ll_struc_size-4],0
 	jz	@f
 		mcall SF_TERMINATE_PROCESS
 	@@:
 	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
 	mcall SF_SET_EVENTS_MASK,0x27
 	;*** áç¨âë¢ ¨¥  áâà®¥ª ¨§ *.ini ä ©«
-	copy_path ini_name,sys_path,file_name,0x0
+	copy_path ini_name,sys_path,file_name,0
 	stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_bkgnd,ini_def_c_bkgnd
 	or  edx,(3 shl 24)+0x10000000+0x20000000
 	mov edi,caption
 	mcall SF_CREATE_WINDOW, (20 shl 16)+580,(20 shl 16)+415
 	; *** á®§¤ ¨¥ ª®¯®ª   ¯ ¥«ì ***
-	mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (panel_0_coord_top shl 16)+20, 3,, [sc.work_button]
+	mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (panel_0_coord_top shl 16)+20, 3, [sc.work_button]
 	add ebx,25 shl 16
 	mov dword[wScr2.all_redraw],1
 	stdcall [tl_draw], tree2
 	stdcall pole_draw_pok, pole
-	; *** á®§¤ ¨¥ ª®¯®ª ãáâ ®¢ª¨ á¨£ «®¢ set_0 ¨ set_1 ***
-	mov esi,[sc.work_button]
+	; *** á®§¤ ¨¥ ª®¯®ª ãáâ ®¢ª¨ á¨£ «®¢ set_0 ¨ set_1 ***
-	mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (panel_1_coord_top shl 16)+20, 20
+	mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (panel_1_coord_top shl 16)+20, 20, [sc.work_button]
 	add ebx,25 shl 16
-	mov edx,21
+	inc edx
 	int 0x40
 	add ebx,30 shl 16
-	mov edx,22
+	inc edx
 	int 0x40
 	add ebx,25 shl 16
-	mov edx,23
+	inc edx
 	int 0x40
 	add ebx,25 shl 16
-	mov edx,24
+	inc edx
 	int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16)
 	int 0x40
-	; *** á®§¤ ¨¥ ª®¯®ª à¨á®¢ ¨ï ¯à®¢®¤  ***
-	mov esi,[sc.work_button]
+	; *** á®§¤ ¨¥ ª®¯®ª à¨á®¢ ¨ï ¯à®¢®¤  ***
-	mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (panel_2_coord_top shl 16)+20, 30
+	mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (panel_2_coord_top shl 16)+20, 30, [sc.work_button]
 	add ebx,30 shl 16
 shem_colors:
 	dd color_s0, color_s1, color_s2, color_s3
 color_captions dd 0x808080
-align 4
-open_file_lif:
-	rb 2*4096 ;®¡« áâì ¤«ï ®âªàëâ¨ï ä ©«®¢
-.end:
 align 4
 but_open_file:
 	pushad
 	copy_path open_dialog_name,communication_area_default_path,file_name,0
 	mov [OpenDialog_data.type],0
 		mov dword[shem_w],5
 		mov dword[shem_h],5
 		mov esi,txt_size
 		call str_analiz_r
-		cmp edi,0
+		or edi,edi
-		je @f
+		jz @f
 			stdcall str_len,esi
 			add edi,eax
 			stdcall conv_str_to_int,edi
 			cmp eax,5
 		stdcall [tl_node_add], tree1,(el_icon_group shl 16),txt_elements-capt_offs
 		stdcall [tl_cur_next], tree1
 		mov esi,txt_elements
 		call str_analiz_r
-		cmp edi,0
+		or edi,edi
-		je .end_elems
+		jz .end_elems
 			stdcall str_len,esi
 			add edi,eax
 			stdcall conv_str_to_int,edi
 			cmp eax,0
 		push edx
 		mov edx,[ebx+offs_cell_x]
 		inc edx
 		push edx
 		stdcall pole_cell_find, edi
-		cmp eax,0
+		or eax,eax
-		je @f
+		jz @f
 			or dword[napr],1
 		@@:
 		mov edx,[ebx+offs_cell_y]
 		inc edx
 		push edx
 		mov edx,[ebx+offs_cell_x]
 		push edx
 		stdcall pole_cell_find, edi
-		cmp eax,0
+		or eax,eax
-		je @f
+		jz @f
 			or dword[napr],2
 		@@:
 		mov edx,[ebx+offs_cell_y]
 		push edx
 		mov edx,[ebx+offs_cell_x]
 		dec edx
 		push edx
 		stdcall pole_cell_find, edi
-		cmp eax,0
+		or eax,eax
-		je @f
+		jz @f
 			or dword[napr],4
 		@@:
 		mov edx,[ebx+offs_cell_y]
 		dec edx
 		push edx
 		mov edx,[ebx+offs_cell_x]
 		push edx
 		stdcall pole_cell_find, edi
-		cmp eax,0
+		or eax,eax
-		je @f
+		jz @f
 			or dword[napr],8
 	add ebx,ecx
 	ret
 endp
 align 4
-proc mem_copy, destination:dword, source:dword, len:dword
-  push ecx esi edi
+proc mem_copy uses ecx esi edi, destination:dword, source:dword, len:dword
-    cld
+	cld
-    mov esi, dword[source]
+	mov edi,[destination]
-    mov edi, dword[destination]
+	mov esi,[source]
-    mov ecx, dword[len]
+	mov ecx,[len]
-    rep movsb
-  pop edi esi ecx
+	rep movsb
-  ret
+	ret
 endp
 		mov ecx,[icon]
 		shl ecx,12 ;ã¬®¦ ¥¬   4 ª¡
 		add ecx,[buf_curs.data]
 		mcall SF_MOUSE_GET,SSF_LOAD_CURSOR
-		cmp eax,0
+		or eax,eax
-		je @f
+		jz @f
 			mov [cursor_pointer],eax
 			mcall SF_MOUSE_GET,SSF_SET_CURSOR,[cursor_pointer]
 	@@:
 	ret
 .end:
 db 0
-include 'le_libs.inc'
-mouse_dd dd 0x0
-sc system_colors
-last_time dd 0
-align 16
-procinfo process_information
+include 'le_libs.inc'
 align 4
 buf_0: dd 0 ;
 .l: dw 170 ;+4 left
 	db 24 ;+20 bit in pixel
 align 4
 buf_font: ;¡ãä¥à á® èà¨äâ®¬
 	dd 0 ;ãª § â¥«ì   ¡ãä¥à ¨§®¡à ¦¥¨ï
-	dw 25 ;+4 left
-	dw 25 ;+6 top
+	dw 25,25 ;+4 left,top
 	dd 96 ;+8 w
 	dd 144 ;+12 h
 	dd 0 ;+16 color
 	db 24 ;+20 bit in pixel
 align 4
 buf_curs: ;¡ãä¥à á ªãàá®à ¬¨
-.data: dd 0 ;ãª § â¥«ì   ¡ãä¥à ¨§®¡à ¦¥¨ï
-	dw 0 ;+4 left
+.data: dd 0 ;ãª § â¥«ì   ¡ãä¥à ¨§®¡à ¦¥¨ï
-	dw 0 ;+6 top
+	dw 0,0 ;+4 left,top
 	dd 32 ;+8 w
 	dd 32*cursors_count ;+12 h
 	dd 0 ;+16 color
 	db 24 ;+20 bit in pixel
 align 4
-buf_curs_8: ;¡ãä¥à á ªãàá®à ¬¨
-.data: dd 0 ;ãª § â¥«ì   ¡ãä¥à ¨§®¡à ¦¥¨ï
+buf_curs_8: ;¡ãä¥à á ªãàá®à ¬¨
-	dw 0 ;+4 left
+.data: dd 0 ;ãª § â¥«ì   ¡ãä¥à ¨§®¡à ¦¥¨ï
-	dw 0 ;+6 top
+	dw 0,0 ;+4 left,top
 	dd 32 ;+8 w
 	stosb	    ;§ ¯¨á âì í«¥¬¥â ¨§ à¥£¨áâà  al ¢ ïç¥ªã ¯ ¬ïâ¨ es:edi
 	ret	      ;¢¥àãâìáï ®ç¥ì ¨â¥à¥áë© å®¤ â.ª. ¯®ª  ¢ áâ¥ª¥ åà ¨âìáï ª®«-¢® ¢ë§®¢®¢ â® áâ®«ìª® à § ¬ë ¨ ¡ã¤¥¬ ¢ë§ë¢ âìáï
 align 16
+i_end:
+	image_data_toolbar dd 0
+	icon_tl_sys dd 0 ;ãª § â¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï á¨áâ¥¬ëå ¨ª®®ª
+	icon_toolbar dd 0 ;ãª § â¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï ¨ª®®ª ®¡ê¥ªâ®¢
+	image_data_gray dd 0 ;¯ ¬ïâì á ¢à¥¬¥ë¬¨ á¥àë¬¨ ¨§®¡à ¦¥¨ï¬¨ ¢ ä®à¬ â¥ 24-bit, ¨§ ª®â®àëå ¡ã¤ãâ á®§¤ ¢ âìáï âà ä à¥âë
+	mouse_dd dd 0
+	last_time dd 0
+	sc system_colors
-i_end:
+	procinfo process_information
+	run_file_70 FileInfoBlock
+	open_file_lif:
+		rb 2*4096 ;®¡« áâì ¤«ï ®âªàëâ¨ï ä ©«®¢
-	run_file_70 FileInfoBlock
+	.end:
 	rb 1024
 stacktop:
-	sys_path rb 1024
-	file_name:
+	sys_path rb 1024
-		rb 1024 ;4096
-	library_path rb 1024
+	file_name rb 2048 ;4096
 	plugin_path rb 4096
 	openfile_path rb 4096
 	filename_area rb 256

Subversion Repositories Kolibri OS

(root)/programs/media/log_el/trunk/log_el.asm – Rev 6213 → 8408