From cd1bf776fa50e3a392238a85e036c050b1612cf9 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Mon, 13 Jun 2011 14:32:25 +0000 Subject: [PATCH] Some corrects for previous revisions. git-svn-id: svn://kolibrios.org@1954 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/opendial/build.sh | 1 + .../opendial/{OpenDial.asm => opendial.asm} | 0 programs/media/zsea/build.sh | 2 +- .../media/zsea/plugins/scaling/macros.inc | 269 ------------------ .../media/zsea/plugins/scaling/scaling.asm | 2 +- .../media/zsea/plugins/scaling/scaling.obj | Bin 1467 -> 0 bytes 6 files changed, 3 insertions(+), 271 deletions(-) rename programs/fs/opendial/{OpenDial.asm => opendial.asm} (100%) delete mode 100644 programs/media/zsea/plugins/scaling/macros.inc delete mode 100644 programs/media/zsea/plugins/scaling/scaling.obj diff --git a/programs/fs/opendial/build.sh b/programs/fs/opendial/build.sh index cd51f9260e..6a16b8aa15 100644 --- a/programs/fs/opendial/build.sh +++ b/programs/fs/opendial/build.sh @@ -5,6 +5,7 @@ echo "lang fix en" echo "lang fix en" > lang.inc fasm -m 16384 opendial.asm opendial + kpack opendial rm -f lang.inc exit 0 diff --git a/programs/fs/opendial/OpenDial.asm b/programs/fs/opendial/opendial.asm similarity index 100% rename from programs/fs/opendial/OpenDial.asm rename to programs/fs/opendial/opendial.asm diff --git a/programs/media/zsea/build.sh b/programs/media/zsea/build.sh index e1c1c272f3..4c7bbd3cb1 100644 --- a/programs/media/zsea/build.sh +++ b/programs/media/zsea/build.sh @@ -3,7 +3,7 @@ echo "lang fix en" echo "lang fix en" > lang.inc fasm -m 65536 zSea.asm zSea - @kpack zSea + kpack zSea rm -f lang.inc read exit 0 diff --git a/programs/media/zsea/plugins/scaling/macros.inc b/programs/media/zsea/plugins/scaling/macros.inc deleted file mode 100644 index 6df8eca325..0000000000 --- a/programs/media/zsea/plugins/scaling/macros.inc +++ /dev/null @@ -1,269 +0,0 @@ -; new application structure -macro meos_app_start - { - use32 - org 0x0 - - db 'MENUET01' - dd 0x01 - dd __start - dd __end - dd __memory - dd __stack - - if used __params & ~defined __params - dd __params - else - dd 0x0 - end if - - dd 0x0 - } -MEOS_APP_START fix meos_app_start - -macro code - { - __start: - } -CODE fix code - -macro data - { - __data: - } -DATA fix data - -macro udata - { - if used __params & ~defined __params - __params: - db 0 - __end: - rb 255 - else - __end: - end if - __udata: - } -UDATA fix udata - -macro meos_app_end - { - align 32 - rb 2048 - __stack: - __memory: - } -MEOS_APP_END fix meos_app_end - - -; macro for defining multiline text data -struc mstr [sstring] - { - forward - local ssize - virtual at 0 - db sstring - ssize = $ - end virtual - dd ssize - db sstring - common - dd -1 - } - - -; strings -macro sz name,[data] { ; from MFAR [mike.dld] - common - if used name - label name - end if - forward - if used name - db data - end if - common - if used name - .size = $-name - end if -} - -macro lsz name,[lng,data] { ; from MFAR [mike.dld] - common - if used name - label name - end if - forward - if (used name)&(lang eq lng) - db data - end if - common - if used name - .size = $-name - end if -} - - - -; easy system call macro -macro mpack dest, hsrc, lsrc -{ - if (hsrc eqtype 0) & (lsrc eqtype 0) - mov dest, (hsrc) shl 16 + lsrc - else - if (hsrc eqtype 0) & (~lsrc eqtype 0) - mov dest, (hsrc) shl 16 - add dest, lsrc - else - mov dest, hsrc - shl dest, 16 - add dest, lsrc - end if - end if -} - -macro __mov reg,a,b { ; mike.dld - if (~a eq)&(~b eq) - mpack reg,a,b - else if (~a eq)&(b eq) - mov reg,a - end if -} - -macro mcall a,b,c,d,e,f { ; mike.dld - __mov eax,a - __mov ebx,b - __mov ecx,c - __mov edx,d - __mov esi,e - __mov edi,f - int 0x40 -} - - - -; optimize the code for size -__regs fix - -macro add arg1,arg2 - { - if (arg2 eqtype 0) - if (arg2) = 1 - inc arg1 - else - add arg1,arg2 - end if - else - add arg1,arg2 - end if - } - -macro sub arg1,arg2 - { - if (arg2 eqtype 0) - if (arg2) = 1 - dec arg1 - else - sub arg1,arg2 - end if - else - sub arg1,arg2 - end if - } - -macro mov arg1,arg2 - { - if (arg1 in __regs) & ((arg2 eqtype 0) | (arg2 eqtype '0')) - if (arg2) = 0 - xor arg1,arg1 - else if (arg2) = 1 - xor arg1,arg1 - inc arg1 - else if (arg2) = -1 - or arg1,-1 - else if (arg2) > -128 & (arg2) < 128 - push arg2 - pop arg1 - else - mov arg1,arg2 - end if - else - mov arg1,arg2 - end if - } - - -macro struct name - { - virtual at 0 - name name - sizeof.#name = $ - name - end virtual - } - -; structures used in MeOS -struc process_information - { - .cpu_usage dd ? ; +0 - .window_stack_position dw ? ; +4 - .window_stack_value dw ? ; +6 - .not_used1 dw ? ; +8 - .process_name rb 12 ; +10 - .memory_start dd ? ; +22 - .used_memory dd ? ; +26 - .PID dd ? ; +30 - .x_start dd ? ; +34 - .y_start dd ? ; +38 - .x_size dd ? ; +42 - .y_size dd ? ; +46 - .slot_state dw ? ; +50 - dw ? ; +52 - reserved - .client_left dd ? ; +54 - .client_top dd ? ; +58 - .client_width dd ? ; +62 - .client_height dd ? ; +66 - .wnd_state db ? ; +70 - rb (1024-71) - } -;struct process_information - -struc system_colors - { - .frame dd ? - .grab dd ? - .grab_button dd ? - .grab_button_text dd ? - .grab_text dd ? - .work dd ? - .work_button dd ? - .work_button_text dd ? - .work_text dd ? - .work_graph dd ? - } -;struct system_colors - - -; constants - -; events -EV_IDLE = 0 -EV_TIMER = 0 -EV_REDRAW = 1 -EV_KEY = 2 -EV_BUTTON = 3 -EV_EXIT = 4 -EV_BACKGROUND = 5 -EV_MOUSE = 6 -EV_IPC = 7 -EV_STACK = 8 - -; event mask bits for function 40 -EVM_REDRAW = 1b -EVM_KEY = 10b -EVM_BUTTON = 100b -EVM_EXIT = 1000b -EVM_BACKGROUND = 10000b -EVM_MOUSE = 100000b -EVM_IPC = 1000000b -EVM_STACK = 10000000b \ No newline at end of file diff --git a/programs/media/zsea/plugins/scaling/scaling.asm b/programs/media/zsea/plugins/scaling/scaling.asm index 4ee7d44840..3c08150a9d 100644 --- a/programs/media/zsea/plugins/scaling/scaling.asm +++ b/programs/media/zsea/plugins/scaling/scaling.asm @@ -33,7 +33,7 @@ public EXPORTS section '.flat' code readable align 16 -include 'macros.inc' +;include 'macros.inc' include '../../../../macros.inc' ;--------------------------------------------------------------------- START: diff --git a/programs/media/zsea/plugins/scaling/scaling.obj b/programs/media/zsea/plugins/scaling/scaling.obj deleted file mode 100644 index ad6f32939412e7ae95a167db463cf6aff4b2d307..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1467 zcmV;s1w{HwP(w?G8vp=700000Yyc)2YL@lLlpUJ*HiQ1knc99)iBc*JBAe3>R;xDZ zpZ!-*n3F5*1bU$5ACik{y-OFL{bpkQuDcRd>A7FHd=?81n~d<5`g9?kueAjVEWl_Z z0=MB~v{NR2p;sy(Z}{FXJGLHfube}@3_8o|6I zoI?23i`^%HZyjrW8!j}VU4IjMDZoNNZABL3)+glL{a~TaJ=1HiY5AIEthA<=Fuk2Z zKW~fiQnOabf_uP2nAgzz+?fNWZ(D6U)tuxc5B(U{7>HtwL@fKQBXZ@vOxDeNnrl2_Ok6{nQ zS!ZTTu6XYl3@RzJQK`0EW<~Iu3ftx|W+aZoLWtr;QVwsgGMkKo)uO9&dn*o48pzB! zve@^Um0-l=i5k1AX_A=4yV{`xAbwMOxV(NLDp|E-q?x&(BKS*xu9?u@EfI^gIqgI+ znu4gieosmsCx$URE8OXHzBcsOAMJOdxbohxa$W89*W^n3y5DvU_xels1pQBC5fjNH zm3`{bVh<2cOl#tEGD^XY4ErF>ifqQ>c%;vrL4y<(3VIGrC(_0{k41CntArDELUK15 z{_?|hjG|I>twxwtU!Zn(ORZW4xcmJzKuu^o+OS6i_)-5`@D0v|A#GK+qY_9kNONR= zrfMdJ7QD2N<5Il7OJF)(P_W`) z-;pWv#Tcg9_iHLk3wSNvmH;H~dDpI$FR^7#{sQrXT7MRRdjM`=Ij^E80_@J&`Z-CW zNY#kr!Q2zVYHR2j(PmRy=~G)eORmp21@+ z{(Y+%6Fr-4FFcrC{K7cL`)p3VW`bx;OC{?O2(}bQ&Ec&KCL1u z`2&;7$tja6=U~HcU@5It9p@;B?u zUHeRPoiEvPQ=-z*jyRSXuaVh+HuZARPkp6sIYu}(sH~&>{9VGy0s}m?5s+6ylZ>d7 zo@xyT$|GF-yUwTHQa&l8qsX{Pf$U84kKrrb)7t{65rNttT~k{(M(GsOEP~Ut%t}{m Vh_+Jdiy@99b&{6H|Kb1u000tX$-)2t