WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/libraries/box_lib/asm/ Rev 9567 and /programs/develop/libraries/box

Regard whitespace Rev 9567 → Rev 9568

 /programs/develop/libraries/box_lib/asm/trunk/ctrldemo.asm
 ,21 → 29,20
 ;---------------------------------------------------------------------
         use32
-        org 0x0
+        org 0
         db 'MENUET01'
-        dd 0x01
+        dd 1
         dd START
         dd IM_END
         dd I_END
         dd stacktop
-        dd 0x0
+        dd 0
         dd path
 include '../../../../../macros.inc'
-include '../../load_lib.mac'
-;include 'macros.inc'
-;include 'load_lib.mac'
+include '../../../../../KOSfuncs.inc'
+include '../../../../../load_lib.mac'
 @use_library
 ;---------------------------------------------------------------------

 /programs/develop/libraries/box_lib/asm/trunk/data.inc
 ,35 → 26,20
 ;... «î¡ ï ¯®á«¥¤®¢ â¥«ì®áâì ¤àã£¨å ª®¬ ¤ ¨ ®¯à¥¤¥«¥¨©.
 ;library_name     db 'box_lib.obj',0
 ;library_name   db      'box_lib.obj',0
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-ihead_f_i:
-ihead_f_l               db 'System error',0
-er_message_found_lib    db 'Sorry I cannot load library box_lib.obj',0
-er_message_import               db 'Error on load import library box_lib.obj',0
-er_message_found_lib2   db 'cnv_png.obj - Not found!',0
-er_message_import2              db 'cnv_png.obj - Wrong import!',0
-er_message_found_lib3   db 'archiver.obj - Not found!',0
-er_message_import3              db 'archiver.obj - Wrong import!',0
-er_message_found_lib4   db 'proc_lib.obj - Not found!',0
-er_message_import4              db 'proc_lib.obj - Wrong import!',0
 ;---------------------------------------------------------------------
 align   4
 l_libs_start:
-library01       l_libs system_dir_Boxlib+9, path, file_name, system_dir_Boxlib,\
-er_message_found_lib, ihead_f_l, Box_lib_import, er_message_import, ihead_f_i, plugins_directory
+library01       l_libs system_dir_Boxlib+9, file_name, system_dir_Boxlib,\
+ Box_lib_import, plugins_directory
-library02       l_libs system_dir_CnvPNG+9, path, file_name, system_dir_CnvPNG,\
-er_message_found_lib2, ihead_f_l, cnv_png_import, er_message_import2, ihead_f_i, plugins_directory
+library02       l_libs system_dir_CnvPNG+9, file_name, system_dir_CnvPNG,\
+ cnv_png_import, plugins_directory
-library03       l_libs system_dir_UNPACK+9, path, file_name, system_dir_UNPACK,\
-er_message_found_lib3, ihead_f_l, UNPACK_import, er_message_import3, ihead_f_i, plugins_directory
+library03       l_libs system_dir_UNPACK+9, file_name, system_dir_UNPACK,\
+ UNPACK_import, plugins_directory
-library04  l_libs system_dir_ProcLib+9, path, file_name, system_dir_ProcLib, \
-er_message_found_lib4, ihead_f_l, ProcLib_import, er_message_import4, ihead_f_i, plugins_directory
+library04  l_libs system_dir_ProcLib+9, file_name, system_dir_ProcLib, \
+ ProcLib_import, plugins_directory
 end_l_libs:
 ;---------------------------------------------------------------------
 ,8 → 48,7
 OpenDialog_Init         dd aOpenDialog_Init
 OpenDialog_Start        dd aOpenDialog_Start
 ;OpenDialog__Version    dd aOpenDialog_Version
-        dd      0
-        dd      0
+        dd      0,0
 aOpenDialog_Init        db 'OpenDialog_init',0
 aOpenDialog_Start       db 'OpenDialog_start',0
 ;aOpenDialog_Version    db 'Version_OpenDialog',0
 ,8 → 59,7
 .Version        dd aCP_Version
 .Check          dd aCP_Check
 .Assoc          dd aCP_Assoc
-                dd 0
-                dd 0
+                dd 0,0
 aCP_Start       db 'START',0
 aCP_Version     db 'version',0
 aCP_Check       db 'Check_Header',0
 ,9 → 82,7
 ;unpack_Close                   dd aUnpack_Close
 unpack_DeflateUnpack            dd aUnpack_DeflateUnpack
 unpack_DeflateUnpack2           dd aUnpack_DeflateUnpack2
-                                dd 0
-                                dd 0
+                                dd 0,0
 ;aUnpack_Version                db 'version',0
 ;aUnpack_PluginLoad             db 'plugin_load',0
 ;aUnpack_OpenFilePlugin         db 'OpenFilePlugin',0
 ,13 → 168,12
 PathShow_prepare        dd sz_PathShow_prepare
 PathShow_draw           dd sz_PathShow_draw
 ;Version_path_show      dd szVersion_path_show
-                        dd 0
-                        dd 0
+                        dd 0,0
 ;a_init                 db 'lib_init',0
 ;a_version              db 'version',0
-;aEdit_box_draw         db 'edit_box',0
+;aEdit_box_draw         db 'edit_box_draw',0
 ;aEdit_box_key          db 'edit_box_key',0
 ;aEdit_box_mouse        db 'edit_box_mouse',0
 ;aVersion_ed            db 'version_ed',0

 /programs/develop/libraries/box_lib/asm/trunk/editbox_ex.asm
 ,28 → 1,28
 ;§ £®«®¢®ª ¯à¨«®¦¥¨ï
 use32                    ; âà á«ïâ®à, ¨á¯®«ì§ãîé¨© 32 à §àï¤ëå ª®¬ ¤ë
-    org 0x0              ; ¡ §®¢ë©  ¤à¥á ª®¤ , ¢á¥£¤  0x0
+    org 0                ; ¡ §®¢ë©  ¤à¥á ª®¤ , ¢á¥£¤  0
     db 'MENUET01'        ; ¨¤¥â¨ä¨ª â®à ¨á¯®«ï¥¬®£® ä ©«  (8 ¡ ©â)
-    dd 0x1               ; ¢¥àá¨ï ä®à¬ â  § £®«®¢ª  ¨á¯®«ï¥¬®£® ä ©«
+    dd 1                 ; ¢¥àá¨ï ä®à¬ â  § £®«®¢ª  ¨á¯®«ï¥¬®£® ä ©«
     dd start             ;  ¤à¥á,   ª®â®àë© á¨áâ¥¬  ¯¥à¥¤ ñâ ã¯à ¢«¥¨¥
     ; ¯®á«¥ § £àã§ª¨ ¯à¨«®¦¥¨ï ¢ ¯ ¬ïâì
     dd i_end             ; à §¬¥à ¯à¨«®¦¥¨ï
     dd mem               ; ¡ê¥¬ ¨á¯®«ì§ã¥¬®© ¯ ¬ïâ¨, ¤«ï áâ¥ª  ®â¢¥¤¥¬ 0å100 ¡ ©â ¨ ¢ëà®¢¨¬   £à¨æã 4 ¡ ©â
     dd mem               ; à á¯®«®¦¨¬ ¯®§¨æ¨î áâ¥ª  ¢ ®¡« áâ¨ ¯ ¬ïâ¨, áà §ã §  â¥«®¬ ¯à®£à ¬¬ë. ¥àè¨  áâ¥ª  ¢ ¤¨ ¯ §®¥ ¯ ¬ïâ¨, ãª § ®¬ ¢ëè¥
-    dd 0x0               ; ãª § â¥«ì   áâà®ªã á ¯ à ¬¥âà ¬¨.
+    dd 0                 ; ãª § â¥«ì   áâà®ªã á ¯ à ¬¥âà ¬¨.
     dd cur_dir_path      ; ãª § â¥«ì    ¤à¥á, ªã¤  ¯®¬¥é ¥âáï áâà®ª , á®¤¥à¦ é ï ¯ãâì ¤® ¯à®£à ¬¬ë ¢ ¬®¬¥â § ¯ãáª .
 include '../../../../../macros.inc'
 include '../../trunk/box_lib.mac'
-include '../../load_lib.mac'
+include '../../../../../KOSfuncs.inc'
+include '../../../../../load_lib.mac'
     @use_library         ;use load lib macros
 start:
 ;universal load library/librarys
-sys_load_library  library_name, cur_dir_path, library_path, system_path, \
-err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
+sys_load_library  library_name, library_path, system_path, myimport
 ;if return code =-1 then exit, else nornary work
     cmp      eax,-1
     jz       exit
-    mcall    40,0x27          ;ãáâ ®¢¨âì ¬ áªã ¤«ï ®¦¨¤ ¥¬ëå á®¡ëâ¨©
+    mcall    SF_SET_EVENTS_MASK,0x80000027 ;ãáâ ®¢¨âì ¬ áªã ¤«ï ®¦¨¤ ¥¬ëå á®¡ëâ¨©
     push     dword check1     ;¯®¤áçñâ ¤¨ë â¥ªáâ  ¤«ï Checkbox'®¢
     call     [init_checkbox]
 ,7 → 34,7
     call     draw_window      ;¯¥à¢® ç «ì® ¥®¡å®¤¨¬®  à¨á®¢ âì ®ª®
 align 4
 still:                        ;®á®¢®© ®¡à ¡®âç¨ª
-    mcall    10               ;¦¨¤ âì á®¡ëâ¨ï
+    mcall    SF_WAIT_EVENT
     dec      eax
     jz       red_win
     dec      eax
 ,13 → 63,13
     jmp     still           ;¥á«¨ ¨ç¥£® ¨§ ¯¥à¥ç¨á«¥®£® â® á®¢  ¢ æ¨ª«
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 button:
-    mcall   17             ;¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª« ¢¨è¨
+    mcall   SF_GET_BUTTON
     test    ah,ah          ;¥á«¨ ¢ ah 0, â® ¯¥à¥©â¨   ®¡à ¡®âç¨ª á®¡ëâ¨© still
     jz      still
 exit:
-    mcall   -1
+    mcall   SF_TERMINATE_PROCESS
 key:
-    mcall   2              ;§ £àã§¨¬ § ç¥¨¥ 2 ¢ à¥£¨áâ®à eax ¨ ¯®«ãç¨¬ ª®¤  ¦ â®© ª« ¢¨è¨
+    mcall   SF_GET_KEY
     push    dword edit1
     call    [edit_box_key]
 ,8 → 82,8
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 align 4
 draw_window:                ;à¨á®¢ ¨¥ ®ª  ¯à¨«®¦¥¨ï
-    mcall   12,1
-    mcall   0,(50*65536+390),(30*65536+200),0x33AABBCC,0x805080DD,hed
+    mcall   SF_REDRAW, SSF_BEGIN_DRAW
+    mcall   SF_CREATE_WINDOW,(50*65536+390),(30*65536+200),0x33AABBCC,0x805080DD,hed
     push    dword edit1
     call    [edit_box_draw]
 ,7 → 103,7
     push    dword Option_boxs2
     call    [option_box_draw]
-    mcall   12,2
+    mcall   SF_REDRAW, SSF_END_DRAW
    ret
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ;DATA ¤ ë¥
 ,12 → 116,6
 ;library_name     db 'box_lib.obj',0
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-err_message_found_lib    db 'Sorry I cannot load library box_lib.obj',0
-head_f_i:
-head_f_l              db 'System error',0
-err_message_import    db 'Error on load import library box_lib.obj',0
 myimport:
 edit_box_draw    dd    aEdit_box_draw
 ,10 → 132,9
 option_box_mouse dd    aOption_box_mouse
 version_op       dd    aVersion_op
-    dd    0
-    dd    0
+    dd    0,0
-aEdit_box_draw   db 'edit_box',0
+aEdit_box_draw   db 'edit_box_draw',0
 aEdit_box_key    db 'edit_box_key',0
 aEdit_box_mouse  db 'edit_box_mouse',0
 aVersion_ed      db 'version_ed',0

 /programs/develop/libraries/box_lib/asm/trunk/tooltip_demo.asm
 ,15 → 3,15
 ; - ¯¥à¥¤¥«  ª ª ¯à¨¬¥à ¨á¯®«ì§®¢ ¨ï tooltip
 use32 ; ¢ª«îç¨âì 32-¡¨âë© à¥¦¨¬  áá¥¬¡«¥à
-org 0x0 ;  ¤à¥á æ¨ï á ã«ï
+org 0 ;  ¤à¥á æ¨ï á ã«ï
 db 'MENUET01' ; 8-¡ ©âë© ¨¤¥â¨ä¨ª â®à MenuetOS
-dd 0x01 ; ¢¥àá¨ï § £®«®¢ª  (¢á¥£¤  1)
+dd 1 ; ¢¥àá¨ï § £®«®¢ª  (¢á¥£¤  1)
 dd START ;  ¤à¥á ¯¥à¢®© ª®¬ ¤ë
 dd CODE_END ; à §¬¥à ¯à®£à ¬¬ë
 dd DATA_END ; ª®«¨ç¥áâ¢® ¯ ¬ïâ¨
 dd STACK_END ;  ¤à¥á ¢¥àè¨ë áâíª
-dd 0x0 ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥âà®¢
+dd 0 ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥âà®¢
 dd cur_dir_path      ; ãª § â¥«ì    ¤à¥á, ªã¤  ¯®¬¥é ¥âáï áâà®ª , á®¤¥à¦ é ï ¯ãâì ¤® ¯à®£à ¬¬ë ¢ ¬®¬¥â § ¯ãáª .
 include '../../../../../proc32.inc'
 ,11 → 19,9
 include '../../../../../KOSfuncs.inc'
 include '../../../../../dll.inc'        ; malloc fn
 include '../../trunk/box_lib.mac'
-include '../../load_lib.mac'
-;include 'proc32.inc'
-;include 'macros.inc'
-;include 'KOSfuncs.inc'
+include '../../../../../load_lib.mac'
 ;---------------------------------------------------------------------
 ;---   ----------------------------------------------
 ;---------------------------------------------------------------------
 ,24 → 28,17
 ; íâ®â ¬ ªà®á ®¡ï§ â¥«¥ ¤«ï ¢á¥å ª®¬¯®¥â®¢, ¨á¯®«ì§ãîé¨å heap
 ; ªà®¬¥ â®£®, ®¡ï§ â¥«ì® ¨¬®àâ¨à®¢ âì lib_init - ¯à¨ ¨¬¯®àâ¥ ®¯à¥¤¥«ïîâáï
 ; äãªæ¨¨ å¨¯  ¤«ï ¡¨¡«¨®â¥ª¨
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
+@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 START:
 ;---------------------------------------------------------------------
 ;---  ----------------------------------------
 ;---------------------------------------------------------------------
-;mov eax, mem_alloc
-;mov [mem.alloc], eax
-;mov eax, mem_realloc
-;mov [mem.realloc], eax
-;mov eax, mem_free
-;mov [mem.free], eax
 mcall   68, 11
 mcall 40, $C0000027 ; ¬ áª  á®¡ëâ¨© - ¬ëèì â®«ìª® ¢  ªâ¨¢®¬ ®ª¥
-sys_load_library  lib_name, cur_dir_path, lib_path, sys_path, \
-        e_notfound_lib, head_f_l, myimport, e_import, head_f_i
+sys_load_library  lib_name, lib_path, sys_path, myimport
 test eax,eax
 jz      @f
         mcall -1 ; alarm exit
 ,12 → 135,6
 cur_dir_path    rb 4096
 lib_path    rb 4096
-e_notfound_lib    db 'Sorry I cannot load library box_lib.obj',0
-head_f_i:
-head_f_l    db 'System error',0
-e_import    db 'Error on load import library box_lib.obj',0
 myimport:
                                 dd sz_lib_init ;äãªæ¨ï § ¯ãáª ¥âáï ¬ ªà®á®¬ 1 à § ¯à¨ ¯®¤ª«îç¥¨¨
 ;¡¨¡«¨®â¥ª¨, ¯®â®¬ã ¢ ¯à®£à ¬¬¥ ¬¥âª    ¥¥ ¥ ã¦
 ,8 → 143,7
 tooltip_test_show       dd sz_tooltip_test_show
 tooltip_mouse   dd sz_tooltip_mouse
 get_font_size   dd sz_get_font_size
-    dd    0
-    dd    0
+    dd    0,0
 sz_lib_init                     db 'lib_init',0
 sz_tooltip_init                 db 'tooltip_init', 0

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9567 → Rev 9568