forked from KolibriOS/kolibrios
Fixed some bugs reported by 0CodErr. Author of fix - GerdtR.
git-svn-id: svn://kolibrios.org@3921 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79)
parent
c6da9f0129
commit
0177401fa8
@ -3,6 +3,7 @@ Shell=/rd/1/shell
|
|||||||
Processes=/rd/1/cpu
|
Processes=/rd/1/cpu
|
||||||
Themes=desktop
|
Themes=desktop
|
||||||
Device setup=setup
|
Device setup=setup
|
||||||
|
menucolor=128,128,128
|
||||||
[KFM]
|
[KFM]
|
||||||
path=/SYS/FILE MANAGERS/KFM
|
path=/SYS/FILE MANAGERS/KFM
|
||||||
param=
|
param=
|
||||||
|
|||||||
@ -3,6 +3,7 @@ Shell=/rd/1/shell
|
|||||||
Processes=/rd/1/cpu
|
Processes=/rd/1/cpu
|
||||||
Themes=desktop
|
Themes=desktop
|
||||||
Device setup=setup
|
Device setup=setup
|
||||||
|
menucolor=128,128,128
|
||||||
[KFM]
|
[KFM]
|
||||||
path=/SYS/FILE MANAGERS/KFM
|
path=/SYS/FILE MANAGERS/KFM
|
||||||
param=
|
param=
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
„¨á¯¥âç¥à ¯à®æ¥áᮢ=/rd/1/cpu
|
„¨á¯¥âç¥à ¯à®æ¥áᮢ=/rd/1/cpu
|
||||||
“¯à ¢«¥¨¥ ⥬®©=desktop
|
“¯à ¢«¥¨¥ ⥬®©=desktop
|
||||||
<EFBFBD> áâனª ãáâனáâ¢=setup
|
<EFBFBD> áâனª ãáâனáâ¢=setup
|
||||||
|
menucolor=128,128,128
|
||||||
[KFM]
|
[KFM]
|
||||||
path=/SYS/FILE MANAGERS/KFM
|
path=/SYS/FILE MANAGERS/KFM
|
||||||
param=
|
param=
|
||||||
|
|||||||
@ -3,6 +3,7 @@ Shell=/rd/1/shell
|
|||||||
Processes=/rd/1/cpu
|
Processes=/rd/1/cpu
|
||||||
Themes=desktop
|
Themes=desktop
|
||||||
Device setup=setup
|
Device setup=setup
|
||||||
|
menucolor=128,128,128
|
||||||
[KFM]
|
[KFM]
|
||||||
path=/SYS/FILE MANAGERS/KFM
|
path=/SYS/FILE MANAGERS/KFM
|
||||||
param=
|
param=
|
||||||
|
|||||||
@ -38,7 +38,6 @@ BegData equ fiStdIco.point
|
|||||||
include 'lang.inc'
|
include 'lang.inc'
|
||||||
include '../../macros.inc'
|
include '../../macros.inc'
|
||||||
include '../../proc32.inc'
|
include '../../proc32.inc'
|
||||||
;include '../../API.inc'
|
|
||||||
include '../../develop/libraries/box_lib/trunk/box_lib.mac'
|
include '../../develop/libraries/box_lib/trunk/box_lib.mac'
|
||||||
include '../../dll.inc'
|
include '../../dll.inc'
|
||||||
;include '../../debug.inc'
|
;include '../../debug.inc'
|
||||||
@ -49,6 +48,7 @@ START: ; start of execution
|
|||||||
stdcall dll.Load,IMPORTS
|
stdcall dll.Load,IMPORTS
|
||||||
test eax,eax
|
test eax,eax
|
||||||
jnz ErrLoadLibs
|
jnz ErrLoadLibs
|
||||||
|
;-------------------------------------------------------------------------------
|
||||||
|
|
||||||
; unpack deflate
|
; unpack deflate
|
||||||
mov eax,[unpack_DeflateUnpack2]
|
mov eax,[unpack_DeflateUnpack2]
|
||||||
@ -141,11 +141,8 @@ START: ; start of execution
|
|||||||
and eax,0FFh
|
and eax,0FFh
|
||||||
mov [sbIcons.max_area],eax
|
mov [sbIcons.max_area],eax
|
||||||
|
|
||||||
; int3
|
stdcall [OpenDialog_Init],OpenDialog_data
|
||||||
; mov eax,1
|
|
||||||
; mov eax,[IconsOffs+eax*4]
|
|
||||||
; stdcall [ini_del_section],IconIni,eax
|
|
||||||
; ret
|
|
||||||
jmp MSGRedrawIcons
|
jmp MSGRedrawIcons
|
||||||
|
|
||||||
messages:
|
messages:
|
||||||
@ -301,6 +298,7 @@ LButtonPress:
|
|||||||
|
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
MovingIcon:
|
MovingIcon:
|
||||||
|
;int3
|
||||||
stdcall GetNumIcon,[MouseX],[MouseY],-1
|
stdcall GetNumIcon,[MouseX],[MouseY],-1
|
||||||
mov [SelIcon],eax
|
mov [SelIcon],eax
|
||||||
stdcall RestoreBackgrnd,[SelIcon]
|
stdcall RestoreBackgrnd,[SelIcon]
|
||||||
@ -369,9 +367,9 @@ MovingIcon:
|
|||||||
;qweqwe:
|
;qweqwe:
|
||||||
|
|
||||||
mov [MovingActiv],1
|
mov [MovingActiv],1
|
||||||
mcall 51,1,MovingWnd,stack_dlg ;CreateThread MovingWnd,stack_dlg
|
mcall 51,1,MovingWnd,stack_move ;CreateThread MovingWnd,stack_dlg
|
||||||
.WaitLB:
|
.WaitLB:
|
||||||
mcall 37,2 ;GetMouseKey
|
mcall 37,2 ;GetMouseKey
|
||||||
test al,001b
|
test al,001b
|
||||||
jz .endWaitLB
|
jz .endWaitLB
|
||||||
|
|
||||||
@ -458,7 +456,7 @@ RButtonPress:
|
|||||||
jmp @b
|
jmp @b
|
||||||
@@:
|
@@:
|
||||||
|
|
||||||
mcall 51,1,RButtonWin,stack_dlg ;CreateThread RButtonWin,stack_dlg
|
mcall 51,1,RButtonWin,stack_rb ;CreateThread RButtonWin,stack_dlg
|
||||||
|
|
||||||
jmp messages
|
jmp messages
|
||||||
|
|
||||||
@ -1178,12 +1176,15 @@ NameIconsDat db ICONS_DAT,0
|
|||||||
align 4
|
align 4
|
||||||
MaxNumIcon dd 0 ;ª®«¨ç¥á⢮ ¨ª®®ª
|
MaxNumIcon dd 0 ;ª®«¨ç¥á⢮ ¨ª®®ª
|
||||||
|
|
||||||
bFixIcons dd 0
|
bFixIcons dd 1
|
||||||
bNotSave dd 0
|
bNotSave dd 0
|
||||||
|
|
||||||
LButtonActiv dd 0
|
LButtonActiv dd 0
|
||||||
RButtonActiv dd 0
|
RButtonActiv dd 0
|
||||||
MovingActiv dd 0
|
MovingActiv dd 0
|
||||||
|
DlgAddActiv dd 0
|
||||||
|
|
||||||
|
slotDlgAdd dd 0
|
||||||
|
|
||||||
IconIni db '/rd/1/icon.ini',0
|
IconIni db '/rd/1/icon.ini',0
|
||||||
|
|
||||||
@ -1242,6 +1243,7 @@ import libini,\
|
|||||||
;----- RButton.inc -------------------------------------------------------------
|
;----- RButton.inc -------------------------------------------------------------
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
secRButt db 'rbmenu',0
|
secRButt db 'rbmenu',0
|
||||||
|
keyMenuColor db 'menucolor',0
|
||||||
|
|
||||||
if lang eq ru
|
if lang eq ru
|
||||||
RMenuRedrawFon db '<27>¥à¥à¨á®¢ âì',0
|
RMenuRedrawFon db '<27>¥à¥à¨á®¢ âì',0
|
||||||
@ -1291,7 +1293,6 @@ DCaptName db '
|
|||||||
DCaptPath db '<27>ãâì',0
|
DCaptPath db '<27>ãâì',0
|
||||||
DCaptParams db '<27> à ¬¥âàë',0
|
DCaptParams db '<27> à ¬¥âàë',0
|
||||||
DCaptIcon db 'ˆª®ª ',0
|
DCaptIcon db 'ˆª®ª ',0
|
||||||
;DCaptChange db '.',0
|
|
||||||
DCaptCreate db '‘®§¤ âì',0
|
DCaptCreate db '‘®§¤ âì',0
|
||||||
DCaptProperties db 'ˆ§¬¥¨âì',0
|
DCaptProperties db 'ˆ§¬¥¨âì',0
|
||||||
DCaptCancel db 'Žâ¬¥¨âì',0
|
DCaptCancel db 'Žâ¬¥¨âì',0
|
||||||
@ -1303,7 +1304,6 @@ DCaptName db 'Name',0
|
|||||||
DCaptPath db 'Path',0
|
DCaptPath db 'Path',0
|
||||||
DCaptParams db 'Parameters',0
|
DCaptParams db 'Parameters',0
|
||||||
DCaptIcon db 'Icon',0
|
DCaptIcon db 'Icon',0
|
||||||
;DCaptChange db '.',0
|
|
||||||
DCaptCreate db 'Create',0
|
DCaptCreate db 'Create',0
|
||||||
DCaptProperties db 'Change',0
|
DCaptProperties db 'Change',0
|
||||||
DCaptCancel db 'Cancel',0
|
DCaptCancel db 'Cancel',0
|
||||||
@ -1404,6 +1404,7 @@ AddX rd 1
|
|||||||
AddY rd 1
|
AddY rd 1
|
||||||
|
|
||||||
SelIcon rd 1
|
SelIcon rd 1
|
||||||
|
DlgSelIcon rd 1
|
||||||
|
|
||||||
sc system_colors
|
sc system_colors
|
||||||
|
|
||||||
@ -1438,12 +1439,17 @@ DAreaIcon rb 256+1
|
|||||||
|
|
||||||
align 4
|
align 4
|
||||||
RBProcInfo rb 1024
|
RBProcInfo rb 1024
|
||||||
align 4
|
RBMenuColor rd 1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; OpenDialog
|
; OpenDialog
|
||||||
temp_dir_pach rb 1024
|
temp_dir_pach rb 1024
|
||||||
fname_Info rb 1024
|
fname_Info rb 1024
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
|
rb 256
|
||||||
|
stack_move:
|
||||||
|
stack_rb:
|
||||||
rb 1024
|
rb 1024
|
||||||
stack_dlg:
|
stack_dlg:
|
||||||
align 4
|
align 4
|
||||||
|
|||||||
@ -6,7 +6,9 @@ idbCancel equ 1
|
|||||||
|
|
||||||
DlgAdd:
|
DlgAdd:
|
||||||
DlgProp:
|
DlgProp:
|
||||||
|
|
||||||
mov eax,[SelIcon]
|
mov eax,[SelIcon]
|
||||||
|
mov [DlgSelIcon],eax
|
||||||
cmp eax,-1
|
cmp eax,-1
|
||||||
jne SetProp
|
jne SetProp
|
||||||
|
|
||||||
@ -92,9 +94,13 @@ SetProp:
|
|||||||
|
|
||||||
|
|
||||||
startDlg:
|
startDlg:
|
||||||
|
mcall 9,RBProcInfo,-1
|
||||||
|
mcall 18,21,dword[RBProcInfo+30]
|
||||||
|
mov [slotDlgAdd],eax
|
||||||
|
|
||||||
or [edtName.flags],ed_focus
|
or [edtName.flags],ed_focus
|
||||||
|
|
||||||
mcall 40,100111b ;SetMaskMessage 100111b
|
mcall 40,100111b ;SetMaskMessage 100111b
|
||||||
xor eax,eax
|
xor eax,eax
|
||||||
mov dword[MaxPage],0
|
mov dword[MaxPage],0
|
||||||
@@:
|
@@:
|
||||||
@ -108,8 +114,6 @@ startDlg:
|
|||||||
mov dword[MaxPage],1
|
mov dword[MaxPage],1
|
||||||
@@:
|
@@:
|
||||||
|
|
||||||
stdcall [OpenDialog_Init],OpenDialog_data
|
|
||||||
|
|
||||||
DReDraw:
|
DReDraw:
|
||||||
mcall 48,3,sc,40
|
mcall 48,3,sc,40
|
||||||
|
|
||||||
@ -141,7 +145,7 @@ DReDraw:
|
|||||||
call DRedraw
|
call DRedraw
|
||||||
|
|
||||||
DMessages:
|
DMessages:
|
||||||
mcall 10 ;WaitMessage
|
mcall 10 ;WaitMessage
|
||||||
|
|
||||||
dec eax
|
dec eax
|
||||||
jz DReDraw
|
jz DReDraw
|
||||||
@ -157,7 +161,7 @@ DMessages:
|
|||||||
|
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
DKey:
|
DKey:
|
||||||
mcall 2 ;GetKeyPressed
|
mcall 2 ;GetKeyPressed
|
||||||
cmp ah,1Bh
|
cmp ah,1Bh
|
||||||
je DExit
|
je DExit
|
||||||
cmp ah,9 ;Tab
|
cmp ah,9 ;Tab
|
||||||
@ -210,7 +214,7 @@ DNextEdit:
|
|||||||
jmp DMessages
|
jmp DMessages
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
DButton:
|
DButton:
|
||||||
mcall 17 ;GetButtonPressed
|
mcall 17 ;GetButtonPressed
|
||||||
cmp ah, idbCancel
|
cmp ah, idbCancel
|
||||||
je DExit
|
je DExit
|
||||||
cmp ah,idbChange
|
cmp ah,idbChange
|
||||||
@ -234,10 +238,10 @@ DMouse:
|
|||||||
call DrawStdIcons
|
call DrawStdIcons
|
||||||
@@:
|
@@:
|
||||||
|
|
||||||
mcall 37,2 ;GetMouseKey
|
mcall 37,2 ;GetMouseKey
|
||||||
test eax,1
|
test eax,1
|
||||||
jz DMessages
|
jz DMessages
|
||||||
mcall 37,1 ;GetMouseWinPos
|
mcall 37,1 ;GetMouseWinPos
|
||||||
|
|
||||||
test eax,10001000h
|
test eax,10001000h
|
||||||
jne DMessages
|
jne DMessages
|
||||||
@ -332,14 +336,14 @@ DSaveIcon:
|
|||||||
mcall 70,fiRunProg
|
mcall 70,fiRunProg
|
||||||
|
|
||||||
|
|
||||||
cmp [SelIcon],-1
|
cmp [DlgSelIcon],-1
|
||||||
je @f
|
je @f
|
||||||
;㤠«ï¥¬ ¨§ ini áâ àãî ¨ª®ªã
|
;㤠«ï¥¬ ¨§ ini áâ àãî ¨ª®ªã
|
||||||
mov ebx,[SelIcon]
|
mov ebx,[DlgSelIcon]
|
||||||
mov eax,[IconsOffs+ebx*4]
|
mov eax,[IconsOffs+ebx*4]
|
||||||
stdcall [ini_del_section],IconIni,eax
|
stdcall [ini_del_section],IconIni,eax
|
||||||
|
|
||||||
stdcall EditIcon,[SelIcon],DAreaIcon,DAreaName,DAreaPath,DAreaParams
|
stdcall EditIcon,[DlgSelIcon],DAreaIcon,DAreaName,DAreaPath,DAreaParams
|
||||||
jmp DExitAndSave
|
jmp DExitAndSave
|
||||||
@@:
|
@@:
|
||||||
stdcall AddIcon,[AddX],[AddY],DAreaIcon,DAreaName,DAreaPath,DAreaParams
|
stdcall AddIcon,[AddX],[AddY],DAreaIcon,DAreaName,DAreaPath,DAreaParams
|
||||||
@ -354,11 +358,13 @@ DExitAndSave:
|
|||||||
stdcall [ini_set_int],IconIni,DAreaName,keyY,[MouseY]
|
stdcall [ini_set_int],IconIni,DAreaName,keyY,[MouseY]
|
||||||
|
|
||||||
DExit:
|
DExit:
|
||||||
mcall -1 ;ExitProcess
|
mov [DlgAddActiv],0
|
||||||
|
mov [slotDlgAdd],0
|
||||||
|
mcall -1 ;ExitThread
|
||||||
|
|
||||||
;##################################################################
|
;##################################################################
|
||||||
proc DRedraw
|
proc DRedraw
|
||||||
mcall 12,1 ;RedrawWinBeg
|
mcall 12,1 ;RedrawWinBeg
|
||||||
mov edx,[sc.work]
|
mov edx,[sc.work]
|
||||||
or edx,33000000h
|
or edx,33000000h
|
||||||
mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+185>,,,DTitle
|
mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+185>,,,DTitle
|
||||||
@ -404,7 +410,7 @@ if lang eq ru
|
|||||||
or ecx,80000000h
|
or ecx,80000000h
|
||||||
mcall ,<309,35+END_ICONS_AREAH>,,DCaptCancel
|
mcall ,<309,35+END_ICONS_AREAH>,,DCaptCancel
|
||||||
|
|
||||||
cmp [SelIcon],-1
|
cmp [DlgSelIcon],-1
|
||||||
jne @f
|
jne @f
|
||||||
mpack ebx,255,35+END_ICONS_AREAH
|
mpack ebx,255,35+END_ICONS_AREAH
|
||||||
mov edx,DCaptCreate
|
mov edx,DCaptCreate
|
||||||
@ -419,7 +425,7 @@ else
|
|||||||
mcall ,<315,35+END_ICONS_AREAH>,,DCaptCancel
|
mcall ,<315,35+END_ICONS_AREAH>,,DCaptCancel
|
||||||
|
|
||||||
|
|
||||||
cmp [SelIcon],-1
|
cmp [DlgSelIcon],-1
|
||||||
jne @f
|
jne @f
|
||||||
mpack ebx,257,35+END_ICONS_AREAH
|
mpack ebx,257,35+END_ICONS_AREAH
|
||||||
mov edx,DCaptCreate
|
mov edx,DCaptCreate
|
||||||
@ -437,7 +443,7 @@ end if
|
|||||||
|
|
||||||
call DrawSelIcon
|
call DrawSelIcon
|
||||||
|
|
||||||
mcall 12,2 ;RedrawWinEnd
|
mcall 12,2 ;RedrawWinEnd
|
||||||
ret
|
ret
|
||||||
endp
|
endp
|
||||||
|
|
||||||
|
|||||||
@ -13,7 +13,7 @@ idbRProp equ 105
|
|||||||
|
|
||||||
;---- thread for rbutton -----------------------------------------------------------------------
|
;---- thread for rbutton -----------------------------------------------------------------------
|
||||||
RButtonWin:
|
RButtonWin:
|
||||||
mcall 40,100101b ;SetMaskMessage 100101b
|
mcall 40,100101b ;SetMaskMessage 100101b
|
||||||
|
|
||||||
stdcall GetNumIcon,[MouseX],[MouseY],-1
|
stdcall GetNumIcon,[MouseX],[MouseY],-1
|
||||||
mov [SelIcon],eax
|
mov [SelIcon],eax
|
||||||
@ -37,7 +37,7 @@ RButtonWin:
|
|||||||
|
|
||||||
|
|
||||||
RBWRedraw:
|
RBWRedraw:
|
||||||
mcall 12,1 ;RedrawWinBeg
|
mcall 12,1 ;RedrawWinBeg
|
||||||
mov ebx,[MouseX]
|
mov ebx,[MouseX]
|
||||||
shl ebx,16
|
shl ebx,16
|
||||||
mov bx,[RMenuW]
|
mov bx,[RMenuW]
|
||||||
@ -63,7 +63,7 @@ RBWRedraw:
|
|||||||
|
|
||||||
xor ebx,ebx
|
xor ebx,ebx
|
||||||
mov bx,[RMenuW]
|
mov bx,[RMenuW]
|
||||||
mov esi,0888888h
|
mov esi,[RBMenuColor];0888888h
|
||||||
mcall 8
|
mcall 8
|
||||||
|
|
||||||
mov ebx,50000h
|
mov ebx,50000h
|
||||||
@ -93,7 +93,7 @@ RBWRedraw:
|
|||||||
mov cx,dx
|
mov cx,dx
|
||||||
|
|
||||||
;¯¥à¢ ï à §¤¥«¨â¥«ì ï «¨¨ï
|
;¯¥à¢ ï à §¤¥«¨â¥«ì ï «¨¨ï
|
||||||
mcall 38,,,0888888h
|
mcall 38,,,[RBMenuColor];0888888h
|
||||||
add ecx,00010001h
|
add ecx,00010001h
|
||||||
mcall ,,,
|
mcall ,,,
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ RBWRedraw:
|
|||||||
shl ecx,16
|
shl ecx,16
|
||||||
mov cx,16
|
mov cx,16
|
||||||
|
|
||||||
mcall 8,,,idbRRedrawFon,0888888h ;3 ª®¯ª¨ ¢â®à®£® ¡«®ª
|
mcall 8,,,idbRRedrawFon,[RBMenuColor];0888888h ;3 ŞŽŻŞ¨ ˘âŽŕŽŁŽ ĄŤŽŞ
|
||||||
add ecx,00100000h
|
add ecx,00100000h
|
||||||
mcall ,,,idbRAlign
|
mcall ,,,idbRAlign
|
||||||
add ecx,00100000h
|
add ecx,00100000h
|
||||||
@ -134,7 +134,7 @@ RBWRedraw:
|
|||||||
mov dx,cx
|
mov dx,cx
|
||||||
shl ecx,16
|
shl ecx,16
|
||||||
mov cx,dx
|
mov cx,dx
|
||||||
mcall 38,,,0888888h
|
mcall 38,,,[RBMenuColor];0888888h
|
||||||
add ecx,00010001h
|
add ecx,00010001h
|
||||||
mcall ,,,
|
mcall ,,,
|
||||||
;------------
|
;------------
|
||||||
@ -146,9 +146,9 @@ RBWRedraw:
|
|||||||
cmp dword[SelIcon],-1
|
cmp dword[SelIcon],-1
|
||||||
je @f
|
je @f
|
||||||
|
|
||||||
mcall 8,,,idbRDel,0888888h
|
mcall 8,,,idbRDel,[RBMenuColor];0888888h
|
||||||
add ecx,00100000h
|
add ecx,00100000h
|
||||||
mcall ,,,idbRProp,0888888h
|
mcall ,,,idbRProp,[RBMenuColor];0888888h
|
||||||
|
|
||||||
mov ebx,50000h
|
mov ebx,50000h
|
||||||
mov bx,word[esp]
|
mov bx,word[esp]
|
||||||
@ -160,7 +160,7 @@ RBWRedraw:
|
|||||||
jmp .endRM
|
jmp .endRM
|
||||||
@@:
|
@@:
|
||||||
|
|
||||||
mcall 8,,,idbRAdd,0888888h
|
mcall 8,,,idbRAdd,[RBMenuColor];0888888h
|
||||||
mov ebx,50000h
|
mov ebx,50000h
|
||||||
mov bx,word[esp]
|
mov bx,word[esp]
|
||||||
add bx,16*3+4+5
|
add bx,16*3+4+5
|
||||||
@ -169,14 +169,14 @@ RBWRedraw:
|
|||||||
.endRM:
|
.endRM:
|
||||||
|
|
||||||
pop ecx
|
pop ecx
|
||||||
mcall 12,2 ;RedrawWinEnd
|
mcall 12,2 ;RedrawWinEnd
|
||||||
|
|
||||||
mcall 9,RBProcInfo,-1 ;GetThreadInfo RBProcInfo,-1
|
mcall 9,RBProcInfo,-1 ;GetThreadInfo RBProcInfo,-1
|
||||||
mcall 18,21,dword[RBProcInfo+30]
|
mcall 18,21,dword[RBProcInfo+30]
|
||||||
m2m dword[RBSlot],eax
|
m2m dword[RBSlot],eax
|
||||||
|
|
||||||
RBWMessages:
|
RBWMessages:
|
||||||
mcall 10 ;WaitMessage
|
mcall 10 ;WaitMessage
|
||||||
dec eax
|
dec eax
|
||||||
jz RBWRedraw
|
jz RBWRedraw
|
||||||
sub eax,2
|
sub eax,2
|
||||||
@ -186,7 +186,7 @@ RBWMessages:
|
|||||||
jmp RBWMessages
|
jmp RBWMessages
|
||||||
|
|
||||||
RBWButton:
|
RBWButton:
|
||||||
mcall 17 ;GetButtonPressed
|
mcall 17 ;GetButtonPressed
|
||||||
shr eax,8
|
shr eax,8
|
||||||
cmp eax,idbRRedrawFon
|
cmp eax,idbRRedrawFon
|
||||||
jz RBRedrawFon
|
jz RBRedrawFon
|
||||||
@ -212,10 +212,10 @@ RBWButton:
|
|||||||
jmp RBWExit
|
jmp RBWExit
|
||||||
|
|
||||||
RBWMouse:
|
RBWMouse:
|
||||||
mcall 37,2 ;GetMouseKey
|
mcall 37,2 ;GetMouseKey
|
||||||
test eax,111b
|
test eax,111b
|
||||||
jz RBWMessages
|
jz RBWMessages
|
||||||
mcall 37,0 ;GetMousePos
|
mcall 37,0 ;GetMousePos
|
||||||
xor ebx,ebx
|
xor ebx,ebx
|
||||||
mov bx,ax ;y
|
mov bx,ax ;y
|
||||||
shr eax,16 ;x
|
shr eax,16 ;x
|
||||||
@ -231,7 +231,7 @@ RBWMouse:
|
|||||||
RBWExit:
|
RBWExit:
|
||||||
mcall 68,13,[RBUser]
|
mcall 68,13,[RBUser]
|
||||||
mov [RButtonActiv],0
|
mov [RButtonActiv],0
|
||||||
mcall -1 ;ExitProcess
|
mcall -1 ;ExitProcess
|
||||||
|
|
||||||
|
|
||||||
RBRedrawFon:
|
RBRedrawFon:
|
||||||
@ -266,8 +266,11 @@ RBFixIcons:
|
|||||||
jmp RBWExit
|
jmp RBWExit
|
||||||
|
|
||||||
RBAdd:
|
RBAdd:
|
||||||
; mov [DlgAddActiv],1
|
cmp [DlgAddActiv],1
|
||||||
mcall 51,1,DlgAdd,stack_dlg ;CreateThread DlgAdd,stack_dlg
|
je RBWSetActivWin
|
||||||
|
mov [DlgAddActiv],1
|
||||||
|
|
||||||
|
mcall 51,1,DlgAdd,stack_dlg ;CreateThread DlgAdd,stack_dlg
|
||||||
jmp RBWExit
|
jmp RBWExit
|
||||||
|
|
||||||
RBDelete:
|
RBDelete:
|
||||||
@ -289,10 +292,16 @@ RBDelete:
|
|||||||
jmp RBRedrawFon
|
jmp RBRedrawFon
|
||||||
|
|
||||||
RBPropeties:
|
RBPropeties:
|
||||||
; mov [DlgAddActiv],1
|
cmp [DlgAddActiv],1
|
||||||
mcall 51,1,DlgProp,stack_dlg ;CreateThread DlgProp,stack_dlg
|
je RBWSetActivWin
|
||||||
|
mov [DlgAddActiv],1
|
||||||
|
|
||||||
|
mcall 51,1,DlgProp,stack_dlg ;CreateThread DlgProp,stack_dlg
|
||||||
jmp RBWExit
|
jmp RBWExit
|
||||||
|
|
||||||
|
RBWSetActivWin:
|
||||||
|
mcall 18,3,[slotDlgAdd]
|
||||||
|
jmp RBWExit
|
||||||
|
|
||||||
|
|
||||||
proc AlignIcons
|
proc AlignIcons
|
||||||
@ -443,6 +452,19 @@ proc GetUserBut stdcall,f_name,sec_name,key_name,key_value
|
|||||||
|
|
||||||
push ebx esi edi
|
push ebx esi edi
|
||||||
|
|
||||||
|
mov edi,[key_name]
|
||||||
|
mov esi,keyMenuColor
|
||||||
|
@@: lodsb
|
||||||
|
scasb
|
||||||
|
jne @f
|
||||||
|
test al,al
|
||||||
|
jnz @b
|
||||||
|
|
||||||
|
stdcall [ini_get_color],[f_name],[sec_name],[key_name],0888888h
|
||||||
|
mov [RBMenuColor],eax
|
||||||
|
ret
|
||||||
|
@@:
|
||||||
|
|
||||||
mov edi,[key_name] ;®¯à¥¤¥«ï¥¬ è¨à¨ã ¬¥î
|
mov edi,[key_name] ;®¯à¥¤¥«ï¥¬ è¨à¨ã ¬¥î
|
||||||
xor eax,eax
|
xor eax,eax
|
||||||
or ecx,-1
|
or ecx,-1
|
||||||
@ -491,7 +513,7 @@ endp
|
|||||||
|
|
||||||
proc Ini_SavePos stdcall,f_name,sec_name
|
proc Ini_SavePos stdcall,f_name,sec_name
|
||||||
push ebx edi esi
|
push ebx edi esi
|
||||||
;int3
|
|
||||||
xor ebx,ebx
|
xor ebx,ebx
|
||||||
.SearchSect:
|
.SearchSect:
|
||||||
mov edi,[IconsOffs+ebx*4]
|
mov edi,[IconsOffs+ebx*4]
|
||||||
@ -520,6 +542,7 @@ proc Ini_SavePos stdcall,f_name,sec_name
|
|||||||
repne scasb
|
repne scasb
|
||||||
repne scasb
|
repne scasb
|
||||||
|
|
||||||
|
;int3
|
||||||
movzx eax,word[edi+2]
|
movzx eax,word[edi+2]
|
||||||
test eax,8000h
|
test eax,8000h
|
||||||
jz @f
|
jz @f
|
||||||
|
|||||||
5
programs/system/icon_new/build.bat
Normal file
5
programs/system/icon_new/build.bat
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
@echo lang fix en >lang.inc
|
||||||
|
@fasm -m 16384 @icon.asm @icon
|
||||||
|
@erase lang.inc
|
||||||
|
@kpack @icon
|
||||||
|
@pause
|
||||||
13
programs/system/icon_new/build.sh
Normal file
13
programs/system/icon_new/build.sh
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# This script does for linux the same as build.bat for DOS,
|
||||||
|
|
||||||
|
echo "lang fix en"
|
||||||
|
echo "lang fix en" > lang.inc
|
||||||
|
fasm -m 16384 @icon.asm @icon
|
||||||
|
kpack @icon
|
||||||
|
rm -f lang.inc
|
||||||
|
exit 0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
131
programs/system/icon_new/ico.inc
Normal file
131
programs/system/icon_new/ico.inc
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
include 'libimg/libimg.asm'
|
||||||
|
|
||||||
|
|
||||||
|
;¢®§¢à é ¥â 㪠§ â¥«ì ¯ ¬ïâì «¨¡® 0
|
||||||
|
LoadIcon:
|
||||||
|
path equ ebp+8
|
||||||
|
BuffR equ ebp-16
|
||||||
|
BuffH equ ebp-22
|
||||||
|
endTablI equ ebp-26
|
||||||
|
|
||||||
|
push ebp
|
||||||
|
mov ebp,esp
|
||||||
|
add esp,-26
|
||||||
|
|
||||||
|
push ebx edi esi
|
||||||
|
|
||||||
|
;--------------------------- ¯à®¢¥à塞 - § £à㦥 «¨ íâ®â ä ©« á ¨ª®ª®© ------
|
||||||
|
xor ebx,ebx
|
||||||
|
.SearchIco:
|
||||||
|
mov edi,[path]
|
||||||
|
mov esi,[IcoTable+ebx]
|
||||||
|
@@: lodsb
|
||||||
|
scasb
|
||||||
|
jne @f
|
||||||
|
test al,al
|
||||||
|
jnz @b
|
||||||
|
|
||||||
|
mov eax,[IcoTable+ebx+4]
|
||||||
|
pop esi edi ebx
|
||||||
|
leave
|
||||||
|
ret 4
|
||||||
|
@@:
|
||||||
|
add ebx,8
|
||||||
|
cmp ebx,50*8
|
||||||
|
jne @f
|
||||||
|
|
||||||
|
xor eax,eax
|
||||||
|
pop esi edi ebx
|
||||||
|
leave
|
||||||
|
ret 4
|
||||||
|
@@:
|
||||||
|
cmp [IcoTable+ebx],0
|
||||||
|
jnz .SearchIco
|
||||||
|
|
||||||
|
;-------------------------------------------------------------------------------
|
||||||
|
mov [endTablI],ebx
|
||||||
|
|
||||||
|
m2m dword[fiIcon.path],dword[path]
|
||||||
|
mcall 70,fiIcon
|
||||||
|
test eax,eax
|
||||||
|
jz @f
|
||||||
|
|
||||||
|
xor eax,eax
|
||||||
|
pop esi edi ebx
|
||||||
|
leave
|
||||||
|
ret 4
|
||||||
|
|
||||||
|
@@:
|
||||||
|
xor ecx,ecx
|
||||||
|
mov cx,[BuffH+4]
|
||||||
|
xor edi,edi
|
||||||
|
.TestRecord:
|
||||||
|
cmp word[BuffR],2020h
|
||||||
|
jne .NextRec
|
||||||
|
cmp byte[BuffR+2],0
|
||||||
|
jne .NextRec
|
||||||
|
|
||||||
|
lea eax,[BuffR]
|
||||||
|
stdcall LoadIco32b, [path],eax
|
||||||
|
|
||||||
|
|
||||||
|
pop esi edi ebx
|
||||||
|
leave
|
||||||
|
ret 4
|
||||||
|
|
||||||
|
.NextRec:
|
||||||
|
inc edi
|
||||||
|
|
||||||
|
mov eax,edi
|
||||||
|
shl eax,4
|
||||||
|
add eax,6
|
||||||
|
mov dword[fiIcon.pos],eax
|
||||||
|
mcall 70,fiIcon
|
||||||
|
|
||||||
|
loop .TestRecord
|
||||||
|
|
||||||
|
xor eax,eax
|
||||||
|
pop esi edi ebx
|
||||||
|
leave
|
||||||
|
ret 4
|
||||||
|
restore path
|
||||||
|
restore BuffH
|
||||||
|
restore BuffR
|
||||||
|
|
||||||
|
proc LoadIco32b, path,bufHeader
|
||||||
|
local ImgBuff:DWORD
|
||||||
|
mov edi,[bufHeader]
|
||||||
|
cmp dword[edi+8],10A8h
|
||||||
|
je @f
|
||||||
|
|
||||||
|
xor eax,eax
|
||||||
|
ret
|
||||||
|
|
||||||
|
@@:
|
||||||
|
mcall 68,12,32*32*4*2
|
||||||
|
mov ebx,[endTablI]
|
||||||
|
mov [IcoTable+ebx],eax
|
||||||
|
add eax,4096
|
||||||
|
mov [IcoTable+ebx+4],eax
|
||||||
|
mov [ImgBuff],eax
|
||||||
|
m2m dword[fiIcon.pos],dword[edi+12]
|
||||||
|
mov dword[fiIcon.size],32*32*4
|
||||||
|
mcall 70,fiIcon
|
||||||
|
|
||||||
|
mov eax,[ImgBuff]
|
||||||
|
ret
|
||||||
|
endp
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
fiIcon:
|
||||||
|
dd 0
|
||||||
|
.pos dd 0
|
||||||
|
dd 0
|
||||||
|
.size dd 22
|
||||||
|
.point dd 0
|
||||||
|
db 0
|
||||||
|
.path dd 0
|
||||||
|
|
||||||
|
|
||||||
|
IcoTable rd 2*50 ;(name(4), data(4)). End - dword 0
|
||||||
@ -3,6 +3,7 @@
|
|||||||
„¨á¯¥âç¥à ¯à®æ¥áᮢ=/rd/1/cpu
|
„¨á¯¥âç¥à ¯à®æ¥áᮢ=/rd/1/cpu
|
||||||
“¯à ¢«¥¨¥ ⥬®©=desktop
|
“¯à ¢«¥¨¥ ⥬®©=desktop
|
||||||
<EFBFBD> áâனª ãáâனáâ¢=setup
|
<EFBFBD> áâனª ãáâனáâ¢=setup
|
||||||
|
menucolor=128,128,128
|
||||||
[KFM]
|
[KFM]
|
||||||
path=/SYS/FILE MANAGERS/KFM
|
path=/SYS/FILE MANAGERS/KFM
|
||||||
param=
|
param=
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user