forked from KolibriOS/kolibrios
1. Calc now use system colors and drawing from client area (with current kernel it works incorrect because there is a bug in 47th function)
2. New version https by Hex, rewrited to use 70th function by YELLOW. It also use 0th function to write header git-svn-id: svn://kolibrios.org@153 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
bede2c62e6
commit
2665e9eebc
@ -1,18 +1,21 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; ;
|
; ;
|
||||||
; Tiny HTTP Server v 0.4 for MenuetOS ;
|
; Tiny HTTP Server v 0.5 for KolibriOS ;
|
||||||
; ;
|
; ;
|
||||||
; License GPL / See file COPYING for details. ;
|
; License GPL / See file COPYING for details. ;
|
||||||
; Copyright 2003 Ville Turjanmaa ;
|
; Copyright 2003 Ville Turjanmaa ;
|
||||||
; ;
|
; ;
|
||||||
; Compile with FASM for Menuet ;
|
; Compile with FASM for Menuet/KolibriOS ;
|
||||||
; ;
|
; ;
|
||||||
; Request /TinyStat for server statistics ;
|
; Request /TinyStat for server statistics ;
|
||||||
; Request /TinyBoard for server message board ;
|
; Request /TinyBoard for server message board ;
|
||||||
; ;
|
; ;
|
||||||
|
; Special version for KoOS by Hex && Heavyiron ;
|
||||||
|
; ;
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
version equ '0.4'
|
appname equ 'Kolibri HTTP Server '
|
||||||
|
version equ '0.6'
|
||||||
|
|
||||||
use32
|
use32
|
||||||
|
|
||||||
@ -26,8 +29,7 @@ use32
|
|||||||
dd 0x20000
|
dd 0x20000
|
||||||
dd 0,0 ; reserved=no extended header
|
dd 0,0 ; reserved=no extended header
|
||||||
|
|
||||||
include 'lang.inc'
|
include "MACROS.INC"
|
||||||
include "macros.inc"
|
|
||||||
|
|
||||||
; 0x0+ - program image
|
; 0x0+ - program image
|
||||||
; 0x1ffff - stack
|
; 0x1ffff - stack
|
||||||
@ -35,18 +37,25 @@ include "macros.inc"
|
|||||||
; 0x100000+ - requested file
|
; 0x100000+ - requested file
|
||||||
|
|
||||||
filel:
|
filel:
|
||||||
dd 0x0,0x0,50000/512,0x20000,0x70000
|
dd 0
|
||||||
|
dd 0
|
||||||
|
dd 0
|
||||||
|
dd 50000
|
||||||
|
dd 0x20000
|
||||||
db '/rd/1/board.htm',0
|
db '/rd/1/board.htm',0
|
||||||
|
|
||||||
files:
|
files:
|
||||||
dd 0x1,0x0,0x0,0x20000,0x70000
|
dd 2
|
||||||
|
dd 0
|
||||||
|
dd 0
|
||||||
|
dd 0
|
||||||
|
dd 0x20000
|
||||||
db '/rd/1/board.htm',0
|
db '/rd/1/board.htm',0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
START: ; start of execution
|
START: ; start of execution
|
||||||
|
|
||||||
mov eax,58
|
mov eax,70
|
||||||
mov ebx,filel
|
mov ebx,filel
|
||||||
int 0x40
|
int 0x40
|
||||||
mov [board_size],ebx
|
mov [board_size],ebx
|
||||||
@ -62,19 +71,18 @@ START: ; start of execution
|
|||||||
|
|
||||||
board_found:
|
board_found:
|
||||||
|
|
||||||
mov eax,58
|
mov eax,70
|
||||||
mov ebx,files
|
mov ebx,files
|
||||||
mov ecx,[board_size]
|
mov ecx,[board_size]
|
||||||
mov [files+8],ecx
|
mov [files+12],ecx
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
mov [status],-1
|
mov [status],-1
|
||||||
mov [last_status],-2
|
mov [last_status],-2
|
||||||
call clear_input
|
call clear_input
|
||||||
|
red:
|
||||||
call draw_window ; at first, draw the window
|
call draw_window ; at first, draw the window
|
||||||
|
|
||||||
; call ops
|
|
||||||
|
|
||||||
still:
|
still:
|
||||||
|
|
||||||
call check_status
|
call check_status
|
||||||
@ -98,16 +106,6 @@ still:
|
|||||||
|
|
||||||
jmp still
|
jmp still
|
||||||
|
|
||||||
|
|
||||||
reb: ; boot
|
|
||||||
|
|
||||||
mov eax,18
|
|
||||||
mov ebx,1
|
|
||||||
int 0x40
|
|
||||||
|
|
||||||
jmp $
|
|
||||||
|
|
||||||
|
|
||||||
last_status dd 0x0
|
last_status dd 0x0
|
||||||
|
|
||||||
check_events:
|
check_events:
|
||||||
@ -121,18 +119,14 @@ check_events:
|
|||||||
|
|
||||||
ret
|
ret
|
||||||
|
|
||||||
red: ; redraw
|
|
||||||
call draw_window
|
|
||||||
ret
|
|
||||||
|
|
||||||
key: ; Keys are not valid at this part of the
|
key: ; Keys are not valid at this part of the
|
||||||
mov eax,2 ; loop. Just read it and ignore
|
mov al,2 ; loop. Just read it and ignore
|
||||||
int 0x40
|
int 0x40
|
||||||
ret
|
ret
|
||||||
|
|
||||||
button: ; button
|
button: ; button
|
||||||
|
|
||||||
mov eax,17 ; get id
|
mov al,17 ; get id
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
cmp ah,1 ; close
|
cmp ah,1 ; close
|
||||||
@ -164,11 +158,8 @@ button: ; button
|
|||||||
call draw_data
|
call draw_data
|
||||||
mov [server_active],1
|
mov [server_active],1
|
||||||
call check_status
|
call check_status
|
||||||
; cmp [status],0
|
|
||||||
; je reb
|
|
||||||
ret
|
ret
|
||||||
tst3:
|
tst3:
|
||||||
|
|
||||||
cmp ah,4 ; button id=4 ?
|
cmp ah,4 ; button id=4 ?
|
||||||
jnz no4
|
jnz no4
|
||||||
mov [server_active],0
|
mov [server_active],0
|
||||||
@ -319,14 +310,6 @@ wait_for_empty_slot:
|
|||||||
|
|
||||||
wait_more:
|
wait_more:
|
||||||
|
|
||||||
; rdtsc
|
|
||||||
; mov ecx,eax
|
|
||||||
; add ecx,1000000
|
|
||||||
; wr:
|
|
||||||
; rdtsc
|
|
||||||
; cmp eax,ecx
|
|
||||||
; jb wr
|
|
||||||
|
|
||||||
mov eax,5
|
mov eax,5
|
||||||
mov ebx,1
|
mov ebx,1
|
||||||
int 0x40
|
int 0x40
|
||||||
@ -397,9 +380,12 @@ send_header:
|
|||||||
popa
|
popa
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
fileinfo dd 0
|
||||||
fileinfo dd 0,0,1,0x100000,0xf0000
|
dd 0
|
||||||
getf db '/RD/1/'
|
dd 0
|
||||||
|
dd 512
|
||||||
|
dd 0x100000
|
||||||
|
getf db '/rd/1/'
|
||||||
times 50 db 0
|
times 50 db 0
|
||||||
wanted_file: times 100 db 0
|
wanted_file: times 100 db 0
|
||||||
|
|
||||||
@ -434,9 +420,9 @@ message_len dd 0x0
|
|||||||
|
|
||||||
read_file: ; start of execution
|
read_file: ; start of execution
|
||||||
|
|
||||||
mov [fileinfo+12],eax
|
mov [fileinfo+16],eax
|
||||||
mov [fileinfo+8],ebx
|
shl ebx, 9
|
||||||
|
mov [fileinfo+12],ebx
|
||||||
mov [file_type],unk
|
mov [file_type],unk
|
||||||
mov [type_len],unkl-unk
|
mov [type_len],unkl-unk
|
||||||
mov [filename+40*2+6],dword 'UNK '
|
mov [filename+40*2+6],dword 'UNK '
|
||||||
@ -449,7 +435,7 @@ read_file: ; start of execution
|
|||||||
|
|
||||||
yes_new_message:
|
yes_new_message:
|
||||||
|
|
||||||
mov eax,58
|
mov eax,70
|
||||||
mov ebx,filel
|
mov ebx,filel
|
||||||
int 0x40
|
int 0x40
|
||||||
mov [board_size],ebx
|
mov [board_size],ebx
|
||||||
@ -485,6 +471,7 @@ read_file: ; start of execution
|
|||||||
je name_found_len
|
je name_found_len
|
||||||
inc edx
|
inc edx
|
||||||
jmp name_new_len
|
jmp name_new_len
|
||||||
|
|
||||||
name_found_len:
|
name_found_len:
|
||||||
|
|
||||||
mov [from_len],edx
|
mov [from_len],edx
|
||||||
@ -546,7 +533,7 @@ read_file: ; start of execution
|
|||||||
imul ebx,16
|
imul ebx,16
|
||||||
add ebx,eax
|
add ebx,eax
|
||||||
mov [esi+edx],bl
|
mov [esi+edx],bl
|
||||||
mov [esi+edx+1],word ' '
|
mov [esi+edx+1],word ''
|
||||||
add edx,2
|
add edx,2
|
||||||
no_ascii:
|
no_ascii:
|
||||||
|
|
||||||
@ -574,7 +561,8 @@ read_file: ; start of execution
|
|||||||
|
|
||||||
mov esi,[from_i] ; name
|
mov esi,[from_i] ; name
|
||||||
mov edi,0x20000
|
mov edi,0x20000
|
||||||
add edi,board1-board + board1e-board1
|
add edi,board1-board
|
||||||
|
add edi,board1e-board1
|
||||||
mov ecx,[from_len]
|
mov ecx,[from_len]
|
||||||
cld
|
cld
|
||||||
rep movsb
|
rep movsb
|
||||||
@ -589,7 +577,7 @@ read_file: ; start of execution
|
|||||||
|
|
||||||
mov esi,[message] ; message
|
mov esi,[message] ; message
|
||||||
mov edi,0x20000
|
mov edi,0x20000
|
||||||
add edi,board1-board + board1e-board1 +board2e-board2
|
add edi,board1-board + board1e-board1 + board2e-board2
|
||||||
add edi,[from_len]
|
add edi,[from_len]
|
||||||
mov ecx,[message_len]
|
mov ecx,[message_len]
|
||||||
cld
|
cld
|
||||||
@ -597,7 +585,7 @@ read_file: ; start of execution
|
|||||||
|
|
||||||
mov esi,board3 ; end part
|
mov esi,board3 ; end part
|
||||||
mov edi,0x20000
|
mov edi,0x20000
|
||||||
add edi,board1-board + board1e-board1 +board2e-board2
|
add edi,board1-board + board1e-board1 + board2e-board2
|
||||||
add edi,[from_len]
|
add edi,[from_len]
|
||||||
add edi,[message_len]
|
add edi,[message_len]
|
||||||
mov ecx,board3e-board3
|
mov ecx,board3e-board3
|
||||||
@ -607,9 +595,9 @@ read_file: ; start of execution
|
|||||||
inc [board_messages]
|
inc [board_messages]
|
||||||
|
|
||||||
mov eax,[board_size]
|
mov eax,[board_size]
|
||||||
mov [files+8],eax
|
mov [files+12],eax
|
||||||
|
|
||||||
mov eax,58
|
mov eax,70
|
||||||
mov ebx,files
|
mov ebx,files
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
@ -778,8 +766,8 @@ read_file: ; start of execution
|
|||||||
cld
|
cld
|
||||||
rep movsb
|
rep movsb
|
||||||
|
|
||||||
mov [fileinfo+8],dword 1 ; file exists ?
|
mov [fileinfo+12],dword 1 ; file exists ?
|
||||||
mov eax,58
|
mov eax,70
|
||||||
mov ebx,fileinfo
|
mov ebx,fileinfo
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
@ -804,8 +792,8 @@ read_file: ; start of execution
|
|||||||
|
|
||||||
file_found:
|
file_found:
|
||||||
|
|
||||||
mov [fileinfo+8],dword 0x2f0000 / 512 ; read all of file
|
mov [fileinfo+12],dword 0x2f0000 ; read all of file
|
||||||
mov eax,58
|
mov eax,70
|
||||||
mov ebx,fileinfo
|
mov ebx,fileinfo
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
@ -1088,30 +1076,19 @@ print_text:
|
|||||||
|
|
||||||
pusha
|
pusha
|
||||||
|
|
||||||
mov eax,13
|
|
||||||
mov ebx,97*65536+23*6
|
|
||||||
mov ecx,[ya]
|
|
||||||
shl ecx,16
|
|
||||||
mov cx,9
|
|
||||||
mov edx,0xffffff
|
|
||||||
int 0x40
|
|
||||||
|
|
||||||
mov eax,4
|
mov eax,4
|
||||||
mov edx,[addr]
|
mov edx,[addr]
|
||||||
mov ebx,97*65536
|
mov ebx,97*65536
|
||||||
add ebx,[ya]
|
add ebx,[ya]
|
||||||
mov ecx,0x000000
|
mov ecx,0x40000000
|
||||||
mov esi,23
|
mov esi,23
|
||||||
|
mov edi,0xffffff
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
popa
|
popa
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; *********************************************
|
; *********************************************
|
||||||
; ******* WINDOW DEFINITIONS AND DRAW ********
|
; ******* WINDOW DEFINITIONS AND DRAW ********
|
||||||
; *********************************************
|
; *********************************************
|
||||||
@ -1127,17 +1104,8 @@ draw_window:
|
|||||||
mov eax,0 ; function 0 : define and draw window
|
mov eax,0 ; function 0 : define and draw window
|
||||||
mov ebx,100*65536+480 ; [x start] *65536 + [x size]
|
mov ebx,100*65536+480 ; [x start] *65536 + [x size]
|
||||||
mov ecx,100*65536+215 ; [y start] *65536 + [y size]
|
mov ecx,100*65536+215 ; [y start] *65536 + [y size]
|
||||||
mov edx,0x03ffffff ; color of work area RRGGBB
|
mov edx,0x13ffffff ; color of work area RRGGBB
|
||||||
mov esi,0x8050a0b0 ; color of grab bar RRGGBB,8->color gl
|
mov edi,header ; WINDOW LABEL
|
||||||
mov edi,0x0050a0b0 ; color of frames RRGGBB
|
|
||||||
int 0x40
|
|
||||||
|
|
||||||
; WINDOW LABEL
|
|
||||||
mov eax,4 ; function 4 : write text to window
|
|
||||||
mov ebx,8*65536+8 ; [x start] *65536 + [y start]
|
|
||||||
mov ecx,0x10ffffff ; color of text RRGGBB
|
|
||||||
mov edx,labelt ; pointer to text beginning
|
|
||||||
mov esi,labellen-labelt ; text length
|
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
mov eax,8 ; function 8 : define and draw button
|
mov eax,8 ; function 8 : define and draw button
|
||||||
@ -1147,14 +1115,14 @@ draw_window:
|
|||||||
mov esi,0x66aa66 ; button color RRGGBB
|
mov esi,0x66aa66 ; button color RRGGBB
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
mov eax,8 ; function 8 : define and draw button
|
; function 8 : define and draw button
|
||||||
mov ebx,(40)*65536+20 ; [x start] *65536 + [x size]
|
mov ebx,(40)*65536+20 ; [x start] *65536 + [x size]
|
||||||
mov ecx,72*65536+9 ; [y start] *65536 + [y size]
|
mov ecx,72*65536+9 ; [y start] *65536 + [y size]
|
||||||
mov edx,4 ; button id
|
mov edx,4 ; button id
|
||||||
mov esi,0xaa6666 ; button color RRGGBB
|
mov esi,0xaa6666 ; button color RRGGBB
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
mov eax,8 ; Enter directory
|
; Enter directory
|
||||||
mov ebx,(25)*65536+66
|
mov ebx,(25)*65536+66
|
||||||
mov ecx,135*65536+15
|
mov ecx,135*65536+15
|
||||||
mov edx,6
|
mov edx,6
|
||||||
@ -1167,7 +1135,7 @@ draw_window:
|
|||||||
mov edx,0x6699cc ; 002288
|
mov edx,0x6699cc ; 002288
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
mov eax,38
|
|
||||||
mov ebx,241*65536+241
|
mov ebx,241*65536+241
|
||||||
mov ecx,22*65536+210
|
mov ecx,22*65536+210
|
||||||
mov edx,0x336699 ; 002288
|
mov edx,0x336699 ; 002288
|
||||||
@ -1259,7 +1227,7 @@ text:
|
|||||||
db ' /TinyBoard -message board '
|
db ' /TinyBoard -message board '
|
||||||
db ' '
|
db ' '
|
||||||
dirp:
|
dirp:
|
||||||
db ' Files: /RD/1/ '
|
db ' Files: /rd/1/ '
|
||||||
db ' '
|
db ' '
|
||||||
filename:
|
filename:
|
||||||
db ' '
|
db ' '
|
||||||
@ -1271,7 +1239,7 @@ filename:
|
|||||||
html_header:
|
html_header:
|
||||||
|
|
||||||
db 'HTTP/1.0 200 OK',13,10
|
db 'HTTP/1.0 200 OK',13,10
|
||||||
db 'Server: MenuetOS HTTP Server',13,10
|
db 'Server: KolibriOS HTTP Server',13,10
|
||||||
db 'Content-Length: '
|
db 'Content-Length: '
|
||||||
c_l: db '000000',13,10
|
c_l: db '000000',13,10
|
||||||
|
|
||||||
@ -1280,9 +1248,9 @@ h_len:
|
|||||||
fnf:
|
fnf:
|
||||||
db '<body>'
|
db '<body>'
|
||||||
db '<pre>'
|
db '<pre>'
|
||||||
db "TinyServer v ",version," for MenuetOS",13,10,13,10
|
db "HTTP-Ñåðâåð v ",version," äëÿ KolibriOS",13,10,13,10
|
||||||
db "Error 404 - File not found.",13,10,13,10
|
db "<H1>Error <FONT color=red>404</FONT> - File not found</H1>",13,10,13,10
|
||||||
db "For more info about server: request /TinyStat",13,10,13,10
|
db "Äëÿ ïîëó÷åíèÿ ñòàòèñòèêè âûïîëíèòå çàïðîñ /TinyStat",13,10,13,10
|
||||||
et: db "xx:xx:xx",13,10
|
et: db "xx:xx:xx",13,10
|
||||||
ed: db "xx.xx.xx",13,10
|
ed: db "xx.xx.xx",13,10
|
||||||
db "</pre></body>"
|
db "</pre></body>"
|
||||||
@ -1292,15 +1260,15 @@ fnfe:
|
|||||||
sm:
|
sm:
|
||||||
db '<body>'
|
db '<body>'
|
||||||
db '<pre>'
|
db '<pre>'
|
||||||
db "TinyServer v ",version," for MenuetOS",13,10,13,10
|
db "HTTP-Ñåðâåð v ",version," äëÿ KolibriOS",13,10,13,10
|
||||||
db "Statistics: (before current request)",13,10,13,10
|
db "Ñòàòèñòèêà: (ïîñëå äàííîãî çàïðîñà)",13,10,13,10
|
||||||
sms: db "- Documents served : xxxxxxxxx",13,10
|
sms: db "- Äîêóìåíòîâ ïðèíÿòî: xxxxxxxxx",13,10
|
||||||
smb: db "- Bytes transferred : xxxxxxxxx",13,10
|
smb: db "- Áàéò ïåðåäàííî : xxxxxxxxx",13,10
|
||||||
db "- Location : <a href=/TinyStat>/TinyStat</a>",13,10,13,10
|
db "- Ìåñòîíàõîæäåíèå : <a href=/TinyStat>Ñòàòèñòèêà</a>",13,10,13,10
|
||||||
db "TinyBoard:",13,10,13,10
|
db "Ãîñòåâàÿ:",13,10,13,10
|
||||||
smm: db "- Messages : xxxxxxxxx",13,10
|
smm: db "- Ñîîáùåíèé : xxxxxxxxx",13,10
|
||||||
smz: db "- Size in bytes : xxxxxxxxx",13,10
|
smz: db "- Ðàçìåð â áàéòàõ : xxxxxxxxx",13,10
|
||||||
db "- Location : <a href=/TinyBoard>/TinyBoard</a>",13,10,13,10
|
db "- Ìåñòîíàõîæäåíèå : <a href=/TinyBoard>Ãîñòåâàÿ</a>",13,10,13,10
|
||||||
smt: db "xx:xx:xx",13,10
|
smt: db "xx:xx:xx",13,10
|
||||||
smd: db "xx.xx.xx",13,10
|
smd: db "xx.xx.xx",13,10
|
||||||
db '</pre></body>'
|
db '</pre></body>'
|
||||||
@ -1326,42 +1294,42 @@ unk: db 'Content-Type: unknown/unknown',13,10,13,10
|
|||||||
unkl:
|
unkl:
|
||||||
|
|
||||||
|
|
||||||
labelt: db 'Tiny http server ',version
|
header db appname,version,0
|
||||||
labellen:
|
|
||||||
|
|
||||||
socket dd 0x0
|
socket dd 0x0
|
||||||
server_active db 0x0
|
server_active db 0x0
|
||||||
|
|
||||||
board:
|
board:
|
||||||
|
|
||||||
db "<HTML><BODY BGCOLOR=#ffffff ALINK=black VLINK=black><br>",13,10
|
db "<HTML><HEAD><TITLE>INTKolibriOS - /Ãîñòåâàÿ/</TITLE></HEAD>",13,10
|
||||||
|
db "<BODY background=bgnd.gif BGCOLOR=#ffffff ALINK=black VLINK=black><br>",13,10
|
||||||
db "<center>",13,10
|
db "<center>",13,10
|
||||||
db "<TABLE CELLPADDING=10 CELLSPACING=0 BORDER=0 bgcolor=#ffffff width=600>"
|
db "<TABLE CELLPADDING=10 CELLSPACING=0 BORDER=0 bgcolor=#ffffff width=600>"
|
||||||
db 13,10
|
db 13,10
|
||||||
db "<TR VALIGN=top><TD ALIGN=center bgcolor=f0f0f8>",13,10
|
db "<TR VALIGN=top><TD ALIGN=center bgcolor=F4F4F4>",13,10
|
||||||
db "<font size=3>Tinyserver Messageboard</TD></TR></TABLE><br>",13,10
|
db "<font size=4>Ãîñòåâàÿ ñåðâåðà INTKolibriOS</TD></TR></TABLE><br>",13,10
|
||||||
db "<TABLE CELLPADDING=14 CELLSPACING=2 BORDER=0 bgcolor=#ffffff width=600>"
|
db "<TABLE CELLPADDING=14 CELLSPACING=2 BORDER=0 bgcolor=#ffffff width=600>"
|
||||||
db 13,10,13,10
|
db 13,10,13,10
|
||||||
|
|
||||||
board1:
|
board1:
|
||||||
|
|
||||||
db "<TR VALIGN=top>",13,10
|
db "<TR VALIGN=top>",13,10
|
||||||
db "<TD ALIGN=left width=80 bgcolor=f0f0f8><P>",13,10
|
db "<TD ALIGN=left width=80 bgcolor=F4F4F4><P>",13,10
|
||||||
db "<font size=3>",13,10
|
db "<font size=3>",13,10
|
||||||
board1e:
|
board1e:
|
||||||
db "WebMaster",13,10
|
db "Hex",13,10
|
||||||
board2:
|
board2:
|
||||||
db "</font>",13,10
|
db "</font>",13,10
|
||||||
db "<br><br><br>",13,10
|
db "<br><br><br>",13,10
|
||||||
db "<br><br><br><br>",13,10
|
db "<br><br><br><br>",13,10
|
||||||
bsmt:
|
bsmt:
|
||||||
db "12.23.45<br>",13,10
|
db "15.23.45<br>",13,10
|
||||||
bsmd:
|
bsmd:
|
||||||
db "02.05.03",13,10
|
db "22.03.06",13,10
|
||||||
db "</P></TD>",13,10
|
db "</P></TD>",13,10
|
||||||
db "<TD bgcolor=f0f0f8><P>",13,10
|
db "<TD bgcolor=F4F4F4><P>",13,10
|
||||||
board2e:
|
board2e:
|
||||||
db "Assembly written messageboard from assembly written MenuetOS.<br>"
|
db "Äîáðî ïîæàëîâàòü â ãîñòåâóþ ñåðâåðà INTKolibriOS! (-:<br>"
|
||||||
db 13,10
|
db 13,10
|
||||||
board3:
|
board3:
|
||||||
db "</P></TD></TR>",13,10,13,10
|
db "</P></TD></TR>",13,10,13,10
|
||||||
@ -1374,11 +1342,11 @@ db "<br>",13,10
|
|||||||
db "<TABLE CELLPADDING=14 CELLSPACING=3 BORDER=0 bgcolor=#ffffff width=600>"
|
db "<TABLE CELLPADDING=14 CELLSPACING=3 BORDER=0 bgcolor=#ffffff width=600>"
|
||||||
db 13,10
|
db 13,10
|
||||||
db "<TR VALIGN=top>",13,10
|
db "<TR VALIGN=top>",13,10
|
||||||
db "<TD ALIGN=left bgcolor=f0f0f8><P>",13,10
|
db "<TD ALIGN=left bgcolor=F4F4F4><P>",13,10
|
||||||
db "<form method=Post Action=/TinyBoard>",13,10
|
db "<form method=Post Action=/TinyBoard>",13,10
|
||||||
db "Name: <br><input type=text name=from size=20 MAXLENGTH=20><br>",13,10
|
db "Èìÿ: <br><input type=text name=from size=20 MAXLENGTH=20><br>",13,10
|
||||||
db "Message: <br><textarea cols=60 rows=6 name=message></textarea><br>",13,10
|
db "Ñîîáùåíèå: <br><textarea cols=60 rows=6 name=message></textarea><br>",13,10
|
||||||
db "<input type=Submit Value=' Send Message '></form>",13,10
|
db "<input type=Submit Value=' Îòïðàâèòü ñîîáùåíèå '></form>",13,10
|
||||||
db "</TD></TR>",13,10
|
db "</TD></TR>",13,10
|
||||||
db "</TABLE>",13,10
|
db "</TABLE>",13,10
|
||||||
db "</BODY>",13,10
|
db "</BODY>",13,10
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
@erase lang.inc
|
@erase lang.inc
|
||||||
@echo lang fix en >lang.inc
|
@echo lang fix en >lang.inc
|
||||||
@fasm calc.asm calc
|
@fasm calc.asm calc
|
||||||
|
@erase lang.inc
|
||||||
@pause
|
@pause
|
@ -1,4 +1,5 @@
|
|||||||
@erase lang.inc
|
@erase lang.inc
|
||||||
@echo lang fix ru >lang.inc
|
@echo lang fix ru >lang.inc
|
||||||
@fasm calc.asm calc
|
@fasm calc.asm calc
|
||||||
|
@erase lang.inc
|
||||||
@pause
|
@pause
|
@ -1,28 +1,32 @@
|
|||||||
;; Calculator for MenuetOS
|
;; Calculator for MenuetOS (original version)
|
||||||
;; (c)Ville Turjanmaa
|
;; (c)Ville Turjanmaa
|
||||||
;; Compile with FASM for Menuet
|
;; Compile with FASM for Menuet
|
||||||
;;
|
;;
|
||||||
;; Š «ìªã«ïâ®à 1.1 alpha
|
;;What's new:
|
||||||
;; (c)Pavel Rymovski aka Heavyiron
|
;; Calc 1.1
|
||||||
;;What's new:1)changed design
|
;; 1)changed design
|
||||||
;; 2)new procedure of draw window (10 decimal digits, 23 binary, "+" not displayed now)
|
;; 2)new procedure of draw window (10 decimal digits, 23 binary, "+" not displayed now)
|
||||||
;; 3)window with skin
|
;; 3)window with skin
|
||||||
;; 4)I had used macroses
|
;; 4)I had used macroses
|
||||||
;; Calc 1.2 alpha
|
;; Calc 1.2
|
||||||
;; 1)added some useful functions, such as arcsin, arccos, arctg, 1/x, x^2
|
;; 1)added some useful functions, such as arcsin, arccos, arctg, 1/x, x^2
|
||||||
;; Calc 1.3
|
;; Calc 1.31
|
||||||
;; 1)optimised program
|
;; 1)optimised program
|
||||||
|
;; 2)new type of window (you need kernel 114 revision or higher)
|
||||||
|
;; Pavel Rymovski (Heavyiron)
|
||||||
|
|
||||||
|
appname equ 'Calc '
|
||||||
|
version equ '1.31'
|
||||||
|
|
||||||
use32
|
use32
|
||||||
org 0x0
|
org 0x0
|
||||||
|
|
||||||
db 'MENUET01' ; 8 byte id
|
db 'MENUET01' ; 8 byte id
|
||||||
dd 0x01 ; header version
|
dd 0x01 ; header version
|
||||||
dd START ; start of code
|
dd START ; start of code
|
||||||
dd I_END ; size of image
|
dd I_END ; size of image
|
||||||
dd 0x1000 ; memory for app
|
dd 0x1000 ; memory for app
|
||||||
dd 0x1000 ; esp
|
dd 0x1000 ; esp
|
||||||
dd 0x0 , 0x0 ; I_Param , I_Icon
|
dd 0x0,0x0 ; I_Param , I_Icon
|
||||||
|
|
||||||
include 'macros.inc'
|
include 'macros.inc'
|
||||||
|
|
||||||
@ -41,12 +45,14 @@ still:
|
|||||||
jz key
|
jz key
|
||||||
|
|
||||||
button:
|
button:
|
||||||
mcall 17 ; ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à ¦ ⮩ ª®¯ª¨
|
mov al,17 ; ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à ¦ ⮩ ª®¯ª¨
|
||||||
|
int 0x40
|
||||||
shr eax,8
|
shr eax,8
|
||||||
jmp testbut
|
jmp testbut
|
||||||
|
|
||||||
key:
|
key:
|
||||||
mcall 2 ; ¯®«ãç¨âì ASCII-ª®¤ ¦ ⮩ ª« ¢¨è¨
|
mov al,2 ; ¯®«ãç¨âì ASCII-ª®¤ ¦ ⮩ ª« ¢¨è¨
|
||||||
|
int 0x40
|
||||||
shr eax,8
|
shr eax,8
|
||||||
mov edi,asci ; ¯¥à¥¢®¤ ASCII ¢ ¨¤¥â¨ä¨ª â®à ª®¯ª¨
|
mov edi,asci ; ¯¥à¥¢®¤ ASCII ¢ ¨¤¥â¨ä¨ª â®à ª®¯ª¨
|
||||||
mov ecx,18
|
mov ecx,18
|
||||||
@ -62,7 +68,8 @@ button:
|
|||||||
testbut:
|
testbut:
|
||||||
cmp eax,1 ; ª®¯ª 1 - § ªàë⨥ ¯à®£à ¬¬ë
|
cmp eax,1 ; ª®¯ª 1 - § ªàë⨥ ¯à®£à ¬¬ë
|
||||||
jne noclose
|
jne noclose
|
||||||
mcall -1
|
or eax,-1
|
||||||
|
int 0x40
|
||||||
|
|
||||||
noclose:
|
noclose:
|
||||||
cmp eax,2
|
cmp eax,2
|
||||||
@ -148,7 +155,7 @@ button:
|
|||||||
no_79:
|
no_79:
|
||||||
cmp eax,34
|
cmp eax,34
|
||||||
jne no_0
|
jne no_0
|
||||||
mov eax,0
|
xor eax,eax
|
||||||
call number_entry
|
call number_entry
|
||||||
jmp still
|
jmp still
|
||||||
|
|
||||||
@ -636,113 +643,186 @@ atof_convertFractionalPart:
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
; *********************************************
|
; *********************************************
|
||||||
; ******* Ž<EFBFBD><EFBFBD>…„…‹…<EFBFBD>ˆ… ˆ Ž’<C5BD>ˆ‘Ž‚Š€ ŽŠ<C5BD>€ ********
|
; ******* WINDOW DEFINITIONS AND DRAW *********
|
||||||
; *********************************************
|
; *********************************************
|
||||||
|
|
||||||
draw_window:
|
draw_window:
|
||||||
|
|
||||||
mcall 12,1
|
mov eax,48
|
||||||
mcall 0,200*65536+255,200*65536+180,0x03ddeeff ; äãªæ¨ï 0: ®¯à¥¤¥«¨âì ¨ ®âà¨á®¢ âì ®ª®
|
mov ebx,3
|
||||||
mcall 4,8*65536+8,0x10000000,labelt,label_len ; ‡€ƒŽ‹Ž‚ŽŠ ŽŠ<C5BD>€
|
mov ecx,sc
|
||||||
|
mov edx,sizeof.system_colors
|
||||||
|
int 0x40
|
||||||
|
|
||||||
mov ebx,24*65536+28
|
mov eax,12
|
||||||
mov ecx,70*65536+18
|
mov ebx,1
|
||||||
|
int 0x40
|
||||||
|
|
||||||
|
mov eax,0
|
||||||
|
mov ebx,200*65536+255
|
||||||
|
mov ecx,200*65536+180
|
||||||
|
mov edx,[sc.work]
|
||||||
|
or edx,0x33000000
|
||||||
|
mov edi,header
|
||||||
|
int 0x40
|
||||||
|
|
||||||
|
mov eax,8
|
||||||
|
mov ebx,19*65536+28
|
||||||
|
mov ecx,49*65536+18
|
||||||
mov edx,6
|
mov edx,6
|
||||||
mov esi,0x0066ee
|
mov esi,[sc.work_button]
|
||||||
mov edi,7
|
mov edi,7
|
||||||
newbutton:
|
newbutton:
|
||||||
dec edi
|
dec edi
|
||||||
jnz no_new_row
|
jnz no_new_row
|
||||||
mov edi,7
|
mov edi,7
|
||||||
mov ebx,24*65536+25+3
|
mov ebx,19*65536+28
|
||||||
add ecx,20*65536
|
add ecx,20*65536
|
||||||
no_new_row:
|
no_new_row:
|
||||||
mcall 8
|
int 0x40
|
||||||
add ebx,30*65536
|
add ebx,30*65536
|
||||||
inc edx
|
inc edx
|
||||||
cmp edx,39
|
cmp edx,39
|
||||||
jbe newbutton
|
jbe newbutton
|
||||||
|
|
||||||
mcall 8,225*65536+8,28*65536+8,3 ; 'dec-bin-hex'
|
mcall ,199*65536+28,49*65536+18,2 ; 'C'
|
||||||
mcall 8,204*65536+28,70*65536+18,2,0xcc0000 ; 'C'
|
mcall ,220*65536+8,7*65536+8,3 ; 'dec-bin-hex'
|
||||||
|
|
||||||
mov ebx,25*65536+75 ; <20>à®à¨á®¢ª ¯®¤¯¨á¥© ª®¯®ª
|
mov eax,4
|
||||||
mov ecx,0xffffff
|
mov ebx,27*65536+54
|
||||||
|
mov ecx,[sc.work_button_text]
|
||||||
mov edx,text
|
mov edx,text
|
||||||
mov esi,34
|
mov esi,33
|
||||||
|
|
||||||
newline:
|
newline:
|
||||||
mcall 4
|
int 0x40
|
||||||
add ebx,20
|
add ebx,20
|
||||||
add edx,34
|
add edx,33
|
||||||
cmp [edx],byte 'x'
|
cmp [edx],byte 'x'
|
||||||
jne newline
|
jne newline
|
||||||
|
|
||||||
call print_display
|
call print_display
|
||||||
mcall 12,2
|
|
||||||
|
mov eax,12
|
||||||
|
mov ebx,2
|
||||||
|
int 0x40
|
||||||
|
|
||||||
ret
|
ret
|
||||||
|
|
||||||
print_display:
|
print_display:
|
||||||
pusha
|
pusha
|
||||||
mcall 13,100*65536+120,25*65536+13,0x00ddeeff
|
mcall 13,18*65536+210,19*65536+13,0xffffff
|
||||||
mcall 13,23*65536+210,40*65536+13,0xffffff
|
|
||||||
mcall 4,140*65536+28,0,calc,1
|
|
||||||
mov eax,4
|
mov eax,4
|
||||||
mov ebx,203*65536+29
|
mov ebx,135*65536+7
|
||||||
mov ecx,0
|
mov ecx,[sc.work_text]
|
||||||
|
or ecx,0x40000000
|
||||||
|
mov edx,calc
|
||||||
|
mov esi,1
|
||||||
|
mov edi,[sc.work]
|
||||||
|
int 0x40
|
||||||
|
|
||||||
|
mov ebx,198*65536+8
|
||||||
mov edx,[display_type]
|
mov edx,[display_type]
|
||||||
shl edx,2
|
shl edx,2
|
||||||
add edx,display_type_text
|
add edx,display_type_text
|
||||||
mov esi,3
|
mov esi,3
|
||||||
|
mov edi,[sc.work]
|
||||||
int 0x40
|
int 0x40
|
||||||
|
|
||||||
cmp [dsign],byte '+'
|
cmp [dsign],byte '+'
|
||||||
je positive
|
je positive
|
||||||
mcall 4,28*65536+43,0x0,dsign,1
|
mov ebx,23*65536+22
|
||||||
|
mov ecx,0x0
|
||||||
|
mov edx,dsign
|
||||||
|
mov esi,1
|
||||||
|
int 0x40
|
||||||
|
|
||||||
positive:
|
positive:
|
||||||
cmp [display_type],0 ; ¤¥áïâ¨ç ï á¨á⥬ áç¨á«¥¨ï
|
cmp [display_type],0
|
||||||
jne no_display_decimal
|
jne no_display_decimal
|
||||||
cmp [decimal],0
|
cmp [decimal],0
|
||||||
je whole
|
je whole
|
||||||
mcall 47,10*65536,[integer],125*65536+43,0x0 ; ®â®¡à ¦ âì 10 æ¨äà
|
|
||||||
mcall 4,185*65536+43,0x0,dot,1
|
mov ebx,180*65536+22
|
||||||
mcall 47,6*65536,[decimal],192*65536+43,0x0 ; ®â®¡à ¦ âì 6 æ¨äà ¯®á«¥ § ¯ï⮩
|
mov ecx,0x0
|
||||||
|
mov edx,dot
|
||||||
|
mov esi,1
|
||||||
|
int 0x40
|
||||||
|
|
||||||
|
mov eax,47
|
||||||
|
mov ebx,10*65536
|
||||||
|
mov ecx,[integer]
|
||||||
|
mov edx,120*65536+22
|
||||||
|
mov esi,0x0
|
||||||
|
int 0x40
|
||||||
|
|
||||||
|
mov ebx,6*65536
|
||||||
|
mov ecx,[decimal]
|
||||||
|
mov edx,187*65536+22
|
||||||
|
mov esi,0x0
|
||||||
|
int 0x40
|
||||||
|
|
||||||
popa
|
popa
|
||||||
ret
|
ret
|
||||||
|
|
||||||
whole:
|
whole:
|
||||||
|
mov ebx,220*65536+22
|
||||||
|
mov ecx,0x0
|
||||||
|
mov edx,dot
|
||||||
|
mov esi,1
|
||||||
|
int 0x40
|
||||||
|
|
||||||
cmp [integer],0
|
cmp [integer],0
|
||||||
je null
|
je null
|
||||||
mcall 47,10*65536,[integer],165*65536+43,0x0
|
|
||||||
mcall 4,225*65536+43,0x0,dot,1
|
mov eax,47
|
||||||
|
mov ebx,10*65536
|
||||||
|
mov ecx,[integer]
|
||||||
|
mov edx,160*65536+22
|
||||||
|
mov esi,0x0
|
||||||
|
int 0x40
|
||||||
|
|
||||||
popa
|
popa
|
||||||
ret
|
ret
|
||||||
|
|
||||||
no_display_decimal:
|
no_display_decimal:
|
||||||
cmp [integer],0
|
|
||||||
je null
|
|
||||||
cmp [display_type],1
|
cmp [display_type],1
|
||||||
jne no_display_hexadecimal
|
jne no_display_hexadecimal
|
||||||
mcall 47,1*256+8*65536,[integer],178*65536+43,0x0 ; ®â®¡à ¦ âì 8 è¥áâ ¤æ â¨à¨çëå æ¨äà
|
cmp [integer],0
|
||||||
|
je null
|
||||||
|
|
||||||
|
mov eax,47
|
||||||
|
mov ebx,256+8*65536
|
||||||
|
mov ecx,[integer]
|
||||||
|
mov edx,173*65536+22
|
||||||
|
mov esi,0x0
|
||||||
|
int 0x40
|
||||||
|
|
||||||
popa
|
popa
|
||||||
ret
|
ret
|
||||||
|
|
||||||
no_display_hexadecimal:
|
no_display_hexadecimal:
|
||||||
cmp [integer],0
|
cmp [integer],0
|
||||||
je null
|
je null
|
||||||
cmp [display_type],2
|
|
||||||
jne null
|
mov eax,47
|
||||||
mcall 47,2*256+32*65536,[integer],37*65536+43,0x0 ; ®â®¡à ¦ âì 32 ¤¢®¨çë¥ æ¨äàë
|
mov ebx,2*256+32*65536
|
||||||
|
mov ecx,[integer]
|
||||||
|
mov edx,32*65536+22
|
||||||
|
mov esi,0x0
|
||||||
|
int 0x40
|
||||||
|
|
||||||
popa
|
popa
|
||||||
ret
|
ret
|
||||||
|
|
||||||
null:
|
null:
|
||||||
mcall 47,1*65536,0,219*65536+43,0x0
|
mov eax,47
|
||||||
cmp [display_type],0
|
mov ebx,1*65536
|
||||||
jne end_pr
|
mov ecx,0
|
||||||
mcall 4,225*65536+43,0x0,dot,1
|
mov edx,214*65536+22
|
||||||
|
mov esi,0x0
|
||||||
|
int 0x40
|
||||||
|
|
||||||
end_pr:
|
|
||||||
popa
|
popa
|
||||||
ret
|
ret
|
||||||
|
|
||||||
@ -768,12 +848,12 @@ clear_all:
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
|
|
||||||
;Ž¡« áâì ¤ ëå
|
;data
|
||||||
|
|
||||||
|
header db appname,version,0
|
||||||
|
|
||||||
display_type dd 0 ; 0 = decimal, 1 = hexadecimal, 2= binary
|
display_type dd 0 ; 0 = decimal, 1 = hexadecimal, 2= binary
|
||||||
entry_multiplier dd 10
|
entry_multiplier dd 10
|
||||||
|
|
||||||
display_start_y dd 0x0
|
|
||||||
display_type_text db 'dec hex bin'
|
display_type_text db 'dec hex bin'
|
||||||
|
|
||||||
dot db '.'
|
dot db '.'
|
||||||
@ -792,12 +872,12 @@ text:
|
|||||||
db ' 1 2 3 + Int Sin Asin'
|
db ' 1 2 3 + Int Sin Asin'
|
||||||
db ' 4 5 6 - 1/x Cos Acos'
|
db ' 4 5 6 - 1/x Cos Acos'
|
||||||
db ' 7 8 9 / x^2 Tan Atan'
|
db ' 7 8 9 / x^2 Tan Atan'
|
||||||
db ' +/- 0 . * Sqr Pi = '
|
db '+/- 0 . * Sqr Pi = '
|
||||||
db 'x'
|
db 'x'
|
||||||
|
|
||||||
asci: db 49,50,51,52,53,54,55,56,57,48,43,61,45,42,47,44,46,27
|
asci: db 49,50,51,52,53,54,55,56,57,48,43,61,45,42,47,44,46,27
|
||||||
butid: db 12,13,14,19,20,21,26,27,28,34,15,39,22,36,29,35,35,1
|
butid: db 12,13,14,19,20,21,26,27,28,34,15,39,22,36,29,35,35,1
|
||||||
labelt:
|
|
||||||
db 'Calc 1.3'
|
|
||||||
label_len = $ - labelt
|
|
||||||
I_END:
|
I_END:
|
||||||
|
|
||||||
|
sc system_colors
|
||||||
|
Loading…
Reference in New Issue
Block a user