From cc80eeaa076b432bf4e263a44c637225a141588b Mon Sep 17 00:00:00 2001 From: heavyiron Date: Mon, 12 Feb 2007 01:06:46 +0000 Subject: [PATCH] *aclock - fixed default size *fasm updated to 1.67.20 *gmon, setup, calendar - now use fn0 to draw header *cpu - fix build for "lang fix ru" (it is necessary for new build_all.bat) *build_all.bat - small fixes and some more functions. Programs now sorting to folders as they are in image. Added ability to compress apps by kpack *Info about new function 53/11 from hidnplayr in docs git-svn-id: svn://kolibrios.org@340 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/docs/sysfuncr.txt | 15 + kernel/trunk/docs/sysfuncs.txt | 15 + programs/build_all.bat | 408 ++++++++++++++------ programs/demos/aclock/trunk/aclock.asm | 8 +- programs/demos/aclock/trunk/make.bat | 3 +- programs/develop/fasm/trunk/assemble.inc | 2 +- programs/develop/fasm/trunk/errors.inc | 2 +- programs/develop/fasm/trunk/expressi.inc | 4 +- programs/develop/fasm/trunk/formats.inc | 2 +- programs/develop/fasm/trunk/parser.inc | 16 +- programs/develop/fasm/trunk/preproce.inc | 2 +- programs/develop/fasm/trunk/tables.inc | 2 +- programs/develop/fasm/trunk/variable.inc | 2 +- programs/develop/fasm/trunk/version.inc | 4 +- programs/develop/fasm/trunk/x86_64.inc | 22 +- programs/system/calendar/trunk/calendar.asm | 24 +- programs/system/cpu/trunk/cpu.asm | 35 +- programs/system/gmon/gmon.asm | 14 +- programs/system/setup/trunk/setup.asm | 26 +- 19 files changed, 397 insertions(+), 209 deletions(-) diff --git a/kernel/trunk/docs/sysfuncr.txt b/kernel/trunk/docs/sysfuncr.txt index 4fbb4866bf..b30c20b896 100644 --- a/kernel/trunk/docs/sysfuncr.txt +++ b/kernel/trunk/docs/sysfuncr.txt @@ -2731,6 +2731,21 @@ dword- * Текущая реализация ядра поддерживает эту функцию только для сетевых карт RTL8139. +====================================================================== +==== Функция 53, подфункция 11 - прочитать данные из стека. ==== +====================================================================== +Параметры: + * eax = 53 - номер функции + * ebx = 11 - номер подфункции + * ecx = номер сокета + * edx = указатель, куда должны быть записаны данные + * esi = размер буфера (максимум байт, которые будут скопированы) +Возвращаемое значение: + * eax = количество скопированных байт +Замечания: + * Если размер буфера равен 0, будут скопированы все данные + (максимум 4096 байт) + ====================================================================== Функция 53, подфункция 255 - отладочная информация сетевого драйвера. ====================================================================== diff --git a/kernel/trunk/docs/sysfuncs.txt b/kernel/trunk/docs/sysfuncs.txt index 3f9f573636..83349cf1d7 100644 --- a/kernel/trunk/docs/sysfuncs.txt +++ b/kernel/trunk/docs/sysfuncs.txt @@ -2707,6 +2707,21 @@ Remarks: * The current kernel implementation supports this function only for RTL8139 network cards. +====================================================================== +===== Function 53, subfunction 10 - read data from stack. ===== +====================================================================== +Parameters: + * eax = 53 + * ebx = 11 + * ecx = socket number + * edx = pointer to where data must be written + * esi = buffer size (max bytes of data to copy) +Returned value: + * eax = number of bytes copied +Remarks: + * if buffer size is zero, all data will be copied + (this will be max 4096 bytes) + ====================================================================== = Function 53, subfunction 255 - debug information of network driver. ====================================================================== diff --git a/programs/build_all.bat b/programs/build_all.bat index 4c5602f64b..87e053487e 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -1,9 +1,10 @@ @echo off set languages=en ru ge et +set kpack=y n cls echo Build KolibriOS apps -echo Enter valide languege +echo Enter valide language echo [%languages%] set /P res="> @@ -11,157 +12,330 @@ set /P res="> @erase lang.inc echo lang fix %res% > lang.inc +if not exist bin mkdir bin +if not exist bin\demos mkdir bin\demos +if not exist bin\develop mkdir bin\develop +if not exist bin\games mkdir bin\games +if not exist bin\network mkdir bin\network +if not exist bin\3d mkdir bin\3d +if not exist bin\fonts mkdir bin\fonts + echo * echo Building system echo * -@fasm system\calendar\trunk\calendar.asm calendar -@fasm system\board\trunk\board.asm board -@fasm system\cpu\trunk\cpu.asm cpu -@fasm system\cpuid\trunk\cpuid.asm cpuid -@fasm system\desktop\trunk\desktop.asm desktop -@fasm system\docpack\trunk\docpack.asm docpack -@fasm system\end\trunk\end.asm end -@fasm system\gmon\gmon.asm gmon -@fasm system\icon\trunk\icon.asm icon -@fasm system\kbd\trunk\kbd.ASM kbd -@fasm system\launcher\trunk\launcher.asm launcher -@fasm system\menu\trunk\menu.asm menu -@fasm system\PANEL\trunk\@PANEL.ASM @PANEL -@fasm system\pcidev\trunk\pcidev.asm pcidev -@fasm system\RB\trunk\@RB.ASM @RB -@fasm system\rdsave\trunk\rdsave.asm rdsave -@fasm system\run\trunk\run.asm run -@fasm system\setup\trunk\setup.asm setup -@fasm system\skinsel\skinsel.asm skinsel -@fasm system\vrr\trunk\vrr.asm vrr -@fasm system\vrr_m\trunk\vrr_m.asm vrr_m +@fasm system\calendar\trunk\calendar.asm bin\calendar +@fasm system\board\trunk\board.asm bin\develop\board +@fasm system\cpu\trunk\cpu.asm bin\cpu +@fasm system\cpuid\trunk\cpuid.asm bin\cpuid +@fasm system\desktop\trunk\desktop.asm bin\desktop +@fasm system\docpack\trunk\docpack.asm bin\docpack +@fasm system\end\trunk\end.asm bin\end +@fasm system\gmon\gmon.asm bin\gmon +@fasm system\icon\trunk\icon.asm bin\icon +@fasm system\kbd\trunk\kbd.ASM bin\kbd +@fasm system\launcher\trunk\launcher.asm bin\launcher +@fasm system\menu\trunk\menu.asm bin\menu +@fasm system\PANEL\trunk\@PANEL.ASM bin\@PANEL +@fasm system\pcidev\trunk\pcidev.asm bin\pcidev +@fasm system\RB\trunk\@RB.ASM bin\@RB +@fasm system\rdsave\trunk\rdsave.asm bin\rdsave +@fasm system\run\trunk\run.asm bin\run +@fasm system\setup\trunk\setup.asm bin\setup +@fasm system\skinsel\skinsel.asm bin\skinsel +@fasm system\vrr\trunk\vrr.asm bin\vrr +@fasm system\vrr_m\trunk\vrr_m.asm bin\vrr_m echo * echo Building develop echo * -@fasm develop\cmd\trunk\cmd.asm cmd -@fasm develop\fasm\trunk\fasm.asm fasm -@fasm develop\h2d2b\trunk\h2d2b.asm h2d2b -@fasm develop\heed\trunk\heed.asm heed -@fasm develop\hexview\trunk\hexview.asm hexview -@fasm develop\keyascii\trunk\keyascii.asm keyascii -@fasm develop\mtdbg\mtdbg.asm mtdbg -@fasm develop\param\trunk\param.asm param -@fasm develop\scancode\trunk\scancode.asm scancode -@fasm develop\tinypad\trunk\tinypad.asm tinypad +@fasm develop\cmd\trunk\cmd.asm bin\cmd +@fasm develop\fasm\trunk\fasm.asm bin\develop\fasm +@fasm develop\h2d2b\trunk\h2d2b.asm bin\develop\h2d2b +@fasm develop\heed\trunk\heed.asm bin\demos\heed +rem @fasm develop\hexview\trunk\hexview.asm hexview +@fasm develop\keyascii\trunk\keyascii.asm bin\develop\keyascii +@fasm develop\mtdbg\mtdbg.asm bin\develop\mtdbg +rem @fasm develop\param\trunk\param.asm param +@fasm develop\scancode\trunk\scancode.asm bin\develop\scancode +@fasm develop\tinypad\trunk\tinypad.asm bin\tinypad echo * echo Building fs echo * -@fasm fs\copy2\trunk\copy2.asm cmd -@fasm fs\copyr\trunk\copyr.asm copyr -@fasm fs\kfar\trunk\kfar.asm kfar -@fasm fs\mfar\trunk\mfar.asm mfar -@fasm fs\sysxtree\trunk\sysxtree.asm sysxtree +@fasm fs\copy2\trunk\copy2.asm bin\copy2 +@fasm fs\copyr\trunk\copyr.asm bin\copyr +@fasm fs\kfar\trunk\kfar.asm bin\kfar +rem @fasm fs\mfar\trunk\mfar.asm bin\mfar +@fasm fs\sysxtree\trunk\sysxtree.asm bin\sysxtree echo * echo Building network echo * -@fasm network\airc\trunk\airc.asm airc -@fasm network\arpstat\trunk\arpstat.asm arpstat -@fasm network\autodhcp\trunk\autodhcp.asm autodhcp -@fasm network\dhcp\trunk\dhcp.asm dhcp -@fasm network\dnsr\trunk\dnsr.asm dnsr -@fasm network\ethstat\trunk\ethstat.asm ethstat -@fasm network\httpc\trunk\httpc.asm httpc -@fasm network\https\trunk\https.asm https -@fasm network\ipc\trunk\ipc.asm ipc -@fasm network\local\trunk\local.asm local -@fasm network\netsendc\trunk\netsendc.asm netsendc -@fasm network\netsends\trunk\netsends.asm netsends -@fasm network\nntpc\trunk\nntpc.asm nntpc -@fasm network\popc\trunk\popc.asm popc -@fasm network\ppp\trunk\ppp.asm ppp -@fasm network\rccc\trunk\rccc.asm rccc -@fasm network\rccs\trunk\rccs.asm rccs -@fasm network\remote\trunk\remote.asm remote -@fasm network\smtps\trunk\smtps.asm smtps -@fasm network\stackcfg\trunk\stackcfg.asm stackcfg -@fasm network\telnet\trunk\telnet.asm telnet -@fasm network\terminal\trunk\terminal.asm terminal -@fasm network\tftpa\trunk\tftpa.asm tftpa -@fasm network\tftpc\trunk\tftpc.asm tftpc -@fasm network\VNCclient\VNCclient.asm VNCclient -@fasm network\ym\trunk\ym.asm ym +@fasm network\airc\trunk\airc.asm bin\network\airc +@fasm network\arpstat\trunk\arpstat.asm bin\network\arpstat +@fasm network\autodhcp\trunk\autodhcp.asm bin\network\autodhcp +@fasm network\dhcp\trunk\dhcp.asm bin\network\dhcp +@fasm network\dnsr\trunk\dnsr.asm bin\network\dnsr +@fasm network\ethstat\trunk\ethstat.asm bin\network\ethstat +@fasm network\httpc\trunk\httpc.asm bin\network\httpc +@fasm network\https\trunk\https.asm bin\network\https +@fasm network\ipc\trunk\ipc.asm bin\network\ipc +@fasm network\local\trunk\local.asm bin\network\local +@fasm network\netsendc\trunk\netsendc.asm bin\network\netsendc +@fasm network\netsends\trunk\netsends.asm bin\network\netsends +@fasm network\nntpc\trunk\nntpc.asm bin\network\nntpc +@fasm network\popc\trunk\popc.asm bin\network\popc +@fasm network\ppp\trunk\ppp.asm bin\network\ppp +@fasm network\rccc\trunk\rccc.asm bin\network\rccc +@fasm network\rccs\trunk\rccs.asm bin\network\rccs +@fasm network\remote\trunk\remote.asm bin\network\remote +@fasm network\smtps\trunk\smtps.asm bin\network\smtps +@fasm network\stackcfg\trunk\stackcfg.asm bin\network\stackcfg +@fasm network\telnet\trunk\telnet.asm bin\network\telnet +@fasm network\terminal\trunk\terminal.asm bin\network\terminal +@fasm network\tftpa\trunk\tftpa.asm bin\network\tftpa +@fasm network\tftpc\trunk\tftpc.asm bin\network\tftpc +@fasm network\VNCclient\VNCclient.asm bin\network\VNCclient +@fasm network\ym\trunk\ym.asm bin\network\ym echo * echo Building other echo * -@fasm other\archer\trunk\@rcher.asm @rcher -@fasm other\calc\trunk\calc.asm calc -@fasm other\mhc\trunk\mhc.asm mhc -@fasm other\period\trunk\period.asm period -@fasm other\rtfread\trunk\rtfread.asm rtfread +rem @fasm other\archer\trunk\@rcher.asm bin\@rcher +@fasm other\calc\trunk\calc.asm bin\calc +@fasm other\mhc\trunk\mhc.asm bin\mhc +@fasm other\period\trunk\period.asm bin\period +@fasm other\rtfread\trunk\rtfread.asm bin\rtfread echo * echo Building media echo * -rem @fasm media\ac97snd\trunk\ac97snd.asm ac97snd -@fasm media\animage\trunk\animage.asm animage -@fasm media\cdp\trunk\cdp.asm cdp -@fasm media\gifview\trunk\gifview.asm gifview -@fasm media\iconedit\trunk\iconedit.asm iconedit -@fasm media\jpegview\trunk\jpegview.asm jpegview -@fasm media\midamp\trunk\midamp.asm midamp -@fasm media\midiplay\trunk\midiplay.asm midiplay -@fasm media\mixer\trunk\mixer.asm mixer -@fasm media\mp3s\trunk\mp3s.asm mp3s -@fasm media\mv\trunk\mv.asm mv -@fasm media\pic4\trunk\pic4.asm pic4 -@fasm media\sb\trunk\sb.asm sb -@fasm media\scrshoot\scrshoot.asm scrshoot +rem media\ac97snd\trunk\ac97snd.asm ac97snd +@fasm media\animage\trunk\animage.asm bin\animage +@fasm media\cdp\trunk\cdp.asm bin\cdp +@fasm media\gifview\trunk\gifview.asm bin\gifview +@fasm media\iconedit\trunk\iconedit.asm bin\iconedit +@fasm media\jpegview\trunk\jpegview.asm bin\jpegview +@fasm media\midamp\trunk\midamp.asm bin\midamp +@fasm media\midiplay\trunk\midiplay.asm bin\midiplay +@fasm media\mixer\trunk\mixer.asm bin\mixer +@fasm media\mp3s\trunk\mp3s.asm bin\mp3s +@fasm media\mv\trunk\mv.asm bin\mv +@fasm media\pic4\trunk\pic4.asm bin\pic4 +@fasm media\sb\trunk\sb.asm bin\sb +@fasm media\scrshoot\scrshoot.asm bin\scrshoot echo * echo Building games echo * -@fasm games\15\trunk\15.asm 15 -@fasm games\arcanii\trunk\arcanii.asm arcanii -@fasm games\arcanoid\trunk\arcanoid.asm arcanoid -rem @fasm games\c4\trunk\c4.asm c4 -@fasm games\chess\trunk\chess.asm chess -@fasm games\freecell\freecell.asm freecell -@fasm games\mblocks\trunk\mblocks.asm mblocks -@fasm games\phenix\trunk\phenix.asm phenix -@fasm games\pipes\pipes.asm pipes -@fasm games\pong\trunk\pong.asm pong -@fasm games\pong3\trunk\pong3.asm pong3 -@fasm games\tanks\trunk\tanks.asm tanks -@fasm games\tetris\trunk\tetris.asm tetris +@fasm games\15\trunk\15.asm bin\games\15 +@fasm games\arcanii\trunk\arcanii.asm bin\games\arcanii +@fasm games\arcanoid\trunk\arcanoid.asm bin\games\arcanoid +cd games\c4\trunk\ +@nasmw -f bin -o ..\..\..\bin\games\c4 c4.asm +cd ..\..\.. +@fasm games\chess\trunk\chess.asm bin\games\chess +@fasm games\freecell\freecell.asm bin\games\freecell +@fasm games\mblocks\trunk\mblocks.asm bin\games\mblocks +@fasm games\phenix\trunk\phenix.asm bin\games\phenix +@fasm games\pipes\pipes.asm bin\games\pipes +@fasm games\pong\trunk\pong.asm bin\games\pong +@fasm games\pong3\trunk\pong3.asm bin\games\pong3 +@fasm games\tanks\trunk\tanks.asm bin\games\tanks +@fasm games\tetris\trunk\tetris.asm bin\games\tetris echo * echo Building demos echo * -@fasm demos\3dcube2\trunk\3dcube2.asm 3dcube2 -@fasm demos\3detx60b\trunk\3detx60b.asm 3detx60b -@fasm demos\3dtcub10\trunk\3dtcub10.asm 3dtcub10 -rem @fasm demos\aclock\trunk\aclock.asm aclock -@fasm demos\bcdclk\bcdclk\bcdclk.asm bcdclk -@fasm demos\bgitest\trunk\bgitest.asm bgitest -@fasm demos\colorref\trunk\colorref.asm colorref -@fasm demos\crownscr\trunk\crownscr.asm crownscr -@fasm demos\cslide\trunk\cslide.asm cslide -@fasm demos\eyes\trunk\eyes.asm eyes -@fasm demos\fire\trunk\fire.asm fire -@fasm demos\fire2\trunk\fire2.asm fire2 -@fasm demos\free3d04\trunk\free3d04.asm free3d04 -@fasm demos\magnify\trunk\magnify.asm magnify -@fasm demos\movback\trunk\movback.asm movback -@fasm demos\plasma\trunk\plasma.asm plasma -@fasm demos\ss\trunk\@ss.asm @ss -@fasm demos\timer\trunk\timer.asm timer -@fasm demos\tinyfrac\trunk\tinyfrac.asm tinyfrac -@fasm demos\transp\trunk\transp.asm transp -@fasm demos\trantest\trunk\trantest.asm trantest -@fasm demos\tube\trunk\tube.asm tube +@fasm demos\3dcube2\trunk\3dcube2.asm bin\3d\3dcube2 +rem @fasm demos\3detx60b\trunk\3detx60b.asm bin\3d\3detx60b +@fasm demos\3dtcub10\trunk\3dtcub10.asm bin\3d\3dtcub10 +cd demos\aclock\trunk\ +@nasmw -t -f bin -o ..\..\..\bin\demos\aclock aclock.asm +cd ..\..\.. +@fasm demos\bcdclk\bcdclk\bcdclk.asm bin\demos\bcdclk +@fasm demos\bgitest\trunk\bgitest.asm bin\fonts\bgitest +@fasm demos\colorref\trunk\colorref.asm bin\demos\colorref +@fasm demos\crownscr\trunk\crownscr.asm bin\3d\crownscr +@fasm demos\cslide\trunk\cslide.asm bin\demos\cslide +@fasm demos\eyes\trunk\eyes.asm bin\demos\eyes +@fasm demos\fire\trunk\fire.asm bin\demos\fire +@fasm demos\fire2\trunk\fire2.asm bin\demos\fire2 +@fasm demos\free3d04\trunk\free3d04.asm bin\3d\free3d04 +@fasm demos\magnify\trunk\magnify.asm bin\magnify +@fasm demos\movback\trunk\movback.asm bin\demos\movback +@fasm demos\plasma\trunk\plasma.asm bin\demos\plasma +@fasm demos\ss\trunk\@ss.asm bin\@ss +@fasm demos\timer\trunk\timer.asm bin\demos\timer +@fasm demos\tinyfrac\trunk\tinyfrac.asm bin\demos\tinyfrac +@fasm demos\transp\trunk\transp.asm bin\demos\transp +@fasm demos\trantest\trunk\trantest.asm bin\demos\trantest +@fasm demos\tube\trunk\tube.asm bin\demos\tube @erase lang.inc echo * echo Finished building echo * + +echo Kpack KolibriOS apps? +echo [%kpack%] + +set /P res="> + +if "%res%"=="y" ( + +echo * +echo Compressing system +echo * +@kpack bin\calendar +@kpack bin\develop\board +@kpack bin\cpu +@kpack bin\cpuid +@kpack bin\desktop +@kpack bin\docpack +@kpack bin\end +@kpack bin\gmon +@kpack bin\icon +@kpack bin\kbd +@kpack bin\launcher +@kpack bin\menu +@kpack bin\@PANEL +@kpack bin\pcidev +@kpack bin\@RB +@kpack bin\rdsave +@kpack bin\run +@kpack bin\setup +@kpack bin\skinsel +@kpack bin\vrr +@kpack bin\vrr_m + +echo * +echo Compressing develop +echo * + +@kpack bin\cmd +@kpack bin\develop\fasm +@kpack bin\develop\h2d2b +@kpack bin\demos\heed +@kpack bin\develop\keyascii +@kpack bin\develop\mtdbg +@kpack bin\develop\scancode + +echo * +echo Compressing fs +echo * + +@kpack bin\copy2 +@kpack bin\copyr +@kpack bin\kfar +@kpack bin\sysxtree + +echo * +echo Compressing network +echo * + +@kpack bin\network\airc +@kpack bin\network\arpstat +@kpack bin\network\autodhcp +@kpack bin\network\dhcp +@kpack bin\network\dnsr +@kpack bin\network\ethstat +@kpack bin\network\httpc +@kpack bin\network\https +@kpack bin\network\ipc +@kpack bin\network\local +@kpack bin\network\netsendc +@kpack bin\network\netsends +@kpack bin\network\nntpc +@kpack bin\network\popc +@kpack bin\network\ppp +@kpack bin\network\rccc +@kpack bin\network\rccs +@kpack bin\network\remote +@kpack bin\network\smtps +@kpack bin\network\stackcfg +@kpack bin\network\telnet +@kpack bin\network\terminal +@kpack bin\network\tftpa +@kpack bin\network\tftpc +@kpack bin\network\VNCclient +@kpack bin\network\ym + +echo * +echo Compressing other +echo * + +rem @kpack bin\@rcher +@kpack bin\calc +@kpack bin\mhc +@kpack bin\period +@kpack bin\rtfread + +echo * +echo Compressing media +echo * + +@kpack bin\animage +@kpack bin\cdp +@kpack bin\gifview +@kpack bin\iconedit +@kpack bin\jpegview +@kpack bin\midamp +@kpack bin\midiplay +@kpack bin\mixer +@kpack bin\mp3s +@kpack bin\mv +@kpack bin\pic4 +@kpack bin\sb +@kpack bin\scrshoot + +echo * +echo Compressing games +echo * + +@kpack bin\games\15 +@kpack bin\games\arcanii +@kpack bin\games\arcanoid +@kpack bin\games\chess +@kpack bin\games\freecell +@kpack bin\games\mblocks +@kpack bin\games\phenix +@kpack bin\games\pipes +@kpack bin\games\pong +@kpack bin\games\pong3 +@kpack bin\games\tanks +@kpack bin\games\tetris + +echo * +echo Compressing demos +echo * + +@kpack bin\3d\3dcube2 +@kpack bin\3d\3dtcub10 +@kpack bin\demos\aclock +@kpack bin\demos\bcdclk +@kpack bin\fonts\bgitest +@kpack bin\demos\colorref +@kpack bin\3d\crownscr +@kpack bin\demos\cslide +@kpack bin\demos\eyes +@kpack bin\demos\fire +@kpack bin\demos\fire2 +@kpack bin\3d\free3d04 +@kpack bin\magnify +@kpack bin\demos\movback +@kpack bin\demos\plasma +@kpack bin\@ss +@kpack bin\demos\timer +@kpack bin\demos\tinyfrac +@kpack bin\demos\transp +@kpack bin\demos\trantest +@kpack bin\demos\tube + +echo * +echo Compressing complete +echo * +) + pause diff --git a/programs/demos/aclock/trunk/aclock.asm b/programs/demos/aclock/trunk/aclock.asm index bde2679943..abaf060edb 100644 --- a/programs/demos/aclock/trunk/aclock.asm +++ b/programs/demos/aclock/trunk/aclock.asm @@ -31,12 +31,12 @@ ; default window position/dimensions (work area) %define DEFAULT_XPOS -20 %define DEFAULT_YPOS 20 - %define DEFAULT_WIDTH 80 - %define DEFAULT_HEIGHT 80 + %define DEFAULT_WIDTH 100 + %define DEFAULT_HEIGHT 100 ; minimal size (horizontal and vertical) of work area - %define MIN_WIDTH 80 - %define MIN_HEIGHT 80 + %define MIN_WIDTH 100 + %define MIN_HEIGHT 100 ;******************************************************************** diff --git a/programs/demos/aclock/trunk/make.bat b/programs/demos/aclock/trunk/make.bat index 016118a765..e770ff785f 100644 --- a/programs/demos/aclock/trunk/make.bat +++ b/programs/demos/aclock/trunk/make.bat @@ -1,2 +1,3 @@ @rem nasm -t -f bin -o aclock -l aclock.lst aclock.asm -DDEBUG -nasm -t -f bin -o aclock aclock.asm +nasmw -t -f bin -o aclock aclock.asm +@pause diff --git a/programs/develop/fasm/trunk/assemble.inc b/programs/develop/fasm/trunk/assemble.inc index 60db5bd2a4..00500dcd55 100644 --- a/programs/develop/fasm/trunk/assemble.inc +++ b/programs/develop/fasm/trunk/assemble.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. assembler: diff --git a/programs/develop/fasm/trunk/errors.inc b/programs/develop/fasm/trunk/errors.inc index f2241743f7..62d2ddba5d 100644 --- a/programs/develop/fasm/trunk/errors.inc +++ b/programs/develop/fasm/trunk/errors.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. out_of_memory: diff --git a/programs/develop/fasm/trunk/expressi.inc b/programs/develop/fasm/trunk/expressi.inc index 0784d1a7f0..981fd4e50c 100644 --- a/programs/develop/fasm/trunk/expressi.inc +++ b/programs/develop/fasm/trunk/expressi.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. convert_expression: @@ -2011,7 +2011,7 @@ get_address_value: jz address_size_ok cmp al,ah je address_size_ok - cmp ax,0408h + cmp ax,0804h jne address_sizes_do_not_agree mov [value_type],2 mov eax,[edi] diff --git a/programs/develop/fasm/trunk/formats.inc b/programs/develop/fasm/trunk/formats.inc index 63d77bdafe..c90a45632b 100644 --- a/programs/develop/fasm/trunk/formats.inc +++ b/programs/develop/fasm/trunk/formats.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. formatter: diff --git a/programs/develop/fasm/trunk/parser.inc b/programs/develop/fasm/trunk/parser.inc index f03130a4eb..3331eac1fd 100644 --- a/programs/develop/fasm/trunk/parser.inc +++ b/programs/develop/fasm/trunk/parser.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. parser: @@ -1297,10 +1297,14 @@ get_label_id: cmp al,39h jbe invalid_name name_first_char_ok: - cmp ecx,1 - jne check_for_reserved_word cmp al,'$' - je reserved_word + jne check_for_reserved_word + cmp ecx,1 + jne invalid_name + reserved_word: + mov eax,0Fh + pop edi + ret check_for_reserved_word: call get_instruction jnc reserved_word @@ -1341,10 +1345,6 @@ get_label_id: mov [eax+24],ebx pop edi ret - reserved_word: - mov eax,0Fh - pop edi - ret allocate_label: mov eax,[labels_list] mov ecx,LABEL_STRUCTURE_SIZE shr 2 diff --git a/programs/develop/fasm/trunk/preproce.inc b/programs/develop/fasm/trunk/preproce.inc index 6a755c8157..33bcbef77b 100644 --- a/programs/develop/fasm/trunk/preproce.inc +++ b/programs/develop/fasm/trunk/preproce.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. preprocessor: diff --git a/programs/develop/fasm/trunk/tables.inc b/programs/develop/fasm/trunk/tables.inc index c82989b5c8..a604df4ab8 100644 --- a/programs/develop/fasm/trunk/tables.inc +++ b/programs/develop/fasm/trunk/tables.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. include_variable db 'INCLUDE',0 diff --git a/programs/develop/fasm/trunk/variable.inc b/programs/develop/fasm/trunk/variable.inc index b6194b13b4..c494f70be9 100644 --- a/programs/develop/fasm/trunk/variable.inc +++ b/programs/develop/fasm/trunk/variable.inc @@ -1,6 +1,6 @@ ; flat assembler core variables -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. ; Variables which have to be set up by interface: diff --git a/programs/develop/fasm/trunk/version.inc b/programs/develop/fasm/trunk/version.inc index ca049c2d3c..93d2f80d6f 100644 --- a/programs/develop/fasm/trunk/version.inc +++ b/programs/develop/fasm/trunk/version.inc @@ -1,6 +1,6 @@ ; flat assembler version 1.67 -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. ; ; This programs is free for commercial and non-commercial use as long as @@ -33,7 +33,7 @@ ; cannot simply be copied and put under another distribution licence ; (including the GNU Public Licence). -VERSION_STRING equ "1.67.18" +VERSION_STRING equ "1.67.20" VERSION_MAJOR = 1 VERSION_MINOR = 67 diff --git a/programs/develop/fasm/trunk/x86_64.inc b/programs/develop/fasm/trunk/x86_64.inc index 7278ef841f..769af2d9d9 100644 --- a/programs/develop/fasm/trunk/x86_64.inc +++ b/programs/develop/fasm/trunk/x86_64.inc @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2006, Tomasz Grysztar. +; Copyright (c) 1999-2007, Tomasz Grysztar. ; All rights reserved. simple_instruction_except64: @@ -6344,6 +6344,14 @@ store_instruction: shl cl,3 or al,cl stos word [edi] + address_32bit_value: + cmp [code_type],64 + jne store_address_32bit_value + mov eax,edx + cdq + cmp edx,[address_high] + jne value_out_of_range + mov edx,eax jmp store_address_32bit_value sib_address_8bit_value: or al,01000000b @@ -6374,10 +6382,12 @@ store_instruction: or al,cl stos word [edi] test ch,44h - jnz store_address_32bit_value + jnz address_32bit_value + test ch,88h + jnz address_32bit_value or ch,ch jnz invalid_address_size - jmp store_address_32bit_value + jmp address_32bit_value zero_index_register: mov bl,4 mov cl,1 @@ -6405,7 +6415,7 @@ store_instruction: shl cl,3 or al,cl stos byte [edi] - jmp store_address_32bit_value + jmp address_32bit_value simple_address_8bit_value: or al,01000000b mov cl,[postbyte_register] @@ -6452,6 +6462,10 @@ store_instruction: jz address_32bit_relocation_ok mov eax,ecx shr eax,16 + cmp al,4 + jne address_32bit_relocation + mov al,2 + address_32bit_relocation: xchg [value_type],al mov ebx,[address_symbol] xchg ebx,[symbol_identifier] diff --git a/programs/system/calendar/trunk/calendar.asm b/programs/system/calendar/trunk/calendar.asm index a79f49c87e..50980d0f0f 100644 --- a/programs/system/calendar/trunk/calendar.asm +++ b/programs/system/calendar/trunk/calendar.asm @@ -480,9 +480,8 @@ draw_window: else mov ecx,WIN_Y-15 end if - mov edx,0x03aabbcc ; цвет рабочей области RRGGBB,8->color gl - mov esi,0x805080d0 ; цвет полосы заголовка RRGGBB,8->color gl - mov edi,0x005080d0 ; цвет рамки RRGGBB + mov edx,0x13aabbcc ; цвет рабочей области RRGGBB,8->color gl + mov edi,header ; заголовок int 0x40 call draw_week @@ -520,13 +519,8 @@ draw_window: int 0x40 call draw_days - ; ЗАГОЛОВОК ОКНА mov eax,4 ; функция 4 : написать в окне текст - mov ebx,8*65536+8 ; [x] *65536 + [y] mov ecx,0x10ddeeff ; шрифт 1 и цвет ( 0xF0RRGGBB ) - mov edx,zagolovok ; адрес строки - mov esi,zag_konets-zagolovok ; и её длина - int 0x40 if SKIP eq 0 mov ebx,B_DATE @@ -796,19 +790,19 @@ calculate: day_count db 3,0,3,2,3,2,3,3,2,3,2,3 Fkeys db 210,211,212,213,214,215,216,217,208,209,228,159 -zagolovok: ; строка заголовка +header: ; строка заголовка if lang eq ru - db 'КАЛЕНДАРЬ' + db 'КАЛЕНДАРЬ',0 else if lang eq ge - db 'KALENDER' + db 'KALENDER',0 else if lang eq fr - db 'CALENDRIER' + db 'CALENDRIER',0 else if lang eq et - db 'KALENDER' + db 'KALENDER',0 else - db 'CALENDAR' + db 'CALENDAR',0 end if -zag_konets: ; и её конец + if SKIP eq 0 datebut: if lang eq ru diff --git a/programs/system/cpu/trunk/cpu.asm b/programs/system/cpu/trunk/cpu.asm index 1e8330ec2f..45a5fa3c7b 100644 --- a/programs/system/cpu/trunk/cpu.asm +++ b/programs/system/cpu/trunk/cpu.asm @@ -589,22 +589,7 @@ file_start: dd 7 start_application: db '/RD/1/LAUNCHER',0 times 60 db 32 -if lang eq en -text: - db ' NAME/TERMINATE PID CPU-USAGE % ' - db 'MEMORY START/USAGE W-STACK W-SIZE' -text_len = $-text - -tbts: db 'PREV PAGE NEXT PAGE REBOOT SYSTEM' -tbte: -tbts_2 db '>' -tbts_3 db 'RUN' -tbte_2: - -labelt: - db 'Processes - Ctrl/Alt/Del' -labellen: -else if lang eq de +if lang eq de text: db ' NAME/BEENDEN PID CPU-LAST % ' db 'SPEICHER START/NUTZUNG W-STACK W-SIZE' @@ -619,6 +604,7 @@ tbte_2: labelt: db 'Prozesse - Ctrl/Alt/Del' labellen: + else if lang eq et text: db ' NIMI/L╒PETA PID CPU-KASUTUS % ' @@ -634,6 +620,23 @@ tbte_2: labelt: db 'Protsessid - Ctrl/Alt/Del' labellen: + +else +text: + db ' NAME/TERMINATE PID CPU-USAGE % ' + db 'MEMORY START/USAGE W-STACK W-SIZE' +text_len = $-text + +tbts: db 'PREV PAGE NEXT PAGE REBOOT SYSTEM' +tbte: +tbts_2 db '>' +tbts_3 db 'RUN' +tbte_2: + +labelt: + db 'Processes - Ctrl/Alt/Del' +labellen: + end if I_END: diff --git a/programs/system/gmon/gmon.asm b/programs/system/gmon/gmon.asm index 12574a2880..534ae948f7 100644 --- a/programs/system/gmon/gmon.asm +++ b/programs/system/gmon/gmon.asm @@ -233,9 +233,8 @@ draw_window: xor eax, eax mov ebx, 300 * 65536 + 309 mov ecx, 150 * 65536 + 450 - mov edx, tcol + 0x3000000 ; color of work area RRGGBB,8->color - mov esi, 0x805080d0 ; color of grab bar RRGGBB,8->color - mov edi, 0x005080d0 ; color of frames RRGGBB + mov edx, tcol + 0x13000000 ; color of work area RRGGBB,8->color + mov edi, title ; color of frames RRGGBB int 0x40 ; ╤ючфр╕ь Ёрьъє уЁрЇшър mov eax, 13 @@ -255,13 +254,6 @@ draw_window: int 0x40 cmp cx, 230 ; яЁшт чрэю ъ ъююЁфшэрЄрь юъэр jl @b - ; ╧ш°шь чруюыютюъ - mov eax, 4 - mov ebx, 8 * 65536 + 8 - mov edx, title - mov ecx, 0x10FFFFFF - mov esi, 29 - int 0x40 ; ╧ш°шь эрчтрэш  ярЁрьхЄЁют (Cpu load, temper, etc...) mov edx, msgs_mon @@ -515,7 +507,7 @@ about_tab: DATA act_tab db 2 ; ═юьхЁ ръЄштэющ тъырфъш tab_lab db 'Info Tests Configs About' -title db 'Ghost Monitor v0.4 [26/12/06]' +title db 'Ghost Monitor v0.4 [26/12/06]',0 msgs_mon mls \ 'CPU Load (%)',\ diff --git a/programs/system/setup/trunk/setup.asm b/programs/system/setup/trunk/setup.asm index 9b61a854ed..cc960c8c58 100644 --- a/programs/system/setup/trunk/setup.asm +++ b/programs/system/setup/trunk/setup.asm @@ -867,29 +867,10 @@ draw_window: xor eax,eax ; DRAW WINDOW mov ebx,40*65536+355+BBB mov ecx,40*65536+320 - mov edx,0x83111199 -; mov esi,0x805588dd -; mov edi,0x005588dd + mov edx,0x93111199 + mov edi,header int 0x40 - mov eax,4 - mov ebx,8*65536+8 - mov ecx,0x10ffffff - mov edx,labelt - cmp [syslang],4 - je ruslabel - add edx,20 - ruslabel: - mov esi,19 ;26 - int 0x40 - -; mov eax,8 ; CLOSE BUTTON -; mov ebx,(355+BBB-19)*65536+12 -; mov ecx,5*65536+12 -; mov edx,1 -; mov esi,0x005588dd -; int 0x40 - mov eax,8 ; APPLY ALL mov ebx,(350-79)*65536+100 mov ecx,282*65536+12 @@ -1394,8 +1375,7 @@ text1_strings = 14 db 'SAVE YOUR SETTINGS BEFORE QUIT KOLIBRI SAVE ALL ' text2_strings = 2 -labelt: - db 'НАСТРОЙКА УСТРОЙСТВ DEVICE SETUP ' +header db 'SETUP',0 hex db '0123456789ABCDEF'