Sync net branch with trunk

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

kernel/branches/net/blkdev/cd_drv.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/cdrom.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/disk.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2011. All rights reserved.      ;;
+;; Copyright (C) KolibriOS team 2011-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/disk_cache.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2011. All rights reserved.      ;;
+;; Copyright (C) KolibriOS team 2011-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/fdc.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/flp_drv.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/hd_drv.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/ide_cache.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/blkdev/rd.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;; RAMDISK functions                                            ;;

kernel/branches/net/blkdev/rdsave.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/bootcode.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
@@ -274,7 +274,7 @@ sayerr:
 
         push    0
         pop     es
-        and     word [es:0x9031], 0
+        and     word [es:BOOT_IDE_BASE_ADDR], 0
 ; \begin{Mario79}
 ; find HDD IDE DMA PCI device
 ; check for PCI BIOS
@@ -311,7 +311,7 @@ sayerr:
         int     0x1A
         jc      .nopci
         and     cx, 0xFFF0      ; clear address decode type
-        mov     [es:0x9031], cx
+        mov     [es:BOOT_IDE_BASE_ADDR], cx
 .nopci:
 ; \end{Mario79}
 
@@ -343,15 +343,15 @@ wait_loop:       ; variant 2
         loopnz  @b
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; --------------- APM ---------------------
-        and     word [es:0x9044], 0     ; ver = 0.0 (APM not found)
+        and     word [es:BOOT_APM_VERSION], 0     ; ver = 0.0 (APM not found)
         mov     ax, 0x5300
         xor     bx, bx
         int     0x15
         jc      apm_end                 ; APM not found
         test    cx, 2
         jz      apm_end                 ; APM 32-bit protected-mode interface not supported
-        mov     [es:0x9044], ax         ; Save APM Version
+        mov     [es:BOOT_APM_VERSION], ax         ; Save APM Version
-        mov     [es:0x9046], cx         ; Save APM flags
+        mov     [es:BOOT_APM_FLAGS], cx           ; Save APM flags
 
         ; Write APM ver ----
         and     ax, 0xf0f
@@ -370,10 +370,10 @@ wait_loop:       ; variant 2
         xor     bx, bx
         int     0x15
 
-        mov     [es:0x9040], ebx
+        mov     [es:BOOT_APM_ENTRY], ebx
-        mov     [es:0x9050], ax
+        mov     [es:BOOT_APM_CODE_32], ax
-        mov     [es:0x9052], cx
+        mov     [es:BOOT_APM_CODE_16], cx
-        mov     [es:0x9054], dx
+        mov     [es:BOOT_APM_DATA_16], dx
 
 apm_end:
         _setcursor d80x25_top_num, 0
@@ -1151,7 +1151,7 @@ no_sys_on_floppy:
         xor     ax, ax
         mov     es, ax
 
-        mov     ax, [es:0x9008]         ; vga & 320x200
+        mov     ax, [es:BOOT_VESA_MODE]         ; vga & 320x200
         mov     bx, ax
         cmp     ax, 0x13
         je      setgr

kernel/branches/net/boot/booteng.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/bootet.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/bootge.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/bootru.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/bootstr.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/bootvesa.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -241,7 +241,8 @@ calc_vmodes_table:
         mov     [es:bx+4],ax               ; +4[2] : attributes
 
         cmp     [s_vesa.ver], '2'
-        jb      .lp1
+;        jb      .lp1
+        jb      @f    ; We do not use Vesa 1.2 mode is now
 
         or      cx, 0x4000 ; use LFB
 .lp1:   mov     [es:bx+6],cx               ; +6 : mode number
@@ -681,9 +682,9 @@ set_vmode:
         mov     bx, word [es:si+2]           ; resolution Y
 
 
-        mov     word [es:0x900A],ax              ; resolution X
+        mov     word [es:BOOT_X_RES], ax             ; resolution X
-        mov     word [es:0x900C],bx              ; resolution Y
+        mov     word [es:BOOT_Y_RES], bx             ; resolution Y
-        mov     word [es:0x9008],cx              ; number of mode
+        mov     word [es:BOOT_VESA_MODE], cx             ; number of mode
 
         cmp     cx, 0x12
         je      .mode0x12_0x13
@@ -691,8 +692,8 @@ set_vmode:
         je      .mode0x12_0x13
 
 
-        cmp     byte [s_vesa.ver],'2'
+;        cmp     byte [s_vesa.ver], '2'
-        jb      .vesa12
+;        jb      .vesa12
 
 ;  VESA 2 and Vesa 3
 
@@ -702,11 +703,11 @@ set_vmode:
         int     0x10
         ; LFB
         mov     eax, [es:mi.PhysBasePtr];di+0x28]
-        mov     [es:0x9018],eax
+        mov     [es:BOOT_LFB], eax
         ; ---- vbe voodoo
         BytesPerLine equ 0x10
         mov     ax, [es:di+BytesPerLine]
-        mov     [es:0x9001], ax
+        mov     [es:BOOT_PITCH], ax
         ; BPP
         cmp     [es:mi.BitsPerPixel], 16
         jne     .l0
@@ -715,40 +716,34 @@ set_vmode:
         mov     [es:mi.BitsPerPixel], 15
 .l0:
         mov     al, byte [es:di+0x19]
-        mov     [es:0x9000], al
+        mov     [es:BOOT_BPP], al
         jmp     .exit
 
 .mode0x12_0x13:
-        mov     byte [es:0x9000], 32
+        mov     byte [es:BOOT_BPP], 32
-        or      dword [es:0x9018], 0xFFFFFFFF; 0x800000
+        or      dword [es:BOOT_LFB], 0xFFFFFFFF; 0x800000
 
 
 ;  VESA 1.2 PM BANK SWITCH ADDRESS
 
-.vesa12:
+;.vesa12:
-
+;        mov     ax, 0x4f0A
-
+;        xor     bx, bx
-        mov     ax,0x4f0A
+;        int     0x10
-        xor     bx,bx
+;        xor     eax, eax
-        int     0x10
+;        xor     ebx, ebx
-        xor     eax,eax
+;        mov     ax, es
-        xor     ebx,ebx
+;        shl     eax, 4
-        mov     ax,es
+;        mov     bx, di
-        shl     eax,4
+;        add     eax, ebx
-        mov     bx,di
+;        movzx   ebx, word[es:di]
-        add     eax,ebx
+;        add     eax, ebx
-        movzx   ebx,word[es:di]
+;        push    0x0000
-        add     eax,ebx
+;        pop     es
-        push    0x0000
+;        mov     [es:0x9014], eax
-        pop     es
-        mov     [es:0x9014],eax
   .exit:
         ret
 
-
-;        mov     dword[es:0x9018],0x000A0000
-;        ret
-
 ;=============================================================================
 ;=============================================================================
 ;=============================================================================

kernel/branches/net/boot/et.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/preboot.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/rdload.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/ru.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/boot/shutdown.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;  Shutdown for Menuet                                         ;;

kernel/branches/net/bus/pci/PCIe.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) 2010 KolibriOS team.     All rights reserved.  ;;
+;; Copyright (C) KolibriOS team 2010-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;                                                              ;;

kernel/branches/net/bus/pci/pci16.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;  PCI16.INC                                                   ;;

kernel/branches/net/bus/pci/pci32.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;                                                              ;;

kernel/branches/net/const.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -210,7 +210,7 @@ BANK_SWITCH         equ (OS_BASE+0x000E030)
 ;unused ? store mousepointer
 MOUSE_PICTURE       equ (OS_BASE+0x000F200)
 
-MOUSE_VISIBLE       equ (OS_BASE+0x000F204)
+;MOUSE_VISIBLE       equ (OS_BASE+0x000F204)
 WIN_TEMP_XY         equ (OS_BASE+0x000F300)
 KEY_COUNT           equ (OS_BASE+0x000F400)
 KEY_BUFF            equ (OS_BASE+0x000F401)
@@ -255,7 +255,7 @@ SYS_SHUTDOWN        equ (OS_BASE+0x000FF00)
 TASK_ACTIVATE       equ (OS_BASE+0x000FF01)
 
 REDRAW_BACKGROUND   equ (OS_BASE+0x000FFF0)
-BACKGROUND_CHANGED  equ (OS_BASE+0x000FFF1)
+
 BANK_RW             equ (OS_BASE+0x000FFF2)
 MOUSE_BACKGROUND    equ (OS_BASE+0x000FFF4)
 DONT_DRAW_MOUSE     equ (OS_BASE+0x000FFF5)
@@ -289,7 +289,11 @@ BgrAuxTable         equ (OS_BASE+0x0298000)
 SB16Buffer          equ (OS_BASE+0x02A0000)
 SB16_Status         equ (OS_BASE+0x02B0000)
 
-BUTTON_INFO         equ (OS_BASE+0x02C0000)
+BUTTON_INFO         equ (OS_BASE+0x02B3FEE)
+
+BPSLine_calc_area   equ (OS_BASE+0x02C4000)
+d_width_calc_area   equ (OS_BASE+0x02CA000)
+
 RESERVED_PORTS      equ (OS_BASE+0x02D0000)
 BOOT_VAR            equ (OS_BASE+0x02E0000)
 
@@ -362,22 +366,30 @@ PG_SHARED           equ 0x200
 
 ;;;;;;;;;;;boot time variables
 
-;BOOT_BPP            equ 0x9000    ;byte   bits per pixel
+BOOT_BPP            equ 0x9000    ;byte   bits per pixel
-BOOT_SCANLINE       equ 0x9001    ;word   scanline length
+BOOT_PITCH          equ 0x9001    ;word   scanline length
 BOOT_VESA_MODE      equ 0x9008    ;word   vesa video mode
-;;BOOT_X_RES          equ 0x900A    ;word   X res
+BOOT_X_RES          equ 0x900A    ;word   X res
-;;BOOT_Y_RES          equ 0x900C    ;word   Y res
+BOOT_Y_RES          equ 0x900C    ;word   Y res
 ;;BOOT_MOUSE_PORT     equ 0x9010    ;byte   mouse port  - not used
 BOOT_BANK_SW        equ 0x9014    ;dword  Vesa 1.2 pm bank switch
 BOOT_LFB            equ 0x9018    ;dword  Vesa 2.0 LFB address
 BOOT_MTRR           equ 0x901C    ;byte   0 or 1 : enable MTRR graphics acceleration
 BOOT_LOG            equ 0x901D    ;byte   not used anymore (0 or 1 : enable system log display)
-BOOT_DIRECT_LFB     equ 0x901E    ;byte   0 or 1 : enable direct lfb write, paging disabled
+;BOOT_DIRECT_LFB     equ 0x901E    ;byte   0 or 1 : enable direct lfb write, paging disabled
+BOOT_DMA            equ 0x901F    ;
 BOOT_PCI_DATA       equ 0x9020    ;8bytes pci data
 BOOT_VRR            equ 0x9030    ;byte   VRR start enabled 1, 2-no
 BOOT_IDE_BASE_ADDR  equ 0x9031   ;word   IDEContrRegsBaseAddr
 BOOT_MEM_AMOUNT     equ 0x9034    ;dword  memory amount
 
+BOOT_APM_ENTRY      equ 0x9040
+BOOT_APM_VERSION    equ 0x9044
+BOOT_APM_FLAGS      equ 0x9046    ;unused
+BOOT_APM_CODE_32    equ 0x9050
+BOOT_APM_CODE_16    equ 0x9052
+BOOT_APM_DATA_16    equ 0x9054
+
 TMP_FILE_NAME       equ     0
 TMP_CMD_LINE        equ  1024
 TMP_ICON_OFFS       equ  1280
@@ -513,6 +525,9 @@ struct  display_t
         move_cursor     dd ?
         restore_cursor  dd ?
         disable_mouse   dd ?
+        mask_seqno      dd ?
+        check_mouse     dd ?
+        check_m_pixel   dd ?
 ends
 
 struct  BOOT_DATA

kernel/branches/net/core/apic.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -61,7 +61,7 @@ APIC_init:
         call    IRQ_mask_all
 
 ; IOAPIC init
-        stdcall map_io_mem, [acpi_ioapic_base], 0x20, PG_SW
+        stdcall map_io_mem, [acpi_ioapic_base], 0x20, PG_SW+PG_NOCACHE
         mov     [IOAPIC_base], eax
 
         mov     eax, IOAPIC_VER
@@ -121,14 +121,11 @@ APIC_init:
 ;===========================================================
 align 4
 LAPIC_init:
-        ; Check MSR support
-        ;....
-        ; Get LAPIC base address
-; mov ecx, 0x1b
-; rdmsr       ; it may be replaced to
-; and ax, 0xf000    ; mov eax, 0xfee00000
 
-        stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_SW
+        cmp     [LAPIC_BASE], 0
+        jne     .done
+
+        stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_SW+PG_NOCACHE
         mov     [LAPIC_BASE], eax
         mov     esi, eax
 
@@ -200,6 +197,8 @@ LAPIC_init:
         ; Start (every 0.01 sec)
         mov     dword[esi + APIC_LVT_timer], 0x30020; periodic int 0x20
         mov     dword[esi + APIC_timer_init], eax
+
+.done:
         ret
 
 ;===========================================================

kernel/branches/net/core/conf_lib.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/debug.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/dll.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -437,10 +437,19 @@ proc load_file stdcall, file_name:dword
         jz      .cleanup
 
         mov     [file2], eax
-        pushfd
+
-        cli
+        pushad
+        mov     ecx, unpack_mutex
+        call    mutex_lock
+        popad
+
         stdcall unpack, [file], eax
-        popfd
+
+        pushad
+        mov     ecx, unpack_mutex
+        call    mutex_unlock
+        popad
+
         stdcall kernel_free, [file]
         mov     eax, [file2]
         mov     ebx, [file_size]
@@ -470,6 +479,11 @@ proc load_file stdcall, file_name:dword
         ret
 endp
 
+uglobal
+align 4
+unpack_mutex MUTEX
+endg
+
 align 4
 proc get_proc_ex stdcall, proc_name:dword, imports:dword
 
@@ -802,7 +816,7 @@ proc load_driver stdcall, driver_name:dword
         jnz     @f
         cmp     word [file_name+21], 'j'
         jnz     @f
-        mov     esi, aSis
+        mov     esi, aHDA
         jmp     .redo
 @@:
         xor     eax, eax

kernel/branches/net/core/export.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/exports.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/ext_lib.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/fpu.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/heap.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -578,7 +578,7 @@ restore block_flags
 
 ;;;;;;;;;;;;;;      USER     ;;;;;;;;;;;;;;;;;
 
-HEAP_TOP  equ 0x5FC00000
+HEAP_TOP  equ 0x80000000
 
 align 4
 proc init_heap
@@ -848,6 +848,71 @@ proc user_free stdcall, base:dword
         ret
 endp
 
+
+align 4
+proc user_unmap stdcall, base:dword, offset:dword, size:dword
+
+        push    ebx
+
+        mov     ebx, [base]             ; must be valid pointer
+        test    ebx, ebx
+        jz      .error
+
+        mov     edx, [offset]           ; check offset
+        add     edx, ebx                ; must be below 2Gb app limit
+        js      .error
+
+        shr     ebx, 12                 ; chek block attributes
+        lea     ebx, [page_tabs+ebx*4]
+        mov     eax, [ebx-4]            ; block attributes
+        test    al, USED_BLOCK
+        jz      .error
+        test    al, DONT_FREE_BLOCK
+        jnz     .error
+
+        shr     edx, 12
+        lea     edx, [page_tabs+edx*4]  ; unmap offset
+
+        mov     ecx, [size]
+        add     ecx, 4095
+        shr     ecx, 12                 ; unmap size in pages
+
+        shr     eax, 12                 ; block size + 1 page
+        lea     ebx, [ebx+eax*4-4]      ; block end ptr
+        lea     eax, [edx+ecx*4]        ; unmap end ptr
+
+        cmp     eax, ebx                ; check for overflow
+        ja      .error
+
+        mov     ebx, [offset]
+        and     ebx, not 4095           ; is it required ?
+
+.unmap:
+        mov     eax, [edx]              ; get page addres
+        test    al, 1                   ; page mapped ?
+        jz      @F
+        test    eax, PG_SHARED          ; page shared ?
+        jnz     @F
+        mov     [page_tabs+edx*4], dword 2
+                                        ; mark page as reserved
+        invlpg  [ebx]                   ; when we start using
+        call    free_page               ; empty c-o-w page instead this ?
+@@:
+        add     ebx, 4096
+        add     edx, 4
+        dec     ecx
+        jnz     .unmap
+
+        pop     ebx
+        or      al, 1                   ; return non zero on success
+        ret
+.error:
+        pop     ebx
+        xor     eax, eax                ; something wrong
+        ret
+endp
+
+align 4
 user_normalize:
 ; in: esi=heap_base, edi=heap_top
 ; out: eax=0 <=> OK

kernel/branches/net/core/irq.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/malloc.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/memory.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -166,6 +166,7 @@ proc free_page
         ret
 endp
 
+align 4
 proc map_io_mem stdcall, base:dword, size:dword, flags:dword
 
         push    ebx
@@ -357,8 +358,10 @@ proc init_LFB
 
         cmp     dword [LFBAddress], -1
         jne     @f
-        mov     [BOOT_VAR+0x901c], byte 2
+        mov     [BOOT_VAR+BOOT_MTRR], byte 2
-        stdcall alloc_pages, (0x280000 / 4096)
+; max VGA=640*480*4=1228800 bytes
+; + 32*640*4=81920 bytes for mouse pointer
+        stdcall alloc_pages, ((1228800+81920)/4096)
 
         push    eax
         call    alloc_page
@@ -366,14 +369,16 @@ proc init_LFB
         pop     eax
         or      eax, PG_UW
         mov     ebx, LFB_BASE
-        mov     ecx, 0x280000 / 4096
+; max VGA=640*480*4=1228800 bytes
+; + 32*640*4=81920 bytes for mouse pointer
+        mov     ecx, (1228800+81920)/4096
         call    commit_pages
         mov     [LFBAddress], dword LFB_BASE
         ret
 @@:
         test    [SCR_MODE], word 0100000000000000b
         jnz     @f
-        mov     [BOOT_VAR+0x901c], byte 2
+        mov     [BOOT_VAR+BOOT_MTRR], byte 2
         ret
 @@:
         call    init_mtrr
@@ -1303,6 +1308,11 @@ f68:
 @@:
         ret
 
+.26:
+        stdcall user_unmap, ecx, edx, esi
+        mov     [esp+32], eax
+        ret
+
 .fail:
         xor     eax, eax
         mov     [esp+32], eax
@@ -1325,8 +1335,9 @@ f68call:   ; keep this table closer to main code
            dd f68.21   ; load_driver
            dd f68.22   ; shmem_open
            dd f68.23   ; shmem_close
-           dd f68.24
+           dd f68.24   ; set exception handler
-           dd f68.25
+           dd f68.25   ; unmask exception
+           dd f68.26   ; user_unmap
 
 
 align 4
@@ -1353,7 +1364,7 @@ endp
 align 4
 proc init_mtrr
 
-        cmp     [BOOT_VAR+0x901c], byte 2
+        cmp     [BOOT_VAR+BOOT_MTRR], byte 2
         je      .exit
 
         bt      [cpu_caps], CAPS_MTRR
@@ -1543,3 +1554,27 @@ proc create_ring_buffer stdcall, size:dword, flags:dword
 .fail:
         ret
 endp
+
+
+align 4
+proc print_mem
+        mov     edi, BOOT_VAR + 0x9104
+        mov     ecx, [edi-4]
+        test    ecx, ecx
+        jz      .done
+
+@@:
+        mov     eax, [edi]
+        mov     edx, [edi+4]
+        add     eax, [edi+8]
+        adc     edx, [edi+12]
+
+        DEBUGF  1, "K : E820 %x%x - %x%x type %d\n", \
+                    [edi+4], [edi],\
+                    edx, eax, [edi+16]
+        add     edi, 20
+        dec     ecx
+        jnz     @b
+.done:
+        ret
+endp

kernel/branches/net/core/peload.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/sched.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/string.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;; Author: Kees J. Bot 1 Jan 1994                               ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/sync.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;; Synhronization for MenuetOS.                                 ;;

kernel/branches/net/core/sys32.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;                                                              ;;

kernel/branches/net/core/syscall.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2010. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -145,7 +145,7 @@ iglobal
       dd sys_settime             ; 22-setting date,time,clock and alarm-clock
       dd sys_wait_event_timeout  ; 23-TimeOutWaitForEvent
       dd syscall_cdaudio         ; 24-PlayCdTrack,StopCd and GetCdPlaylist
-      dd undefined_syscall       ; 25-reserved
+      dd syscall_putarea_backgr  ; 25-Put Area to background
       dd sys_getsetup            ; 26-GetMidiBase,GetKeymap,GetShiftKeymap,.
       dd undefined_syscall       ; 27-reserved
       dd undefined_syscall       ; 28-reserved
@@ -154,7 +154,7 @@ iglobal
       dd undefined_syscall       ; 31-reserved
       dd undefined_syscall       ; 32-reserved
       dd undefined_syscall       ; 33-reserved
-      dd undefined_syscall       ; 34-reserved
+      dd syscall_getpixel_WinMap ; 34-GetPixel WinMap
       dd syscall_getpixel        ; 35-GetPixel
       dd syscall_getarea         ; 36-GetArea
       dd readmousepos            ; 37-GetMousePosition_ScreenRelative,.

kernel/branches/net/core/taskman.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -72,6 +72,7 @@ proc fs_execute
          slot_base     dd ?
          file_base     dd ?
          file_size     dd ?
+         handle        dd ? ;temp. for default cursor handle for curr. thread
                       ;app header data
          hdr_cmdline   dd ? ;0x00
          hdr_path      dd ? ;0x04
@@ -83,6 +84,13 @@ proc fs_execute
 
         pushad
 
+        pushad
+        stdcall set_cursor, [def_cursor_clock]
+        mov     [handle], eax
+        mov     [redrawmouse_unconditional], 1
+        call    __sys_draw_pointer
+        popad
+
         mov     [flags], edx
 
 ; [ebp]  pointer to filename
@@ -113,7 +121,8 @@ proc fs_execute
 .bigfilename:
         popad
         mov     eax, -ERROR_FILE_NOT_FOUND
-        ret
+
+        jmp     .final
 
 .namecopied:
 
@@ -127,6 +136,7 @@ proc fs_execute
 @@:
         lea     eax, [filename]
         stdcall load_file, eax
+
         mov     esi, -ERROR_FILE_NOT_FOUND
         test    eax, eax
         jz      .err_file
@@ -237,7 +247,9 @@ end if
         xor     ebx, ebx
         mov     [application_table_status], ebx;unlock application_table_status mutex
         mov     eax, [process_number];set result
-        ret
+
+        jmp     .final
+
 .failed:
         mov     eax, [save_cr3]
         call    set_cr3
@@ -248,6 +260,12 @@ end if
         xor     eax, eax
         mov     [application_table_status], eax
         mov     eax, esi
+.final:
+        pushad
+        stdcall set_cursor, [handle]
+        mov     [redrawmouse_unconditional], 1
+        call    __sys_draw_pointer
+        popad
         ret
 endp
 

kernel/branches/net/core/test_malloc.asm

@@ -1,3 +1,10 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2009-2011. All rights reserved. ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 ; Tests of malloc()/free() from the kernel heap.
 ; This file is not included in the kernel, it is just test application.
 use32

kernel/branches/net/core/timers.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2011. All rights reserved.      ;;
+;; Copyright (C) KolibriOS team 2012. All rights reserved.      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/core/v86.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2007-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2007-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/data16.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/data32.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -107,7 +107,7 @@ msg_module     db 'in module ',0
 msg_version    db 'incompatible driver version',13,10,0
 msg_www        db 'please visit www.kolibrios.org',13,10,0
 msg_CR         db  13,10,0
-aSis           db 'SIS',0
+aHDA           db 'INTEL_HDA',0
 
 intel_str      db "GenuineIntel",0
 AMD_str        db "AuthenticAMD",0
@@ -156,23 +156,25 @@ dll_list:
  .bk           dd dll_list
  .fd           dd dll_list
 
-MAX_DEFAULT_DLL_ADDR = 0x20000000
+MAX_DEFAULT_DLL_ADDR = 0x80000000
-MIN_DEFAULT_DLL_ADDR = 0x10000000
+MIN_DEFAULT_DLL_ADDR = 0x70000000
 dll_cur_addr   dd MIN_DEFAULT_DLL_ADDR
 
 ; supported videomodes
 
 
 ; mike.dld {
-db 0
+;db 0
-dd servetable-0x10000
+;dd servetable-0x10000
-draw_line       dd __sys_draw_line
+;align 4
-draw_pointer    dd __sys_draw_pointer
+;draw_line       dd __sys_draw_line
+;draw_pointer    dd __sys_draw_pointer
 ;//mike.dld, 2006-08-02 [
-;drawbar         dd __sys_drawbar
+;;drawbar         dd __sys_drawbar
-drawbar         dd __sys_drawbar.forced
+;;drawbar         dd __sys_drawbar.forced
+;drawbar         dd vesa20_drawbar
 ;//mike.dld, 2006-08-02 ]
-putpixel        dd __sys_putpixel
+;putpixel        dd __sys_putpixel
 ; } mike.dld
 
 
@@ -292,7 +294,8 @@ endofcode:
 gdte:
 
 align 16
-cur_saved_data    rb 4096
+cur_saved_data:
+                  rb 4096
 fpu_data:
                   rb 512
 
@@ -330,6 +333,7 @@ _WinMapAddress    rd 1
 _WinMapSize       rd 1
 
 def_cursor        rd 1
+def_cursor_clock  rd 1
 current_cursor    rd 1
 hw_cursor         rd 1
 cur_saved_base    rd 1
@@ -393,13 +397,10 @@ windowtypechanged rd 1
 
 hd_entries        rd 1     ;unused ? 0xfe10
 
-;* start code - Mario79
-
 mouse_active          rd 1
 mouse_pause           rd 1
-MouseTickCounter      rd 1
 
-;* end code - Mario79
+redrawmouse_unconditional rd 1
 
 img_background        rd 1
 mem_BACKGROUND        rd 1

kernel/branches/net/detect/biosdisk.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2008. All rights reserved.      ;;
+;; Copyright (C) KolibriOS team 2008-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/detect/biosmem.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2009. All rights reserved.      ;;
+;; Copyright (C) KolibriOS team 2009-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -23,8 +23,8 @@
         cmp     eax, 0x534D4150
         jnz     no_E820
 e820_mem_loop:
-        cmp     byte [di+16], 1 ; ignore non-free areas
+;        cmp     byte [di+16], 1 ; ignore non-free areas
-        jnz     e820_mem_next
+;        jnz     e820_mem_next
         inc     byte [0x9100]
         add     di, 20
 e820_mem_next:

kernel/branches/net/detect/dev_fd.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/detect/dev_hdcd.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/detect/disks.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/detect/getcache.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/detect/sear_par.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/drivers/sceletone.asm

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -16,10 +16,6 @@ API_VERSION     equ 0  ;debug
 include 'proc32.inc'
 include 'imports.inc'
 
-OS_BASE         equ 0;
-new_app_base    equ 0x60400000
-PROC_BASE       equ OS_BASE+0x0080000
-
 struc IOCTL
 {  .handle      dd ?
    .io_code     dd ?

kernel/branches/net/fdo.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

kernel/branches/net/fs/ext2.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2010. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;   02.02.2010  turbanoff  - support 70.5                      ;;
 ;;   23.01.2010  turbanoff  - support 70.0 70.1                 ;;

kernel/branches/net/fs/fat12.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;; FAT12.INC                                                    ;;

kernel/branches/net/fs/fat32.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  FAT32.INC                                                      ;;

kernel/branches/net/fs/fs.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;                                                              ;;

kernel/branches/net/fs/fs_lfn.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/fs/iso9660.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/fs/ntfs.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/fs/parse_fn.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/fs/part_set.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/gui/button.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2010. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
@@ -133,7 +133,8 @@ syscall_button: ;///// system function 8 //////////////////////////////////////
         call    button._.button_dececx
         push    edi
         xor     edi, edi
-        call    [draw_line]
+;        call    [draw_line]
+        call    __sys_draw_line
         pop     edi
         add     ebx, 0x00010001
         dec     edx
@@ -164,7 +165,8 @@ syscall_button: ;///// system function 8 //////////////////////////////////////
         xor     edi, edi
         mov     ecx, esi
         call    button._.incecx
-        call    [draw_line]
+;        call    [draw_line]
+        call    __sys_draw_line
 
         ; bottom border
         movzx   edx, word[esp + 4 + 0]
@@ -173,7 +175,8 @@ syscall_button: ;///// system function 8 //////////////////////////////////////
         add     ebx, edx
         mov     ecx, esi
         call    button._.dececx
-        call    [draw_line]
+;        call    [draw_line]
+        call    __sys_draw_line
 
         ; left border
         pop     ebx
@@ -188,7 +191,8 @@ syscall_button: ;///// system function 8 //////////////////////////////////////
         pop     edx
         mov     ecx, esi
         call    button._.incecx
-        call    [draw_line]
+;        call    [draw_line]
+        call    __sys_draw_line
 
         ; right border
         mov     dx, [esp + 4]
@@ -198,7 +202,8 @@ syscall_button: ;///// system function 8 //////////////////////////////////////
         add     ebx, 0x00010000
         mov     ecx, esi
         call    button._.dececx
-        call    [draw_line]
+;        call    [draw_line]
+        call    __sys_draw_line
 
         pop     ecx ebx
 

kernel/branches/net/gui/event.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -23,6 +23,7 @@ endg
 EV_SPACE   = 512
 FreeEvents = event_start-EVENT.fd    ; "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" event, <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
                                      ;  FreeEvents.fd=event_start <EFBFBD> FreeEvents.bk=event_end
+;-----------------------------------------------------------------------------
 align 4
 init_events:                                       ;; used from kernel.asm
         stdcall kernel_alloc, EV_SPACE*sizeof.EVENT
@@ -32,6 +33,8 @@ init_events:                                       ;; used from kernel.asm
         mov     ecx, EV_SPACE        ; current - in allocated space
         mov     ebx, FreeEvents      ; previos - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         push    ebx                  ; <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+;--------------------------------------
+align 4
 @@:
         mov     [ebx+EVENT.fd], eax
         mov     [eax+EVENT.bk], ebx
@@ -41,14 +44,16 @@ init_events:                                       ;; used from kernel.asm
         pop     eax                  ; <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         mov     [ebx+EVENT.fd], eax
         mov     [eax+EVENT.bk], ebx
+;--------------------------------------
+align 4
 .fail:
         ret
-
+;-----------------------------------------------------------------------------
 EVENT_WATCHED    equ 0x10000000 ;<EFBFBD><EFBFBD><EFBFBD> 28
 EVENT_SIGNALED   equ 0x20000000 ;<EFBFBD><EFBFBD><EFBFBD> 29
 MANUAL_RESET     equ 0x40000000 ;<EFBFBD><EFBFBD><EFBFBD> 30
 MANUAL_DESTROY   equ 0x80000000 ;<EFBFBD><EFBFBD><EFBFBD> 31
-
+;-----------------------------------------------------------------------------
 align 4
 create_event:                                      ;; EXPORT use
 ;info:
@@ -67,7 +72,8 @@ create_event:                                      ;; EXPORT use
         mov     edx, [edx+TASKDATA.pid]
         pushfd
         cli
-
+;--------------------------------------
+align 4
 set_event:                                         ;; INTERNAL use !!! don't use for Call
 ;info:
 ;   <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> event <20><> FreeEvents, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ecx,edx,esi
@@ -89,6 +95,8 @@ set_event:                                         ;; INTERNAL use !!! don't use
         call    init_events
         popad
         jz      RemoveEventTo.break ; POPF+RET
+;--------------------------------------
+align 4
 @@:
         mov     eax, [eax+EVENT.fd]
         mov     [eax+EVENT.magic], 'EVNT'
@@ -103,7 +111,8 @@ set_event:                                         ;; INTERNAL use !!! don't use
         mov     ecx, (sizeof.EVENT -EVENT.code)/4
         cld
         rep movsd
-
+;--------------------------------------
+align 4
 RemoveEventTo:                                     ;; INTERNAL use !!! don't use for Call
 ;param:
 ;   eax - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> event, <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -118,10 +127,12 @@ RemoveEventTo:                                     ;; INTERNAL use !!! don't use
         xchg    ecx, [eax+EVENT.fd]  ; Self.fd=NewRight,  ecx=OldRight
         mov     [ebx+EVENT.fd], ecx  ; OldLeft.fd=OldRight
         mov     [ecx+EVENT.bk], ebx  ; OldRight.bk=OldLeft
+;--------------------------------------
+align 4
 .break:
         popfd
         ret
-
+;-----------------------------------------------------------------------------
 align 4
 NotDummyTest:                                      ;; INTERNAL use (not returned for fail !!!)
         pop     edi
@@ -129,6 +140,8 @@ NotDummyTest:                                      ;; INTERNAL use (not returned
         mov     ebx, eax
         mov     eax, [ebx+EVENT.pid]
         push    edi
+;--------------------------------------
+align 4
 .small: ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD>...
         pop     edi
         pushfd
@@ -137,7 +150,7 @@ NotDummyTest:                                      ;; INTERNAL use (not returned
         shl     eax, 8
         jz      RemoveEventTo.break ; POPF+RET
         jmp     edi ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-
+;-----------------------------------------------------------------------------
 align 4
 raise_event:                                       ;; EXPORT use
 ;info:
@@ -158,6 +171,8 @@ raise_event:                                       ;; EXPORT use
         mov     ecx, (sizeof.EVENT -EVENT.code)/4
         cld
         rep movsd
+;--------------------------------------
+align 4
 @@:
         test    byte[ebx+EVENT.state+3], EVENT_SIGNALED shr 24
         jnz     RemoveEventTo.break  ; POPF+RET
@@ -165,12 +180,14 @@ raise_event:                                       ;; EXPORT use
         jnc     @f
         test    byte[ebx+EVENT.state+3], EVENT_WATCHED shr 24
         jz      RemoveEventTo.break  ; POPF+RET
+;--------------------------------------
+align 4
 @@:
         or      byte[ebx+EVENT.state+3], EVENT_SIGNALED shr 24
         add     eax, SLOT_BASE+APP_EV_OFFSET
         xchg    eax, ebx
         jmp     RemoveEventTo
-
+;-----------------------------------------------------------------------------
 align 4
 clear_event:                                       ;; EXPORT use
 ;info:
@@ -184,7 +201,7 @@ clear_event:                                       ;; EXPORT use
         and     byte[ebx+EVENT.state+3], not((EVENT_SIGNALED+EVENT_WATCHED)shr 24)
         xchg    eax, ebx
         jmp     RemoveEventTo
-
+;-----------------------------------------------------------------------------
 align 4
 send_event:                                        ;; EXPORT use
 ;info:
@@ -207,7 +224,7 @@ send_event:                                        ;; EXPORT use
         lea     ebx, [eax+SLOT_BASE+APP_EV_OFFSET]
         mov     ecx, EVENT_SIGNALED
         jmp     set_event
-
+;-----------------------------------------------------------------------------
 align 4
 DummyTest:                                         ;; INTERNAL use (not returned for fail !!!)
 ;param:
@@ -217,16 +234,21 @@ DummyTest:                                         ;; INTERNAL use (not returned
         jne     @f
         cmp     [eax+EVENT.id], ebx
         je      .ret
+;--------------------------------------
+align 4
 @@:
         pop     eax
         xor     eax, eax
+;--------------------------------------
+align 4
 .ret:
         ret
-
+;-----------------------------------------------------------------------------
-
 align 4
 Wait_events:
         or      ebx, -1; infinite timeout
+;--------------------------------------
+align 4
 Wait_events_ex:
 ;info:
 ;   <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> 5-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
@@ -260,9 +282,11 @@ Wait_events_ex:
         mov     [eax+TASKDATA.state], 5
         call    change_task
         mov     eax, [esi+APPDATA.wait_param]
+;--------------------------------------
+align 4
 @@:
         ret
-
+;-----------------------------------------------------------------------------
 align 4
 wait_event:                                        ;; EXPORT use
 ;info:
@@ -281,7 +305,7 @@ wait_event:                                        ;; EXPORT use
         mov     edx, get_event_alone ; wait_test
         call    Wait_events          ; timeout ignored
         jmp     wait_finish
-
+;-----------------------------------------------------------------------------
 align 4
 get_event_ex:                                      ;; f68:14
 ;info:
@@ -303,6 +327,8 @@ get_event_ex:                                      ;; f68:14
         cld
         rep movsd
         mov     byte[edi-(sizeof.EVENT-EVENT.code)+2], cl;clear priority field
+;--------------------------------------
+align 4
 wait_finish:
         test    byte[eax+EVENT.state+3], MANUAL_RESET shr 24
         jnz     get_event_queue.ret  ; RET
@@ -314,7 +340,7 @@ wait_finish:
         pushfd
         cli
         jmp     RemoveEventTo
-
+;-----------------------------------------------------------------------------
 align 4
 destroy_event:                                     ;; EXPORT use
 ;info:
@@ -326,6 +352,8 @@ destroy_event:                                     ;; EXPORT use
 ;   eax - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> EVENT (=0 => fail)
 ;scratched: ebx,ecx
         call    DummyTest ; not returned for fail !!!
+;--------------------------------------
+align 4
 .internal:
         xor     ecx, ecx  ; clear common header
         pushfd
@@ -336,7 +364,7 @@ destroy_event:                                     ;; EXPORT use
         mov     [eax+EVENT.id], ecx
         mov     ebx, FreeEvents
         jmp     RemoveEventTo
-
+;-----------------------------------------------------------------------------
 align 4
 get_event_queue:
 ;info:
@@ -353,9 +381,11 @@ get_event_queue:
         mov     eax, [ebx+APPOBJ.bk] ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> FIFO
         cmp     eax, ebx ; empty ???
         je      get_event_alone.ret0
+;--------------------------------------
+align 4
 .ret:
         ret
-
+;-----------------------------------------------------------------------------
 align 4
 get_event_alone:
 ;info:
@@ -372,21 +402,27 @@ get_event_alone:
         test    byte[eax+EVENT.state+3], EVENT_SIGNALED shr 24
         jnz     .ret
         or      byte[eax+EVENT.state+3], EVENT_WATCHED shr 24
+;--------------------------------------
+align 4
 .ret0:
         xor     eax, eax; NO event!!!
+;--------------------------------------
+align 4
 .ret:
         ret
-
+;-----------------------------------------------------------------------------
 align 4
 sys_sendwindowmsg:                                 ;; f72
         dec     ebx
         jnz     .ret ;subfunction==1 ?
-       ;pushfd  ;<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
+        pushfd
         cli
         sub     ecx, 2
         je      .sendkey
         dec     ecx
         jnz     .retf
+;--------------------------------------
+align 4
 .sendbtn:
         cmp     byte[BTN_COUNT], 1
         jae     .result ;overflow
@@ -394,18 +430,27 @@ sys_sendwindowmsg:                                 ;; f72
         shl     edx, 8
         mov     [BTN_BUFF], edx
         jmp     .result
+;--------------------------------------
+align 4
 .sendkey:
         movzx   eax, byte[KEY_COUNT]
         cmp     al, 120
         jae     .result ;overflow
         inc     byte[KEY_COUNT]
         mov     [KEY_COUNT+1+eax], dl
+;--------------------------------------
+align 4
 .result:
         setae   byte[esp+32] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: dword[esp+32]==72
-.retf: ;popfd
+;--------------------------------------
+align 4
+.retf:
+        popfd
+;--------------------------------------
+align 4
 .ret:
         ret
-
+;-----------------------------------------------------------------------------
 align 4
 sys_getevent:                                      ;; f11
         mov     ebx, [current_slot];<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..........
@@ -415,16 +460,18 @@ sys_getevent:                                      ;; f11
         popfd
         mov     [esp+32], eax
         ret
-
+;-----------------------------------------------------------------------------
 align 4
 sys_waitforevent:                                  ;; f10
         or      ebx, -1; infinite timeout
+;--------------------------------------
+align 4
 sys_wait_event_timeout:                            ;; f23
         mov     edx, get_event_for_app; wait_test
         call    Wait_events_ex        ; ebx - timeout
         mov     [esp+32], eax
         ret
-
+;-----------------------------------------------------------------------------
 align 4
 get_event_for_app:                                 ;; used from f10,f11,f23
 ;info:
@@ -441,46 +488,78 @@ get_event_for_app:                                 ;; used from f10,f11,f23
         shl     edi, 5
         add     edi, CURRENT_TASK     ; edi is assumed as [TASK_BASE]
         mov     ecx, [edi+TASKDATA.event_mask]
+        and     ecx, 0x7FFFFFFF
+;--------------------------------------
+align 4
 .loop: ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         bsr     eax, ecx       ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (31 -> 0)
         jz      .no_events     ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ???
         btr     ecx, eax       ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
        ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (eax) <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         cmp     eax, 9
-        jae     .loop          ; eax=[9..31], ignored
+        jae     .loop          ; eax=[9..31], ignored (event 10...32)
+
         cmp     eax, 3
-        je      .loop          ; eax=3, ignored
+        je      .loop          ; eax=3, ignored (event 4)
-        ja      .FlagAutoReset ; eax=[4..8], retvals=eax+1
+
+        cmp     eax, 4
+        je      .FlagAutoReset  ; eax=4, retvals=eax+1 (event 5)
+
+        cmp     eax, 5
+        je      .mouse_check  ; eax=5, retvals=eax+1 (event 6)
+
+        ja      .FlagAutoReset ; eax=[6..8], retvals=eax+1 (event 7...9)
+
         cmp     eax, 1
-        jae     .BtKy          ; eax=[1,2],  retvals=eax+1
+        jae     .BtKy          ; eax=[1,2],  retvals=eax+1 (event 2,3)
+;--------------------------------------
+align 4
 .WndRedraw:                    ; eax=0, retval WndRedraw=1
         cmp     [edi-twdw+WDATA.fl_redraw], al;al==0
         jne     .result
         jmp     .loop
+;--------------------------------------
+align 4
 .no_events:
         xor     eax, eax
         ret
-
+;--------------------------------------
-.FlagAutoReset: ; retvals: BgrRedraw=5, Mouse=6, IPC=7, Stack=8, Debug=9
+align 4
-        cmp     eax, 5; Mouse 5+1=6
+.mouse_check:    ; Mouse 5+1=6
-        jne     @f
         push    eax
+        mov     eax, [TASK_BASE]
+        mov     eax, [eax + TASKDATA.event_mask]
+        test    eax, 0x80000000 ; bit 31: active/inactive filter f.40
+        jz      @f
+        pop     eax
+        jmp     .FlagAutoReset
+;--------------------------------------
+align 4
+@@:
 ; If the window is captured and moved by the user, then no mouse events!!!
         mov     al, [mouse.active_sys_window.action]
         and     al, WINDOW_MOVE_AND_RESIZE_FLAGS
         test    al, al
         pop     eax
         jnz     .loop
-@@:
+;--------------------------------------
+align 4
+.FlagAutoReset: ; retvals: BgrRedraw=5, IPC=7, Stack=8, Debug=9
         btr     [ebx+APPDATA.event_mask], eax
         jnc     .loop
+;--------------------------------------
+align 4
 .result:      ; retval = eax+1
         inc     eax
         ret
+;--------------------------------------
+align 4
 .BtKy:
         movzx   edx, bh
         movzx   edx, word[WIN_STACK+edx*2]
         je      .Keys          ; eax=1, retval Keys=2
+;--------------------------------------
+align 4
 .Buttons:                      ; eax=2, retval Buttons=3
         cmp     byte[BTN_COUNT], 0
         je      .loop          ; empty ???
@@ -493,13 +572,19 @@ get_event_for_app:                                 ;; used from f10,f11,f23
         mov     [window_minimize], 1
         dec     byte[BTN_COUNT]
         jmp     .loop
+;--------------------------------------
+align 4
 .Keys:    ; eax==1
         cmp     edx, [TASK_COUNT]
         jne     @f             ; not Top ???
         cmp     [KEY_COUNT], al; al==1
         jae     .result        ; not empty ???
+;--------------------------------------
+align 4
 @@:
         mov     edx, hotkey_buffer
+;--------------------------------------
+align 4
 @@:
         cmp     [edx], bh      ; bh - slot for testing
         je      .result
@@ -508,3 +593,4 @@ get_event_for_app:                                 ;; used from f10,f11,f23
         jb      @b
         jmp     .loop
 ;end.
+;-----------------------------------------------------------------------------

kernel/branches/net/gui/font.inc

@@ -1,23 +1,22 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 $Revision $
 
-; // Alver 22.06.2008 // {
+;------------------------------------------------------------------------------
 align 4
 dtext_asciiz_esi:                          ; for skins title out
         push    eax
         xor     eax, eax
         inc     eax
         jmp     dtext.1
-; } \\ Alver \\
+;------------------------------------------------------------------------------
-
 align 4
-dtext:  ; Text String Output (rw by Johnny_B[john@kolibrios.org])
+dtext:
 ; ebx x & y
 ; ecx style ( 0xX0000000 ) & color ( 0x00RRGGBB )
 ; X = ABnnb:
@@ -25,108 +24,208 @@ dtext:  ; Text String Output (rw by Johnny_B[john@kolibrios.org])
 ; A = 0 <=> output esi characters; otherwise output ASCIIZ string
 ; B = 1 <=> fill background with color eax
 ; edx start of text
-        ; edi 1 force
+; edi 1 force or user area for redirect
-
-; // Alver 22.06.2008 // {
         push    eax
         xor     eax, eax
+;--------------------------------------
+align 4
 .1:
-; } \\ Alver \\
         pushad
-        call    [_display.disable_mouse]
-
         movsx   eax, bx         ; eax=y
         sar     ebx, 16         ; ebx=x
         xchg    eax, ebx        ; eax=x, ebx=y
         cmp     esi, 255
         jb      .loop
+
         mov     esi, 255
+;--------------------------------------
+align 4
 .loop:
         test    ecx, ecx
         js      .test_asciiz
+
         dec     esi
         js      .end
+
         jmp     @f
+;--------------------------------------
+align 4
 .test_asciiz:
         cmp     byte [edx], 0
         jz      .end
-; // Alver 22.06.2008 // {
+
         cmp     byte [esp+28], 1
         jne     @f
+
         dec     esi
         js      .end
-; } \\ Alver \\
+;--------------------------------------
+align 4
 @@:
         inc     edx
         pushad
         movzx   edx, byte [edx-1]
         test    ecx, 0x10000000
         jnz     .font2
+
         mov     esi, 9
         lea     ebp, [FONT_I+8*edx+edx]
+;--------------------------------------
+align 4
 .symloop1:
         mov     dl, byte [ebp]
         or      dl, 1 shl 6
+;--------------------------------------
+align 4
 .pixloop1:
         shr     dl, 1
         jz      .pixloop1end
+
         jnc     .nopix
-        call    [putpixel]
+
+        test    ecx, 0x08000000  ; redirect the output to the user area
+        jz      @f
+
+        call    draw_text_to_user_area
         jmp     .pixloop1cont
+;--------------------------------------
+align 4
+@@:
+        and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
+;        call    [putpixel]
+        call    __sys_putpixel
+        jmp     .pixloop1cont
+;--------------------------------------
+align 4
 .nopix:
         test    ecx, 0x40000000
         jz      .pixloop1cont
+
         push    ecx
         mov     ecx, [esp+4+20h+20h]
-        call    [putpixel]
+
+        test    ecx, 0x08000000  ; redirect the output to the user area
+        jz      @f
+
+        call    draw_text_to_user_area
         pop     ecx
+        jmp     .pixloop1cont
+;--------------------------------------
+align 4
+@@:
+        and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
+;        call    [putpixel]
+        call    __sys_putpixel
+        pop     ecx
+;--------------------------------------
+align 4
 .pixloop1cont:
         inc     eax
         jmp     .pixloop1
+;--------------------------------------
+align 4
 .pixloop1end:
         sub     eax, 6
         inc     ebx
         inc     ebp
         dec     esi
         jnz     .symloop1
+
         popad
         add     eax, 6
         jmp     .loop
+;--------------------------------------
+align 4
 .font2:
         add     edx, edx
         lea     ebp, [FONT_II+4*edx+edx+1]
         push    9
         movzx   esi, byte [ebp-1]
+;--------------------------------------
+align 4
 .symloop2:
         mov     dl, byte [ebp]
         push    esi
+;--------------------------------------
+align 4
 .pixloop2:
         shr     dl, 1
         jnc     .nopix2
-        call    [putpixel]
+
+        test    ecx, 0x08000000  ; redirect the output to the user area
+        jz      @f
+
+        call    draw_text_to_user_area
         jmp     .pixloop2cont
+;--------------------------------------
+align 4
+@@:
+        and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
+;        call    [putpixel]
+        call    __sys_putpixel
+        jmp     .pixloop2cont
+;--------------------------------------
+align 4
 .nopix2:
         test    ecx, 0x40000000
         jz      .pixloop2cont
+
         push    ecx
         mov     ecx, [esp+12+20h+20h]
-        call    [putpixel]
+
+        test    ecx, 0x08000000  ; redirect the output to the user area
+        jz      @f
+
+        call    draw_text_to_user_area
         pop     ecx
+        jmp     .pixloop2cont
+;--------------------------------------
+align 4
+@@:
+        and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
+;        call    [putpixel]
+        call    __sys_putpixel
+        pop     ecx
+;--------------------------------------
+align 4
 .pixloop2cont:
         inc     eax
         dec     esi
         jnz     .pixloop2
+
         pop     esi
         sub     eax, esi
         inc     ebx
         inc     ebp
         dec     dword [esp]
         jnz     .symloop2
+
         pop     eax
         add     dword [esp+28], esi
         popad
         jmp     .loop
+;--------------------------------------
+align 4
 .end:
         popad
-        pop     eax             ; << // Alver 22.06.2008 // <<
+        pop     eax
         ret
+;------------------------------------------------------------------------------
+; eax = x coordinate
+; ebx = y coordinate
+; ecx = ?? RR GG BB
+; edi = user area
+align 4
+draw_text_to_user_area:
+        pushad
+        imul    ebx, [edi+0]
+        add     eax, ebx
+        shl     eax, 2
+        add     eax, edi
+        add     eax, 8
+        and     ecx, 0xffffff
+        or      ecx, 0xff000000  ; not transparent
+        mov     [eax], ecx       ; store  pixel
+        popad
+        ret
+;------------------------------------------------------------------------------

kernel/branches/net/gui/mouse.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2010. All rights reserved.      ;;
+;; Copyright (C) KolibriOS team 2010-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -527,9 +527,12 @@ mouse._.find_sys_window_under_cursor: ;////////////////////////////////////////
 ;< esi = process slot
 ;< edi = pointer to WDATA struct
 ;------------------------------------------------------------------------------
-        mov     esi, [Screen_Max_X]
+;        mov     esi, [Screen_Max_X]
-        inc     esi
+;        inc     esi
-        imul    esi, [mouse.state.pos.y]
+;        imul    esi, [mouse.state.pos.y]
+        mov     esi, [mouse.state.pos.y]
+        mov     esi, [d_width_calc_area + esi*4]
+
         add     esi, [_WinMapAddress]
         add     esi, [mouse.state.pos.x]
         movzx   esi, byte[esi]

kernel/branches/net/gui/mousepointer.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/gui/skincode.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -11,7 +11,8 @@ $Revision$
 include "skindata.inc"
 
 ;skin_data = 0x00778000
-
+;------------------------------------------------------------------------------
+align 4
 read_skin_file:
         stdcall load_file, ebx
         test    eax, eax
@@ -21,6 +22,8 @@ read_skin_file:
         cmp     ebx, 32*1024
         jb      @f
         mov     ebx, 32*1024
+;--------------------------------------
+align 4
 @@:
         lea     ecx, [ebx+3]
         shr     ecx, 2
@@ -32,16 +35,20 @@ read_skin_file:
         call    parse_skin_data
         xor     eax, eax
         ret
+;--------------------------------------
+align 4
 .notfound:
         xor     eax, eax
         inc     eax
         ret
+;--------------------------------------
+align 4
 .noskin:
         stdcall kernel_free, eax
         push    2
         pop     eax
         ret
-
+;------------------------------------------------------------------------------
 struct  SKIN_HEADER
         ident           dd ?
         version         dd ?
@@ -81,13 +88,15 @@ struct  SKIN_BITMAPS
         type    dw ?
         data    dd ?
 ends
-
+;------------------------------------------------------------------------------
+align 4
 load_default_skin:
         mov     [_skinh], 22
         mov     ebx, _skin_file_default
         call    read_skin_file
         ret
-
+;------------------------------------------------------------------------------
+align 4
 parse_skin_data:
         mov     ebp, skin_data
         cmp     [ebp+SKIN_HEADER.ident], 'SKIN'
@@ -127,6 +136,8 @@ parse_skin_data:
 
         mov     ebx, [ebp+SKIN_HEADER.bitmaps]
         add     ebx, skin_data
+;--------------------------------------
+align 4
 .lp1:
         cmp     dword[ebx], 0
         je      .end_bitmaps
@@ -139,8 +150,12 @@ parse_skin_data:
         or      ecx, ecx
         jnz     @f
         mov     edx, skin_inactive.left.data
+;--------------------------------------
+align 4
 @@:
         jmp     .next_bitmap
+;--------------------------------------
+align 4
 .not_left:
         dec     eax
         jnz     .not_oper
@@ -152,8 +167,12 @@ parse_skin_data:
         or      ecx, ecx
         jnz     @f
         mov     edx, skin_inactive.oper.data
+;--------------------------------------
+align 4
 @@:
         jmp     .next_bitmap
+;--------------------------------------
+align 4
 .not_oper:
         dec     eax
         jnz     .not_base
@@ -163,11 +182,17 @@ parse_skin_data:
         jnz     @f
         mov     eax, [skin_inactive.left.width]
         mov     edx, skin_inactive.base.data
+;--------------------------------------
+align 4
 @@:
         jmp     .next_bitmap
+;--------------------------------------
+align 4
 .not_base:
         add     ebx, 8
         jmp     .lp1
+;--------------------------------------
+align 4
 .next_bitmap:
         mov     ecx, [ebx+SKIN_BITMAPS.data]
         add     ecx, skin_data
@@ -178,10 +203,13 @@ parse_skin_data:
         mov     [edx+0], ecx
         add     ebx, 8
         jmp     .lp1
+;--------------------------------------
+align 4
 .end_bitmaps:
-
         mov     ebx, [ebp+SKIN_HEADER.buttons]
         add     ebx, skin_data
+;--------------------------------------
+align 4
 .lp2:
         cmp     dword[ebx], 0
         je      .end_buttons
@@ -190,14 +218,20 @@ parse_skin_data:
         jnz     .not_close
         mov     edx, skin_btn_close
         jmp     .next_button
+;--------------------------------------
+align 4
 .not_close:
         dec     eax
         jnz     .not_minimize
         mov     edx, skin_btn_minimize
         jmp     .next_button
+;--------------------------------------
+align 4
 .not_minimize:
         add     ebx, 12
         jmp     .lp2
+;--------------------------------------
+align 4
 .next_button:
         movsx   eax, [ebx+SKIN_BUTTONS.left]
         mov     [edx+SKIN_BUTTON.left], eax
@@ -209,26 +243,22 @@ parse_skin_data:
         mov     [edx+SKIN_BUTTON.height], eax
         add     ebx, 12
         jmp     .lp2
+;--------------------------------------
+align 4
 .end_buttons:
-
 .exit:
         ret
-
+;------------------------------------------------------------------------------
-sys_putimage_with_check:
+align 4
-        or      ebx, ebx
-        jz      @f
-        call    sys_putimage.forced
-    @@:
-        ret
-
 drawwindow_IV_caption:
 
         mov     ebp, skin_active
         or      al, al
         jnz     @f
         mov     ebp, skin_inactive
+;--------------------------------------
+align 4
 @@:
-
         mov     esi, [esp+4]
         mov     eax, [esi+WDATA.box.width]   ; window width
         mov     edx, [ebp+SKIN_DATA.left.left]
@@ -238,8 +268,12 @@ drawwindow_IV_caption:
         add     ecx, [_skinh]
 
         mov     ebx, [ebp+SKIN_DATA.left.data]
-        call    sys_putimage_with_check
+        or      ebx, ebx
-
+        jz      @f
+        call    sys_putimage.forced
+;--------------------------------------
+align 4
+@@:
         mov     esi, [esp+4]
         mov     eax, [esi+WDATA.box.width]
         sub     eax, [ebp+SKIN_DATA.left.width]
@@ -260,17 +294,27 @@ drawwindow_IV_caption:
         mov     edx, [ebp+SKIN_DATA.base.left]
         sub     edx, [ebp+SKIN_DATA.base.width]
         shl     edx, 16
+;--------------------------------------
+align 4
 .baseskinloop:
         shr     edx, 16
         add     edx, [ebp+SKIN_DATA.base.width]
         shl     edx, 16
 
         push    eax ebx ecx edx
-        call    sys_putimage_with_check
+
+        or      ebx, ebx
+        jz      @f
+        call    sys_putimage.forced
+;--------------------------------------
+align 4
+@@:
         pop     edx ecx ebx eax
 
         dec     eax
         jnz     .baseskinloop
+;--------------------------------------
+align 4
 .non_base:
 
         mov     esi, [esp+4]
@@ -283,16 +327,18 @@ drawwindow_IV_caption:
         mov     ecx, [ebp+SKIN_DATA.oper.width]
         shl     ecx, 16
         add     ecx, [_skinh]
-        call    sys_putimage_with_check
 
+        or      ebx, ebx
+        jz      @f
+        call    sys_putimage.forced
+;--------------------------------------
+align 4
+@@:
         ret
-
+;------------------------------------------------------------------------------
-;//mike.dld, 2006-08-02 ]
+align 4
-
-
 drawwindow_IV:
 ;param1 - aw_yes
-
         pusha
 
         push    edx
@@ -303,8 +349,9 @@ drawwindow_IV:
         cmp     byte [esp+32+4+4], 0
         jne     @f
         mov     ebp, skin_inactive
+;--------------------------------------
+align 4
 @@:
-
         mov     eax, [edi+WDATA.box.left]
         shl     eax, 16
         mov     ax, word [edi+WDATA.box.left]
@@ -313,32 +360,42 @@ drawwindow_IV:
         shl     ebx, 16
         mov     bx, word [edi+WDATA.box.top]
         add     bx, word [edi+WDATA.box.height]
-;        mov   esi,[edi+24]
-;        shr   esi,1
-;        and   esi,0x007f7f7f
         mov     esi, [ebp+SKIN_DATA.colors.outer]
+        or      esi, 1 shl 25 ; 0x02000000 used for draw_rectangle without top line
+        ror     ebx, 16
+        add     ebx, [_skinh]
+        sub     bx, 1
+        rol     ebx, 16
         call    draw_rectangle
         mov     ecx, 3
+;--------------------------------------
+align 4
 _dw3l:
         add     eax, 1*65536-1
-        add     ebx, 1*65536-1
+        add     ebx, 0*65536-1
         test    ax, ax
         js      no_skin_add_button
         test    bx, bx
         js      no_skin_add_button
         mov     esi, [ebp+SKIN_DATA.colors.frame];[edi+24]
+        or      esi, 1 shl 25; 0x02000000 used for draw_rectangle without top line
         call    draw_rectangle
         dec     ecx
         jnz     _dw3l
         mov     esi, [ebp+SKIN_DATA.colors.inner]
+        or      esi, 1 shl 25; 0x02000000 used for draw_rectangle without top line
         add     eax, 1*65536-1
-        add     ebx, 1*65536-1
+        add     ebx, 0*65536-1
         test    ax, ax
         js      no_skin_add_button
         test    bx, bx
         js      no_skin_add_button
+        test    [edi + WDATA.fl_wstate], WSTATE_ROLLEDUP
+        jnz     @f
         call    draw_rectangle
-
+;--------------------------------------
+align 4
+@@:
         cmp     dword[skin_data], 'SKIN'
         je      @f
         xor     eax, eax
@@ -348,15 +405,17 @@ drawwindow_IV:
         inc     ecx
         mov     edx, [_skinh]
         mov     edi, [common_colours+4]; standard grab color
-        call    [drawbar]
+;        call    [drawbar]
+        call    vesa20_drawbar
         jmp     draw_clientbar
+;--------------------------------------
+align 4
 @@:
-
         mov     al, [esp+32+4+4]
         call    drawwindow_IV_caption
-
+;--------------------------------------
+align 4
 draw_clientbar:
-
         mov     esi, [esp]
 
         mov     edx, [esi+WDATA.box.top]                    ; WORK AREA
@@ -374,12 +433,13 @@ drawwindow_IV:
         mov     edi, [esi+WDATA.cl_workarea]
         test    edi, 0x40000000
         jnz     _noinside2
-        call    [drawbar]
+;        call    [drawbar]
+        call    vesa20_drawbar
+;--------------------------------------
+align 4
 _noinside2:
-
         cmp     dword[skin_data], 'SKIN'
         jne     no_skin_add_button
-
 ;* close button
         mov     edi, [BTN_ADDR]
         movzx   eax, word [edi]
@@ -404,6 +464,8 @@ drawwindow_IV:
         mov     ebx, [esp]
         mov     ebx, [ebx+WDATA.box.width]
         inc     ebx
+;--------------------------------------
+align 4
 _bCx_at_right:
         add     ebx, [skin_btn_close.left]
         mov     [eax], bx
@@ -418,7 +480,6 @@ drawwindow_IV:
         mov     ebx, [skin_btn_close.height]
         dec     ebx
         mov     [eax], bx
-
 ;* minimize button
         mov     edi, [BTN_ADDR]
         movzx   eax, word [edi]
@@ -443,6 +504,8 @@ drawwindow_IV:
         mov     ebx, [esp]
         mov     ebx, [ebx+WDATA.box.width]
         inc     ebx
+;--------------------------------------
+align 4
 _bMx_at_right:
         add     ebx, [skin_btn_minimize.left]
         mov     [eax], bx
@@ -457,10 +520,10 @@ drawwindow_IV:
         mov     ebx, [skin_btn_minimize.height]
         dec     ebx
         mov     [eax], bx
-
+;--------------------------------------
+align 4
 no_skin_add_button:
         pop     edi
         popa
-
         ret     4
-
+;------------------------------------------------------------------------------

kernel/branches/net/gui/skindata.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/hid/mousedrv.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -22,36 +22,32 @@ $Revision$
 ;   FCFF              com1/ps2 buffer count starting from FC00
 
 uglobal
+;--------------------------------------
+align 4
   mousecount  dd  0x0
   mousedata   dd  0x0
+Y_UNDER_subtraction_CUR_hot_y:
+        dd 0
+X_UNDER_subtraction_CUR_hot_x:
+        dd 0
+Y_UNDER_sub_CUR_hot_y_add_curh:
+        dd 0
+X_UNDER_sub_CUR_hot_x_add_curh:
+        dd 0
 endg
 
 iglobal
+;--------------------------------------
+align 4
 mouse_delay        dd 10
 mouse_speed_factor:
                     dd 3
 mouse_timer_ticks  dd 0
 endg
-
+;-----------------------------------------------------------------------------
-;include 'm_com.inc'
+align 4
-
-
-;test_mario79:
-;        push   esi
-;        push   eax
-;        mov    [write_error_to],process_test_m79+43
-;        movzx  eax,al  ;[DevErrorCode]
-;        call   writehex
-;        mov    esi,process_test_m79
-;        call   sys_msg_board_str
-;        pop    eax
-;        pop    esi
-;        ret
-;process_test_m79 db 'K : Process - test Mario79 error    00000000',13,10,0
-
 draw_mouse_under:
         ; return old picture
-
         cmp     [_display.restore_cursor], 0
         je      @F
 
@@ -61,10 +57,13 @@ draw_mouse_under:
         stdcall [_display.restore_cursor], eax, ebx
         popad
         ret
+;--------------------------------------
+align 4
 @@:
         pushad
         xor     ecx, ecx
         xor     edx, edx
+;--------------------------------------
 align 4
 mres:
         movzx   eax, word [X_UNDER]
@@ -84,7 +83,9 @@ mres:
         pop     ebx
         pop     eax
         mov     edi, 1 ; force
-        call    [putpixel]
+        or      ecx, 0x04000000  ; don't save to mouseunder area
+;        call    [putpixel]
+        call    __sys_putpixel
         pop     edx
         pop     ecx
         inc     ecx
@@ -96,9 +97,9 @@ mres:
         jnz     mres
         popad
         ret
-
+;-----------------------------------------------------------------------------
+align 4
 save_draw_mouse:
-
         cmp     [_display.move_cursor], 0
         je      .no_hw_cursor
         pushad
@@ -110,9 +111,11 @@ save_draw_mouse:
         push    eax
         push    ebx
 
-        mov     ecx, [Screen_Max_X]
+;        mov     ecx, [Screen_Max_X]
-        inc     ecx
+;        inc     ecx
-        mul     ecx
+;        mul     ecx
+        mov     eax, [d_width_calc_area + eax*4]
+
         add     eax, [_WinMapAddress]
         movzx   edx, byte [ebx+eax]
         shl     edx, 8
@@ -124,17 +127,22 @@ save_draw_mouse:
         push    esi
         call    [_display.select_cursor]
         mov     [current_cursor], esi
+;--------------------------------------
+align 4
 .draw:
         stdcall [_display.move_cursor], esi
         popad
         ret
-.fail:
+;--------------------------------------
-        mov     ecx, [def_cursor]
+;align 4
-        mov     [edx+SLOT_BASE+APPDATA.cursor], ecx
+;.fail:
-        stdcall [_display.move_cursor], ecx        ; stdcall: [esp]=ebx,eax
+;        mov     ecx, [def_cursor]
-        popad
+;        mov     [edx+SLOT_BASE+APPDATA.cursor], ecx
-        ret
+;        stdcall [_display.move_cursor], ecx        ; stdcall: [esp]=ebx,eax
-
+;        popad
+;        ret
+;--------------------------------------
+align 4
 .no_hw_cursor:
         pushad
         ; save & draw
@@ -144,6 +152,7 @@ save_draw_mouse:
         push    ebx
         mov     ecx, 0
         mov     edx, 0
+;--------------------------------------
 align 4
 drm:
         push    eax
@@ -155,6 +164,7 @@ drm:
         add     eax, ecx; save picture under mouse
         add     ebx, edx
         push    ecx
+        or      ecx, 0x04000000  ; don't load to mouseunder area
         call    getpixel
         mov     [COLOR_TEMP], ecx
         pop     ecx
@@ -164,6 +174,7 @@ drm:
         add     eax, ecx
         add     eax, mouseunder
         mov     ebx, [COLOR_TEMP]
+        and     ebx, 0xffffff
         mov     [eax], ebx
         pop     ecx
         mov     edi, edx     ; y cycle
@@ -178,6 +189,7 @@ drm:
         push    ecx
         mov     ecx, [COLOR_TEMP]
         call    combine_colors
+        and     ecx, 0xffffff
         mov     [MOUSE_COLOR_MEM], ecx
         pop     ecx
         pop     edx
@@ -188,8 +200,10 @@ drm:
         add     ebx, edx     ; and y coord+cycle
         push    ecx
         mov     ecx, [MOUSE_COLOR_MEM]
-        mov     edi, 1
+        mov     edi, 1 ; force
-        call    [putpixel]
+        or      ecx, 0x04000000  ; don't save to mouseunder area
+;        call    [putpixel]
+        call    __sys_putpixel
         pop     ecx
         mov     ebx, [esp+0]    ; pure y coord again
         mov     eax, [esp+4]    ; and x
@@ -203,8 +217,8 @@ drm:
         add     esp, 8
         popad
         ret
-
+;-----------------------------------------------------------------------------
-
+align 4
 combine_colors:
       ; in
       ; ecx - color ( 00 RR GG BB )
@@ -272,126 +286,187 @@ combine_colors:
         pop     ebx
         pop     eax
         ret
+;-----------------------------------------------------------------------------
+align 4
+check_mouse_area_for_getpixel:
+; in:
+; eax = x
+; ebx = y
+; out:
+; ecx = new color
+        push    eax ebx
+; check for Y
+        xor     ecx, ecx
+        mov     cx, [Y_UNDER]  ; [MOUSE_Y]
 
-
-__sys_disable_mouse:
-        cmp     dword [MOUSE_VISIBLE], dword 0
-        je      @f
-        ret
-@@:
-        pushad
-        cmp     [CURRENT_TASK], dword 1
-        je      disable_m
-        mov     edx, [CURRENT_TASK]
-        shl     edx, 5
-        add     edx, window_data
-        movzx   eax, word [MOUSE_X]
-        movzx   ebx, word [MOUSE_Y]
-        mov     ecx, [Screen_Max_X]
-        inc     ecx
-        imul    ecx, ebx
-        add     ecx, eax
-        add     ecx, [_WinMapAddress]
-        mov     eax, [CURRENT_TASK]
-        cmp     al, [ecx]
-        je      yes_mouse_disable
-        cmp     al, [ecx+16]
-        je      yes_mouse_disable
-        add     ebx, 10
-        cmp     ebx, [Screen_Max_Y]
-        jae     no_mouse_disable
-        mov     ebx, [Screen_Max_X]
-        inc     ebx
-        imul    ebx, 10
-        add     ecx, ebx
-        cmp     al, [ecx]
-        je      yes_mouse_disable
-        cmp     al, [ecx+16]
-        je      yes_mouse_disable
-        jmp     no_mouse_disable
-yes_mouse_disable:
-        mov     edx, [CURRENT_TASK]
-        shl     edx, 5
-        add     edx, window_data
-        movzx   eax, word [MOUSE_X]
-        movzx   ebx, word [MOUSE_Y]
-        mov     ecx, [edx+0]; mouse inside the area ?
-        add     eax, 10
-        cmp     eax, ecx
-        jb      no_mouse_disable
-        sub     eax, 10
-        add     ecx, [edx+8]
-        cmp     eax, ecx
-        jg      no_mouse_disable
-        mov     ecx, [edx+4]
-        add     ebx, 14
         cmp     ebx, ecx
-        jb      no_mouse_disable
+        jb      .no_mouse_area
-        sub     ebx, 14
+        add     ecx, 23  ; mouse cursor Y size
-        add     ecx, [edx+12]
         cmp     ebx, ecx
-        jg      no_mouse_disable
+        ja      .no_mouse_area
-disable_m:
+; offset Y
-        cmp     dword [MOUSE_VISIBLE], dword 0
+        sub     bx, [Y_UNDER]  ;[MOUSE_Y]
-        jne     no_mouse_disable
+;--------------------------------------
-        pushf
+; check for X
-        cli
+        xor     ecx, ecx
-        call    draw_mouse_under
+        mov     cx, [X_UNDER]  ;[MOUSE_X]
-        popf
+        cmp     eax, ecx
-        mov     [MOUSE_VISIBLE], dword 1
+        jb      .no_mouse_area
-no_mouse_disable:
+        add     ecx, 15  ; mouse cursor X size
-        popad
+        cmp     eax, ecx
+        ja      .no_mouse_area
+; offset X
+        sub     ax, [X_UNDER]  ;[MOUSE_X]
+;--------------------------------------
+; eax = offset x
+; ebx = offset y
+        shl     ebx, 6  ;y
+        shl     eax, 2  ;x
+        add     eax, ebx
+        add     eax, mouseunder
+        mov     ecx, [eax]
+        and     ecx, 0xffffff
+        or      ecx, 0xff000000
+        pop     ebx eax
         ret
-
+;--------------------------------------
-__sys_draw_pointer:
+align 4
-        cmp     [mouse_pause], 0
+.no_mouse_area:
-        je      @f
+        xor     ecx, ecx
+        pop     ebx eax
         ret
-@@:
+;-----------------------------------------------------------------------------
+align 4
+check_mouse_area_for_putpixel:
+; in:
+; ecx = x shl 16 + y
+; eax = color
+; out:
+; eax = new color
         push    eax
-        mov     eax, [timer_ticks]
+; check for Y
-        sub     eax, [MouseTickCounter]
+        mov     ax, [Y_UNDER]  ; [MOUSE_Y]
-        cmp     eax, 1
+        cmp     cx, ax
-        ja      @f
+        jb      .no_mouse_area
+        add     ax, 23  ; mouse cursor Y size
+        cmp     cx, ax
+        ja      .no_mouse_area
+; offset Y
+        sub     cx, [Y_UNDER]  ;[MOUSE_Y]
+        mov     ax, cx
+        shl     eax, 16
+;--------------------------------------
+; check for X
+        mov     ax, [X_UNDER]  ;[MOUSE_X]
+        shr     ecx, 16
+        cmp     cx, ax
+        jb      .no_mouse_area
+        add     ax, 15  ; mouse cursor X size
+        cmp     cx, ax
+        ja      .no_mouse_area
+; offset X
+        sub     cx, [X_UNDER]  ;[MOUSE_X]
+        mov     ax, cx
+;--------------------------------------
+; eax = (offset y) shl 16 + (offset x)
+
+        pop     ecx
+
+        push    eax ebx
+
+        mov     ebx, eax
+        shr     ebx, 16        ;y
+        and     eax, 0xffff    ;x
+
+        shl     ebx, 6
+        shl     eax, 2
+        add     eax, ebx
+        add     eax, mouseunder
+        and     ecx, 0xFFFFFF
+        mov     [eax], ecx
+
+        pop     ebx eax
+
+        push    esi edi
+        rol     eax, 16
+        movzx   edi, ax     ; y cycle
+        shl     edi, 4     ; *16 bytes per row
+        shr     eax, 16
+        add     edi, eax     ; x cycle
+        lea     edi, [edi*3]
+        add     edi, [MOUSE_PICTURE]    ; we have our str address
+        mov     esi, edi
+        add     esi, 16*24*3
+        call    combine_colors
+        pop     edi esi
+;--------------------------------------
+align 4
+.end:
+        mov     eax, ecx
+        ret
+;--------------------------------------
+align 4
+.no_mouse_area:
         pop     eax
         ret
-@@:
+;-----------------------------------------------------------------------------
-        mov     eax, [timer_ticks]
+align 4
-        mov     [MouseTickCounter], eax
+__sys_draw_pointer:
-        pop     eax
         pushad
-        cmp     dword [MOUSE_VISIBLE], dword 0; mouse visible ?
-        je      chms00
-        mov     [MOUSE_VISIBLE], dword 0
-        movzx   ebx, word [MOUSE_Y]
-        movzx   eax, word [MOUSE_X]
-        pushfd
-        cli
-        call    save_draw_mouse
-        popfd
-nodmu2:
-        popad
-        ret
-chms00:
         movzx   ecx, word [X_UNDER]
         movzx   edx, word [Y_UNDER]
         movzx   ebx, word [MOUSE_Y]
         movzx   eax, word [MOUSE_X]
+        cmp     [redrawmouse_unconditional], 0
+        je      @f
+        mov     [redrawmouse_unconditional], 0
+        jmp     redrawmouse
+;--------------------------------------
+align 4
+@@:
         cmp     eax, ecx
         jne     redrawmouse
         cmp     ebx, edx
-        jne     redrawmouse
+        je      nodmp
-        jmp     nodmp
+;--------------------------------------
+align 4
 redrawmouse:
         pushfd
         cli
         call    draw_mouse_under
         call    save_draw_mouse
+
+;        mov     eax, [_display.select_cursor]
+;        test    eax, eax
+;        jz      @f
+        cmp     [_display.select_cursor], select_cursor
+        jne     @f
+
+        xor     eax, eax
+        mov     esi, [current_cursor]
+
+        mov     ax, [Y_UNDER]
+        sub     eax, [esi+CURSOR.hot_y]
+        mov     [Y_UNDER_subtraction_CUR_hot_y], eax
+        add     eax, [cur.h]
+        mov     [Y_UNDER_sub_CUR_hot_y_add_curh], eax
+
+        mov     ax, [X_UNDER]
+        sub     eax, [esi+CURSOR.hot_x]
+        mov     [X_UNDER_subtraction_CUR_hot_x], eax
+        add     eax, [cur.w]
+        mov     [X_UNDER_sub_CUR_hot_x_add_curh], eax
+;--------------------------------------
+align 4
+@@:
         popfd
+;--------------------------------------
+align 4
 nodmp:
         popad
         ret
-
+;-----------------------------------------------------------------------------
+align 4
 proc set_mouse_data stdcall, BtnState:dword, XMoving:dword, YMoving:dword, VScroll:dword, HScroll:dword
 
         mov     eax, [BtnState]
@@ -404,11 +479,14 @@ proc set_mouse_data stdcall, BtnState:dword, XMoving:dword, YMoving:dword, VScro
         jge     @@M1
         mov     eax, 0
         jmp     @@M2
+;--------------------------------------
+align 4
 @@M1:
         cmp     ax, [Screen_Max_X];ScreenLength
         jl      @@M2
         mov     ax, [Screen_Max_X];ScreenLength-1
-
+;--------------------------------------
+align 4
 @@M2:
         mov     [MOUSE_X], ax;[XCoordinate]
 
@@ -421,11 +499,14 @@ proc set_mouse_data stdcall, BtnState:dword, XMoving:dword, YMoving:dword, VScro
         jge     @@M3
         mov     ax, 0
         jmp     @@M4
+;--------------------------------------
+align 4
 @@M3:
         cmp     ax, [Screen_Max_Y];ScreenHeigth
         jl      @@M4
         mov     ax, [Screen_Max_Y];ScreenHeigth-1
-
+;--------------------------------------
+align 4
 @@M4:
         mov     [MOUSE_Y], ax;[YCoordinate]
 
@@ -440,7 +521,8 @@ proc set_mouse_data stdcall, BtnState:dword, XMoving:dword, YMoving:dword, VScro
         mov     [mouse_timer_ticks], eax
         ret
 endp
-
+;-----------------------------------------------------------------------------
+align 4
 mouse_acceleration:
         push    eax
         mov     eax, [timer_ticks]
@@ -451,6 +533,8 @@ mouse_acceleration:
         ;push  edx
         imul    eax, [mouse_speed_factor]
         ;pop   edx
+;--------------------------------------
+align 4
 @@:
         ret
-
+;-----------------------------------------------------------------------------

kernel/branches/net/hid/set_dtc.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/imports.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/init.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -55,6 +55,9 @@ proc init_mem
 .calcmax:
 ; round all to pages
         mov     eax, [edi]
+        cmp     [edi+16], byte 1
+        jne     .unusable
+
         test    eax, 0xFFF
         jz      @f
         neg     eax
@@ -87,7 +90,7 @@ proc init_mem
         add     esi, eax
         jmp     .usable
 .unusable:
-        and     dword [edi+8], 0
+;        and     dword [edi+8], 0
 .usable:
         add     edi, 20
         loop    .calcmax
@@ -195,6 +198,9 @@ proc init_page_map
         mov     ebx, BOOT_VAR-OS_BASE + 0x9104
         mov     edx, [ebx-4]
 .scanmap:
+        cmp     [ebx+16], byte 1
+        jne     .next
+
         mov     ecx, [ebx+8]
         shr     ecx, 12; ecx = number of pages
         jz      .next
@@ -432,6 +438,11 @@ proc test_cpu
         ret
 endp
 
+iglobal
+align 4
+acpi_lapic_base   dd 0xfee00000   ; default local apic base
+endg
+
 uglobal
 align 4
 acpi_rsdp         rd 1
@@ -443,8 +454,10 @@ acpi_dev_size     rd 1
 
 acpi_rsdt_base    rd 1
 acpi_madt_base    rd 1
-acpi_lapic_base   rd 1
 acpi_ioapic_base  rd 1
+
+cpu_count         rd 1
+smpt              rd 16
 endg
 
 ACPI_HI_RSDP_WINDOW_START  equ 0x000E0000
@@ -493,6 +506,7 @@ rsdt_find:           ;ecx= rsdt edx= SIG
         lea     ebx, [ecx+36]
         mov     esi, [ecx+4]
         add     esi, ecx
+align 4
 .next:
         mov     eax, [ebx]
         cmp     [eax], edx
@@ -513,9 +527,7 @@ rsdt_find:           ;ecx= rsdt edx= SIG
         pop     ebx
         ret
 
-
 align 4
-
 check_acpi:
 
         call    acpi_locate
@@ -533,22 +545,47 @@ check_acpi:
         mov     ecx, [eax+36]
         mov     [acpi_lapic_base-OS_BASE], ecx
 
+        mov     edi, smpt-OS_BASE
+        mov     ebx, [ecx+0x20]
+        shr     ebx, 24              ; read APIC ID
+
+        mov     [edi], ebx           ; bootstrap always first
+        inc     [cpu_count-OS_BASE]
+        add     edi, 4
+
         lea     edx, [eax+44]
         mov     ecx, [eax+4]
         add     ecx, eax
 .check:
         mov     eax, [edx]
-        cmp     al, 1
+        cmp     al, 0
-        je      .ioapic
+        jne     .io_apic
 
+        shr     eax, 24              ; get APIC ID
+        cmp     eax, ebx             ; skip self
+        je      .next
+
+        test    [edx+4], byte 1      ; is enabled ?
+        jz      .next
+
+        cmp     [cpu_count-OS_BASE], 16
+        jae     .next
+
+        stosd                        ; store APIC ID
+        inc     [cpu_count-OS_BASE]
 .next:
+        mov     eax, [edx]
         movzx   eax, ah
         add     edx, eax
         cmp     edx, ecx
         jb      .check
 .done:
         ret
-.ioapic:
+
+.io_apic:
+        cmp     al, 1
+        jne     .next
+
         mov     eax, [edx+4]
         mov     [acpi_ioapic_base-OS_BASE], eax
-        ret
+        jmp     .next

kernel/branches/net/kernel32.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;; KERNEL32.INC                                                 ;;
@@ -125,7 +125,8 @@ struct  APPDATA
         wait_param      dd ?            ;+100  +++
         tls_base        dd ?            ;+104
         dlls_list_ptr   dd ?            ;+108
-                        rb 16           ;+112
+        event_filter    dd ?            ;+112
+                        rb 12           ;+116
 
         wnd_shape       dd ?            ;+128
         wnd_shape_scale dd ?            ;+132
@@ -194,7 +195,7 @@ include "sound/playnote.inc" ; player Note for Speaker PC
 
 ; display
 
-include "video/vesa12.inc"   ; Vesa 1.2 functions
+;include "video/vesa12.inc"   ; Vesa 1.2 functions
 include "video/vesa20.inc"   ; Vesa 2.0 functions
 include "video/blitter.inc"  ;
 include "video/vga.inc"      ; VGA 16 color functions

kernel/branches/net/kglobals.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

kernel/branches/net/macros.inc

@@ -1,3 +1,9 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 __REV = 0
 

kernel/branches/net/memmap.inc

@@ -1,3 +1,9 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;
 ;   MEMORY MAP
 ;
@@ -131,7 +137,7 @@
 ;   FF00  byte        1 = system shutdown request
 ;   FF01  byte        task activation request?
 ;   FFF0  byte        >0 if redraw background request from app
-;   FFF1  byte        >0 if background changed
+;   FFF1  byte        free
 ;   FFF2              write and read bank in screen
 ;   FFF4  byte        0 if first mouse draw & do not return picture under
 ;   FFF5  byte        1 do not draw pointer
@@ -198,15 +204,18 @@
 ; 0x80284000 -> 28BFFF   HDD DMA AREA   (32k)
 ; 0x8028C000 -> 297FFF   free (48k)
 ;
-; 0x80298000 -> 29ffff   auxiliary table for background smoothing code (32k)
+; 0x80298000 -> 29FFFF   auxiliary table for background smoothing code (32k)
 ;
-; 0x802A0000 -> 2B00ff   wav device buffer (64k)
+; 0x802A0000 -> 2B00FF   wav device buffer (64k)
-; 0x802A0000 -> 2B00ff   wav device status (256)
+; 0x802A0000 -> 2B00FF   wav device status (256)
-; 0x802B0100 -> 2Bffff   free (63k8)
-; 0x802C0000 -> 2C3fff   button info (8k)
 ;
-;       0000 word    number of buttons
+; 0x802B0100 -> 2B3FFD   free (15k7)
-;        first button entry at 0x10
+;
+; 0x802B3FEE -> 2B3FEF   button info (64K+ 16 + 2 byte)
+;     2B3FEE   0000 word    number of buttons
+;     2B3FF0    first button entry
+;      
+;        button entry at 0x10
 ;       +0000 word   process number
 ;       +0002 word   button id number : bits 00-15
 ;       +0004 word   x start
@@ -215,7 +224,10 @@
 ;       +000A word   y size
 ;       +000C word   button id number : bits 16-31
 ;
-; 0x802C4000 -> 2CFFFF   free (48k)
+; 0x802C4000 -> 2C9FFF   area for fast getting offset to LFB (24k)
+;                        BPSLine_calc_area
+; 0x802CA000 -> 2CFFFF   area for fast getting offset to _WinMapAddress (24k)
+;                        d_width_calc_area
 ;
 ; 0x802D0000 -> 2DFFFF   reserved port area (64k)
 ;
@@ -225,25 +237,29 @@
 ;            dword   end port
 ;            dword   0
 ;
-; 0x802E0000 -> 2EFFFF   irq data area  (64k)
+; 0x802E0000 -> 2EFFFF   irq data area  (64k)  ;BOOT_VAR
-; 0x802F0000 -> 2FFFFF   low memory save        (64k)
 ;
-; 0x80300000 -> 31FFFF   tcp memory       (128k)
+; 0x802F0000 -> 2F3FFF   tcp memory  stack_data_start eth_data_start (16k)
-; 0x80320000 -> 327FFF   tcp memory       (32k)
 ;
-; 0x80328000 -> 32FFFF   !vrr driver      (32k)
+; 0x802F4000 -> 30ffff   stack_data | stack_data_end (112k)
-
+;
-; 0x80330000 -> 377FFF   skin data              (32k)
+; 0x80310000 -> 317fff   resendQ (32k)
-
+;
-; 0x80338000 -> 338FFF draw data     - 256 entries (4k)
+; 0x80318000 -> 31ffff   skin_data (32k)
+;
+; 0x80320000 -> 323FF3   draw data     - 256 entries (4k)
 ;         00   dword  draw limit - x start
 ;         04   dword  draw limit - y start
 ;         08   dword  draw limit - x end
 ;         0C   dword  draw limit - y end
-; 0x80339000 -> 3BFFF3   free (12k)
+;
-; 0x8033BFF4 -> 33BFFF   background info 
+; 0x8032BFF4 -> 32BFFF   background info 
-; 0x8033C000             page map     (length b = memsize shr 15)
+;         0x80323FF4    BgrDrawMode
-; 0x8033C000 + b         start of static pagetables
+;         0x80323FF8    BgrDataWidth
+;         0x80323FFC    BgrDataHeight
+;
+; 0x80324000             page map     (length b = memsize shr 15)
+; 0x80324000 + b         start of static pagetables
 
 ; 0x803FFFFF <- no direct address translation beyond this point
 ; ============================================================= 

kernel/branches/net/proc32.inc

@@ -1,3 +1,9 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 $Revision $
 

kernel/branches/net/sound/playnote.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  PLAYNOTE.INC                    version 1.1  22 November 2003  ;;

kernel/branches/net/video/blitter.inc

@@ -1,3 +1,9 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2011-2012. All rights reserved. ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 struct  BLITTER_BLOCK
         xmin            dd ?
@@ -324,19 +330,26 @@ blit_32:
         test    eax, eax
         jne     .L57
 
-        inc     [mouse_pause]
-        call    [_display.disable_mouse]
-
         mov     eax, [TASK_BASE]
 
         mov     ebx, [esp+BLITTER.dst_x]
         mov     ebp, [esp+BLITTER.dst_y]
         add     ebx, [eax-twdw + WDATA.box.left]
         add     ebp, [eax-twdw + WDATA.box.top]
+
+        mov     ecx, ebx
+        add     ecx, [esp+BLITTER.w]
+        shl     ecx, 16
+        mov     cx, bp
+        add     ecx, [esp+BLITTER.h]
+
         mov     edi, ebp
 
-        imul    edi, [_display.pitch]
+;        imul    edi, [_display.pitch]
-        imul    ebp, [_display.width]
+        mov     edi, [BPSLine_calc_area+edi*4]
+;        imul    ebp, [_display.width]
+        mov     ebp, [d_width_calc_area+ebp*4]
+
         add     ebp, ebx
         add     ebp, [_WinMapAddress]
 
@@ -346,6 +359,7 @@ blit_32:
         lea     esi, [eax+esi*4]
         add     esi, [esp+BLITTER.bitmap]
 
+        mov     eax, ecx
         mov     ecx, [esp+BLITTER.h]
         mov     edx, [esp+BLITTER.w]
 
@@ -361,7 +375,6 @@ blit_32:
         lea     edi, [edi+ebx*4]
 
         mov     ebx, [CURRENT_TASK]
-
 align 4
 .outer32:
         xor     ecx, ecx
@@ -369,11 +382,39 @@ align 4
 align 4
 .inner32:
         cmp     [ebp+ecx], bl
-        jne     @F
+        jne     .skip
-
+;--------------------------------------
+        push    eax
         mov     eax, [esi+ecx*4]
-        mov     [LFB_BASE+edi+ecx*4], eax
+
+; check for hardware cursor
+        cmp     [_display.select_cursor], select_cursor
+        je      @f
+        cmp     [_display.select_cursor], 0
+        jne     .no_mouseunder
+;--------------------------------------
+align 4
 @@:
+        push    ecx
+
+        mov     ecx, [esp+4]
+        ror     ecx, 16
+        sub     ecx, edx
+        rol     ecx, 16
+        sub     ecx, [esp+BLITTER.h + 8]
+
+; check mouse area for putpixel
+        call    [_display.check_mouse]
+        pop     ecx
+;--------------------------------------
+align 4
+.no_mouseunder:
+; store to real LFB
+        mov     [LFB_BASE+edi+ecx*4], eax
+        pop     eax
+;--------------------------------------
+align 4
+.skip:
         inc     ecx
         dec     edx
         jnz     .inner32
@@ -387,8 +428,8 @@ align 4
         jnz     .outer32
 
 .done:
-        dec     [mouse_pause]
+;        call    [draw_pointer]
-        call    [draw_pointer]
+        call    __sys_draw_pointer
 .L57:
         add     esp, 72
         pop     ebx
@@ -410,15 +451,43 @@ align 4
 align 4
 .inner24:
         cmp     [ebp+ecx], bl
-        jne     @F
+        jne     .skip_1
-
+;--------------------------------------
+        push    eax
         mov     eax, [esi+ecx*4]
 
         lea     edi, [edi+ecx*2]
+
+; check for hardware cursor
+        cmp     [_display.select_cursor], select_cursor
+        je      @f
+        cmp     [_display.select_cursor], 0
+        jne     .no_mouseunder_1
+;--------------------------------------
+align 4
+@@:
+        push    ecx
+
+        mov     ecx, [esp+4]
+        ror     ecx, 16
+        sub     ecx, edx
+        rol     ecx, 16
+        sub     ecx, [esp+BLITTER.h + 8]
+
+; check mouse area for putpixel
+        call    [_display.check_mouse]
+        pop     ecx
+;--------------------------------------
+align 4
+.no_mouseunder_1:
         mov     [edi+ecx], ax
         shr     eax, 16
         mov     [edi+ecx+2], al
-@@:
+
+        pop     eax
+;--------------------------------------
+align 4
+.skip_1:
         mov     edi, [esp+64]
         inc     ecx
         dec     edx

kernel/branches/net/video/cursors.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -26,7 +26,7 @@ struct  BITMAPINFOHEADER
         ClrUsed                 dd ?
         ClrImportant            dd ?
 ends
-
+;------------------------------------------------------------------------------
 align 4
 proc init_cursor stdcall, dst:dword, src:dword
            locals
@@ -49,7 +49,8 @@ proc init_cursor stdcall, dst:dword, src:dword
         je      .img_8
         cmp     [esi+BITMAPINFOHEADER.BitCount], 4
         je      .img_4
-
+;--------------------------------------
+align 4
 .img_2:
         add     eax, [esi]
         mov     [pQuad], eax
@@ -68,6 +69,8 @@ proc init_cursor stdcall, dst:dword, src:dword
         mov     [rBase], edi
 
         mov     esi, [pQuad]
+;--------------------------------------
+align 4
 .l21:
         mov     ebx, [pBits]
         mov     ebx, [ebx]
@@ -76,6 +79,8 @@ proc init_cursor stdcall, dst:dword, src:dword
         mov     eax, [eax]
         bswap   eax
         mov     [counter], 32
+;--------------------------------------
+align 4
 @@:
         xor     edx, edx
         shl     eax, 1
@@ -103,7 +108,8 @@ proc init_cursor stdcall, dst:dword, src:dword
         sub     [height], 1
         jnz     .l21
         ret
-
+;--------------------------------------
+align 4
 .img_4:
         add     eax, [esi]
         mov     [pQuad], eax
@@ -123,11 +129,15 @@ proc init_cursor stdcall, dst:dword, src:dword
 
         mov     esi, [pQuad]
         mov     ebx, [pBits]
+;--------------------------------------
+align 4
 .l4:
         mov     eax, [pAnd]
         mov     eax, [eax]
         bswap   eax
         mov     [counter], 16
+;--------------------------------------
+align 4
 @@:
         xor     edx, edx
         shl     eax, 1
@@ -168,6 +178,8 @@ proc init_cursor stdcall, dst:dword, src:dword
         sub     [height], 1
         jnz     .l4
         ret
+;--------------------------------------
+align 4
 .img_8:
         add     eax, [esi]
         mov     [pQuad], eax
@@ -187,11 +199,15 @@ proc init_cursor stdcall, dst:dword, src:dword
 
         mov     esi, [pQuad]
         mov     ebx, [pBits]
+;--------------------------------------
+align 4
 .l81:
         mov     eax, [pAnd]
         mov     eax, [eax]
         bswap   eax
         mov     [counter], 32
+;--------------------------------------
+align 4
 @@:
         xor     edx, edx
         shl     eax, 1
@@ -217,6 +233,8 @@ proc init_cursor stdcall, dst:dword, src:dword
         sub     [height], 1
         jnz     .l81
         ret
+;--------------------------------------
+align 4
 .img_24:
         add     eax, [esi]
         mov     [pQuad], eax
@@ -234,10 +252,14 @@ proc init_cursor stdcall, dst:dword, src:dword
 
         mov     esi, [pAnd]
         mov     ebx, [pQuad]
+;--------------------------------------
+align 4
 .row_24:
         mov     eax, [esi]
         bswap   eax
         mov     [counter], 32
+;--------------------------------------
+align 4
 @@:
         xor     edx, edx
         shl     eax, 1
@@ -263,7 +285,7 @@ proc init_cursor stdcall, dst:dword, src:dword
         jnz     .row_24
         ret
 endp
-
+;------------------------------------------------------------------------------
 align 4
 proc set_cursor stdcall, hcursor:dword
         mov     eax, [hcursor]
@@ -274,13 +296,16 @@ proc set_cursor stdcall, hcursor:dword
         mov     ebx, [current_slot]
         xchg    eax, [ebx+APPDATA.cursor]
         ret
+;--------------------------------------
+align 4
 .fail:
         mov     eax, [def_cursor]
         mov     ebx, [current_slot]
         xchg    eax, [ebx+APPDATA.cursor]
         ret
 endp
-
+;------------------------------------------------------------------------------
+align 4
 ; param
 ;  eax= pid
 ;  ebx= src
@@ -328,6 +353,8 @@ create_cursor:
 
         stdcall init_cursor, eax, esi
 
+align 4
+.add_cursor:
         mov     ecx, [.hcursor]
         lea     ecx, [ecx+CURSOR.list_next]
         lea     edx, [_display.cr_list.next]
@@ -338,7 +365,6 @@ create_cursor:
         popfd
 
         mov     eax, [.hcursor]
-.check_hw:
         cmp     [_display.init_cursor], 0
         je      .fail
 
@@ -347,22 +373,26 @@ create_cursor:
         add     esp, 4
 
         mov     eax, [.hcursor]
+;--------------------------------------
+align 4
 .fail:
         add     esp, 12
         ret
+;--------------------------------------
+align 4
 .indirect:
         shr     ebx, 16
         movzx   ecx, bh
         movzx   edx, bl
-        mov     [eax+CURSOR.hot_x], ecx
+        mov     [edi+CURSOR.hot_x], ecx
-        mov     [eax+CURSOR.hot_y], edx
+        mov     [edi+CURSOR.hot_y], edx
 
         xchg    edi, eax
         mov     ecx, 1024
         cld
         rep movsd
-        jmp     .check_hw
+        jmp     .add_cursor
-
+;------------------------------------------------------------------------------
 align 4
 proc load_cursor stdcall, src:dword, flags:dword
            locals
@@ -381,6 +411,8 @@ proc load_cursor stdcall, src:dword, flags:dword
         test    eax, eax
         jz      .fail
         mov     [src], eax
+;--------------------------------------
+align 4
 @@:
         push    ebx
         push    esi
@@ -397,16 +429,22 @@ proc load_cursor stdcall, src:dword, flags:dword
         cmp     word [flags], LOAD_FROM_FILE
         jne     .exit
         stdcall kernel_free, [src]
+;--------------------------------------
+align 4
 .exit:
         pop     edi
         pop     esi
         pop     ebx
+;--------------------------------------
+align 4
 .fail:
         mov     eax, [handle]
+;--------------------------------------
+align 4
 .fail2:
         ret
 endp
-
+;------------------------------------------------------------------------------
 align 4
 proc delete_cursor stdcall, hcursor:dword
            locals
@@ -433,17 +471,20 @@ proc delete_cursor stdcall, hcursor:dword
         jne     @F
         mov     eax, [def_cursor]
         mov     [ebx+APPDATA.cursor], eax
+;--------------------------------------
+align 4
 @@:
         mov     eax, [hcursor]
         call    [eax+APPOBJ.destroy]
+;--------------------------------------
+align 4
 .fail:
         ret
 endp
-
+;------------------------------------------------------------------------------
+align 4
 ; param
 ;  eax= cursor
-
-align 4
 destroy_cursor:
 
         push    eax
@@ -460,13 +501,13 @@ destroy_cursor:
         pop     eax
         call    destroy_kernel_object
         ret
-
+;------------------------------------------------------------------------------
 align 4
 select_cursor:
         mov     eax, [esp+4]
         mov     [_display.cursor], eax
         ret     4
-
+;------------------------------------------------------------------------------
 align 4
 proc restore_24 stdcall, x:dword, y:dword
 
@@ -484,6 +525,8 @@ proc restore_24 stdcall, x:dword, y:dword
         mov     ecx, [cur.w]
         lea     ecx, [ecx+ecx*2]
         push    ecx
+;--------------------------------------
+align 4
 @@:
         mov     edi, ebx
         add     ebx, [BytesPerScanLine]
@@ -496,11 +539,13 @@ proc restore_24 stdcall, x:dword, y:dword
         pop     ecx
         pop     edi
         pop     esi
+;--------------------------------------
+align 4
 .ret:
         pop     ebx
         ret
 endp
-
+;------------------------------------------------------------------------------
 align 4
 proc restore_32 stdcall, x:dword, y:dword
 
@@ -515,6 +560,8 @@ proc restore_32 stdcall, x:dword, y:dword
         push    edi
 
         mov     esi, cur_saved_data
+;--------------------------------------
+align 4
 @@:
         mov     edi, ebx
         add     ebx, [BytesPerScanLine]
@@ -525,12 +572,14 @@ proc restore_32 stdcall, x:dword, y:dword
         jnz     @B
 
         pop     edi
+;--------------------------------------
+align 4
 .ret:
         pop     esi
         pop     ebx
         ret
 endp
-
+;------------------------------------------------------------------------------
 align 4
 proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
            locals
@@ -542,7 +591,7 @@ proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
         mov     esi, [hcursor]
         mov     ecx, [x]
         mov     eax, [y]
-        mov     ebx, [BytesPerScanLine]
+;        mov     ebx, [BytesPerScanLine]
 
         xor     edx, edx
         sub     ecx, [esi+CURSOR.hot_x]
@@ -568,7 +617,8 @@ proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
         sub     edx, [y]
         mov     [_dy], edx
 
-        mul     dword [BytesPerScanLine]
+;        mul     dword [BytesPerScanLine]
+        mov     eax, [BPSLine_calc_area+eax*4]
         lea     edx, [LFB_BASE+ecx*3]
         add     edx, eax
         mov     [cur_saved_base], edx
@@ -576,10 +626,14 @@ proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
         cmp     ebx, [Screen_Max_X]
         jbe     @F
         mov     ebx, [Screen_Max_X]
+;--------------------------------------
+align 4
 @@:
         cmp     edi, [Screen_Max_Y]
         jbe     @F
         mov     edi, [Screen_Max_Y]
+;--------------------------------------
+align 4
 @@:
         mov     [cur.right], ebx
         mov     [cur.bottom], edi
@@ -595,6 +649,8 @@ proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
 
         mov     eax, edi
         mov     edi, cur_saved_data
+;--------------------------------------
+align 4
 @@:
         mov     esi, edx
         add     edx, [BytesPerScanLine]
@@ -613,12 +669,16 @@ proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
         mov     esi, [hcursor]
         mov     esi, [esi+CURSOR.base]
         lea     edx, [esi+eax*4]
+;--------------------------------------
+align 4
 .row:
         mov     ecx, [cur.w]
         mov     esi, edx
         mov     edi, ebx
         add     edx, 32*4
         add     ebx, [BytesPerScanLine]
+;--------------------------------------
+align 4
 .pix:
         lodsd
         test    eax, 0xFF000000
@@ -626,6 +686,8 @@ proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
         mov     [edi], ax
         shr     eax, 16
         mov     [edi+2], al
+;--------------------------------------
+align 4
 @@:
         add     edi, 3
         dec     ecx
@@ -635,8 +697,7 @@ proc move_cursor_24 stdcall, hcursor:dword, x:dword, y:dword
         jnz     .row
         ret
 endp
-
+;------------------------------------------------------------------------------
-
 align 4
 proc move_cursor_32 stdcall, hcursor:dword, x:dword, y:dword
            locals
@@ -673,17 +734,22 @@ proc move_cursor_32 stdcall, hcursor:dword, x:dword, y:dword
         sub     edx, [y]
         mov     [_dy], edx
 
-        mul     dword [BytesPerScanLine]
+;        mul     dword [BytesPerScanLine]
+        mov     eax, [BPSLine_calc_area+eax*4]
         lea     edx, [LFB_BASE+eax+ecx*4]
         mov     [cur_saved_base], edx
 
         cmp     ebx, [Screen_Max_X]
         jbe     @F
         mov     ebx, [Screen_Max_X]
+;--------------------------------------
+align 4
 @@:
         cmp     edi, [Screen_Max_Y]
         jbe     @F
         mov     edi, [Screen_Max_Y]
+;--------------------------------------
+align 4
 @@:
         mov     [cur.right], ebx
         mov     [cur.bottom], edi
@@ -699,6 +765,8 @@ proc move_cursor_32 stdcall, hcursor:dword, x:dword, y:dword
 
         mov     eax, edi
         mov     edi, cur_saved_data
+;--------------------------------------
+align 4
 @@:
         mov     esi, edx
         add     edx, [BytesPerScanLine]
@@ -716,17 +784,23 @@ proc move_cursor_32 stdcall, hcursor:dword, x:dword, y:dword
         mov     esi, [hcursor]
         mov     esi, [esi+CURSOR.base]
         lea     edx, [esi+eax*4]
+;--------------------------------------
+align 4
 .row:
         mov     ecx, [cur.w]
         mov     esi, edx
         mov     edi, ebx
         add     edx, 32*4
         add     ebx, [BytesPerScanLine]
+;--------------------------------------
+align 4
 .pix:
         lodsd
         test    eax, 0xFF000000
         jz      @F
         mov     [edi], eax
+;--------------------------------------
+align 4
 @@:
         add     edi, 4
         dec     ecx
@@ -736,16 +810,158 @@ proc move_cursor_32 stdcall, hcursor:dword, x:dword, y:dword
         jnz     .row
         ret
 endp
+;------------------------------------------------------------------------------
+align 4
+check_mouse_area_for_getpixel_new:
+; in:
+; eax = x
+; ebx = y
+; out:
+; ecx = new color
+;--------------------------------------
+; check for Y
+        cmp     bx, [Y_UNDER_subtraction_CUR_hot_y]
+        jb      .no_mouse_area
 
+        cmp     bx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jae     .no_mouse_area
+;--------------------------------------
+; check for X
+        cmp     ax, [X_UNDER_subtraction_CUR_hot_x]
+        jb      .no_mouse_area
 
+        cmp     ax, [X_UNDER_sub_CUR_hot_x_add_curh]
+        jae     .no_mouse_area
+;--------------------------------------
+        push    eax ebx
+; offset X
+        mov     ecx, [X_UNDER_subtraction_CUR_hot_x]
+        sub     eax, ecx        ; x1
+; offset Y
+        mov     ecx, [Y_UNDER_subtraction_CUR_hot_y]
+        sub     ebx, ecx        ; y1
+;--------------------------------------
+; ebx = offset y
+; eax = offset x
+        imul    ebx, [cur.w]     ;y
+        add     eax, ebx
+        mov     ebx, eax
+        shl     eax, 2
+        cmp     [ScreenBPP], byte 32
+        je      @f
+        sub     eax, ebx
+;--------------------------------------
+align 4
+@@:
+        add     eax, cur_saved_data
+        mov     ecx, [eax]
+        and     ecx, 0xffffff
+        add     ecx, 0xff000000
+        pop     ebx eax
+        ret
+;--------------------------------------
+align 4
+.no_mouse_area:
+        xor     ecx, ecx
+        ret
+;-----------------------------------------------------------------------------
+align 4
+check_mouse_area_for_putpixel_new:
+; in:
+; ecx = x shl 16 + y
+; eax = color
+; out:
+; eax = new color
+;--------------------------------------
+; check for Y
+        cmp     cx, [Y_UNDER_subtraction_CUR_hot_y]
+        jb      .no_mouse_area
+
+        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jae     .no_mouse_area
+
+        rol     ecx, 16
+;--------------------------------------
+; check for X
+        cmp     cx, [X_UNDER_subtraction_CUR_hot_x]
+        jb      .no_mouse_area
+
+        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
+        jae     .no_mouse_area
+;--------------------------------------
+align 4
+.1:
+        push    eax
+; offset X
+        mov     ax, [X_UNDER_subtraction_CUR_hot_x]
+        sub     cx, ax        ; x1
+        ror     ecx, 16
+; offset Y
+        mov     ax, [Y_UNDER_subtraction_CUR_hot_y]
+        sub     cx, ax        ; y1
+;--------------------------------------
+; ecx = (offset x) shl 16 + (offset y)
+        push    ebx
+        mov     ebx, ecx
+        shr     ebx, 16        ; x
+        and     ecx, 0xffff    ; y
+; ecx = offset y
+; ebx = offset x
+        mov     eax, [esp + 4]
+
+        push    ebx ecx
+        imul    ecx, [cur.w]    ;y
+        add     ecx, ebx
+        mov     ebx, ecx
+        shl     ecx, 2
+        cmp     [ScreenBPP], byte 24
+        je      .24
+        and     eax, 0xFFFFFF
+        mov     [ecx + cur_saved_data], eax   ;store new color  to
+        jmp     @f
+;--------------------------------------
+align 4
+.24:
+        sub     ecx, ebx
+        mov     [ecx + cur_saved_data], ax      ;store new color  to
+        shr     eax, 16
+        mov     [ecx + cur_saved_data + 2], al  ;store new color  to
+;--------------------------------------
+align 4
+@@:
+        pop     ecx ebx
+
+        shl     ecx, 5
+        add     ecx, ebx
+
+        mov     eax, [current_cursor]
+        mov     eax, [eax+CURSOR.base]
+        lea     eax, [eax+ecx*4]
+        mov     eax, [eax]
+
+        pop     ebx
+
+        test    eax, 0xFF000000
+        jz      @f
+
+        pop     ecx
+        ret
+;--------------------------------------
+align 4
+@@:
+        pop     eax
+;--------------------------------------
+align 4
+.no_mouse_area:
+        ret
+;------------------------------------------------------------------------------
 align 4
 get_display:
         mov     eax, _display
         ret
-
+;------------------------------------------------------------------------------
 align 4
 init_display:
-
         xor     eax, eax
         mov     edi, _display
 
@@ -764,6 +980,7 @@ init_display:
 
         test    word [SCR_MODE], 0x4000
         jz      .fail
+;        jmp      .fail
 
         mov     ebx, restore_32
         mov     ecx, move_cursor_32
@@ -775,22 +992,47 @@ init_display:
         mov     ecx, move_cursor_24
         cmp     eax, 24
         jne     .fail
+;--------------------------------------
+align 4
 @@:
         mov     [_display.select_cursor], select_cursor
         mov     [_display.move_cursor], ecx
         mov     [_display.restore_cursor], ebx
+        mov     [_display.check_mouse], check_mouse_area_for_putpixel_new
+        mov     [_display.check_m_pixel], check_mouse_area_for_getpixel_new
 
+        cmp     [PUTPIXEL], dword VGA_putpixel
+        je      @f
+        cmp     [ScreenBPP], byte 32
+        je      .32
+        mov     [PUTPIXEL], dword Vesa20_putpixel24_new
+        jmp     @f
+;--------------------------------------
+align 4
+.32:
+        mov     [PUTPIXEL], dword Vesa20_putpixel32_new
+;--------------------------------------
+align 4
+@@:
+        stdcall load_cursor, clock_arrow, dword LOAD_FROM_MEM
+        mov     [def_cursor_clock], eax
         stdcall load_cursor, def_arrow, dword LOAD_FROM_MEM
         mov     [def_cursor], eax
         ret
+;--------------------------------------
+align 4
 .fail:
         xor     eax, eax
         mov     [_display.select_cursor], eax
         mov     [_display.move_cursor], eax
         ret
-
+;------------------------------------------------------------------------------
-
 align 4
 def_arrow:
   file 'arrow.cur'
+;------------------------------------------------------------------------------
+align 4
+clock_arrow:
+  file 'arrow_clock.cur'
+;------------------------------------------------------------------------------
 

kernel/branches/net/video/vesa12.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;  VESA12.INC                                                  ;;

kernel/branches/net/video/vga.inc

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;  VGA.INC                                                     ;;
@@ -13,7 +13,8 @@
 
 $Revision $
 
-
+;------------------------------------------------------------------------------
+align 4
 paletteVGA:
 
 ;16 colour palette
@@ -24,9 +25,9 @@ paletteVGA:
         mov     ecx, 16
         mov     dx, 0x3c9
         xor     eax, eax
-
+;--------------------------------------
+align 4
 palvganew:
-
         mov     al, 0
         test    ah, 4
         jz      palvgalbl1
@@ -34,6 +35,8 @@ paletteVGA:
         test    ah, 8
         jz      palvgalbl1
         add     al, 32
+;--------------------------------------
+align 4
 palvgalbl1:
         out     dx, al; red 0,31 or 63
         mov     al, 0
@@ -43,6 +46,8 @@ paletteVGA:
         test    ah, 8
         jz      palvgalbl2
         add     al, 32
+;--------------------------------------
+align 4
 palvgalbl2:
         out     dx, al; blue 0,31 or 63
         mov     al, 0
@@ -52,6 +57,8 @@ paletteVGA:
         test    ah, 8
         jz      palvgalbl3
         add     al, 32
+;--------------------------------------
+align 4
 palvgalbl3:
         out     dx, al; green 0,31 or 63
         add     ah, 1
@@ -60,59 +67,76 @@ paletteVGA:
 ;       mov    ax, 0005h
 ;       out    dx, ax
         ret
-
+;------------------------------------------------------------------------------
+align 4
 palette320x200:
-
         mov     edx, 0x3c8
         xor     eax, eax
         out     dx, al
         mov     ecx, 256
         mov     edx, 0x3c9
         xor     eax, eax
-
+;--------------------------------------
+align 4
 palnew:
         mov     al, 0
         test    ah, 64
         jz      pallbl1
         add     al, 21
+;--------------------------------------
+align 4
 pallbl1:
         test    ah, 128
         jz      pallbl2
         add     al, 42
+;--------------------------------------
+align 4
 pallbl2:
         out     dx, al
         mov     al, 0
         test    ah, 8
         jz      pallbl3
         add     al, 8
+;--------------------------------------
+align 4
 pallbl3:
         test    ah, 16
         jz      pallbl4
         add     al, 15
+;--------------------------------------
+align 4
 pallbl4:
         test    ah, 32
         jz      pallbl5
         add     al, 40
+;--------------------------------------
+align 4
 pallbl5:
         out     dx, al
         mov     al, 0
         test    ah, 1
         jz      pallbl6
         add     al, 8
+;--------------------------------------
+align 4
 pallbl6:
         test    ah, 2
         jz      pallbl7
         add     al, 15
+;--------------------------------------
+align 4
 pallbl7:
         test    ah, 4
         jz      pallbl8
         add     al, 40
+;--------------------------------------
+align 4
 pallbl8:
         out     dx, al
         add     ah, 1
         loop    palnew
-
         ret
+;------------------------------------------------------------------------------
 align 4
 uglobal
   novesachecksum dd 0x0
@@ -123,13 +147,12 @@ uglobal
   temp:
      .cx dd 0
 endg
+;------------------------------------------------------------------------------
 align 4
 checkVga_N13:
-
         cmp     [SCR_MODE], dword 0x13
         jne     @f
 
-;      cnvl:
         pushad
         cmp     [EGA_counter], 1
         je      novesal
@@ -137,9 +160,12 @@ checkVga_N13:
         cmp     ecx, [novesachecksum]
         jne     novesal
         popad
+;--------------------------------------
+align 4
 @@:
         ret
-
+;--------------------------------------
+align 4
 novesal:
         mov     [novesachecksum], ecx
         mov     ecx, 0
@@ -147,10 +173,14 @@ checkVga_N13:
         cmp     eax, 100
         jge     m13l3
         mov     eax, 100
+;--------------------------------------
+align 4
 m13l3:
         cmp     eax, 480-100
         jbe     m13l4
         mov     eax, 480-100
+;--------------------------------------
+align 4
 m13l4:
         sub     eax, 100
         imul    eax, 640*4
@@ -159,10 +189,14 @@ checkVga_N13:
         cmp     eax, 160
         jge     m13l1
         mov     eax, 160
+;--------------------------------------
+align 4
 m13l1:
         cmp     eax, 640-160
         jbe     m13l2
         mov     eax, 640-160
+;--------------------------------------
+align 4
 m13l2:
         sub     eax, 160
         shl     eax, 2
@@ -173,6 +207,8 @@ checkVga_N13:
         mov     edx, 200
         mov     ecx, 320
         cld
+;--------------------------------------
+align 4
 m13pix:
         lodsd
         test    eax, eax
@@ -188,6 +224,8 @@ checkVga_N13:
         and     ebx, (128+64)*256*256; red
         shr     ebx, 8+8
         add     eax, ebx
+;--------------------------------------
+align 4
 .save_pixel:
         stosb
         loop    m13pix
@@ -198,16 +236,17 @@ checkVga_N13:
         mov     [EGA_counter], 0
         popad
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA_drawbackground:
 ; draw all
-        cmp     [SCR_MODE], dword 0x12
-        jne     .end
         pushad
         mov     esi, [LFBAddress]
         mov     edi, VGABasePtr
         mov     ebx, 640/32; 640*480/(8*4)
         mov     edx, 480
+;--------------------------------------
+align 4
 @@:
         push    ebx edx esi edi
         shl     edx, 9
@@ -221,9 +260,9 @@ VGA_drawbackground:
         jnz     @r
         call    VGA_draw_long_line_1
         popad
-    .end:
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA_draw_long_line:
         mov     dx, 3ceh
         mov     ax, 0ff08h
@@ -231,6 +270,8 @@ VGA_draw_long_line:
         out     dx, ax
         mov     ax, 0005h
         out     dx, ax
+;--------------------------------------
+align 4
 m12pix:
         call    VGA_draw_32_pixels
         dec     ebx
@@ -246,7 +287,8 @@ VGA_draw_long_line:
         out     dx, al
         sti
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA_draw_32_pixels:
         xor     eax, eax
         mov     ebp, VGA_8_pixels
@@ -255,8 +297,12 @@ VGA_draw_32_pixels:
         mov     [ebp+8], eax
         mov     [ebp+12], eax
         mov     ch, 4
+;--------------------------------------
+align 4
 .main_loop:
         mov     cl, 8
+;--------------------------------------
+align 4
 .convert_pixels_to_VGA:
         lodsd   ; eax = 24bit colour
         test    eax, eax
@@ -273,6 +319,8 @@ VGA_draw_32_pixels:
         cmp     al, 170
         jbe     .p13green
         or      [ebp+12], ch
+;--------------------------------------
+align 4
 .p13green:
         cmp     ah, 85
         jbe     .p13red
@@ -280,6 +328,8 @@ VGA_draw_32_pixels:
         cmp     ah, 170
         jbe     .p13red
         or      [ebp+12], ch
+;--------------------------------------
+align 4
 .p13red:
         shr     eax, 8
         cmp     ah, 85
@@ -288,10 +338,14 @@ VGA_draw_32_pixels:
         cmp     ah, 170
         jbe     .p13cont
         or      [ebp+12], ch
+;--------------------------------------
+align 4
 .p13cont:
         ror     eax, 8
         mov     ch, ah
         inc     cl
+;--------------------------------------
+align 4
 .end:
         dec     cl
         jnz     .convert_pixels_to_VGA
@@ -303,6 +357,8 @@ VGA_draw_32_pixels:
         mov     esi, ebp
         mov     dx, 3c4h
         mov     ah, 1h
+;--------------------------------------
+align 4
 @@:
         mov     al, 02h
         out     dx, ax
@@ -316,12 +372,36 @@ VGA_draw_32_pixels:
         add     edi, 4
         pop     esi
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA_putpixel:
  ; eax = x
  ; ebx = y
         mov     ecx, eax
         mov     eax, [esp+32-8+4] ; color
+;--------------------------------------
+; check for hardware cursor
+        cmp     [_display.select_cursor], select_cursor
+        je      @f
+        cmp     [_display.select_cursor], 0
+        jne     .no_mouseunder
+;--------------------------------------
+align 4
+@@:
+        push    ecx
+        shl     ecx, 16
+        mov     cx, bx
+; check mouse area for putpixel
+        test    eax, 0x04000000
+        jnz     @f
+        call    [_display.check_mouse]
+;--------------------------------------
+align 4
+@@:
+        pop     ecx
+;--------------------------------------
+align 4
+.no_mouseunder:
         shl     ebx, 9
         lea     ebx, [ebx+ebx*4]   ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> 5
         lea     edx, [ebx+ecx*4]  ; + x*BytesPerPixel (Vesa2.0 32)
@@ -343,6 +423,8 @@ VGA_putpixel:
         cmp     al, 170
         jbe     .p13green
         or      dl, 0x08
+;--------------------------------------
+align 4
 .p13green:
         cmp     ah, 85
         jbe     .p13red
@@ -350,6 +432,8 @@ VGA_putpixel:
         cmp     ah, 170
         jbe     .p13red
         or      dl, 0x08
+;--------------------------------------
+align 4
 .p13red:
         shr     eax, 8
         cmp     ah, 85
@@ -358,6 +442,8 @@ VGA_putpixel:
         cmp     ah, 170
         jbe     .p13cont
         or      dl, 0x08
+;--------------------------------------
+align 4
 .p13cont:
         ror     edx, 8
         inc     cl
@@ -371,14 +457,12 @@ VGA_putpixel:
         rol     edx, 8
         mov     [edi], dl
         popfd
-;.end:
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA__putimage:
 ; ecx = size [x|y]
 ; edx = coordinates [x|y]
-        cmp     [SCR_MODE], dword 0x12
-        jne     @f
         pushad
         rol     edx, 16
         movzx   eax, dx
@@ -389,16 +473,14 @@ VGA__putimage:
         movzx   ecx, cx
         call    VGA_draw_bar_1
         popad
-@@:
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA_draw_bar:
 ; eax   cx
 ; ebx   cy
 ; ecx   xe
 ; edx   ye
-        cmp     [SCR_MODE], dword 0x12
-        jne     @f
         pushad
         sub     ecx, eax
         sub     edx, ebx
@@ -408,9 +490,9 @@ VGA_draw_bar:
         and     edx, 0xffff
         call    VGA_draw_bar_1
         popad
-@@:
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA_draw_bar_1:
         mov     [temp.cx], eax
         mov     eax, [TASK_BASE]
@@ -429,13 +511,16 @@ VGA_draw_bar_1:
         mov     ebx, ecx
         shr     ebx, 5
         inc     ebx
+;--------------------------------------
+align 4
 .main_loop:
         call    VGA_draw_long_line_1
         dec     edx
         jnz     .main_loop
         call    VGA_draw_long_line_1
         ret
-
+;------------------------------------------------------------------------------
+align 4
 VGA_draw_long_line_1:
         push    ebx edx esi edi
         shl     edx, 9
@@ -446,5 +531,4 @@ VGA_draw_long_line_1:
         call    VGA_draw_long_line
         pop     edi esi edx ebx
         ret
-
+;------------------------------------------------------------------------------
-