diff --git a/kernel/trunk/network/eth_drv/ethernet.inc b/kernel/trunk/network/eth_drv/ethernet.inc index bc1591fd7c..b72be5b685 100644 --- a/kernel/trunk/network/eth_drv/ethernet.inc +++ b/kernel/trunk/network/eth_drv/ethernet.inc @@ -112,6 +112,26 @@ dd 0x24498086, I8255x_probe, I8255x_reset, I8255x_poll, I8255x_transmit dd 0x802910ec, rtl8029_probe, rtl8029_reset, rtl8029_poll, rtl8029_transmit dd 0x12111113, rtl8029_probe, rtl8029_reset, rtl8029_poll, rtl8029_transmit dd 0x813910ec, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +; /+/ Новые вендоры сетевых карт на базе rtl8139 +dd 0x813810ec, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x12111113, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x13601500, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x13604033, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x13001186, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x13401186, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0xab0613d1, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0xa1171259, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0xa11e1259, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0xab0614ea, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0xab0714ea, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x123411db, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x91301432, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x101202ac, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x0106018a, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x1211126c, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x81391743, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +dd 0x8139021b, rtl8139_probe, rtl8139_reset, rtl8139_poll, rtl8139_transmit +; /-/ dd 0x590010b7, e3c59x_probe, e3c59x_reset, e3c59x_poll, e3c59x_transmit dd 0x592010b7, e3c59x_probe, e3c59x_reset, e3c59x_poll, e3c59x_transmit dd 0x597010b7, e3c59x_probe, e3c59x_reset, e3c59x_poll, e3c59x_transmit diff --git a/programs/colorref/trunk/colorref.asm b/programs/colorref/trunk/colorref.asm index 5124949ef2..f4fb40b36f 100644 --- a/programs/colorref/trunk/colorref.asm +++ b/programs/colorref/trunk/colorref.asm @@ -10,8 +10,8 @@ use32 dd 0x01 ; header version dd start ; start of code dd finis ; size of image - dd 0x100000 ; memory for app - dd 0x7fff0 ; esp + dd 0x1000 ; memory for app + dd 0x1000 ; esp dd 0x0,0x0 ; I_Param , I_Icon include 'lang.inc' @@ -148,7 +148,7 @@ draw_window: mov eax,0 ; DRAW WINDOW mov ebx,1*65536+200 ; [x start] *65536 + [x size] mov ecx,200*65536+240 ; [y start] *65536 + [y size] - mov edx,0x02000000 ; work area color (type II) + mov edx,0x03000000 ; work area color (type II) mov esi,0x82a0a0a0 ; grab bar color (w/glide) mov edi,0x82bbbbbb ; frame color int 0x40 @@ -158,13 +158,7 @@ draw_window: mov edx,prog_name ; pointer to header mov esi,namelen-prog_name ; text length int 0x40 - mov eax,8 ; CLOSE BUTTON - mov ebx,(200-19)*65536+12 ; [x start] *65536 + [x size] - mov ecx,5*65536+12 ; [y start] *65536 + [y size] - mov edx,1 ; button id - mov esi,0xaaaaaa ; button color (light grey) - int 0x40 - + call palette ; display color palette mov eax,12 ; tell os about windowdraw diff --git a/programs/icon/trunk/icon.asm b/programs/icon/trunk/icon.asm index 3213891d97..dcbea27cda 100644 --- a/programs/icon/trunk/icon.asm +++ b/programs/icon/trunk/icon.asm @@ -27,6 +27,7 @@ ICON_STRIP equ '/RD/1/ICONSTRP.GIF' dd icon_data+0x30000 ; esp dd I_Param , 0x0 ; I_Param , I_Icon include 'macros.inc' +include 'lang.inc' COLOR_ORDER equ MENUETOS include 'gif_lite.inc' ;include 'debug.inc' diff --git a/programs/vrr/trunk/vrr.asm b/programs/vrr/trunk/vrr.asm index e6e38bdbb4..a1e4373b11 100644 --- a/programs/vrr/trunk/vrr.asm +++ b/programs/vrr/trunk/vrr.asm @@ -11,13 +11,13 @@ use32 org 0x0 - db 'MENUET01' ; 8 byte id - dd 0x01 ; header version + db 'MENUET01' ; 8 byte id + dd 0x01 ; header version dd START ; start of code dd I_END ; size of image - dd 0x5000 ; memory for app + dd 0x5000 ; memory for app dd 0x4ff0 ; esp - dd 0x0 , 0x0 ; I_Param , I_Icon + dd 0x0 , 0x0 ; I_Param , I_Icon include 'lang.inc' include 'macros.inc' @@ -204,7 +204,7 @@ dw_continue: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+400 ; [x start] *65536 + [x size] mov ecx,100*65536+200 ; [y start] *65536 + [y size] - mov edx,0x020020C0;0x00000040 ; color of work area RRGGBB,8->color glide + mov edx,0x030020C0;0x00000040 ; color of work area RRGGBB,8->color glide mov esi,0x805080d0 ; color of grab bar RRGGBB,8->color glide mov edi,0x00ffffff ; color of frames RRGGBB int 0x40 @@ -212,14 +212,7 @@ dw_continue: ; WINDOW LABEL call print_my_title - ; CLOSE BUTTON - mov eax,8 ; function 8 : define and draw button - mov ebx,(400-19)*65536+12 ; [x start] *65536 + [x size] - mov ecx,5*65536+12 ; [y start] *65536 + [y size] - mov edx,1 ; button id - mov esi,0x5599cc ; button color RRGGBB - int 0x40 - + ; BUTTONS xor eax,eax mov edx,eax @@ -1023,7 +1016,7 @@ warning_window: warning_loop: mov eax,5 - mov ebx,13 + mov ebx,10 int 0x40 mov eax,11 int 40h