Kernel updated to 0.6.3.0

git-svn-id: svn://kolibrios.org@202 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/trunk/boot/booteng.inc

@@ -80,7 +80,7 @@ gr_acc    db      "Vesa 2.0+ : MTRR graphics acceleration "
 ;mem_model db      13,10,186," Motherboard memory [1-16 Mb / 2-32 Mb / "
 ;          db      "3-64Mb / 4-128 Mb / 5-256 Mb] ? ",0
 ;bootlog   db      13,10,186," After bootlog display [1-continue/2-pause] ? ",0
-bdev      db      "Load ramdisk from [1-floppy; 2-C:\menuet.img (FAT32);"
+bdev      db      "Load ramdisk from [1-floppy; 2-C:\kolibri.img (FAT32);"
           db      13,10,186,"                    "
           db      "3-use preloaded ram-image from kernel restart]: ",0
 probetext db      13,10,13,10,186," Use standart graphics mode? [1-yes, "
@@ -127,7 +127,7 @@ vrrm_msg  db      " [c] Use VRR:",0
 preboot_device_msg db " [d] Floppy image: ",0
 preboot_device_msgs dw 0,pdm1-0x10000,pdm2-0x10000,pdm3-0x10000
 pdm1      db      "real floppy",13,10,0
-pdm2      db      "C:\menuet.img (FAT32)",13,10,0
+pdm2      db      "C:\kolibri.img (FAT32)",13,10,0
 pdm3      db      "use already loaded image",13,10,0
 loading_msg db    "Loading KolibriOS...",0
 save_quest db     "Remember current settings? [y/n]: ",0

kernel/trunk/boot/bootge.inc

@@ -85,7 +85,7 @@ gr_acc    db      "Vesa 2.0+ : MTRR Grafikbeschleunigung "
 ;mem_model db      13,10,186," Hauptspeicher [1-16 Mb / 2-32 Mb / "
 ;          db      "3-64Mb / 4-128 Mb / 5-256 Mb] ? ",0
 ;bootlog   db      13,10,186," After bootlog display [1-continue/2-pause] ? ",0
-bdev      db      "Lade die Ramdisk von [1-Diskette; 2-C:\menuet.img (FAT32);"
+bdev      db      "Lade die Ramdisk von [1-Diskette; 2-C:\kolibri.img (FAT32);"
           db      13,10,186,"                    "
           db      "3-benutze ein bereits geladenes Kernel image]: ",0
 probetext db      13,10,13,10,186," Nutze Standardgrafikmodi? [1-ja, "
@@ -132,7 +132,7 @@ vrrm_msg  db      " [c] Nutze VRR:",0
 preboot_device_msg db " [d] Diskettenimage: ",0
 preboot_device_msgs dw 0,pdm1-0x10000,pdm2-0x10000,pdm3-0x10000
 pdm1      db      "Echte Diskette",13,10,0
-pdm2      db      "C:\menuet.img (FAT32)",13,10,0
+pdm2      db      "C:\kolibri.img (FAT32)",13,10,0
 pdm3      db      "Nutze bereits geladenes Image",13,10,0
 loading_msg db    "Lade KolibriOS...",0
 save_quest db     "Aktuelle Einstellungen speichern? [y/n]: ",0

kernel/trunk/boot/bootru.inc

@@ -80,7 +80,7 @@ gr_acc    db      "Vesa 2.0+:
 ;mem_model db      13,10,186," Ž¡ê+¬ ¯ ¬ï⨠[1-16 Mb / 2-32 Mb / "
 ;          db      "3-64Mb / 4-128 Mb / 5-256 Mb]: ",0
 ;bootlog   db      13,10,186," <20>à®á¬®âà¥âì ¦ãà­ « § £à㧪¨? [1-­¥â/2-¤ ]: ",0
-bdev      db      "‡ £à㧨âì ®¡à § ¨§ [1-¤¨áª¥â ; 2-C:\menuet.img (FAT32);"
+bdev      db      "<EFBFBD>｣璢ｧｨ粮 ｮ｡燿ｧ ｨｧ [1-､ｨ皙･笄; 2-C:\kolibri.img (FAT32);"
           db      13,10,186,"                    "
           db      "3-¨á¯®«ì§®¢ âì 㦥 § £à㦥­­ë© ®¡à §]: ",0
 probetext db      13,10,13,10,186," ‘â ­¤ àâ­ë© ¢¨¤¥®à¥¦¨¬? [1-¤ , "
@@ -127,7 +127,7 @@ vrrm_msg  db      " [c]
 preboot_device_msg db " [d] Ž¡à § ¤¨áª¥âë: ",0
 preboot_device_msgs dw 0,pdm1-0x10000,pdm2-0x10000,pdm3-0x10000
 pdm1      db      "­ áâ®ïé ï ¤¨áª¥â ",13,10,0
-pdm2      db      "C:\menuet.img (FAT32)",13,10,0
+pdm2      db      "C:\kolibri.img (FAT32)",13,10,0
 pdm3      db      "¨á¯®«ì§®¢ âì 㦥 § £à㦥­­ë© ®¡à §",13,10,0
 loading_msg db    "ˆ¤ñâ § £à㧪  KolibriOS...",0
 save_quest db     "‡ ¯®¬­¨âì ⥪ã騥 ­ áâனª¨? [y/n]: ",0

kernel/trunk/boot/preboot.inc

@@ -19,5 +19,5 @@ preboot_blogesc     db  1 ; start immediately after bootlog
       if $>10200h
 ERROR: prebooting parameters must fit in first sector!!!
       end if
-hdsysimage          db  'MENUET  IMG' ; load from
+hdsysimage          db  'KOLIBRI IMG' ; load from
-image_save          db  'MENUET  IMG' ; save to
+image_save          db  'KOLIBRI IMG' ; save to

kernel/trunk/core/dll.inc

@@ -914,8 +914,8 @@ proc load_library stdcall, file_name:dword
 endp
 
 
-drv_sound      db '/rd/1/unisound.obj', 0
+drv_sound      db '/rd/1/drivers/unisound.obj', 0
-drv_infinity   db '/rd/1/infinity.obj', 0
+drv_infinity   db '/rd/1/drivers/infinity.obj', 0
 
 szSound        db 'SOUND',0
 szInfinity     db 'INFINITY',0

kernel/trunk/core/syscall.inc

@@ -98,13 +98,10 @@ iglobal
       dd sys_wss                 ; 27-SetWssMainVol and SetWssCdVol
       dd sys_sb16II              ; 28-SetSb16
       dd sys_date                ; 29-GetDate
-;      dd syscall_readhd          ; 30-ReadHd - obsolete <diamond>
       dd undefined_syscall       ; 30-reserved
-;      dd syscall_starthdapp      ; 31-StartHdApp - obsolete <diamond>
       dd undefined_syscall       ; 31-reserved
       dd syscall_delramdiskfile  ; 32-DelRamdiskFile
       dd syscall_writeramdiskfile; 33-WriteRamdiskFile
-;      dd read_floppy_file        ; 34-ReadFloppyDrive - obsolete <diamond>
       dd undefined_syscall       ; 34-reserved
       dd syscall_getpixel        ; 35-GetPixel
       dd syscall_readstring      ; 36-ReadString (not yet ready)
@@ -127,8 +124,7 @@ iglobal
       dd socket                  ; 53-Socket interface
       dd user_events             ; 54-User events
       dd sound_interface         ; 55-Sound interface
-      dd write_to_hd             ; 56-Write a file to hd
+      dd undefined_syscall       ; 56-reserved
-;      dd delete_from_hd          ; 57-Delete a file from hd - obsolete <diamond>
       dd undefined_syscall       ; 57-reserved
       dd file_system             ; 58-Common file system interface
       dd sys_trace               ; 59-System call trace

kernel/trunk/core/taskman.inc

@@ -683,10 +683,13 @@ proc add_app_parameters stdcall,slot:dword,img_base:dword,\
            mov    ebx,[slot]
            mov    eax,ebx
            shl    ebx,5
+; set window state to 'normal' (non-minimized/maximized/rolled-up) state
+        mov     [ebx+window_data+WDATA.fl_wstate], WSTATE_NORMAL
+        mov     [ebx+window_data+WDATA.fl_redraw], 1
            add    ebx,CURRENT_TASK            ;ebx - pointer to information about process
-           mov    [ebx+0xe],al          ;set window number on screen = process slot
+           mov    [ebx+TASKDATA.wnd_number],al;set window number on screen = process slot
 
-           mov    [ebx],dword 1+2+4     ;set default event flags (see 40 function)
+           mov    [ebx+TASKDATA.event_mask],dword 1+2+4 ;set default event flags (see 40 function)
 
            inc    dword [process_number]
            mov    eax,[process_number]
@@ -702,8 +705,6 @@ proc add_app_parameters stdcall,slot:dword,img_base:dword,\
            mov    [ecx+8],eax
            mov    eax,[SCR_Y_SIZE]
            mov    [ecx+12],eax
-;set window state to 'normal' (non-minimized/maximized/rolled-up) state
-           mov    [ecx+WDATA.fl_wstate],WSTATE_NORMAL
 ;set cr3 register in TSS of application
 
            mov    ecx,[slot]

kernel/trunk/kernel.asm

@@ -78,7 +78,7 @@ drawbar         dd __sys_drawbar.forced
 putpixel        dd __sys_putpixel
 ; } mike.dld
 
-version           db    'Kolibri OS  version 0.6.0.0      ',13,10,13,10,0
+version           db    'Kolibri OS  version 0.6.3.0      ',13,10,13,10,0
                   ;dd    endofcode-0x10000
 
                   ;db   'Boot02'
@@ -228,8 +228,8 @@ boot_log:
 
 iglobal
   firstapp   db  '/rd/1/LAUNCHER',0
-  char       db  'CHAR    MT '
+  char       db  'FONTS/CHAR.MT',0
-  char2      db  'CHAR2   MT '
+  char2      db  'FONTS/CHAR2.MT',0
   bootpath   db  '/KOLIBRI    '
   bootpath2  db  0
   vmode      db  'VMODE   MDR'
@@ -523,19 +523,17 @@ include 'vmodeld.inc'
         mov   [0x3004],dword 1
         mov   [0x3010],dword 0x3020
 
-        mov   eax,char
+        mov   esi,char
-        mov   esi,12
         xor   ebx,ebx
         mov   ecx,2560;26000
         mov   edx,0x3F600;0x37000
-        call  fileread
+        call  fs_RamdiskRead
 
-        mov   eax,char2
+        mov   esi,char2
-        mov   esi,12
         xor   ebx,ebx
         mov   ecx,2560;26000
         mov   edx,0x3EC00;0x30000
-        call  fileread
+        call  fs_RamdiskRead
 
         mov   esi,boot_fonts
         call  boot_log
@@ -2190,7 +2188,7 @@ endg
 
 iglobal
 version_inf:
-  db 0,6,0,0  ; version 0.6.0.0
+  db 0,6,3,0  ; version 0.6.3.0
   db UID_KOLIBRI
   db 'Kolibri',0
 version_end:
@@ -3023,10 +3021,12 @@ syscall_windowsettings:
         ; have to check if caption is within application memory limit
         ; check is trivial, and if application resizes its memory,
         ;   caption still can become over bounds
-        mov     ecx,[edi*8+0x80000+APPDATA.mem_size]
+; diamond, 31.10.2006: check removed because with new memory manager
-        add     ecx,255 ; max caption length
+; there can be valid data after APPDATA.mem_size bound
-        cmp     ebx,ecx
+;        mov     ecx,[edi*8+0x80000+APPDATA.mem_size]
-        ja      .exit_fail
+;        add     ecx,255 ; max caption length
+;        cmp     ebx,ecx
+;        ja      .exit_fail
 
         mov     [edi*8+0x80000+APPDATA.wnd_caption],ebx
         or      [edi+window_data+WDATA.fl_wstyle],WSTYLE_HASCAPTION
@@ -4850,31 +4850,6 @@ read_from_hd:                           ; Read from hd - fn not in use
      ret
 
 
-align 4
-
-write_to_hd:                            ; Write a file to hd
-
-     mov   edi,[0x3010]
-     add   edi,TASKDATA.mem_start
-     add   eax,[edi]
-     add   ecx,[edi]
-     add   edx,[edi]
-     call  file_write
-     ret
-
-; <diamond> Sysfunction 57, delete_from_hd, is obsolete. Use 58 or 70 functions instead.
-;align 4
-;
-;delete_from_hd:                         ; Delete a file from hd
-;
-;     mov   edi,[0x3010]
-;     add   edi,0x10
-;     add   eax,[edi]
-;     add   ecx,[edi]
-;     call  file_delete
-;     ret
-;
-
 ; --------------- APM ---------------------
 apm_entry    dp    0
 apm_vf        dd    0