Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 8407 → Rev 8408

/programs/media/log_el/trunk/le_libs.inc
/programs/media/log_el/trunk/log_el.asm
1,5 → 1,5
use32
org 0x0
org 0
db 'MENUET01' ;¨¤¥­â¨ä. ¨á¯®«­ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
dd 1,start,i_end,mem,stacktop,0,sys_path
 
42,11 → 42,12
include '../../../proc32.inc'
include '../../../KOSfuncs.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 ;¯®¤¯¨áì ®ª­ 
 
panel_0_coord_top equ 5 ;¢¥àå­ïï ª®®à¤¨­ â  0-£® à鸞 ¯ ­¥«¨ ¨­áâà㬥­â®¢
171,13 → 172,7
0,-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, ¨§ ª®â®àëå ¡ã¤ãâ ᮧ¤ ¢ âìáï âà ä à¥âë
 
cursors_count equ 4
 
ini_name db 'log_el.ini',0 ;¨¬ï ä ©« 
196,7 → 191,7
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
205,7 → 200,7
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
mov dword[buf_0.color],eax
642,7 → 637,7
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 edx,4
758,27 → 753,26
stdcall pole_draw_pok, pole
 
; *** ᮧ¤ ­¨¥ ª­®¯®ª ãáâ ­®¢ª¨ ᨣ­ «®¢ set_0 ¨ set_1 ***
mov esi,[sc.work_button]
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,25 shl 16
mov edx,25
inc edx
int 0x40
 
mov ecx,[sc.work_text]
808,8 → 802,7
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
mov edx,31
1043,11 → 1036,6
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
1080,8 → 1068,8
 
mov esi,txt_size
call str_analiz_r
cmp edi,0
je @f
or edi,edi
jz @f
stdcall str_len,esi
add edi,eax
stdcall conv_str_to_int,edi
1104,8 → 1092,8
 
mov esi,txt_elements
call str_analiz_r
cmp edi,0
je .end_elems
or edi,edi
jz .end_elems
stdcall str_len,esi
add edi,eax
stdcall conv_str_to_int,edi
1416,8 → 1404,8
inc edx
push edx
stdcall pole_cell_find, edi
cmp eax,0
je @f
or eax,eax
jz @f
or dword[napr],1
@@:
 
1427,8 → 1415,8
mov edx,[ebx+offs_cell_x]
push edx
stdcall pole_cell_find, edi
cmp eax,0
je @f
or eax,eax
jz @f
or dword[napr],2
@@:
 
1438,8 → 1426,8
dec edx
push edx
stdcall pole_cell_find, edi
cmp eax,0
je @f
or eax,eax
jz @f
or dword[napr],4
@@:
 
1449,8 → 1437,8
mov edx,[ebx+offs_cell_x]
push edx
stdcall pole_cell_find, edi
cmp eax,0
je @f
or eax,eax
jz @f
or dword[napr],8
@@:
 
1970,14 → 1958,12
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
mov esi, dword[source]
mov edi, dword[destination]
mov ecx, dword[len]
mov edi,[destination]
mov esi,[source]
mov ecx,[len]
rep movsb
pop edi esi ecx
ret
endp
 
2290,8 → 2276,8
add ecx,[buf_curs.data]
mcall SF_MOUSE_GET,SSF_LOAD_CURSOR
 
cmp eax,0
je @f
or eax,eax
jz @f
mov [cursor_pointer],eax
mcall SF_MOUSE_GET,SSF_SET_CURSOR,[cursor_pointer]
@@:
2339,15 → 2325,6
 
include 'le_libs.inc'
 
mouse_dd dd 0x0
sc system_colors
last_time dd 0
 
 
 
align 16
procinfo process_information
 
align 4
buf_0: dd 0 ;
.l: dw 170 ;+4 left
2360,8 → 2337,7
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
2370,8 → 2346,7
align 4
buf_curs: ;¡ãä¥à á ªãàá®à ¬¨
.data: dd 0 ;㪠§ â¥«ì ­  ¡ãä¥à ¨§®¡à ¦¥­¨ï
dw 0 ;+4 left
dw 0 ;+6 top
dw 0,0 ;+4 left,top
dd 32 ;+8 w
dd 32*cursors_count ;+12 h
dd 0 ;+16 color
2380,8 → 2355,7
align 4
buf_curs_8: ;¡ãä¥à á ªãàá®à ¬¨
.data: dd 0 ;㪠§ â¥«ì ­  ¡ãä¥à ¨§®¡à ¦¥­¨ï
dw 0 ;+4 left
dw 0 ;+6 top
dw 0,0 ;+4 left,top
dd 32 ;+8 w
dd 32*cursors_count ;+12 h
dd 0 ;+16 color
2618,13 → 2592,22
 
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
procinfo process_information
run_file_70 FileInfoBlock
open_file_lif:
rb 2*4096 ;®¡« áâì ¤«ï ®âªàëâ¨ï ä ©«®¢
.end:
rb 1024
stacktop:
sys_path rb 1024
file_name:
rb 1024 ;4096
library_path rb 1024
file_name rb 2048 ;4096
plugin_path rb 4096
openfile_path rb 4096
filename_area rb 256