animage use ColorDialog

git-svn-id: svn://kolibrios.org@8271 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/libraries/buf2d/trunk/examples/build.bat

@@ -1,6 +1,4 @@
 if not exist bin mkdir bin
-@fasm.exe -m 16384 ..\buf2d.asm bin\buf2d.obj
-@kpack bin\buf2d.obj
 
 if not exist bin\font8x9.bmp @copy ..\..\..\..\..\fs\kfar\trunk\font8x9.bmp bin\font8x9.bmp
 @copy foto.jpg bin\foto.jpg

programs/develop/libraries/buf2d/trunk/examples/e6_vox_1g.asm

@@ -1,18 +1,15 @@
 use32
-	org 0x0
+	org 0
 	db 'MENUET01' ;¨¤¥­â¨ä. ¨á¯®«­ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-	dd 0x1
+	dd 1,start,i_end,mem,stacktop,0,cur_dir_path
-	dd start
-	dd i_end ;à §¬¥à ¯à¨«®¦¥­¨ï
-	dd mem,stacktop
-	dd 0,cur_dir_path
 
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+include '../../../../../KOSfuncs.inc'
+include '../../../../../load_lib.mac'
 include '../../../../../dll.inc'
 
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, 0 ;dll.Load
+@use_library mem.Alloc,mem.Free,mem.ReAlloc, 0 ;dll.Load
 
 struct FileInfoBlock
 	Function dd ?
@@ -60,19 +57,18 @@ endp
 
 align 4
 start:
-	load_library vectors_name, cur_dir_path, library_path, system_path, \
+	load_library name_buf2d, library_path, system_path, import_buf2d_lib
-		err_message_found_lib, head_f_l, import_buf2d_lib, err_message_import, head_f_i
 	cmp eax,-1
 	jz button.exit
 
-	mcall 40,0x27
+	mcall SF_SET_EVENTS_MASK,0x27
 	stdcall [buf2d_create], buf_0 ;ᮧ¤ ¥¬ ¡ãä¥à
 	stdcall [buf2d_create], buf_z
 
 	stdcall mem.Alloc,max_open_file_size
 	mov dword[open_file_vox],eax
 
-	copy_path f_name,[32],file_name,0x0
+	copy_path f_name,[32],file_name,0
 
 	mov eax,70 ;70-ï äã­ªæ¨ï à ¡®â  á ä ©« ¬¨
 	mov [run_file_70.Function], 0
@@ -99,7 +95,7 @@ red_win:
 
 align 4
 still:
-	mcall 10
+	mcall SF_WAIT_EVENT
 	cmp al,1 ;¨§¬¥­¨«®áì ¯®«®¦¥­¨¥ ®ª­ 
 	jz red_win
 	cmp al,2
@@ -111,20 +107,20 @@ still:
 align 4
 draw_window:
 	pushad
-	mcall 12,1
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
 
 	mov edx,0x33000000
-	mcall 0,(50 shl 16)+330,(30 shl 16)+295,,,caption
+	mcall SF_CREATE_WINDOW,(50 shl 16)+330,(30 shl 16)+295,,,caption
 
 	stdcall [buf2d_draw], buf_0
 
-	mcall 12,2
+	mcall SF_REDRAW,SSF_END_DRAW
 	popad
 	ret
 
 align 4
 key:
-	mcall 2
+	mcall SF_GET_KEY
 
 	cmp ah,27 ;Esc
 	je button.exit
@@ -133,14 +129,14 @@ key:
 
 align 4
 button:
-	mcall 17 ;¯®«ãç¨âì ª®¤ ­ ¦ â®© ª­®¯ª¨
+	mcall SF_GET_BUTTON
 	cmp ah,1
 	jne still
 .exit:
 	stdcall [buf2d_delete],buf_0 ;㤠«ï¥¬ ¡ãä¥à
 	stdcall [buf2d_delete],buf_z
 	stdcall mem.Free,[open_file_vox]
-	mcall -1 ;¢ë室 ¨§ ¯à®£à ¬¬ë
+	mcall SF_TERMINATE_PROCESS
 
 caption db 'Test buf2d library, [Esc] - exit',0
 
@@ -206,21 +202,18 @@ buf_z:
 
 ;--------------------------------------------------
 system_path db '/sys/lib/'
-vectors_name db 'buf2d.obj',0
+name_buf2d db 'buf2d.obj',0
-err_message_found_lib db 'Sorry I cannot load library buf2d.obj',0
-head_f_i:
-head_f_l db 'System error',0
-err_message_import db 'Error on load import library buf2d.obj',0
 ;--------------------------------------------------
 
+align 16
 i_end: ;ª®­¥æ ª®¤ 
-	rb 1024
-stacktop:
 file_name:
 	rb 4096
 cur_dir_path:
 	rb 4096
 library_path:
 	rb 4096
+	rb 1024
+stacktop:
 mem:
 

programs/develop/libraries/buf2d/trunk/examples/e7_vox_3g.asm

@@ -1,18 +1,15 @@
 use32
-	org 0x0
+	org 0
 	db 'MENUET01' ;¨¤¥­â¨ä. ¨á¯®«­ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-	dd 0x1
+	dd 1,start,i_end,mem,stacktop,0,cur_dir_path
-	dd start
-	dd i_end ;à §¬¥à ¯à¨«®¦¥­¨ï
-	dd mem,stacktop
-	dd 0,cur_dir_path
 
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+include '../../../../../KOSfuncs.inc'
+include '../../../../../load_lib.mac'
 include '../../../../../dll.inc'
 
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, 0 ;dll.Load
+@use_library mem.Alloc,mem.Free,mem.ReAlloc, 0 ;dll.Load
 
 struct FileInfoBlock
 	Function dd ?
@@ -61,12 +58,11 @@ endp
 
 align 4
 start:
-	load_library vectors_name, cur_dir_path, library_path, system_path, \
+	load_library name_buf2d, library_path, system_path, import_buf2d_lib
-		err_message_found_lib, head_f_l, import_buf2d_lib, err_message_import, head_f_i
 	cmp eax,-1
 	jz button.exit
 
-	mcall 40,0x27
+	mcall SF_SET_EVENTS_MASK,0x27
 	stdcall [buf2d_create], buf_0 ;ᮧ¤ ¥¬ ¡ãä¥à
 	stdcall [buf2d_create], buf_z
 	stdcall [buf2d_vox_brush_create], buf_vox, vox_6_7_z ;ᮧ¤ ¥¬ ¢®ªá¥«ì­ãî ª¨áâì
@@ -74,7 +70,7 @@ start:
 	stdcall mem.Alloc,max_open_file_size
 	mov dword[open_file_vox],eax
 
-	copy_path f_name,[32],file_name,0x0
+	copy_path f_name,[32],file_name,0
 
 	mov eax,70 ;70-ï äã­ªæ¨ï à ¡®â  á ä ©« ¬¨
 	mov [run_file_70.Function], 0
@@ -105,7 +101,7 @@ red_win:
 
 align 4
 still:
-	mcall 10
+	mcall SF_WAIT_EVENT
 	cmp al,1 ;¨§¬¥­¨«®áì ¯®«®¦¥­¨¥ ®ª­ 
 	jz red_win
 	cmp al,2
@@ -117,20 +113,20 @@ still:
 align 4
 draw_window:
 	pushad
-	mcall 12,1
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
 
 	mov edx,0x33000000
-	mcall 0,(50 shl 16)+410,(30 shl 16)+480,,,caption
+	mcall SF_CREATE_WINDOW,(50 shl 16)+410,(30 shl 16)+480,,,caption
 
 	stdcall [buf2d_draw], buf_0
 
-	mcall 12,2
+	mcall SF_REDRAW,SSF_END_DRAW
 	popad
 	ret
 
 align 4
 key:
-	mcall 2
+	mcall SF_GET_KEY
 
 	cmp ah,27 ;Esc
 	je button.exit
@@ -139,7 +135,7 @@ key:
 
 align 4
 button:
-	mcall 17 ;¯®«ãç¨âì ª®¤ ­ ¦ â®© ª­®¯ª¨
+	mcall SF_GET_BUTTON
 	cmp ah,1
 	jne still
 .exit:
@@ -147,7 +143,7 @@ button:
 	stdcall [buf2d_delete],buf_z
 	stdcall [buf2d_vox_brush_delete],buf_vox
 	stdcall mem.Free,[open_file_vox]
-	mcall -1 ;¢ë室 ¨§ ¯à®£à ¬¬ë
+	mcall SF_TERMINATE_PROCESS
 
 caption db 'Test buf2d library, [Esc] - exit',0
 
@@ -229,21 +225,18 @@ buf_vox:
 
 ;--------------------------------------------------
 system_path db '/sys/lib/'
-vectors_name db 'buf2d.obj',0
+name_buf2d db 'buf2d.obj',0
-err_message_found_lib db 'Sorry I cannot load library buf2d.obj',0
-head_f_i:
-head_f_l db 'System error',0
-err_message_import db 'Error on load import library buf2d.obj',0
 ;--------------------------------------------------
 
+align 16
 i_end: ;ª®­¥æ ª®¤ 
-	rb 1024
-stacktop:
 file_name:
 		rb 4096
 cur_dir_path:
 	rb 4096
 library_path:
 	rb 4096
+	rb 1024
+stacktop:
 mem:
 

programs/develop/libraries/buf2d/trunk/examples/e8_filters.asm

@@ -1,18 +1,15 @@
 use32
-	org 0x0
+	org 0
 	db 'MENUET01' ;¨¤¥­â¨ä. ¨á¯®«­ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-	dd 0x1
+	dd 1,start,i_end,mem,stacktop,0,sys_path
-	dd start
-	dd i_end ;à §¬¥à ¯à¨«®¦¥­¨ï
-	dd mem,stacktop
-	dd 0,sys_path
 
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+include '../../../../../KOSfuncs.inc'
+include '../../../../../load_lib.mac'
 include '../../../../../dll.inc'
 
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, dll.Load
+@use_library mem.Alloc,mem.Free,mem.ReAlloc, dll.Load
 
 struct FileInfoBlock
 	Function dd ?
@@ -46,9 +43,9 @@ macro load_image_file path,buf,size { ;
 			db 0
 		@@:
 		;32 - áâ ­¤ àâ­ë©  ¤à¥á ¯® ª®â®à®¬ã ¤®«¦¥­ ¡ëâì ¡ãä¥à á á¨á⥬­ë¬ ¯ã⥬
-		copy_path .path_str,[32],file_name,0x0
+		copy_path .path_str,[32],file_name,0
 	else
-		copy_path path,[32],file_name,0x0 ;ä®à¬¨à㥬 ¯®«­ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥­¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ®­ ¢ ®¤­®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
+		copy_path path,[32],file_name,0 ;ä®à¬¨à㥬 ¯®«­ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥­¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ®­ ¢ ®¤­®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
 	end if
 
 	stdcall mem.Alloc, dword size ;¢ë¤¥«ï¥¬ ¯ ¬ïâì ¤«ï ¨§®¡à ¦¥­¨ï
@@ -67,12 +64,12 @@ macro load_image_file path,buf,size { ;
 	cmp ebx,0xffffffff
 	je @f
 		;®¯à¥¤¥«ï¥¬ ¢¨¤ ¨§®¡à ¦¥­¨ï ¨ ¯¥à¥¢®¤¨¬ ¥£® ¢® ¢à¥¬¥­­ë© ¡ãä¥à image_data
-		stdcall dword[img_decode], dword[buf],ebx,0
+		stdcall [img_decode], [buf],ebx,0
-		mov dword[image_data],eax
+		mov [image_data],eax
 		;¯à¥®¡à §ã¥¬ ¨§®¡à ¦¥­¨¥ ª ä®à¬ âã rgb
-		stdcall dword[img_to_rgb2], dword[image_data],dword[buf]
+		stdcall [img_to_rgb2], [image_data],[buf]
 		;㤠«ï¥¬ ¢à¥¬¥­­ë© ¡ãä¥à image_data
-		stdcall dword[img_destroy], dword[image_data]
+		stdcall [img_destroy], [image_data]
 	@@:
 }
 
@@ -84,16 +81,16 @@ start:
 	mov	ebp,lib0
 	cmp	dword [ebp+ll_struc_size-4],0
 	jz	@f
-		mcall -1 ;exit not correct
+		mcall SF_TERMINATE_PROCESS
 	@@:
 	mov	ebp,lib1
 	cmp	dword [ebp+ll_struc_size-4],0
 	jz	@f
-		mcall -1 ;exit not correct
+		mcall SF_TERMINATE_PROCESS
 	@@:
 
-	mcall 40,0x27
+	mcall SF_SET_EVENTS_MASK,0x27
-	mcall 48,3,sc,sizeof.system_colors ;¯®«ãç ¥¬ á¨á⥬­ë¥ 梥â 
+	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors ;¯®«ãç ¥¬ á¨á⥬­ë¥ 梥â 
 
 	load_image_file 'img1.png',image_data_rgb, IMAGE_FILE1_SIZE
 	stdcall [buf2d_create_f_img], buf_0,[image_data_rgb] ;ᮧ¤ ¥¬ ¡ãä¥à
@@ -110,13 +107,13 @@ red_win:
 
 align 4
 still: ;£« ¢­ë© 横«
-	mcall 10
+	mcall SF_WAIT_EVENT
 
-	cmp al,0x1 ;¨§¬¥­¨«®áì ¯®«®¦¥­¨¥ ®ª­ 
+	cmp al,1 ;¨§¬¥­¨«®áì ¯®«®¦¥­¨¥ ®ª­ 
 	jz red_win
-	cmp al,0x2
+	cmp al,2
 	jz key
-	cmp al,0x3
+	cmp al,3
 	jz button
 
 	jmp still
@@ -124,7 +121,7 @@ still: ;
 align 4
 key:
 	push eax ebx
-	mcall 2
+	mcall SF_GET_KEY
 ;...
 	pop ebx eax
 	jmp still
@@ -133,49 +130,42 @@ key:
 align 4
 draw_window:
 	pushad
-	mcall 12,1
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
 
 	mov edx,[sc.work]
 	or  edx,0x33000000
-	mcall 0,(20 shl 16)+670,(20 shl 16)+520,,,caption ;ᮧ¤ ­¨¥ ®ª­ 
+	mcall SF_CREATE_WINDOW,(20 shl 16)+670,(20 shl 16)+520,,,caption ;ᮧ¤ ­¨¥ ®ª­ 
 
 	stdcall [buf2d_draw], buf_0
 	stdcall [buf2d_draw], buf_1
 	stdcall [buf2d_draw], buf_2
 	
-	mcall 12,2
+	mcall SF_REDRAW,SSF_END_DRAW
 	popad
 	ret
 
-head_f_i:
-head_f_l  db '‘¨á⥬­ ï ®è¨¡ª ',0
-
 system_dir0 db '/sys/lib/'
 name_buf2d db 'buf2d.obj',0
-err_message_found_lib0 db '<27>¥ 㤠«®áì ­ ©â¨ ¡¨¡«¨®â¥ªã buf2d.obj',0
-err_message_import0 db 'Žè¨¡ª  ¯à¨ ¨¬¯®à⥠¡¨¡«¨®â¥ª¨ buf2d.obj',0
 
 system_dir1 db '/sys/lib/'
 name_libimg db 'libimg.obj',0
-err_message_found_lib1 db '<27>¥ 㤠«®áì ­ ©â¨ ¡¨¡«¨®â¥ªã libimg.obj',0
-err_message_import1 db 'Žè¨¡ª  ¯à¨ ¨¬¯®à⥠¡¨¡«¨®â¥ª¨ libimg.obj',0
 
 ;library structures
 l_libs_start:
-	lib0 l_libs name_buf2d,  sys_path, file_name, system_dir0, err_message_found_lib0, head_f_l, import_buf2d_lib, err_message_import0, head_f_i
+	lib0 l_libs name_buf2d,  file_name, system_dir0, import_buf2d_lib
-	lib1 l_libs name_libimg, sys_path, file_name, system_dir1, err_message_found_lib1, head_f_l, import_libimg, err_message_import1, head_f_i
+	lib1 l_libs name_libimg, file_name, system_dir1, import_libimg
 load_lib_end:
 
 align 4
 button:
-	mcall 17 ;¯®«ãç¨âì ª®¤ ­ ¦ â®© ª­®¯ª¨
+	mcall SF_GET_BUTTON
 	cmp ah,1
 	jne still
 .exit:
 	stdcall [buf2d_delete],buf_0 ;㤠«ï¥¬ ¡ãä¥à
 	stdcall [buf2d_delete],buf_1 ;㤠«ï¥¬ ¡ãä¥à
 	stdcall [buf2d_delete],buf_2 ;㤠«ï¥¬ ¡ãä¥à
-	mcall -1 ;¢ë室 ¨§ ¯à®£à ¬¬ë
+	mcall SF_TERMINATE_PROCESS
 
 image_data dd 0 ;¯ ¬ïâì ¤«ï ¯à¥®¡à §®¢ ­¨ï ª à⨭ª¨ äã­ªæ¨ï¬¨ libimg
 image_data_gray dd 0 ;¯ ¬ïâì á ¯à¥®¡à §®¢ ­­ë¬ ¨§®¡à ¦¥­¨¥¬ ¢ ä®à¬ â¥ 8-bit
@@ -183,7 +173,7 @@ image_data_rgb dd 0 ;
 image_data_foto dd 0
 
 run_file_70 FileInfoBlock
-caption db 'Draw images 13.09.11',0 ;¯®¤¯¨áì ®ª­ 
+caption db 'Draw images 28.11.20',0 ;¯®¤¯¨áì ®ª­ 
 sc system_colors  ;á¨á⥬­ë¥ 梥â 
 
 align 4
@@ -281,9 +271,8 @@ import_buf2d_lib:
 	sz_buf2d_delete db 'buf2d_delete',0
 	sz_buf2d_filter_dither db 'buf2d_filter_dither',0
 
+align 16
 i_end:
-	rb 1024
-stacktop:
 	sys_path rb 4096
 	file_name:
 		rb 4096
@@ -293,4 +282,6 @@ stacktop:
 		rb 4096
 	filename_area:
 		rb 256
+		rb 1024
+stacktop:
 mem:

programs/develop/str_double/trunk/str_double.asm

@@ -17,7 +17,7 @@ use32
 include '../../../proc32.inc'
 include '../../../macros.inc'
 include '../../../KOSfuncs.inc'
-include '../../../develop/libraries/box_lib/load_lib.mac'
+include '../../../load_lib.mac'
 include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../../develop/info3ds/info_fun_float.inc'
 include 'lang.inc'
@@ -259,17 +259,9 @@ binstr db 'bin:',0
 if lang eq ru
 	numstr db '—¨á«®:',0
 	Okstr db '‚¢®¤',0
-	head_f_i:
-	head_f_l db '"‘¨á⥬­ ï ®è¨¡ª ',0
-	err_msg_found_lib_0 db '<27>¥ ­ ©¤¥­  ¡¨¡«¨®â¥ª  ',39,'box_lib.obj',39,'" -tE',0
-	err_msg_import_0 db 'Žè¨¡ª  ¯à¨ ¨¬¯®à⥠¡¨¡«¨®â¥ª¨ ',39,'box_lib',39,'" -tW',0
 else
 	numstr db 'Number:',0
 	Okstr db 'Ok',0
-	head_f_i:
-	head_f_l db '"System error',0
-	err_msg_found_lib_0 db 'Sorry I cannot found library ',39,'box_lib.obj',39,'" -tE',0
-	err_msg_import_0 db 'Error on load import library ',39,'box_lib',39,'" -tW',0
 end if
 
 mouse_dd dd 0
@@ -294,8 +286,7 @@ lib_name_0 db 'box_lib.obj',0
 
 
 l_libs_start:
-	lib_0 l_libs lib_name_0, sys_path, library_path, system_dir_0,\
+	lib_0 l_libs lib_name_0, library_path, system_dir_0,import_box_lib
-		err_msg_found_lib_0,head_f_l,import_box_lib,err_msg_import_0,head_f_i
 l_libs_end:
 
 align 4

programs/fs/kfar/trunk/zlib/example1.asm

@@ -6,7 +6,7 @@ org 0
 include '../../../../proc32.inc'
 include '../../../../macros.inc'
 include '../../../../KOSfuncs.inc'
-include '../../../../develop/libraries/box_lib/load_lib.mac'
+include '../../../../load_lib.mac'
 
 include 'deflate.inc'
 include 'debug.inc'
@@ -262,14 +262,8 @@ import_archiver:
 system_dir_0 db '/sys/lib/'
 lib_name_0 db 'archiver.obj',0
 
-err_message_found_lib0 db 'Sorry I cannot load library archiver.obj',0
-head_f_i:
-head_f_l db 'System error',0
-err_message_import0 db 'Error on load import library archiver.obj',0
-
 l_libs_start:
-	lib0 l_libs lib_name_0, cur_dir_path, library_path, system_dir_0,\
+	lib0 l_libs lib_name_0, library_path, system_dir_0, import_archiver
-		err_message_found_lib0, head_f_l, import_archiver,err_message_import0, head_f_i
 load_lib_end:
 ;---------------------------------------------------------------------
 

programs/fs/opendial/opendial.asm

@@ -81,7 +81,8 @@ include '../../macros.inc'
 ;define __DEBUG__ 1
 ;define __DEBUG_LEVEL__ 1
 ;include '../../debug-fdo.inc'
-include '../../develop/libraries/box_lib/load_lib.mac'
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;include 'macros.inc'
 ;include 'load_lib.mac'
@@ -2530,34 +2531,19 @@ system_dir_CnvPNG	db '/sys/lib/cnv_png.obj',0
 system_dir_Sort 	db '/sys/lib/sort.obj',0
 system_dir_UNPACK	db '/sys/lib/archiver.obj',0
 
-ihead_f_i:
-ihead_f_l	db 'System      error',0
-
-er_message_found_lib	db 'box_lib.obj - Not found!',0
-er_message_import	db 'box_lib.obj - Wrong import!',0
-
-er_message_found_lib2	db 'cnv_png.obj - Not found!',0
-er_message_import2	db 'cnv_png.obj - Wrong import!',0
-
-err_message_found_lib3	db 'sort.obj - Not found!',0
-err_message_import3	db 'sort.obj - Wrong import!',0
-
-err_message_found_lib4	db 'archiver.obj - Not found!',0
-err_message_import4	db 'archiver.obj - Wrong import!',0
-
 align	4
 l_libs_start:
-library01	l_libs	system_dir_Boxlib+9,path,file_name,system_dir_Boxlib,\
+library01	l_libs	system_dir_Boxlib+9,file_name,system_dir_Boxlib,\
-er_message_found_lib,ihead_f_l,Box_lib_import,er_message_import,ihead_f_i,plugins_directory
+Box_lib_import,plugins_directory
 
-library02	l_libs	system_dir_CnvPNG+9,path,file_name,system_dir_CnvPNG,\
+library02	l_libs	system_dir_CnvPNG+9,file_name,system_dir_CnvPNG,\
-er_message_found_lib2,ihead_f_l,cnv_png_import,er_message_import2,ihead_f_i,plugins_directory
+cnv_png_import,plugins_directory
 
-library03	l_libs	system_dir_Sort+9,path,file_name,system_dir_Sort,\
+library03	l_libs	system_dir_Sort+9,file_name,system_dir_Sort,\
-err_message_found_lib3,ihead_f_l,Sort_import,err_message_import3,ihead_f_i,plugins_directory
+Sort_import,plugins_directory
 
-library04	l_libs	system_dir_UNPACK+9,path,file_name,system_dir_UNPACK,\
+library04	l_libs	system_dir_UNPACK+9,file_name,system_dir_UNPACK,\
-err_message_found_lib4,ihead_f_l,UNPACK_import,err_message_import4,ihead_f_i,plugins_directory
+UNPACK_import,plugins_directory
 
 end_l_libs:
 

programs/media/animage/trunk/animage.asm

@@ -146,6 +146,7 @@ include 'init_data.inc'
 @@:
 ;OpenDialog     initialisation
         stdcall [OpenDialog_Init], OpenDialog_data
+        stdcall [ColorDialog_Init], ColorDialog_data
 ;---------------------------------------------------------------------
 
 align 4
@@ -206,7 +207,6 @@ include 'menu.inc'
 
 include 'lib_data.inc'
 include 'panel_data.inc'
-include 'palitra256.inc'
 include 'brushes.inc'
 include 'spray.inc'
 include 'width_lines.inc'

programs/media/animage/trunk/events_of_window.inc

@@ -6,10 +6,10 @@ drawwin:
 	mcall SF_THREAD_INFO,procinfo
 	mov	esi,procinfo
 
-	mov	eax,[esi+34]
+	mov	eax,[esi+process_information.box.left]
-	mov	ebx,[esi+38]
+	mov	ebx,[esi+process_information.box.top]
-	mov	ecx,[esi+42]
+	mov	ecx,[esi+process_information.box.width]
-	mov	edx,[esi+46]
+	mov	edx,[esi+process_information.box.height]
 	mov	[Window_CordinatX],eax
 	mov	[Window_CordinatY],ebx
 	
@@ -45,10 +45,8 @@ no_znak2:
 
 	mcall SF_REDRAW,SSF_BEGIN_DRAW
 ;------------------------------------------------
-	mov	ebx,50 ;[Window_CordinatX]
+	mov	ebx,50 shl 16 ;[Window_CordinatX]
-	mov	ecx,50 ;[Window_CordinatY]
+	mov	ecx,50 shl 16 ;[Window_CordinatY]
-	shl	ebx,16
-	shl	ecx,16
 	add	ebx, [Window_SizeX]
 	add	ecx, [Window_SizeY]
 	mcall SF_CREATE_WINDOW,,,0x73aabbcc,,name_of_program
@@ -69,18 +67,10 @@ no_znak2:
 	shl ebx, 16
 	add ebx, [Window_SizeX]
 	sub	ebx, 9
-	mov ecx, ci_panel_y_pos
+	mov ecx, (ci_panel_y_pos shl 16) + 51
-	shl ecx, 16
-	add ecx, 51
 	mov edx, 0xD5CDCB
-	mcall 13
+	mcall SF_DRAW_RECT
 
-	;mov	eax,ci_panel_x_pos
-	;mov	ebx,ci_panel_y_pos
-	;mov	ecx,[Window_SizeX]
-	;mov	edx,50
-	;mov	esi,1
-	;sub	ecx,5+ci_panel_x_pos+ci_offs_skin_w
 	call	draw_icons
 	call	PrintMousePos
 ;------------------------------------------------

programs/media/animage/trunk/icons_instruments.inc

@@ -638,99 +638,17 @@ TakeButtonInstruments:
 	cmp eax,51
 	jne no_palette
 
-	mov eax,20
+	stdcall [ColorDialog_Start],ColorDialog_data
-	mov ebx,ci_palete_y_pos
+; 2 - use another method/not found program
-	mov ecx,32*10+32*5+7
+	;cmp	[ColorDialog_data.status],2
-	mov edx,140
+	;je	no_palette
-	mov  esi,1
+; 1 - OK, color selected	
-	call draw_volume_rectangle
+	cmp	[ColorDialog_data.status],1
-	mov [x],20+5
-	mov [y],ci_palete_y_pos+10
-	mov edi,256
-	xor esi,esi
-	next_rectangle:
-	mov ebx,[x]
-	mov ecx,[y]
-	mov edx,[palitra+esi]
-	and edx,0xffffff
-	shl ebx,16
-	shl ecx,16
-	add ebx,13
-	add ecx,13
-	mcall SF_DRAW_RECT
-	add [x],15
-	cmp [x],20+15*32
-	jl no_new_line
-	mov [x],20+5
-	add [y],15
-	no_new_line:
-	add esi,4
-	dec edi
-	jnz next_rectangle
-
-	wait_events:
-	mcall SF_WAIT_EVENT
-
-	cmp eax,1
 	jne	@f
-		ret
+		mov	eax,[ColorDialog_data.color]
+		mov [Color],eax
 	@@:
-	cmp eax,2
+	;call drawwin
-	jne no_keys
-		mcall SF_GET_KEY
-		jmp wait_events
-	no_keys:
-	cmp eax,3
-	jne no_buttons
-		mcall SF_GET_BUTTON
-		jmp wait_events
-	no_buttons:
-	cmp eax,6
-	jne wait_events
-
-	call GetMouseClick
-
-	test eax,eax
-	jz wait_events
-	call GetMouseCoordinats
-	mov [x],20+5
-	mov [y],ci_palete_y_pos+10
-	mov [counter],0
-	next_rectangle_column:
-	mov eax,[x]
-	mov ebx,[y]
-	mov ecx,[MouseX]
-	mov edx,[MouseY]
-	mov esi,13
-	mov edi,13
-	call columnus
-	test eax,eax
-	jz no_columnus_color
-
-	mov eax,[counter]
-	shl eax,2
-	mov ebx,[palitra+eax]
-	and ebx,0xffffff
-	mov [Color],ebx
-	no_columnus_color:
-
-	add [x],15
-
-	cmp [x],20+15*32
-	jl no_new_line_column
-
-	mov [x],20+5
-	add [y],15
-	no_new_line_column:
-
-	inc [counter]
-
-	cmp [counter],257
-	jne next_rectangle_column
-
-	mcall SF_SLEEP,10
-
-	call drawwin
 
 	mov eax,[Last_instrument]
 	mov [Current_instrument],eax

programs/media/animage/trunk/lib_data.inc

@@ -52,6 +52,29 @@ db	'PNG',0
 .end:
 db	0
 
+align 4
+ColorDialog_data:
+.type			dd 0
+.procinfo		dd procinfo ;+4
+.com_area_name		dd cd_communication_area_name ;+8
+.com_area		dd 0 ;+12
+.start_path		dd colordialog_path ;+16
+.draw_window		dd drawwin ;+20
+.status			dd 0 ;+24
+.x:
+.x_size			dw 510 ;+28 ; Window X size
+.x_start		dw 10 ;+30 ; Window X position
+.y:
+.y_size			dw 310 ;+32 ; Window y size
+.y_start		dw 10 ;+34 ; Window Y position
+.color_type		dd 0 ;+36 ; 0- RGB, 1 or other - reserved
+.color			dd 0 ;+40 ; Selected color
+
+cd_communication_area_name:
+	db 'FFFFFFFF_color_dialog',0
+colordialog_path:
+	db '/rd/1/colrdial',0 
+
 ;start_temp_file_name:	db 'pattern.mgb',0
 
 path4	db '/sys/noname.bmp',0
@@ -106,11 +129,15 @@ align 4
 ProcLib_import:
 OpenDialog_Init		dd aOpenDialog_Init
 OpenDialog_Start	dd aOpenDialog_Start
+ColorDialog_Init	dd aColorDialog_Init
+ColorDialog_Start	dd aColorDialog_Start
 ;OpenDialog__Version	dd aOpenDialog_Version
         dd      0
         dd      0
 aOpenDialog_Init	db 'OpenDialog_init',0
 aOpenDialog_Start	db 'OpenDialog_start',0
+aColorDialog_Init	db 'ColorDialog_init',0
+aColorDialog_Start	db 'ColorDialog_start',0
 ;aOpenDialog_Version	db 'Version_OpenDialog',0
 
 align 4

programs/media/animage/trunk/palitra256.inc

@@ -1,133 +0,0 @@
-;------------------------------------------------
-;--------Palette with 256 colors-----------------
-;------------------------------------------------
-;three bytes for one color
-palitra:		 
-db 0,0,0,0,0,0,128,0
-db 0,128,0,0,0,128,128,0
-db 128,0,0,0,128,0,128,0
-db 128,128,0,0,128,128,128,0
-db 192,220,192,0,240,202,166,0
-db 170,63,42,0,255,63,42,0
-db 0,95,42,0,85,95,42,0
-db 170,95,42,0,255,95,42,0
-db 0,127,42,0,85,127,42,0
-db 170,127,42,0,255,127,42,0
-db 0,159,42,0,85,159,42,0
-db 170,159,42,0,255,159,42,0
-db 0,191,42,0,85,191,42,0
-db 170,191,42,0,255,191,42,0
-db 0,223,42,0,85,223,42,0
-db 170,223,42,0,255,223,42,0
-db 0,255,42,0,85,255,42,0
-db 170,255,42,0,255,255,42,0
-db 0,0,85,0,85,0,85,0
-db 170,0,85,0,255,0,85,0
-db 0,31,85,0,85,31,85,0
-db 170,31,85,0,255,31,85,0
-db 0,63,85,0,85,63,85,0
-db 170,63,85,0,255,63,85,0
-db 0,95,85,0,85,95,85,0
-db 170,95,85,0,255,95,85,0
-db 0,127,85,0,85,127,85,0
-db 170,127,85,0,255,127,85,0
-db 0,159,85,0,85,159,85,0
-db 170,159,85,0,255,159,85,0
-db 0,191,85,0,85,191,85,0
-db 170,191,85,0,255,191,85,0
-db 0,223,85,0,85,223,85,0
-db 170,223,85,0,255,223,85,0
-db 0,255,85,0,85,255,85,0
-db 170,255,85,0,255,255,85,0
-db 0,0,127,0,85,0,127,0
-db 170,0,127,0,255,0,127,0
-db 0,31,127,0,85,31,127,0
-db 170,31,127,0,255,31,127,0
-db 0,63,127,0,85,63,127,0
-db 170,63,127,0,255,63,127,0
-db 0,95,127,0,85,95,127,0
-db 170,95,127,0,255,95,127,0
-db 0,127,127,0,85,127,127,0
-db 170,127,127,0,255,127,127,0
-db 0,159,127,0,85,159,127,0
-db 170,159,127,0,255,159,127,0
-db 0,191,127,0,85,191,127,0
-db 170,191,127,0,255,191,127,0
-db 0,223,127,0,85,223,127,0
-db 170,223,127,0,255,223,127,0
-db 0,255,127,0,85,255,127,0
-db 170,255,127,0,255,255,127,0
-db 0,0,170,0,85,0,170,0
-db 170,0,170,0,255,0,170,0
-db 0,31,170,0,85,31,170,0
-db 170,31,170,0,255,31,170,0
-db 0,63,170,0,85,63,170,0
-db 170,63,170,0,255,63,170,0
-db 0,95,170,0,85,95,170,0
-db 170,95,170,0,255,95,170,0
-db 0,127,170,0,85,127,170,0
-db 170,127,170,0,255,127,170,0
-db 0,159,170,0,85,159,170,0
-db 170,159,170,0,255,159,170,0
-db 0,191,170,0,85,191,170,0
-db 170,191,170,0,255,191,170,0
-db 0,223,170,0,85,223,170,0
-db 170,223,170,0,255,223,170,0
-db 0,255,170,0,85,255,170,0
-db 170,255,170,0,255,255,170,0
-db 0,0,212,0,85,0,212,0
-db 170,0,212,0,255,0,212,0
-db 0,31,212,0,85,31,212,0
-db 170,31,212,0,255,31,212,0
-db 0,63,212,0,85,63,212,0
-db 170,63,212,0,255,63,212,0
-db 0,95,212,0,85,95,212,0
-db 170,95,212,0,255,95,212,0
-db 0,127,212,0,85,127,212,0
-db 170,127,212,0,255,127,212,0
-db 0,159,212,0,85,159,212,0
-db 170,159,212,0,255,159,212,0
-db 0,191,212,0,85,191,212,0
-db 170,191,212,0,255,191,212,0
-db 0,223,212,0,85,223,212,0
-db 170,223,212,0,255,223,212,0
-db 0,255,212,0,85,255,212,0
-db 170,255,212,0,255,255,212,0
-db 85,0,255,0,170,0,255,0
-db 0,31,255,0,85,31,255,0
-db 170,31,255,0,255,31,255,0
-db 0,63,255,0,85,63,255,0
-db 170,63,255,0,255,63,255,0
-db 0,95,255,0,85,95,255,0
-db 170,95,255,0,255,95,255,0
-db 0,127,255,0,85,127,255,0
-db 170,127,255,0,255,127,255,0
-db 0,159,255,0,85,159,255,0
-db 170,159,255,0,255,159,255,0
-db 0,191,255,0,85,191,255,0
-db 170,191,255,0,255,191,255,0
-db 0,223,255,0,85,223,255,0
-db 170,223,255,0,255,223,255,0
-db 85,255,255,0,170,255,255,0
-db 255,204,204,0,255,204,255,0
-db 255,255,51,0,255,255,102,0
-db 255,255,153,0,255,255,204,0
-db 0,127,0,0,85,127,0,0
-db 170,127,0,0,255,127,0,0
-db 0,159,0,0,85,159,0,0
-db 170,159,0,0,255,159,0,0
-db 0,191,0,0,85,191,0,0
-db 170,191,0,0,255,191,0,0
-db 0,223,0,0,85,223,0,0
-db 170,223,0,0,255,223,0,0
-db 85,255,0,0,170,255,0,0
-db 0,0,42,0,85,0,42,0
-db 170,0,42,0,255,0,42,0
-db 0,31,42,0,85,31,42,0
-db 170,31,42,0,255,31,42,0
-db 0,63,42,0,170,174,160,0
-db 240,251,255,0,164,160,160,0
-db 128,128,128,0,0,0,255,0
-db 0,255,0,0,0,255,255,0
-db 255,0,0,0,255,0,255,0
-db 255,255,0,0xff,0xff,0xff,0xff

programs/media/zsea/load.inc

@@ -23,19 +23,8 @@ load_convert_plugins:
 	cld
 	rep movsd
 	
-	mov esi,[cnv_plugin_name_pointer]
+load_library system_path.1, library_path, system_path, \
-	mov edi,err_message_found_lib.1
+[cnv_plugin_import_pointer], plugins_directory
-	mov ecx,128/4
-	rep movsd
-	
-	mov esi,[cnv_plugin_name_pointer]
-	mov edi,err_message_import.1
-	mov ecx,128/4
-	rep movsd
-	
-load_library system_path.1, path, library_path, system_path, \
-err_message_found_lib, head_f_l, \
-[cnv_plugin_import_pointer], err_message_import, head_f_i, plugins_directory
 
 	test  eax,eax
 	jnz    START.exit_1

programs/media/zsea/zSea.asm

@@ -47,8 +47,8 @@ include '../../macros.inc'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../proc32.inc'
 ;include 'debug.inc'
-;include 'load_lib.mac'
+include '../../KOSfuncs.inc'
-include '../../develop/libraries/box_lib/load_lib.mac'
+include '../../load_lib.mac'
         @use_library    ;use load lib macros
 ;******************************************************************************
 ;------------------------------------------------------------------------------

programs/system/colrdial/color_dialog.asm

@@ -80,7 +80,8 @@
   dd	 path
 ;---------------------------------------------------------------------
 include '../../macros.inc'
-include '../../develop/libraries/box_lib/load_lib.mac'
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;include 'lang.inc'
 ;include '../../debug.inc'

programs/system/colrdial/i_data.inc

@@ -19,16 +19,10 @@ plugins_directory	db 0
 
 system_dir_Boxlib	db '/sys/lib/box_lib.obj',0
 
-ihead_f_i:
-ihead_f_l	db 'System	error',0
-
-er_message_found_lib	db 'box_lib.obj - Not found!',0
-er_message_import	db 'box_lib.obj - Wrong import!',0
-
 align	4
 l_libs_start:
-library01	l_libs	system_dir_Boxlib+9,path,file_name,system_dir_Boxlib,\
+library01	l_libs	system_dir_Boxlib+9,file_name,system_dir_Boxlib,\
-er_message_found_lib,ihead_f_l,Box_lib_import,er_message_import,ihead_f_i,plugins_directory
+Box_lib_import,plugins_directory
 
 end_l_libs:
 ;---------------------------------------------------------------------