KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

*kernel - fixes in 15.2 by Mario79 and 67 by mike.dld

Browse Source 
updated sysfunc.txt
*programs 
         new icons and logo for CPUID and ICON
         added new version of @ICON and ICONMNGR
         fixes in iconedit and calendar from DedOK
         new algoritm of fill background in pic4
         all apps (fasm-writen only) rewriten to use common macros.inc for easy recompile in fastcall mode (there is a bug in https; run need rewrite to use common macros.inc)
         small fixes in build_all.bat script
         

git-svn-id: svn://kolibrios.org@485 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
heavyiron
2007-05-10 13:48:35 +00:00
parent 0f7aa4d574
commit 4daae89053
545 changed files with 31819 additions and 34012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
programs/games/phenix/trunk/ascgl.inc
View File

@@ -373,7 +373,7 @@ macro drawfbox x,y,xs,ys,color
wordstoreg ecx,y,ys ;y*65536+ys
mov edx,color
mov eax,13
int 0x40
mcall
}
; FPS - Set Frame Per Second Display
@@ -390,7 +390,7 @@ ttt dd 0
spdat:
get_time:
mov eax,3
int 0x40
mcall
cmp eax,[savetime]
jne new_time
inc [fps_cntr]
@@ -409,7 +409,7 @@ if ~(delcolor eq )
mov ecx,y*65536+7
mov edx,delcolor
mov eax,13
int 0x40
mcall
end if
mov dword [ttt],fps_show_frequency
mov eax,47
@@ -418,7 +418,7 @@ end if
mov edx,x*65536+y
mov esi,color
mov ecx,[fps]
int 0x40
mcall
no_out_fps:
}
@@ -496,7 +496,7 @@ macro setimg x , y ,arg3
add cx,[arg3+4]
; wordstoreg ecx,[arg3],[arg3+4]
wordstoreg edx, x , y ;arg1*65536+arg2
int 0x40
mcall
}
macro setframe x , y ,arg3
@@ -507,7 +507,7 @@ macro setframe x , y ,arg3
wordstoreg edx, x , y ;arg1*65536+arg2
add edx,dword [arg3]
mov ecx,dword [arg3+4]
int 0x40
mcall
}

76
programs/games/phenix/trunk/ascl.inc
View File

@@ -50,14 +50,14 @@ open:
mov dword [fileinfo+8],1 ; how many blocks to read (1)
mov eax,58
mov ebx,fileinfo
int 0x40
mcall
mov eax,[file_load_area+2]
shr eax,9 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> 512 <EFBFBD> <EFBFBD>ਡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 - <EFBFBD><EFBFBD><EFBFBD><EFBFBD>稬 <EFBFBD><EFBFBD>᫮ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
inc eax
mov dword [fileinfo+8],eax
mov eax,58
mov ebx,fileinfo
int 0x40
mcall
}
@@ -145,7 +145,7 @@ asd:
mov edx,id
mov esi,bcolor
mov eax,8
int 0x40
mcall
mov eax,asd-lab ;calc size
mov ebx,6
@@ -170,7 +170,7 @@ asd:
mov edx,lab
mov esi,asd-lab ;calc size
mov eax,4
int 0x40
mcall
}
@@ -199,7 +199,7 @@ mov [dlg_pid_get],0
mov eax,9
mov ebx,procinfo
mov ecx,-1
int 0x40
mcall
; convert eax bin to param dec
mov eax,dword [procinfo+30] ;offset of myPID
@@ -233,12 +233,12 @@ new_d:
mov ebx,1 ; define IPC
mov ecx,path ; offset of area
mov edx,150 ; size 150 bytes
int 0x40
mcall
; change wanted events list 7-bit IPC event
mov eax,40
mov ebx,01000111b
int 0x40
mcall
;
; STEP 3 run SYSTEM XTREE with parameters
@@ -246,7 +246,7 @@ new_d:
mov eax,58
mov ebx,run_fileinfo
int 0x40
mcall
call redproc
@@ -254,7 +254,7 @@ new_d:
getmesloop:
mov eax,23
mov ebx,50 ;0.5 sec
int 0x40
mcall
cmp eax,1
je mred
@@ -269,14 +269,14 @@ getmesloop:
mov ebx,procinfo
mov ecx,-1
mov eax,9
int 0x40
mcall
mov ebp,eax
loox:
mov eax,9
mov ebx,procinfo
mov ecx,ebp
int 0x40
mcall
mov eax,[DLGPID]
cmp [procinfo+30],eax ;IF Dialog find
je dlg_is_work ;jmp to dlg_is_work
@@ -301,15 +301,15 @@ mred:
jmp getmesloop
mkey:
mov eax,2
int 0x40 ; read (eax=2)
mcall ; read (eax=2)
jmp getmesloop
mbutton:
mov eax,17 ; get id
int 0x40
mcall
cmp ah,1 ; button id=1 ?
jne getmesloop
mov eax,-1 ; close this program
int 0x40
mcall
mgetmes:
; If dlg_pid_get then second message get jmp to still
@@ -411,7 +411,7 @@ mov [dlg_pid_get],0
mov eax,9
mov ebx,procinfo
mov ecx,-1
int 0x40
mcall
; convert eax bin to param dec
mov eax,dword [procinfo+30] ;offset of myPID
@@ -445,12 +445,12 @@ new_d:
mov ebx,1 ; define IPC
mov ecx,path ; offset of area
mov edx,120 ; size 150 bytes
int 0x40
mcall
; change wanted events list 7-bit IPC event
mov eax,40
mov ebx,01000111b
int 0x40
mcall
;
; STEP 3 run SYSTEM XTREE with parameters
@@ -458,7 +458,7 @@ new_d:
mov eax,58
mov ebx,run_fileinfo
int 0x40
mcall
call redproc
@@ -466,7 +466,7 @@ new_d:
getmesloop:
mov eax,23
mov ebx,50 ;0.5 sec
int 0x40
mcall
cmp eax,1
je mred
@@ -481,14 +481,14 @@ getmesloop:
mov ebx,procinfo
mov ecx,-1
mov eax,9
int 0x40
mcall
mov ebp,eax
loox:
mov eax,9
mov ebx,procinfo
mov ecx,ebp
int 0x40
mcall
mov eax,[DLGPID]
cmp [procinfo+30],eax ;IF Dialog find
je dlg_is_work ;jmp to dlg_is_work
@@ -512,15 +512,15 @@ mred:
call redproc
jmp getmesloop
mkey:
int 0x40 ; read (eax=2)
mcall ; read (eax=2)
jmp getmesloop
mbutton:
mov eax,17 ; get id
int 0x40
mcall
cmp ah,1 ; button id=1 ?
jne getmesloop
mov eax,-1 ; close this program
int 0x40
mcall
mgetmes:
; If dlg_pid_get then second message get jmp to still
@@ -672,7 +672,7 @@ rxproc:
macro scank
{
mov eax,10
int 0x40
mcall
}
macro putpix x,y,color
@@ -681,7 +681,7 @@ macro putpix x,y,color
mov ecx,y
mov edx,color
mov eax,1
int 0x40
mcall
}
macro puttxt x,y,offs,size,color
@@ -694,7 +694,7 @@ macro puttxt x,y,offs,size,color
mov edx,offs
mov esi,size
mov eax,4
int 0x40
mcall
}
macro outcount data, x, y, color, numtype
@@ -706,7 +706,7 @@ macro outcount data, x, y, color, numtype
words2reg edx,x,y
mov esi,color
mov eax,47
int 0x40
mcall
}
; SCEVENT - Scan event
@@ -714,7 +714,7 @@ macro outcount data, x, y, color, numtype
macro scevent red,key,but
{
mov eax,11
int 0x40
mcall
dec eax
jz red
dec eax
@@ -728,7 +728,7 @@ macro scevent red,key,but
macro wtevent red,key,but
{
mov eax,10
int 0x40
mcall
dec eax
jz red
dec eax
@@ -743,7 +743,7 @@ macro timeevent xfps,noevent,red,key,but
{
mov eax,23
mov ebx,xfps
int 0x40
mcall
cmp eax,0
je noevent
dec eax
@@ -760,7 +760,7 @@ macro timeevent xfps,noevent,red,key,but
macro close
{
mov eax,-1
int 0x40
mcall
}
; DELAY - Create delay 1/100 sec
@@ -771,7 +771,7 @@ macro delay arg1
{
mov eax,5
mov ebx,arg1
int 0x40
mcall
}
; WINDOW - Draw window
@@ -786,7 +786,7 @@ macro window arg1,arg2,arg3,arg4,arg5
words2reg ecx,arg2,arg4
mov edx,arg5
mov eax,0
int 0x40
mcall
}
macro colorwindow arg1,arg2,arg3,arg4,arg5,arg6,arg7
@@ -797,7 +797,7 @@ macro colorwindow arg1,arg2,arg3,arg4,arg5,arg6,arg7
mov esi,arg6
mov edi,arg7
mov eax,0
int 0x40
mcall
}
@@ -807,7 +807,7 @@ macro startwd
{
mov eax,12
mov ebx,1
int 0x40
mcall
}
; ENDWD - End window draw
@@ -816,7 +816,7 @@ macro endwd
{
mov eax,12
mov ebx,2
int 0x40
mcall
}
; LABEL - Put text to frame
@@ -842,7 +842,7 @@ asd:
mov edx,lab
mov esi,asd-lab ;calc size
mov eax,4
int 0x40
mcall
}
;Key's

1
programs/games/phenix/trunk/build_en.bat
View File

@@ -1,4 +1,5 @@
@erase lang.inc
@echo lang fix en >lang.inc
@fasm phenix.asm phenix
@erase lang.inc
@pause

1
programs/games/phenix/trunk/build_ru.bat
View File

@@ -1,4 +1,5 @@
@erase lang.inc
@echo lang fix ru >lang.inc
@fasm phenix.asm phenix
@erase lang.inc
@pause

33
programs/games/phenix/trunk/phenix.asm
View File

@@ -22,6 +22,7 @@
include 'lang.inc'
include '..\..\..\macros.inc'
include 'ascl.inc'
include 'ascgl.inc'
include 'ascml.inc'
@@ -350,13 +351,13 @@ oelemsize = 20
mov eax,66
mov ebx,1
mov ecx,1
int 0x40
mcall
mov eax,26
mov ebx,2
mov ecx,1
mov edx,keymap
int 0x40
mcall
startgame:
gif_hash_offset = gif_hash_area
@@ -388,11 +389,11 @@ redm:
jmp stillm
keym:
mov eax,2
int 0x40
mcall
jmp stillm
buttonm:
mov eax,17 ; get id
int 0x40
mcall
cmp ah,1 ; button id=1 ?
je close_app
cmp ah,2 ; button id=1 ?
@@ -426,11 +427,11 @@ redh:
jmp stillh
keyh:
mov eax,2
int 0x40
mcall
jmp stillh
buttonh:
mov eax,17 ; get id
int 0x40
mcall
cmp ah,1 ; button id=1 ?
je close_app
cmp ah,2 ; button id=1 ?
@@ -457,7 +458,7 @@ draw_helpwindow:
dec ebp
looht:
mov eax,4
int 0x40
mcall
add edx,esi
add ebx,10
dec ebp
@@ -882,7 +883,7 @@ xr_ok:
key: ; key
mov eax,2
int 0x40 ; read (eax=2)
mcall ; read (eax=2)
shr eax,8
and eax,0xff
@@ -954,12 +955,12 @@ no_num8u:
button: ; button
mov eax,17 ; get id
int 0x40
mcall
cmp ah,1 ; button id=1 ?
jne noclose
close_app:
mov eax,-1 ; close this program
int 0x40
mcall
noclose:
jmp still
@@ -986,11 +987,11 @@ redgo:
jmp stillgo
keygo:
mov eax,2
int 0x40
mcall
jmp stillgo
buttongo:
mov eax,17 ; get id
int 0x40
mcall
cmp ah,1
je close_app
cmp ah,4
@@ -1077,11 +1078,11 @@ redeg:
jmp stilleg
keyeg:
mov eax,2
int 0x40
mcall
jmp stilleg
buttoneg:
mov eax,17 ; get id
int 0x40
mcall
cmp ah,1
je close_app
cmp ah,2
@@ -1211,11 +1212,11 @@ redeg2:
jmp end_gm ;stilleg2
keyeg2:
mov eax,2
int 0x40
mcall
jmp main_menu
buttoneg2:
mov eax,17 ; get id
int 0x40
mcall
jmp stilleg2