From f8ca762192364cb169b7d18d84ac52bf5e85c25b Mon Sep 17 00:00:00 2001 From: "SPraid (simba)" Date: Fri, 22 Jun 2007 20:24:06 +0000 Subject: [PATCH] in some programs set not sized changed window git-svn-id: svn://kolibrios.org@551 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/demos/3dcube2/trunk/3DCUBE2.ASM | 2 +- programs/demos/bcdclk/bcdclk/bcdclk.asm | 2 +- programs/demos/bgitest/trunk/bgitest.asm | 2 +- programs/demos/colorref/trunk/colorref.asm | 2 +- programs/demos/cslide/trunk/cslide.asm | 2 +- programs/demos/free3d04/trunk/free3d04.asm | 2 +- programs/demos/magnify/trunk/magnify.asm | 2 +- programs/demos/movback/trunk/movback.asm | 2 +- programs/demos/plasma/trunk/plasma.asm | 2 +- programs/demos/timer/trunk/timer.asm | 2 +- programs/demos/tinyfrac/trunk/tinyfrac.asm | 2 +- programs/demos/trantest/trunk/trantest.asm | 2 +- programs/demos/tube/trunk/tube.asm | 2 +- programs/develop/examples/thread/trunk/thread.asm | 2 +- programs/develop/h2d2b/trunk/h2d2b.asm | 2 +- programs/develop/keyascii/trunk/keyascii.asm | 2 +- programs/develop/mtdbg/mtdbg.asm | 2 +- programs/develop/scancode/trunk/scancode.asm | 2 +- programs/fs/copy2/trunk/copy2.asm | 2 +- programs/fs/copyr/trunk/copyr.asm | 2 +- programs/games/15/trunk/15.ASM | 2 +- programs/games/arcanii/trunk/arcanii.asm | 2 +- programs/games/arcanoid/trunk/ascl.inc | 2 +- programs/games/mblocks/trunk/mblocks.asm | 2 +- programs/games/mine/trunk/draw.h-- | 2 +- programs/games/phenix/trunk/ascl.inc | 2 +- programs/games/pipes/pipes.asm | 2 +- programs/games/pong/trunk/pong.asm | 2 +- programs/games/pong3/trunk/ascl.inc | 2 +- programs/games/rsquare/trunk/RSQUARE.ASM | 2 +- programs/games/tetris/trunk/tetris.asm | 2 +- programs/media/cdp/trunk/cdp.asm | 2 +- programs/media/iconedit/trunk/iconedit.asm | 2 +- programs/media/midiplay/trunk/midiplay.asm | 2 +- programs/media/mixer/trunk/mixer.asm | 2 +- programs/media/pic4/trunk/pic4.asm | 2 +- programs/media/sb/trunk/sb.asm | 2 +- programs/media/scrshoot/scrshoot.asm | 2 +- programs/network/airc/trunk/airc.asm | 2 +- programs/network/arpstat/trunk/arpstat.asm | 2 +- programs/network/chess/trunk/chess.asm | 2 +- programs/network/dhcp/trunk/dhcp.asm | 2 +- programs/network/dnsr/trunk/dnsr.asm | 2 +- programs/network/ethstat/trunk/ethstat.asm | 2 +- programs/network/ipc/trunk/ipc.asm | 2 +- programs/network/local/trunk/local.asm | 2 +- programs/network/mp3s/trunk/mp3s.asm | 2 +- programs/network/ppp/trunk/ppp.asm | 2 +- programs/network/rccc/trunk/rccc.asm | 2 +- programs/network/rccs/trunk/rccs.asm | 2 +- programs/network/remote/trunk/remote.asm | 2 +- programs/network/stackcfg/trunk/stackcfg.asm | 2 +- programs/network/tftpa/trunk/tftpa.asm | 2 +- programs/network/tftpc/trunk/tftpc.asm | 2 +- programs/network/ym/trunk/ym.asm | 2 +- programs/other/calc/trunk/calc.asm | 2 +- programs/other/mhc/trunk/mhc.asm | 2 +- programs/other/period/trunk/period.asm | 2 +- programs/system/calendar/trunk/calendar.asm | 2 +- programs/system/cpu/trunk/cpu.asm | 2 +- programs/system/cpuid/trunk/CPUID.ASM | 2 +- programs/system/desktop/trunk/desktop.asm | 2 +- programs/system/docpack/trunk/docpack.asm | 2 +- programs/system/gmon/gmon.asm | 2 +- programs/system/icon/trunk/icon.asm | 2 +- programs/system/mgb/trunk/mgb.asm | 2 +- programs/system/rdsave/trunk/rdsave.asm | 2 +- programs/system/setup/trunk/setup.asm | 2 +- 68 files changed, 68 insertions(+), 68 deletions(-) diff --git a/programs/demos/3dcube2/trunk/3DCUBE2.ASM b/programs/demos/3dcube2/trunk/3DCUBE2.ASM index 2bacac7d38..f0fd4ce278 100644 --- a/programs/demos/3dcube2/trunk/3DCUBE2.ASM +++ b/programs/demos/3dcube2/trunk/3DCUBE2.ASM @@ -101,7 +101,7 @@ draw_window: mov eax,0 ;Draw window mov ebx,100*65536+(SCREEN_X+9) ;x start*65536+x size mov ecx,100*65536+(SCREEN_Y+26) ;y start*65536+y size - mov edx,0x13000000 ;0x03 use skinned window + mov edx,0x14000000 ;0x03 use skinned window mov edi,title mcall diff --git a/programs/demos/bcdclk/bcdclk/bcdclk.asm b/programs/demos/bcdclk/bcdclk/bcdclk.asm index ee7a960663..839c4887d6 100644 --- a/programs/demos/bcdclk/bcdclk/bcdclk.asm +++ b/programs/demos/bcdclk/bcdclk/bcdclk.asm @@ -121,7 +121,7 @@ drawwindow: xor eax,eax ; window mov ebx,100*65536+107 mov ecx,100*65536+105 - mov edx,0x33400088 + mov edx,0x34400088 mov edi,title mcall diff --git a/programs/demos/bgitest/trunk/bgitest.asm b/programs/demos/bgitest/trunk/bgitest.asm index d157a00a08..4f98dd2dd1 100644 --- a/programs/demos/bgitest/trunk/bgitest.asm +++ b/programs/demos/bgitest/trunk/bgitest.asm @@ -237,7 +237,7 @@ draw_window: xor eax,eax mov ebx,10*65536+_X*2+30 mov ecx,100*65536+_Y*2 - mov edx,0x03261212 + mov edx,0x04261212 mov esi,0x805080d0 mov edi,0x005080d0 mcall diff --git a/programs/demos/colorref/trunk/colorref.asm b/programs/demos/colorref/trunk/colorref.asm index 128d80289d..f0121ca15a 100644 --- a/programs/demos/colorref/trunk/colorref.asm +++ b/programs/demos/colorref/trunk/colorref.asm @@ -149,7 +149,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,0x13000000 ; work area color (type II) + mov edx,0x14000000 ; work area color (type II) mov edi,title ; frame color mcall diff --git a/programs/demos/cslide/trunk/cslide.asm b/programs/demos/cslide/trunk/cslide.asm index 3f9b3b01d3..54b13e730f 100644 --- a/programs/demos/cslide/trunk/cslide.asm +++ b/programs/demos/cslide/trunk/cslide.asm @@ -80,7 +80,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+200 ; [x start] *65536 + [x size] mov ecx,100*65536+200 ; [y start] *65536 + [y size] - mov edx,0x13ffffff ; color of work area RRGGBB,8->color gl + mov edx,0x14ffffff ; color of work area RRGGBB,8->color gl mov edi,title ; WINDOW LABEL mcall diff --git a/programs/demos/free3d04/trunk/free3d04.asm b/programs/demos/free3d04/trunk/free3d04.asm index 3649a1ada9..82678e7794 100644 --- a/programs/demos/free3d04/trunk/free3d04.asm +++ b/programs/demos/free3d04/trunk/free3d04.asm @@ -309,7 +309,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,50*65536+649 ; [x start] *65536 + [x size] mov ecx,50*65536+504 ; [y start] *65536 + [y size] - mov edx,0x33ffffff ; color of work area RRGGBB,8->color gl + mov edx,0x34ffffff ; color of work area RRGGBB,8->color gl mov edi,title mcall diff --git a/programs/demos/magnify/trunk/magnify.asm b/programs/demos/magnify/trunk/magnify.asm index 95f4f745c5..57d0ded0e1 100644 --- a/programs/demos/magnify/trunk/magnify.asm +++ b/programs/demos/magnify/trunk/magnify.asm @@ -61,7 +61,7 @@ draw_window: ; DRAW WINDOW mov ebx, 100*65536 + 8*magnify_width + 8 lea ecx, [eax + 100*65536 + 8*magnify_height + 3] - mov edx, 0x33000000 ; color of work area RRGGBB + mov edx, 0x34000000 ; color of work area RRGGBB mov edi, labelt ; header xor eax, eax ; function 0 : define and draw window mcall diff --git a/programs/demos/movback/trunk/movback.asm b/programs/demos/movback/trunk/movback.asm index 3dfe151fcc..63360aa6a2 100644 --- a/programs/demos/movback/trunk/movback.asm +++ b/programs/demos/movback/trunk/movback.asm @@ -50,7 +50,7 @@ CODE xor eax,eax mov ebx,(100 shl 16)+(WND_SIZE_X+9) mov ecx,(100 shl 16)+(WND_SIZE_Y+28) - mov edx,0x33000000 + mov edx,0x34000000 mov edi,title mcall diff --git a/programs/demos/plasma/trunk/plasma.asm b/programs/demos/plasma/trunk/plasma.asm index 29ac2ee3a8..14f85835f9 100644 --- a/programs/demos/plasma/trunk/plasma.asm +++ b/programs/demos/plasma/trunk/plasma.asm @@ -46,7 +46,7 @@ CODE xor eax,eax mov ebx,(100 shl 16)+(WND_SIZE_X+8) mov ecx,(100 shl 16)+(WND_SIZE_Y+25) - mov edx,0x33000000 + mov edx,0x34000000 mov edi,title mcall diff --git a/programs/demos/timer/trunk/timer.asm b/programs/demos/timer/trunk/timer.asm index 3c4de439ae..df797aa962 100644 --- a/programs/demos/timer/trunk/timer.asm +++ b/programs/demos/timer/trunk/timer.asm @@ -122,7 +122,7 @@ draw_window: mov ebx,100*65536+100 ; [x start] *65536 + [x size] mov ecx,100*65536+40 ; [y start] *65536 + [y size] mov edx,[sc.work] ; color of work area RRGGBB,8->color gl - or edx,0x33000000 + or edx,0x34000000 mov edi,title mcall diff --git a/programs/demos/tinyfrac/trunk/tinyfrac.asm b/programs/demos/tinyfrac/trunk/tinyfrac.asm index c60ace8e05..2c503ef579 100644 --- a/programs/demos/tinyfrac/trunk/tinyfrac.asm +++ b/programs/demos/tinyfrac/trunk/tinyfrac.asm @@ -434,7 +434,7 @@ draw_window: xor eax,eax mov ebx,50*65536+PIXWIDTH+8 mov ecx,100*65536+PIXHEIGHT+25 - mov edx,0x13334455 + mov edx,0x14334455 mov edi,title mcall diff --git a/programs/demos/trantest/trunk/trantest.asm b/programs/demos/trantest/trunk/trantest.asm index e2b71a8b1b..56252bf7f5 100644 --- a/programs/demos/trantest/trunk/trantest.asm +++ b/programs/demos/trantest/trunk/trantest.asm @@ -88,7 +88,7 @@ draw_window: xor eax,eax ;Draw window mov ebx,100*65536+(SCREEN_X+9) ;x start*65536+x size mov ecx,100*65536+(SCREEN_Y+26) ;y start*65536+y size - mov edx,0x13000000 ;0x13 use skinned window + mov edx,0x14000000 ;0x13 use skinned window mov edi,title mcall diff --git a/programs/demos/tube/trunk/tube.asm b/programs/demos/tube/trunk/tube.asm index 2fad59eeeb..cd512fddec 100644 --- a/programs/demos/tube/trunk/tube.asm +++ b/programs/demos/tube/trunk/tube.asm @@ -195,7 +195,7 @@ draw_window: xor eax,eax mov ebx,100*65536+329 mov ecx,100*65536+186 - mov edx,0x33000000 + mov edx,0x34000000 mov edi,title mcall mov eax,12 diff --git a/programs/develop/examples/thread/trunk/thread.asm b/programs/develop/examples/thread/trunk/thread.asm index 7c012efb87..b191ce004c 100644 --- a/programs/develop/examples/thread/trunk/thread.asm +++ b/programs/develop/examples/thread/trunk/thread.asm @@ -93,7 +93,7 @@ draw_window: shl esi,16 add ebx,esi add ecx,esi - mov edx,0x33ffffff ; color of work area RRGGBB,8->color gl + mov edx,0x34ffffff ; color of work area RRGGBB,8->color gl mov edi,title ; WINDOW LABEL mcall diff --git a/programs/develop/h2d2b/trunk/h2d2b.asm b/programs/develop/h2d2b/trunk/h2d2b.asm index dbcef361c2..94933a7f92 100644 --- a/programs/develop/h2d2b/trunk/h2d2b.asm +++ b/programs/develop/h2d2b/trunk/h2d2b.asm @@ -147,7 +147,7 @@ next_digit: draw_window: ;------------------------------------------------ mcall 12, 1 - mcall 0, 200*65536+300, 200*65536+175, 0x13AABBCC,,title + mcall 0, 200*65536+300, 200*65536+175, 0x14AABBCC,,title mcall 8, 15 *65536+ 38, 90*65536+ 15, 2, 0x6688DD ; ъэюяър shl mcall , ,110*65536+ 15, , ; ъэюяър sal diff --git a/programs/develop/keyascii/trunk/keyascii.asm b/programs/develop/keyascii/trunk/keyascii.asm index 7c6b3fd486..f0c76018b0 100644 --- a/programs/develop/keyascii/trunk/keyascii.asm +++ b/programs/develop/keyascii/trunk/keyascii.asm @@ -74,7 +74,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+270 ; [x start] *65536 + [x size] mov ecx,100*65536+80 ; [y start] *65536 + [y size] - mov edx,0x33ffffff ; color of work area RRGGBB,8->color gl + mov edx,0x34ffffff ; color of work area RRGGBB,8->color gl mov edi,title mcall diff --git a/programs/develop/mtdbg/mtdbg.asm b/programs/develop/mtdbg/mtdbg.asm index 96ac220365..e2efc585ce 100644 --- a/programs/develop/mtdbg/mtdbg.asm +++ b/programs/develop/mtdbg/mtdbg.asm @@ -978,7 +978,7 @@ draw_window: xor eax, eax mov ebx, wnd_x_size mov ecx, wnd_y_size - mov edx, 13FFFFFFh + mov edx, 14FFFFFFh mov edi, caption_str mcall ; messages frame diff --git a/programs/develop/scancode/trunk/scancode.asm b/programs/develop/scancode/trunk/scancode.asm index 2451bf1fd4..0b53c47479 100644 --- a/programs/develop/scancode/trunk/scancode.asm +++ b/programs/develop/scancode/trunk/scancode.asm @@ -164,7 +164,7 @@ draw_window: mov ebx, 100*65536+200 ; [x start] *65536 + [x size] mov ecx, 100*65536+275 ; [y start] *65536 + [y size] mov edx, [sc.work] ; color of work area RRGGBB,8->color gl - or edx, 0x33000000 + or edx, 0x34000000 mov edi, title ; WINDOW LABEL mcall diff --git a/programs/fs/copy2/trunk/copy2.asm b/programs/fs/copy2/trunk/copy2.asm index a7ab2f0167..f1b185bc74 100644 --- a/programs/fs/copy2/trunk/copy2.asm +++ b/programs/fs/copy2/trunk/copy2.asm @@ -250,7 +250,7 @@ draw_window: xor eax, eax ; function 0 : define and draw window mov ebx, 160*65536+415 ; [x start] *65536 + [x size] mov ecx, 160*65536+100 ; [y start] *65536 + [y size] - mov edx, 0x13DDDDDD ; color of work area RRGGBB + mov edx, 0x14DDDDDD ; color of work area RRGGBB mov edi, title ; WINDOW LABEL mcall diff --git a/programs/fs/copyr/trunk/copyr.asm b/programs/fs/copyr/trunk/copyr.asm index 5a50c82701..97d570dbc5 100644 --- a/programs/fs/copyr/trunk/copyr.asm +++ b/programs/fs/copyr/trunk/copyr.asm @@ -183,7 +183,7 @@ draw_window: xor eax,eax ; function 0 : define and draw window mov ebx,160*65536+415 ; [x start] *65536 + [x size] mov ecx,160*65536+90 ; [y start] *65536 + [y size] - mov edx,0x13DDDDDD ; color of work area RRGGBB + mov edx,0x14DDDDDD ; color of work area RRGGBB mov edi,labelt ; WINDOW LABEL mcall diff --git a/programs/games/15/trunk/15.ASM b/programs/games/15/trunk/15.ASM index e4025375e0..57423813d4 100644 --- a/programs/games/15/trunk/15.ASM +++ b/programs/games/15/trunk/15.ASM @@ -8,7 +8,7 @@ include '..\..\..\macros.inc' ; decreases program size (not required) StatusColor equ 0x02ffffff StatusColor2 equ 0x02dc1e14 -BgdColor equ 0x03aabbcc +BgdColor equ 0x04aabbcc ; Main window dimensions XXwindow equ 200 shl 16+276 diff --git a/programs/games/arcanii/trunk/arcanii.asm b/programs/games/arcanii/trunk/arcanii.asm index 53804c93c5..36a07524ee 100644 --- a/programs/games/arcanii/trunk/arcanii.asm +++ b/programs/games/arcanii/trunk/arcanii.asm @@ -785,7 +785,7 @@ draw_window: startwd - window 100,100,X_SIZE+8,Y_SIZE+21,0x03ffffff + window 100,100,X_SIZE+8,Y_SIZE+21,0x04ffffff label 8,8,VERSION,cl_White+font_Big label 200,8,'LIVES:',0x10ddeeff outcount dword [lives],250,8,0x10ddeeff,65536 diff --git a/programs/games/arcanoid/trunk/ascl.inc b/programs/games/arcanoid/trunk/ascl.inc index 7ab13ae7c3..17a65adf5a 100644 --- a/programs/games/arcanoid/trunk/ascl.inc +++ b/programs/games/arcanoid/trunk/ascl.inc @@ -812,7 +812,7 @@ key_PgDown equ 183 ;Attributes ;Window Attributes -window_Skinned equ 0x03000000 +window_Skinned equ 0x04000000 window_Type2 equ 0x02000000 window_Type1 equ 0x00000000 window_Reserve equ 0x01000000 diff --git a/programs/games/mblocks/trunk/mblocks.asm b/programs/games/mblocks/trunk/mblocks.asm index d80434409d..507998beb8 100644 --- a/programs/games/mblocks/trunk/mblocks.asm +++ b/programs/games/mblocks/trunk/mblocks.asm @@ -125,7 +125,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+413 ; [x start] *65536 + [x size] mov ecx,100*65536+295 ; [y start] *65536 + [y size] - mov edx,0x93000000 ; color of work area RRGGBB,8->color gl + mov edx,0x94000000 ; color of work area RRGGBB,8->color gl mov edi,title ; WINDOW LABEL mcall diff --git a/programs/games/mine/trunk/draw.h-- b/programs/games/mine/trunk/draw.h-- index 49dc528d29..8e2f4554df 100644 --- a/programs/games/mine/trunk/draw.h-- +++ b/programs/games/mine/trunk/draw.h-- @@ -29,7 +29,7 @@ void draw_window() // WINDOW EBX = xpos << 16 + xsize; ECX = ypos << 16 + ysize; - sys_draw_window(EBX, ECX, 0x13CCCCCC, colors.w_grab | 0x80000000, "MineSweeper"); + sys_draw_window(EBX, ECX, 0x14CCCCCC, colors.w_grab | 0x80000000, "MineSweeper"); // BUTTON (911) EBX = xsize / 2 - 10; diff --git a/programs/games/phenix/trunk/ascl.inc b/programs/games/phenix/trunk/ascl.inc index 2eadfc1268..0342768ede 100644 --- a/programs/games/phenix/trunk/ascl.inc +++ b/programs/games/phenix/trunk/ascl.inc @@ -874,7 +874,7 @@ key_PgDown equ 183 ;Attributes ;Window Attributes -window_Skinned equ 0x03000000 +window_Skinned equ 0x04000000 window_Type2 equ 0x02000000 window_Type1 equ 0x00000000 window_Reserve equ 0x01000000 diff --git a/programs/games/pipes/pipes.asm b/programs/games/pipes/pipes.asm index b22a4a84e3..622150c029 100644 --- a/programs/games/pipes/pipes.asm +++ b/programs/games/pipes/pipes.asm @@ -557,7 +557,7 @@ pusha mov ebx,100*65536+492 ; [x start] *65536 + [x size] mov ecx,100*65536+420 ; [y start] *65536 + [y size] mov edx,bgcolor ; color of work area RRGGBB,8->color gl - or edx,0x13000000 + or edx,0x14000000 mov edi,title mcall diff --git a/programs/games/pong/trunk/pong.asm b/programs/games/pong/trunk/pong.asm index e402b17278..99a53fc301 100644 --- a/programs/games/pong/trunk/pong.asm +++ b/programs/games/pong/trunk/pong.asm @@ -330,7 +330,7 @@ draw_window: mov eax,0 mov ebx,100*65536+320 mov ecx,100*65536+250 - mov edx,0x134873a0 ;70d0 + mov edx,0x144873a0 ;70d0 mov edi,labelt mcall diff --git a/programs/games/pong3/trunk/ascl.inc b/programs/games/pong3/trunk/ascl.inc index 9751d32f12..d9e8fe98f1 100644 --- a/programs/games/pong3/trunk/ascl.inc +++ b/programs/games/pong3/trunk/ascl.inc @@ -478,7 +478,7 @@ key_PgDown equ 183 ;Attributes ;Window Attributes -window_Skinned equ 0x03000000 +window_Skinned equ 0x04000000 window_Type2 equ 0x02000000 window_Type1 equ 0x00000000 window_Reserve equ 0x01000000 diff --git a/programs/games/rsquare/trunk/RSQUARE.ASM b/programs/games/rsquare/trunk/RSQUARE.ASM index 2865b081ea..69e2b0bc54 100644 --- a/programs/games/rsquare/trunk/RSQUARE.ASM +++ b/programs/games/rsquare/trunk/RSQUARE.ASM @@ -184,7 +184,7 @@ button: ; BUTTON - only close supported draw_window: mov [ticks],TICKS mcall 12,1 - mcall 0,<100,FLDSIZE2+16>,<100,FLDSIZE2+38>,0x03008000 + mcall 0,<100,FLDSIZE2+16>,<100,FLDSIZE2+38>,0x04008000 mcall 4,<8,8>,0x10ffffff,header,header.size mov esi,ecx if lang eq ru diff --git a/programs/games/tetris/trunk/tetris.asm b/programs/games/tetris/trunk/tetris.asm index a13cd8dfc9..3135c7a757 100644 --- a/programs/games/tetris/trunk/tetris.asm +++ b/programs/games/tetris/trunk/tetris.asm @@ -257,7 +257,7 @@ draw_window: mov ebx,320*65536+(LEN_X-BORDER_LEFT-BORDER_RIGHT)*ADOBE_SIZE+X_LOCATION*2 mov ecx,25*65536+ (LEN_Y-BORDER_TOP-BORDER_BOTTOM)*ADOBE_SIZE+Y_LOCATION+30 mov edx,[sc.work] ; color of work area RRGGBB - or edx,0x13000000 + or edx,0x14000000 mov edi,title ; WINDOW LABEL mcall diff --git a/programs/media/cdp/trunk/cdp.asm b/programs/media/cdp/trunk/cdp.asm index 999bc5c406..cfa2fb5f1b 100644 --- a/programs/media/cdp/trunk/cdp.asm +++ b/programs/media/cdp/trunk/cdp.asm @@ -749,7 +749,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx, 50*65536+219 ; [x start] *65536 + [x size] mov ecx,100*65536+168 ; [y start] *65536 + [y size] - mov edx,0x03ffffff ; color of work area RRGGBB + mov edx,0x04ffffff ; color of work area RRGGBB mov esi,0x8099bbff ; color of grab bar RRGGBB,8->color glide mov edi,0x0099bbee ; color of frames RRGGBB mcall diff --git a/programs/media/iconedit/trunk/iconedit.asm b/programs/media/iconedit/trunk/iconedit.asm index 88aca6b267..5bf27166de 100644 --- a/programs/media/iconedit/trunk/iconedit.asm +++ b/programs/media/iconedit/trunk/iconedit.asm @@ -176,7 +176,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+window_x_size ; [x start] *65536 + [x size] mov ecx,100*65536+window_y_size ; [y start] *65536 + [y size] - mov edx,0x13ffffff ; color of work area 0x00RRGGBB + mov edx,0x14ffffff ; color of work area 0x00RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/media/midiplay/trunk/midiplay.asm b/programs/media/midiplay/trunk/midiplay.asm index f13e4e7de8..714cb6421f 100644 --- a/programs/media/midiplay/trunk/midiplay.asm +++ b/programs/media/midiplay/trunk/midiplay.asm @@ -113,7 +113,7 @@ draw_window: mov eax,0 ; define and draw window mov ebx,20*65536+250 mov ecx,20*65536+120 - mov edx,0x13ffffff + mov edx,0x14ffffff mov edi,title mcall diff --git a/programs/media/mixer/trunk/mixer.asm b/programs/media/mixer/trunk/mixer.asm index c0633b799c..380bb1ad49 100644 --- a/programs/media/mixer/trunk/mixer.asm +++ b/programs/media/mixer/trunk/mixer.asm @@ -323,7 +323,7 @@ drawusedcard: bcolor dd 0x5577c8 -wcolor dd 0x13000000 +wcolor dd 0x14000000 text: diff --git a/programs/media/pic4/trunk/pic4.asm b/programs/media/pic4/trunk/pic4.asm index b4f7b4c474..1ac640b95f 100644 --- a/programs/media/pic4/trunk/pic4.asm +++ b/programs/media/pic4/trunk/pic4.asm @@ -335,7 +335,7 @@ draw_window: mov ebx, 220*65536+293 mov ecx, 50*65536+408 mov edx, [sc.work] - or edx, 0x33000000 + or edx, 0x34000000 mov edi, title mcall diff --git a/programs/media/sb/trunk/sb.asm b/programs/media/sb/trunk/sb.asm index 049301d3cb..541426b660 100644 --- a/programs/media/sb/trunk/sb.asm +++ b/programs/media/sb/trunk/sb.asm @@ -847,7 +847,7 @@ draw_window: mov ebx,100*65536+320 ; [x start] *65536 + [x size] mov ecx,100*65536+140 ; [y start] *65536 + [y size] mov edx,[bgr] - or edx,0x13000000 ; color of work area RRGGBB,8->color gl + or edx,0x14000000 ; color of work area RRGGBB,8->color gl mov edi,title ; WINDOW LABEL mcall diff --git a/programs/media/scrshoot/scrshoot.asm b/programs/media/scrshoot/scrshoot.asm index fbe345a4fd..1eb34a9c63 100644 --- a/programs/media/scrshoot/scrshoot.asm +++ b/programs/media/scrshoot/scrshoot.asm @@ -132,7 +132,7 @@ start_draw_window ; mov ecx,100*65536+220 add cx,ax mov edx,[sc.work] - add edx,0x33000000;0x33000000 + add edx,0x34000000;0x33000000 xor esi,esi ;xor edi,edi mov edi,grab_text diff --git a/programs/network/airc/trunk/airc.asm b/programs/network/airc/trunk/airc.asm index aaeb09f2de..2c135cbb53 100644 --- a/programs/network/airc/trunk/airc.asm +++ b/programs/network/airc/trunk/airc.asm @@ -1845,7 +1845,7 @@ draw_window: mov ebx,5*65536+499 mov ecx,5*65536+345 mov edx,[wcolor] - add edx,0x13ffffff + add edx,0x14ffffff mov edi,title mcall diff --git a/programs/network/arpstat/trunk/arpstat.asm b/programs/network/arpstat/trunk/arpstat.asm index 68c1251245..e6cb79b4bf 100644 --- a/programs/network/arpstat/trunk/arpstat.asm +++ b/programs/network/arpstat/trunk/arpstat.asm @@ -345,7 +345,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+280 ; [x start] *65536 + [x size] mov ecx,100*65536+270 ; [y start] *65536 + [y size] - mov edx,0x13224466 ; color of work area RRGGBB + mov edx,0x14224466 ; color of work area RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/chess/trunk/chess.asm b/programs/network/chess/trunk/chess.asm index 352bce3141..2cc5eb3697 100644 --- a/programs/network/chess/trunk/chess.asm +++ b/programs/network/chess/trunk/chess.asm @@ -888,7 +888,7 @@ draw_window: mov bx,550 mov cx,470 mov edx,[wcolor] - add edx,0x13000000 + add edx,0x14000000 mov edi,title mcall diff --git a/programs/network/dhcp/trunk/dhcp.asm b/programs/network/dhcp/trunk/dhcp.asm index 7f0c27f1d5..abf9e8ff5e 100644 --- a/programs/network/dhcp/trunk/dhcp.asm +++ b/programs/network/dhcp/trunk/dhcp.asm @@ -489,7 +489,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+300 ; [x start] *65536 + [x size] mov ecx,100*65536+156 ; [y start] *65536 + [y size] - mov edx,0x13224466 ; color of work area RRGGBB + mov edx,0x14224466 ; color of work area RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/dnsr/trunk/dnsr.asm b/programs/network/dnsr/trunk/dnsr.asm index bc8234d7cc..f7eabef1c5 100644 --- a/programs/network/dnsr/trunk/dnsr.asm +++ b/programs/network/dnsr/trunk/dnsr.asm @@ -554,7 +554,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+300 ; [x start] *65536 + [x size] mov ecx,100*65536+140 ; [y start] *65536 + [y size] - mov edx,0x13224466 ; color of work area RRGGBB + mov edx,0x14224466 ; color of work area RRGGBB mov edi,title ; WINDOW LABEL; mcall diff --git a/programs/network/ethstat/trunk/ethstat.asm b/programs/network/ethstat/trunk/ethstat.asm index 45678d5e80..4788bf2c29 100644 --- a/programs/network/ethstat/trunk/ethstat.asm +++ b/programs/network/ethstat/trunk/ethstat.asm @@ -138,7 +138,7 @@ draw_window: xor eax,eax ; function 0 : define and draw window mov ebx,100*65536+260 ; [x start] *65536 + [x size] mov ecx,100*65536+205 ; [y start] *65536 + [y size] - mov edx,0x13224466 ; color of work area RRGGBB + mov edx,0x14224466 ; color of work area RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/ipc/trunk/ipc.asm b/programs/network/ipc/trunk/ipc.asm index dde9081bbf..0814998b21 100644 --- a/programs/network/ipc/trunk/ipc.asm +++ b/programs/network/ipc/trunk/ipc.asm @@ -225,7 +225,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+290 ; [x start] *65536 + [x size] mov ecx,100*65536+220 ; [y start] *65536 + [y size] - mov edx,0x13ffffff ; color of work area RRGGBB,8->color gl + mov edx,0x14ffffff ; color of work area RRGGBB,8->color gl mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/local/trunk/local.asm b/programs/network/local/trunk/local.asm index 1908ac3d71..95985dea89 100644 --- a/programs/network/local/trunk/local.asm +++ b/programs/network/local/trunk/local.asm @@ -252,7 +252,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+286 ; [x start] *65536 + [x size] mov ecx,60*65536+330 ; [y start] *65536 + [y size] - mov edx,0x03ffffff ; color of work area RRGGBB + mov edx,0x04ffffff ; color of work area RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/mp3s/trunk/mp3s.asm b/programs/network/mp3s/trunk/mp3s.asm index 5bec53ebed..c9d508d867 100644 --- a/programs/network/mp3s/trunk/mp3s.asm +++ b/programs/network/mp3s/trunk/mp3s.asm @@ -628,7 +628,7 @@ draw_window: mov eax,0 ; Draw Window mov ebx,50*65536+410 mov ecx,100*65536+141 - mov edx,0x13ffffff + mov edx,0x14ffffff mov edi,title mcall diff --git a/programs/network/ppp/trunk/ppp.asm b/programs/network/ppp/trunk/ppp.asm index 3de0009ea2..3df5bcfbc7 100644 --- a/programs/network/ppp/trunk/ppp.asm +++ b/programs/network/ppp/trunk/ppp.asm @@ -1385,7 +1385,7 @@ draw_window: mov eax, 0 ; function 0 : define and draw window mov ebx, 100*65536+250 ; [x start] *65536 + [x size] mov ecx, 100*65536+150 ; [y start] *65536 + [y size] - mov edx,0x13224466 ; color of work area RRGGBB + mov edx,0x14224466 ; color of work area RRGGBB mov edi,title ; color of frames RRGGBB mcall diff --git a/programs/network/rccc/trunk/rccc.asm b/programs/network/rccc/trunk/rccc.asm index 163e2f709e..fbe7270fa4 100644 --- a/programs/network/rccc/trunk/rccc.asm +++ b/programs/network/rccc/trunk/rccc.asm @@ -214,7 +214,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+250 ; [x start] *65536 + [x size] mov ecx,60*65536+280 ; [y start] *65536 + [y size] - mov edx,0x13ffffff ; color of work area RRGGBB + mov edx,0x14ffffff ; color of work area RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/rccs/trunk/rccs.asm b/programs/network/rccs/trunk/rccs.asm index 9fc851bce1..63ace450b5 100644 --- a/programs/network/rccs/trunk/rccs.asm +++ b/programs/network/rccs/trunk/rccs.asm @@ -254,7 +254,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+300 ; [x start] *65536 + [x size] mov ecx,100*65536+330 ; [y start] *65536 + [y size] - mov edx,0x13ffffff ; color of work area RRGGBB + mov edx,0x14ffffff ; color of work area RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/remote/trunk/remote.asm b/programs/network/remote/trunk/remote.asm index ae6c771974..fad097d434 100644 --- a/programs/network/remote/trunk/remote.asm +++ b/programs/network/remote/trunk/remote.asm @@ -148,7 +148,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+286 ; [x start] *65536 + [x size] mov ecx,100*65536+330 ; [y start] *65536 + [y size] - mov edx,0x13ffffff ; color of work area RRGGBB + mov edx,0x14ffffff ; color of work area RRGGBB mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/stackcfg/trunk/stackcfg.asm b/programs/network/stackcfg/trunk/stackcfg.asm index cc12660401..ddb8554da9 100644 --- a/programs/network/stackcfg/trunk/stackcfg.asm +++ b/programs/network/stackcfg/trunk/stackcfg.asm @@ -472,7 +472,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+330 ; [x start] *65536 + [x size] mov ecx,100*65536+157 ; [y start] *65536 + [y size] - mov edx,0x13ffffff ; color of work area RRGGBB,8->color gl + mov edx,0x14ffffff ; color of work area RRGGBB,8->color gl mov edi,title ; WINDOW LABEL mcall diff --git a/programs/network/tftpa/trunk/tftpa.asm b/programs/network/tftpa/trunk/tftpa.asm index 193a9a05e1..14f38b54c1 100644 --- a/programs/network/tftpa/trunk/tftpa.asm +++ b/programs/network/tftpa/trunk/tftpa.asm @@ -580,7 +580,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+230 ; [x start] *65536 + [x size] mov ecx,100*65536+170 ; [y start] *65536 + [y size] - mov edx,0x13224466 ; color of work area RRGGBB + mov edx,0x14224466 ; color of work area RRGGBB mov edi,title mcall diff --git a/programs/network/tftpc/trunk/tftpc.asm b/programs/network/tftpc/trunk/tftpc.asm index 2891c59be4..e3600ffd3a 100644 --- a/programs/network/tftpc/trunk/tftpc.asm +++ b/programs/network/tftpc/trunk/tftpc.asm @@ -812,7 +812,7 @@ draw_window: mov eax,0 ; function 0 : define and draw window mov ebx,100*65536+230 ; [x start] *65536 + [x size] mov ecx,100*65536+170 ; [y start] *65536 + [y size] - mov edx,0x13224466 ; color of work area RRGGBB + mov edx,0x14224466 ; color of work area RRGGBB mov edi,title mcall diff --git a/programs/network/ym/trunk/ym.asm b/programs/network/ym/trunk/ym.asm index f5fc822eec..f91510da54 100644 --- a/programs/network/ym/trunk/ym.asm +++ b/programs/network/ym/trunk/ym.asm @@ -160,7 +160,7 @@ draw_window: mov ebx,150*65536+h_sp mov ecx,100*65536+v_sp mov edx,[sys_colors+4*5] - or edx,0x13000000 + or edx,0x14000000 mov edi,title mcall diff --git a/programs/other/calc/trunk/calc.asm b/programs/other/calc/trunk/calc.asm index 0169a8b0eb..5f1febc42d 100644 --- a/programs/other/calc/trunk/calc.asm +++ b/programs/other/calc/trunk/calc.asm @@ -656,7 +656,7 @@ draw_window: mov ebx,200 shl 16+255 mov ecx,200 shl 16+180 mov edx,[sc.work] - or edx,0x33000000 + or edx,0x34000000 mov edi,title mcall diff --git a/programs/other/mhc/trunk/mhc.asm b/programs/other/mhc/trunk/mhc.asm index 36f289a6a0..c3af1ab22c 100644 --- a/programs/other/mhc/trunk/mhc.asm +++ b/programs/other/mhc/trunk/mhc.asm @@ -207,7 +207,7 @@ ENTRANCE: xor eax,eax ; Define window mov ebx,100*65536+240 mov ecx,100*65536+130 - mov edx,0x03AAAAAA + mov edx,0x04AAAAAA mov esi,0x80777777 mov edi,0x00777777 mcall diff --git a/programs/other/period/trunk/period.asm b/programs/other/period/trunk/period.asm index 8eb57c00fb..4fe88018a5 100644 --- a/programs/other/period/trunk/period.asm +++ b/programs/other/period/trunk/period.asm @@ -93,7 +93,7 @@ draw_window: mov ebx,50*65536+555 ;x mov ecx,30*65536+455 ;y mov edx,[sc.work] - or edx,0x33000000 ;style + or edx,0x34000000 ;style mov edi,caption mcall diff --git a/programs/system/calendar/trunk/calendar.asm b/programs/system/calendar/trunk/calendar.asm index 9e72770814..f357942183 100644 --- a/programs/system/calendar/trunk/calendar.asm +++ b/programs/system/calendar/trunk/calendar.asm @@ -675,7 +675,7 @@ draw_window: else mov ecx,WIN_Y-15 end if - mov edx,0x13aabbcc ; цвет рабочей области RRGGBB,8->color gl + mov edx,0x14aabbcc ; цвет рабочей области RRGGBB,8->color gl mov edi,title ; заголовок mcall call draw_week diff --git a/programs/system/cpu/trunk/cpu.asm b/programs/system/cpu/trunk/cpu.asm index 77eedc1df7..b9517e341f 100644 --- a/programs/system/cpu/trunk/cpu.asm +++ b/programs/system/cpu/trunk/cpu.asm @@ -479,7 +479,7 @@ draw_window: xor eax,eax ; function 0 : define and draw window mov ebx,[winxpos] ; [x start] *65536 + [x size] mov ecx,[winypos] ; [y start] *65536 + [y size] - mov edx,0x13ddffdd ;ffffff ; color of work area RRGGBB,8->color + mov edx,0x14ddffdd ;ffffff ; color of work area RRGGBB,8->color mov edi,title ; WINDOW CAPTION; int 0x40 diff --git a/programs/system/cpuid/trunk/CPUID.ASM b/programs/system/cpuid/trunk/CPUID.ASM index 6a2859fa30..a6969c6c1a 100644 --- a/programs/system/cpuid/trunk/CPUID.ASM +++ b/programs/system/cpuid/trunk/CPUID.ASM @@ -1625,7 +1625,7 @@ draw_window: mov ebx,1h mcall - Window 150,150,350,385, 0x33FFFFFF, 0x805080d0, title + Window 150,150,350,385, 0x34FFFFFF, 0x805080d0, title ; place size Button 15,330,92,23,2,0x03FFFFFF ; button "press for more" diff --git a/programs/system/desktop/trunk/desktop.asm b/programs/system/desktop/trunk/desktop.asm index 12826ad932..5e9f873b4c 100644 --- a/programs/system/desktop/trunk/desktop.asm +++ b/programs/system/desktop/trunk/desktop.asm @@ -808,7 +808,7 @@ draw_window: mov ebx,110*65536+555 ; [x start] *65536 + [x size] mov ecx,50*65536+255 ; [y start] *65536 + [y size] mov edx,[w_work] ; color of work area RRGGBB,8->color - or edx,0x13000000 + or edx,0x14000000 mov edi,title ; WINDOW LABEL mcall diff --git a/programs/system/docpack/trunk/docpack.asm b/programs/system/docpack/trunk/docpack.asm index 84b07822d1..a3ae8d4ad3 100755 --- a/programs/system/docpack/trunk/docpack.asm +++ b/programs/system/docpack/trunk/docpack.asm @@ -98,7 +98,7 @@ red: mov ebx,220*65536+120 mov ecx,30*65536+FILECOUNT*16+35 mov edx,[sc.work] - or edx,0x33000000 + or edx,0x34000000 mov edi,title mcall diff --git a/programs/system/gmon/gmon.asm b/programs/system/gmon/gmon.asm index 3f7f48fffd..4ce9995000 100644 --- a/programs/system/gmon/gmon.asm +++ b/programs/system/gmon/gmon.asm @@ -191,7 +191,7 @@ draw_window: xor eax, eax mov ebx, 300 * 65536 + 309 mov ecx, 150 * 65536 + 450 - mov edx, tcol + 0x13000000 ; color of work area RRGGBB,8->color + mov edx, tcol + 0x14000000 ; color of work area RRGGBB,8->color mov edi, title ; color of frames RRGGBB int 0x40 ; ╤ючфр╕ь Ёрьъє уЁрЇшър diff --git a/programs/system/icon/trunk/icon.asm b/programs/system/icon/trunk/icon.asm index 97e9b10762..937d840cb9 100644 --- a/programs/system/icon/trunk/icon.asm +++ b/programs/system/icon/trunk/icon.asm @@ -566,7 +566,7 @@ draw_window: xor eax,eax mov ebx,210*65536+300 mov ecx,30*65536+390-14 - mov edx,0x13ffffff + mov edx,0x14ffffff mov edi,title ; WINDOW LABEL mcall diff --git a/programs/system/mgb/trunk/mgb.asm b/programs/system/mgb/trunk/mgb.asm index b82a403d9a..3753a2aed7 100644 --- a/programs/system/mgb/trunk/mgb.asm +++ b/programs/system/mgb/trunk/mgb.asm @@ -408,7 +408,7 @@ proc subDrawMainWindow ; CODE XREF: start:locRedrawEventp mov ebx, 100*65536+72*5+14;640145h mov ecx, 80*65536+TESTS_NUM*LINE_HEIGHT+15+20+35 add cx, ax - mov edx, 33000000h + mov edx, 34000000h mov edi, aCaption xor eax, eax mcall diff --git a/programs/system/rdsave/trunk/rdsave.asm b/programs/system/rdsave/trunk/rdsave.asm index 550db00ed7..4fc4bd4de9 100644 --- a/programs/system/rdsave/trunk/rdsave.asm +++ b/programs/system/rdsave/trunk/rdsave.asm @@ -166,7 +166,7 @@ draw_window: mov ebx,200 shl 16 + 270 ; [x старт] *65536 + [x размер] mov ecx,200 shl 16 + 190 ; [y старт] *65536 + [y размер] mov edx,[sc.work] ; цвет рабочей области RRGGBB,8->color gl - or edx,0x33000000 + or edx,0x34000000 mov edi,title ; ЗАГОЛОВОК ОКНА mcall diff --git a/programs/system/setup/trunk/setup.asm b/programs/system/setup/trunk/setup.asm index e5a7102b7f..24fbe5452b 100644 --- a/programs/system/setup/trunk/setup.asm +++ b/programs/system/setup/trunk/setup.asm @@ -866,7 +866,7 @@ draw_window: xor eax,eax ; DRAW WINDOW mov ebx,40*65536+355+BBB mov ecx,40*65536+320 - mov edx,0x93111199 + mov edx,0x94111199 mov edi,title mcall