WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/libraries/buf2d/trunk Rev 7861 and /programs/develop/libraries/buf2d/trunk Rev 8236

Regard whitespace Rev 7861 → Rev 8236

 /programs/develop/libraries/buf2d/trunk/examples/e0_dr_lines.asm
 ,23 → 1,19
 use32
-        org 0x0
-        db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-        dd 0x1
-        dd start
-        dd i_end ;à §¬¥à ¯à¨«®¦¥¨ï
-        dd mem,stacktop
-        dd 0,cur_dir_path
+        org 0
+        db 'MENUET01'
+        dd 1,start,i_end,mem,stacktop,0,cur_dir_path
+include '../../../../../KOSfuncs.inc'
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+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
 align 4
 start:
-        load_library vectors_name, cur_dir_path, library_path, system_path, \
-                err_message_found_lib, head_f_l, import_buf2d_lib, err_message_import, head_f_i
+        load_library lib0_name, library_path, system_path, import_buf2d_lib
         cmp eax,-1
         jz button.exit
 ,11 → 128,7
 ;--------------------------------------------------
 system_path db '/sys/lib/'
-vectors_name 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
+lib0_name db 'buf2d.obj',0
 ;--------------------------------------------------
 i_end: ;ª®¥æ ª®¤

 /programs/develop/libraries/buf2d/trunk/examples/e1_scaling.asm
 ,23 → 1,19
 use32
-        org 0x0
-        db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-        dd 0x1
-        dd start
-        dd i_end ;à §¬¥à ¯à¨«®¦¥¨ï
-        dd mem,stacktop
-        dd 0,cur_dir_path
+        org 0
+        db 'MENUET01'
+        dd 1,start,i_end,mem,stacktop,0,cur_dir_path
+include '../../../../../KOSfuncs.inc'
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
 include '../../../../../dll.inc'
+include '../../../../../load_lib.mac'
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, 0 ;dll.Load
+@use_library mem.Alloc,mem.Free,mem.ReAlloc, 0 ;dll.Load
 align 4
 start:
-        load_library vectors_name, cur_dir_path, library_path, system_path, \
-                err_message_found_lib, head_f_l, import_buf2d_lib, err_message_import, head_f_i
+        load_library lib0_name, library_path, system_path, import_buf2d_lib
         cmp eax,-1
         jz button.exit
 ,11 → 160,7
 ;--------------------------------------------------
 system_path db '/sys/lib/'
-vectors_name 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
+lib0_name db 'buf2d.obj',0
 ;--------------------------------------------------
 i_end: ;ª®¥æ ª®¤

 /programs/develop/libraries/buf2d/trunk/examples/e2_images.asm
 ,18 → 1,15
 use32
-        org 0x0
-        db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-        dd 0x1
-        dd start
-        dd i_end ;à §¬¥à ¯à¨«®¦¥¨ï
-        dd mem,stacktop
-        dd 0,sys_path
+        org 0
+        db 'MENUET01'
+        dd 1,start,i_end,mem,stacktop,0,cur_dir_path
+include '../../../../../KOSfuncs.inc'
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+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 ?
 ,12 → 55,12
         cmp ebx,0xffffffff
         je @f
                 ;®¯à¥¤¥«ï¥¬ ¢¨¤ ¨§®¡à ¦¥¨ï ¨ ¯¥à¥¢®¤¨¬ ¥£® ¢® ¢à¥¬¥ë© ¡ãä¥à image_data
-                stdcall dword[img_decode], dword[buf],ebx,0
-                mov dword[image_data],eax
+                stdcall [img_decode], [buf],ebx,0
+                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]
         @@:
 }
 ,23 → 143,17
         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 '¥ ã¤ «®áì  ©â¨ ¡¨¡«¨®â¥ªã 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 '¥ ã¤ «®áì  ©â¨ ¡¨¡«¨®â¥ªã 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
-        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
+        lib0 l_libs name_buf2d,  file_name, system_dir0, import_buf2d_lib
+        lib1 l_libs name_libimg, file_name, system_dir1, import_libimg
 load_lib_end:
 align 4

 /programs/develop/libraries/buf2d/trunk/examples/e3_text.asm
 ,18 → 1,15
 use32
-        org 0x0
-        db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-        dd 0x1
-        dd start
-        dd i_end ;à §¬¥à ¯à¨«®¦¥¨ï
-        dd mem,stacktop
-        dd 0,sys_path
+        org 0
+        db 'MENUET01'
+        dd 1,start,i_end,mem,stacktop,0,cur_dir_path
+include '../../../../../KOSfuncs.inc'
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+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 ?
 ,12 → 53,12
         cmp ebx,0xffffffff
         je @f
                 ;®¯à¥¤¥«ï¥¬ ¢¨¤ ¨§®¡à ¦¥¨ï ¨ ¯¥à¥¢®¤¨¬ ¥£® ¢® ¢à¥¬¥ë© ¡ãä¥à image_data
-                stdcall dword[img_decode], dword[buf],ebx,0
-                mov dword[image_data],eax
+                stdcall [img_decode], [buf],ebx,0
+                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]
         @@:
 }
 ,23 → 134,17
         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 '¥ ã¤ «®áì  ©â¨ ¡¨¡«¨®â¥ªã 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 '¥ ã¤ «®áì  ©â¨ ¡¨¡«¨®â¥ªã 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
-        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
+        lib0 l_libs name_buf2d,  file_name, system_dir0, import_buf2d_lib
+        lib1 l_libs name_libimg, file_name, system_dir1, import_libimg
 load_lib_end:
 align 4

 /programs/develop/libraries/buf2d/trunk/examples/e4_graf_ed.asm
 ,18 → 1,15
 use32
-        org 0x0
-        db 'MENUET01' ;èäåíòèô. èñïîëíÿåìîãî ôàéëà âñåãäà 8 áàéò
-        dd 0x1
-        dd start
-        dd i_end ;ðàçìåð ïðèëîæåíèÿ
-        dd mem,stacktop
-        dd 0,cur_dir_path
+        org 0
+        db 'MENUET01'
+        dd 1,start,i_end,mem,stacktop,0,cur_dir_path
+include '../../../../../KOSfuncs.inc'
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+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
 buf2d_l equ word[edi+4] ;îòñòóï ñëåâà
 buf2d_t equ word[edi+6] ;îòñòóï ñâåðõó
 ,8 → 16,7
 align 4
 start:
-        load_library vectors_name, cur_dir_path, library_path, system_path, \
-                err_message_found_lib, head_f_l, import_buf2d_lib, err_message_import, head_f_i
+        load_library lib0_name, library_path, system_path, import_buf2d_lib
         cmp eax,-1
         jz button.exit
 ,11 → 167,7
 ;--------------------------------------------------
 system_path db '/sys/lib/'
-vectors_name 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
+lib0_name db 'buf2d.obj',0
 ;--------------------------------------------------
 i_end: ;êîíåö êîäà

 /programs/develop/libraries/buf2d/trunk/examples/e5_lines_sm.asm
 ,18 → 1,15
 use32
-        org 0x0
-        db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-        dd 0x1
-        dd start
-        dd i_end ;à §¬¥à ¯à¨«®¦¥¨ï
-        dd mem,stacktop
-        dd 0,cur_dir_path
+        org 0
+        db 'MENUET01'
+        dd 1,start,i_end,mem,stacktop,0,cur_dir_path
+include '../../../../../KOSfuncs.inc'
 include '../../../../../macros.inc'
 include '../../../../../proc32.inc'
-include '../../../../../develop/libraries/box_lib/load_lib.mac'
+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
 buf2d_l equ word[edi+4] ;®âáâã¯ á«¥¢
 buf2d_t equ word[edi+6] ;®âáâã¯ á¢¥àåã
 ,8 → 17,7
 align 4
 start:
-        load_library vectors_name, cur_dir_path, library_path, system_path, \
-                err_message_found_lib, head_f_l, import_buf2d_lib, err_message_import, head_f_i
+        load_library lib0_name, library_path, system_path, import_buf2d_lib
         cmp eax,-1
         jz button.exit
 ,11 → 161,7
 ;--------------------------------------------------
 system_path db '/sys/lib/'
-vectors_name 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
+lib0_name db 'buf2d.obj',0
 ;--------------------------------------------------
 i_end: ;ª®¥æ ª®¤

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7861 → Rev 8236