change path to "/sys" in some programs.

in build_all.bat: delete config.inc after compiling
delete /kernel/trunk/lib

git-svn-id: svn://kolibrios.org@529 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
SPraid (simba) 2007-05-30 14:45:45 +00:00
parent 5d38105bff
commit 93e66701fb
28 changed files with 44 additions and 523 deletions

View File

@ -2,7 +2,7 @@
set languages=en ru ge et
set drivers=sound sis infinity ati2d vmode ps2mouse
set targets=all kernel drivers skins lib clean
set targets=all kernel drivers skins clean
call :Check_Target %1
for %%a in (all kernel) do if %%a==%target% call :Check_Lang %2
@ -60,7 +60,6 @@ goto :eof
call :Target_kernel
call :Target_drivers
call :Target_skins
call :Target_lib
goto :eof
@ -88,16 +87,6 @@ goto :eof
cd ..
goto :eof
:Target_lib
echo *** building libs ...
if not exist bin\lib mkdir bin\lib
cd lib
fasm -m 65536 inifiles.asm ..\bin\lib\inifiles.obj
if not %errorlevel%==0 goto :Error_FasmFailed
cd ..
goto :eof
:Target_clean
echo *** cleaning ...
rmdir /S /Q bin

View File

@ -1,3 +1,4 @@
$Revision$
;-------------------------------------------------------------------------
;
; <EFBFBD> 狙凋見蜬䭾豕

View File

@ -1,3 +1,4 @@
$Revision$
;============================================================================
;
; اـكِ<EFBFBD>هيـ قٍم<EFBFBD>ٍو<EFBFBD> <EFBFBD><EFBFBD>ٍي<EFBFBD>وى <EFBFBD>لِـ

View File

@ -1,3 +1,4 @@
$Revision$
;-------------------------------------------------------------------------
;
; ‡ ¬¥­  ¨¬¥­ ה ©«®¢

View File

@ -1,372 +0,0 @@
;-----------------------------------------------------------------------------
; Copyright (c) 2007, SPraid
;-----------------------------------------------------------------------------
format MS COFF
public EXPORTS
include '../proc32.inc'
include 'proc.inc'
purge section
section '.flat' code readable align 16
mem.alloc dd ?
mem.free dd ?
mem.realloc dd ?
dll.load dd ?
block_count: dd 0
sect_num: dd 0
data_adr: dd 0
data_adr_last dd 0
filei_len EQU 0x4000
filei dd ?;0x4000 ; áá뫪¨ ­  ¤ ­­ë¥ - ⨯  â ¬ åà ­¨âìáï ¡ã¤¨â... ¢­ ç «¥ â ¬ - ᪮ª  ­ ¤  ¢ë¤¥«¨âì
sec_i_len EQU 0x4000
sec_i dd ?;0x4000
dat_i_len EQU 0x4000
dat_i dd ?;0x4000
;-----------------------------------------------------------------------------
proc lib_init ;////////// ˆ­æ¨«¨§ æ¨ï ¡¨¡«¨®â¥ª¨ ( ¢â®¬ â¨ç¥áª¨© ¢ë§®¢)///////
;-----------------------------------------------------------------------------
mov [mem.alloc],eax
mov [mem.free],ebx
mov [mem.realloc],ecx
mov [dll.load],edx
xor eax,eax
inc eax
ret
endp
; áâàãªâãà  ¡«®ª 
block_adr EQU 0
block_name EQU block_adr + 4
block_i_count EQU block_name + 30
block_len EQU block_i_count + 4
; áâàãªâãà  ¤ ­­ëå
data_name EQU 0
data_prev EQU data_name+200
data_next EQU data_prev+4
data_len EQU data_next+4
; ¢§ïâì á«¥¤ã騩 ¯ àã § ­ç¥­¨ï ª«îç 
proc ini.get_par stdcall, sect:dword, param:dword, val:dword, num:dword
pushad
mov edx,[block_count]
mov edi,[sect]
mov esi,[sec_i]
add esi,block_name
@@: call strcmp
cmp eax,-1
jne .sec_found
dec edx
or edx,edx
jz .sec_not_found
add esi,block_len
jmp @b
.sec_found:
mov eax,esi
sub eax,block_name
add eax, block_i_count
mov eax,[eax]
; eax - count
mov ebx,[num] ; test max count
; ebx - num
cmp eax,ebx
jle .param_not_found
sub esi,4
mov esi,[esi]
; esi - first adr
mov eax,ebx ; eax - num
@@:
or eax,eax
je .param_found
dec eax
add esi,data_next
mov esi,[esi]
jmp @b
.param_found:
mov ebx,esi
mov eax,[param]
mov cl,'='
call copy_s
add ebx,eax
add ebx,1
mov eax,[val]
mov cl,0
call copy_s
jmp .ok
.param_not_found:
.sec_not_found:
; set_default_.... 0
mov eax,[param]
mov [eax],byte 0
mov eax,[val]
mov [eax],byte 0
.ok:
popad
ret
endp
;------------------------------------------------------
proc ini.get_str stdcall, sect:dword, param:dword, buff:dword, default:dword
; sect - ᥪæ¨ï
; param - ¯ à ¬¥âà
; buff - ¡ãä¥à
; default - ¥á«¨ ®âáãâáâ¢ã¥â
pushad
mov edx,[block_count]
mov edi,[sect]
mov esi,[sec_i]
add esi,block_name
@@: call strcmp
cmp eax,-1
jne .sec_found
dec edx
or edx,edx
jz .sec_not_found
add esi,block_len
jmp @b
.sec_found:
mov eax,esi
sub eax,block_name
add eax, block_i_count
mov eax,[eax]
; eax - count
sub esi,4
mov esi,[esi]
; esi - first adr
mov edi,[param]
push eax
@@:
mov cl,'='
mov eax,text
mov ebx,esi
call copy_s
mov edx,eax
push esi
mov esi,text
call strcmp
pop esi
cmp eax,-1
jne .param_found
pop eax
dec eax
or eax,eax
jz .sec_not_found
push eax
add esi,data_next
mov esi,[esi]
jmp @b
.param_found:
mov ebx,esi
add ebx,edx
add ebx,1
pop eax
mov eax,[buff]
mov cl,0
call copy_s
jmp .ok
.param_not_found:
.sec_not_found:
; set_default_text
mov eax,[buff]
mov ebx,[default]
mov cl,0
call copy_s
.ok:
popad
ret
endp
;--------------------------------------------------------------------------------
;-----------------------------------------------------------------------------
proc ini.load stdcall filename ;/(§ £à㧪  ¨­¨ ä ©« )/////////////////////////
locals
reads: dd 0,0,0
fsize dd 0
addr dd filei
nulls db 0
fname dd 0
endl
mov [reads],dword 0
mov [reads+4],dword 0
mov [reads+8],dword 0
mov [nulls],byte 0
stdcall get_filesize, [filename]
mov [fsize],eax
inc eax
mov ebx,eax
invoke mem.alloc,eax
mov [filei],eax
mov [addr],eax
add eax,ebx
mov [eax], byte 0 ;null string
invoke mem.alloc,sec_i_len
mov [sec_i],eax
invoke mem.alloc,dat_i_len
mov [dat_i],eax
mov [data_adr],eax
mov eax,[filename]
mov [fname],eax
mov eax,70
mov ebx , reads-ebp
add ebx,ebp
int 0x40
stdcall readlnf
xor eax,eax
ret
endp
proc readlnf
pushad
mov [.pos],dword 0
.char:
mov eax,[.pos]
inc eax
mov [.pos],eax
sub eax,1
add eax,[filei]
mov al,[eax] ; ᨬ¢®« ®â ¯®§¨æ¨¨
; ⨯ ¯® ¯¥à¢®¬ã ᨬ¢®«ã
cmp al,' '
je .char
cmp al,9
je .char
cmp al,13
je .char
cmp al,10
je .char
cmp al,'['
je .sect
cmp al,0
je .exit
;------------------------------------------------------------------------------------------
; ç⥭¨¥ ¯ à ¬¥â஢
mov eax,[data_adr]
mov ebx,[.pos]
add ebx,[filei]
dec ebx
mov cl,0xD
call copy_s
xchg ebx,eax
mov eax,[.pos]
add eax,ebx
mov [.pos],eax
mov ebx,[data_adr]
mov ecx,[data_adr_last]
mov [ebx+data_prev],ecx
;add ebx,data_next
mov [ecx],ebx
add ebx,data_next
mov [data_adr_last],ebx
add ebx,data_len-data_next
mov [data_adr],ebx
mov eax,[sect_num]
imul eax,eax,block_len
add eax,[sec_i]
add eax, block_i_count
mov ebx,[eax]
inc ebx
mov [eax],ebx
jmp .test_next
;-----------------------------------------------------------------------------------------------------------------
.sect: ; ç⥭¨¥ ᥪ樨
mov eax,[block_count]
imul eax,eax,block_len
; ª®¯¨à㥬 ¨¬ï (¤® ])
add eax,[sec_i]
add eax,block_name ; ªã¦  «®¦¨âì ¨¬ï
mov ebx,[.pos]
add ebx,[filei] ; ®âªã¤ 
mov cl,']'
call copy_s ; «®¦¨¬
mov ebx,[.pos]
add ebx,eax
;sub ebx,filei
add ebx,1
mov [.pos],ebx
mov eax,[block_count] ; ¯à¨¡ ¢¨âì ª®«¨ç¥á⢮ ¡«®ª®¢
mov [sect_num],eax
mov ebx,eax
imul eax,eax,block_len ; íâ® ¡ã¤¨â  ¤à¥á ¯¥à¤ë¤ã饣® ¤«ï ¯¥à¢®£® í«¥¬¥­â 
add eax,[sec_i]
mov [data_adr_last],eax
inc ebx
mov [block_count],ebx
.test_next:
cmp [.pos] ,dword 97
jb .char
.exit:
popad
ret
.pos dd 0
endp
text db 255 dup(?)
align 16
EXPORTS:
export \
lib_init ,'lib_init',\
ini.load ,'ini.load',\
ini.get_str,'ini.get_str',\
ini.get_par,'ini.get_par'

View File

@ -1,100 +0,0 @@
macro export [name,sname]
{
forward
dd __#name#_export_name__,name
common
dd 0
forward
align 4
__#name#_export_name__ db sname,0
}
copy_s:
; eax - ªã¤ 
; ebx - ®âªã¤ 
; cl - ¤® 祣®
; ¢ë室 - eax - ᪮«ìª® ᪮¯¨à®¢ ­®
pushad
push eax
@@:
mov ch,[ebx]
cmp ch,cl
je @f
mov [eax],ch
inc ebx
inc eax
jmp @b
@@:
mov [eax], byte 0
pop ebx
sub eax,ebx
mov [esp+0x1c],eax
popad
ret
strcmp:
; esi - áâப  1
; edi - áâப  2
; ¢ë室 - eax=-1 - ­¥à ¢­®
xor eax,eax
pushad
@@: lodsb
scasb
jne .fail
or al,al
jnz @b
jmp .ok
.fail: or eax,-1
mov [esp+0x1c],eax
.ok: popad
ret
proc get_filesize stdcall, file_name:dword
locals
cmd dd ?
offset dd ?
dd ?
count dd ?
buff dd ?
db ?
name dd ?
info dd ?
flags dd ?
cr_time dd ?
cr_date dd ?
acc_time dd ?
acc_date dd ?
mod_time dd ?
mod_date dd ?
file_size dd ?
file dd ?
file2 dd ?
endl
xor eax, eax
mov ebx, [file_name]
mov ecx,info-ebp
add ecx,ebp
mov [cmd], 5
mov [offset], eax
mov [offset+4], eax
mov [count], eax
mov [buff], ecx
mov byte [buff+4], al
mov [name], ebx
mov eax, 70
lea ebx, [cmd]
int 0x40
mov eax,[file_size]
ret
endp

View File

@ -1,3 +1,4 @@
$Revision$
;============================================================================
;
; Загрузка ссылки на внешние функции

View File

@ -387,6 +387,7 @@ echo *
)
:END
erase config.inc
echo *
echo Done. Thanks for your choise ;)
echo *

View File

@ -1 +0,0 @@
__CPU_type fix p5

View File

@ -330,7 +330,7 @@ dest_info: ; DESTINATION FILEINFO
.size dd 0
.return dd 0x10000
.name:
db '/rd/1/kernel.mnt',0 ; ASCIIZ dir & filename
db '/sys/kernel.mnt',0 ; ASCIIZ dir & filename
times (STRLEN-16) db 0
param_info:

View File

@ -6439,7 +6439,7 @@ aOk db 'OK',0
aNoMemory db 'No memory!'
nullstr db 0
standard_dll_path:
libini_name db '/rd/1/dll/'
libini_name db '/sys/dll/'
standard_dll_path_size = $ - standard_dll_path
db 'libini.obj',0
aStart db 'START',0

View File

@ -2545,13 +2545,13 @@ b_color dd 0x6677cc
;Name of programs
editor db '/RD/1/TINYPAD',0
bmpview db '/RD/1/MV',0
jpgview db '/RD/1/JPEGVIEW',0
gifview db '/RD/1/GIFVIEW',0
bmpview db '/sys/MV',0
jpgview db '/sys/JPEGVIEW',0
gifview db '/sys/GIFVIEW',0
ac97 db '/RD/1/AC97SND',0
rtfread db '/RD/1/RTFREAD',0
; //// Willow
pngview db '/RD/1/@RCHER',0
pngview db '/sys/@RCHER',0
; //// Willow
midamp db '/RD/1/MIDAMP',0
view3ds db '/RD/1/3D/VIEW3DS',0
@ -2583,7 +2583,7 @@ copyr_run:
dd copyr_param
dd 0
dd 0
db '/RD/1/COPYR',0
db '/sys/COPYR',0
fileinfoblock:
dd 0x1 ; read folder

View File

@ -270,7 +270,7 @@ title db appname,0 ;
inp_pos dd inp_end-fn_input
fn_input:
; db '/hd/1/gif/smileys/sm100000.gif'
db '/rd/1/meos.gif'
db '/sys/meos.gif'
; db '/hd/1/1/tex256.gif',0
; db '/rd/1/tex256.gif'
inp_end:

View File

@ -578,7 +578,7 @@ winxs dw 0
winys dw 0
jpeg_st dd 0
file_dir dd 0
name_string: db '/rd/1/jpegview.jpg',0
name_string: db '/sys/jpegview.jpg',0
rb 256
.end:
.cursor: db 19

View File

@ -1054,7 +1054,7 @@ fileinfo:
dd 0x290000-I_END
dd I_END
string:
db '/rd/1/bgr.bmp',0
db '/sys/bgr.bmp',0
IM_END:
rb string+257-$

View File

@ -19,7 +19,7 @@ DEFCOLOR equ 0x303030
;RENDER equ BGI
RENDER equ FREE
BGIFONT_PATH equ '/rd/1/fonts/'
BGIFONT_PATH equ '/sys/fonts/'
FONT_NAME equ 'LITT'
TOP =35
MODE equ RTF

View File

@ -579,7 +579,7 @@ list_start dd 0
file_start: dd 7
dd 0,0,0,0
start_application: db '/RD/1/LAUNCHER',0
start_application: db '/sys/LAUNCHER',0
times 60 db 32
if lang eq de

View File

@ -1032,7 +1032,7 @@ lsz button_text,\
en, 'Button text',\
et, 'Nupu tekst'
sz default_skn, '/RD/1/DEFAULT.SKN',0
sz default_skn, '/sys/DEFAULT.SKN',0
if lang eq ru
title db '<27><E28098>Ž‰Š€ ŽŠŽ<C5A0>',0

View File

@ -215,7 +215,7 @@ rdsave:
dd 0
dd 0
dd 0
db '/rd/1/rdsave',0
db '/sys/rdsave',0
udata
sc system_colors

View File

@ -12,9 +12,9 @@ RAW_SIZE equ 350000
ICON_SIZE equ 32*32*3
GIF_SIZE equ 45000
REC_SIZE equ 80
ICONS_DAT equ '/RD/1/ICONS.DAT'
ICON_APP equ '/RD/1/ICON'
ICON_STRIP equ '/RD/1/ICONSTRP.GIF'
ICONS_DAT equ '/sys/ICONS.DAT'
ICON_APP equ '/sys/ICON'
ICON_STRIP equ '/sys/ICONSTRP.GIF'
use32
org 0x0

View File

@ -736,7 +736,7 @@ finfo_start:
db 0
dd icon_path
icon_path db '/rd/1/@ICON',0
icon_path db '/sys/@ICON',0
finfo:
dd 0
@ -747,7 +747,7 @@ finfo:
db 0
dd icon_list
icon_list db '/rd/1/icons.dat',0
icon_list db '/sys/icons.dat',0
icon_start_parameters:
db 25,1,1,1

View File

@ -180,7 +180,7 @@ START: ; start of execution
dd 0
.blocks dd 16*512 ; 16*512 bytes max
.address dd file_data
db "/RD/1/AUTORUN.DAT",0
db "AUTORUN.DAT",0
start_info:
.mode dd 7

View File

@ -532,7 +532,7 @@ fileinfo:
.size dd 0x10000-mem_end ; blocks to read
.return dd mem_end ; return data pointer
.name:
db '/RD/1/MENU.DAT',0 ; ASCIIZ dir & filename
db '/sys/MENU.DAT',0 ; ASCIIZ dir & filename
fileinfo_start:
.subfunction dd 7 ; 7=START APPLICATION

View File

@ -2054,7 +2054,7 @@ setup_exec:
.cmdline dd ?
dd 0
dd 0
db '/RD/1/'
db '/sys/'
file_sys db 'SETUP',0
exec_fileinfo:
@ -2066,10 +2066,10 @@ exec_fileinfo:
db 0
.name dd ?
end_name db '/RD/1/END',0
menu_name db '/RD/1/@MENU',0
calendar_name db '/RD/1/CALENDAR',0
sysmeter_name db '/RD/1/GMON',0
end_name db '/sys/END',0
menu_name db '/sys/@MENU',0
calendar_name db '/sys/CALENDAR',0
sysmeter_name db '/sys/GMON',0
dat_fileinfo:
dd 0
@ -2077,7 +2077,7 @@ dat_fileinfo:
dd 0
dd 1024
dd I_END
db '/RD/1/PANEL.DAT',0
db '/sys/PANEL.DAT',0
m_bmp_fileinfo:
dd 0
@ -2085,7 +2085,7 @@ m_bmp_fileinfo:
dd 0
dd 8192
dd image
db '/RD/1/MENUET.BMP',0
db '/sys/MENUET.BMP',0
iconf_fileinfo:
dd 0
@ -2093,7 +2093,7 @@ iconf_fileinfo:
dd 0
dd 8192
dd image
db '/RD/1/'
db '/sys/'
iconf db 'MBAR_IX.BMP',0
I_END:

View File

@ -344,12 +344,12 @@ DATA
}
strtbl startapps ,\
<"/RD/1/PIC4",0> ,\
<"/RD/1/DESKTOP",0> ,\
<"/RD/1/ICON",0>,\
<"/RD/1/SETUP",0> ,\
<"/RD/1/VRR",0> ,\
<"/RD/1/CPU",0>
<"/sys/PIC4",0> ,\
<"/sys/DESKTOP",0> ,\
<"/sys/ICON",0>,\
<"/sys/SETUP",0> ,\
<"/sys/VRR",0> ,\
<"/sys/CPU",0>
sz title, "KolibriOS"

View File

@ -1597,7 +1597,7 @@ save_fileinfo:
dd 0
dd 48
dd keyboard
file_name: db '/rd/1/setup.dat',0
file_name: db '/sys/setup.dat',0
I_PARAM dd 0

View File

@ -91,7 +91,7 @@ fileinfo:
dq 0
dd max_file_size
dd filebuf
db '/rd/1/skinsel.dat',0
db '/sys/skinsel.dat',0
i_end:
max_file_size = 0x1000 - 0x40 - $
filebuf:

View File

@ -101,7 +101,7 @@ launcher:
dd 0
dd 0
dd 0
db '/RD/1/LAUNCHER'
db '/sys/LAUNCHER'
I_END: ; ¬¥âª  ª®­æ  ¯à®£à ¬¬ë
db ? ; system loader will zero all memory after program end
; this byte will be terminating zero for launcher string