aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests 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

1
programs/develop/examples/example2/trunk/build_en.bat
View File

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

1
programs/develop/examples/example2/trunk/build_ru.bat
View File

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

66
programs/develop/examples/example2/trunk/dialogs1.inc
View File

@@ -59,7 +59,7 @@ check_mouse:
mov eax,37
mov ebx,2
int 0x40
mcall
cmp [window_on],0
jne openw2
@@ -73,14 +73,14 @@ check_mouse:
mov eax,23
mov ebx,2
int 0x40
mcall
cmp eax,0
jne no_open
mov eax,37
mov ebx,2
int 0x40
mcall
cmp eax,0
jne waitformouse
@@ -88,7 +88,7 @@ check_mouse:
mov eax,37
mov ebx,1
int 0x40
mcall
mov esi,eax
@@ -120,7 +120,7 @@ check_mouse:
waitm:
mov eax,5
mov ebx,1
int 0x40
mcall
dec ecx
jz no_open
cmp [window_on],0
@@ -150,7 +150,7 @@ check_mouse:
mov eax,9
mov ebx,table
mov ecx,-1
int 0x40
mcall
mov eax,[table+34]
mov [mo_x],eax
@@ -161,7 +161,7 @@ check_mouse:
mov ebx,1
mov ecx,alert_entry
mov edx,[g_stack]
int 0x40
mcall
mov [esp+28],dword 0 ; clear button entry
@@ -179,7 +179,7 @@ draw_menu:
mov eax,9
mov ebx,table
mov ecx,-1
int 0x40
mcall
cmp [table+46],dword 30
jb drmr
@@ -193,7 +193,7 @@ draw_menu:
shl ecx,16
add ecx,[m_ys]
mov edx,0xf0f8ff
int 0x40
mcall
mov eax,38 ; egde lines
mov ebx,[m_x]
@@ -204,14 +204,14 @@ draw_menu:
shl ecx,16
add ecx,[m_y]
mov edx,0x000000
int 0x40
mcall
mov eax,38
mov ecx,[m_y]
add ecx,[m_ys]
shl ecx,16
add ecx,[m_y]
add ecx,[m_ys]
int 0x40
mcall
mov esi,menu-1
mov edi,[m_x]
@@ -231,7 +231,7 @@ draw_menu:
mov edx,esi
add edx,3
mov esi,12
int 0x40 ; draw text
mcall ; draw text
pop esi
add esi,2
add edi,50
@@ -282,7 +282,7 @@ alert_box:
mov ebx,1
mov ecx,alert_entry
mov edx,[g_stack]
int 0x40
mcall
mov [menu_action],'MA '
@@ -298,7 +298,7 @@ alert_still:
mov eax,23 ; wait here for event
mov ebx,1
int 0x40
mcall
cmp eax,1 ; redraw request ?
je alert_red
@@ -313,7 +313,7 @@ alert_still:
mov eax,9
mov ebx,table
mov ecx,-1
int 0x40
mcall
cmp ax,[table+4]
je no_close
@@ -323,7 +323,7 @@ alert_still:
mov [menu_action],'----'
mov [window_on],0
mov eax,-1
int 0x40
mcall
no_close:
jmp alert_still
@@ -334,12 +334,12 @@ alert_still:
alert_key: ; key
mov eax,2 ; just read it and ignore
int 0x40
mcall
jmp alert_still
alert_button: ; button
mov eax,17 ; get id
int 0x40
mcall
shr eax,8
cmp eax,3
@@ -364,7 +364,7 @@ alert_still:
mov [g_n],-1
mov [window_on],0
mov eax,-1 ; close this program
int 0x40
mcall
rtext db 'NO YES OK '
@@ -381,7 +381,7 @@ alert_draw_window:
mov eax,12 ; function 12:tell os about windowdraw
mov ebx,1 ; 1, start of draw
int 0x40
mcall
cmp [window_on],2
jne no_win_type_2
@@ -418,7 +418,7 @@ alert_draw_window:
mov edx,0x00ffffff ; color of work area RRGGBB,8->color gl
mov esi,0x00ffffff ; color of grab bar RRGGBB,8->color gl
mov edi,0x000000cc ; color of frames RRGGBB
int 0x40
mcall
pop edx
@@ -445,10 +445,10 @@ alert_draw_window:
mov edx,0x40000000
add edx,ebp
mov esi,0
int 0x40
mcall
popa
mov eax,4 ; draw text
int 0x40
mcall
inc ebp
add ebx,14
jmp no_d_found
@@ -461,7 +461,7 @@ alert_draw_window:
jne no_win_1
mov eax,14 ; to middle of screen
int 0x40
mcall
mov ecx,eax
and ecx,0xffff
shr ecx,1
@@ -480,7 +480,7 @@ alert_draw_window:
mov edx,0x02ffffff ; color of work area RRGGBB,8->color gl
mov esi,0x80d05050 ; color of grab bar RRGGBB,8->color gl
mov edi,0x00d05050 ; color of frames RRGGBB
int 0x40
mcall
mov eax,4 ; label
@@ -488,14 +488,14 @@ alert_draw_window:
mov ecx,0x10ddeeff
mov edx,alert_labelt1
mov esi,alert_label1len-alert_labelt1
int 0x40
mcall
mov eax,4
mov ebx,10*65536+43
mov ecx,0x10000000
mov edx,[g_t]
mov esi,[g_l]
int 0x40
mcall
cmp [g_1],1
jne gadgets_no_1
@@ -509,7 +509,7 @@ alert_draw_window:
mov ecx,75*65536+16
mov edx,3
mov esi,0x446688
int 0x40
mcall
mov eax,4
mov ebx,[g_x]
@@ -520,7 +520,7 @@ alert_draw_window:
mov ecx,0x10ffffff
mov edx,alert_t2
mov esi,alert_t2len-alert_t2
int 0x40
mcall
gadgets_no_1:
@@ -536,7 +536,7 @@ alert_draw_window:
mov ecx,75*65536+16
mov edx,1
mov esi,0x446688
int 0x40
mcall
mov eax,8
mov ebx,[g_x]
@@ -547,7 +547,7 @@ alert_draw_window:
mov ecx,75*65536+16
mov edx,2
mov esi,0x446688
int 0x40
mcall
mov eax,4
mov ebx,[g_x]
@@ -558,7 +558,7 @@ alert_draw_window:
mov ecx,0x10ffffff
mov edx,alert_t1
mov esi,alert_t1len-alert_t1
int 0x40
mcall
gadgets_no_2:
@@ -566,7 +566,7 @@ alert_draw_window:
mov eax,12 ; function 12:tell os about windowdraw
mov ebx,2 ; 2, end of draw
int 0x40
mcall
ret

42
programs/develop/examples/example2/trunk/example2.asm
View File

@@ -18,20 +18,20 @@ use32
dd 0x0 , 0x0 ; I_Param , I_Icon
include 'lang.inc'
include 'macros.inc'
include '..\..\..\..\macros.inc'
include 'dialogs1.inc'
menu_history dd 0x0
START: ; start of execution
red:
call draw_window_main
still: ; wait here for event
mov eax,23
mov ebx,2
int 0x40
mov eax,10
mcall
cmp eax,1 ; process events
je red
@@ -52,42 +52,38 @@ still: ; wait here for event
mov ebx,220*65536+6*4
mov ecx,70*65536+8
mov edx,0xffffff
int 0x40
mcall
mov eax,4 ; show menu selections
mov ebx,220*65536+70
mov ecx,0x000000
mov edx,menu_action
mov esi,4
int 0x40
mcall
nodisplay:
cmp word [menu_action],word 'AD' ; user requests close
jne no_menu_close
mov eax,-1
int 0x40
mcall
no_menu_close:
jmp still
red: ; redraw
call draw_window_main
jmp still
key:
mov eax,2 ; key in buffer
int 0x40
mcall
jmp still
button: ; button in buffer
mov eax,17
int 0x40
mcall
cmp ah,1 ; close application
jne noclose
mov eax,-1
int 0x40
or eax,-1
mcall
noclose:
cmp ah,2
@@ -122,7 +118,7 @@ draw_window_main:
mov eax,12 ; function 12:tell os about windowdraw
mov ebx,1 ; 1, start of draw
int 0x40
mcall
mov eax,0 ; open window
mov ebx,100*65536+300
@@ -130,7 +126,7 @@ draw_window_main:
mov edx,0x02ffffff
mov esi,0x805080d0
mov edi,0x005080d0
int 0x40
mcall
call draw_menu ; DRAW MENU
@@ -139,28 +135,28 @@ draw_window_main:
mov ecx,0x10ddeeff
mov edx,labelt
mov esi,labellen-labelt
int 0x40
mcall
mov eax,8 ; close button
mov ebx,(300-17)*65536+10
mov ecx,5*65536+10
mov edx,1
mov esi,0x4466bb
int 0x40
mcall
mov eax,8 ; button : OPEN ALERT BOX
mov ebx,25*65536+150
mov ecx,61*65536+14
mov edx,2
mov esi,0x4466aa
int 0x40
mcall
mov eax,8 ; button : OPEN CHOOSE BOX
mov ebx,25*65536+150
mov ecx,81*65536+14
mov edx,3
mov esi,0x4466aa
int 0x40
mcall
mov ebx,20*65536+55 ; draw info text with function 4
mov ecx,0xffffff
@@ -168,7 +164,7 @@ draw_window_main:
mov esi,40
newline:
mov eax,4
int 0x40
mcall
add ebx,10
add edx,40
cmp [edx],byte 'x'
@@ -176,7 +172,7 @@ draw_window_main:
mov eax,12 ; function 12:tell os about windowdraw
mov ebx,2 ; 2, end of draw
int 0x40
mcall
ret

267
programs/develop/examples/example2/trunk/macros.inc
View File

@@ -1,267 +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 <eax,ebx,ecx,edx,esi,edi,ebp,esp>
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)
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
rb (1024-52)
}
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