- для ошибок у которых нет текста описания теперь выдает всегда

текст ошибки "Unknown Error".
- исправлена ошибка приводящая к вылету при копировании нескольких файлов
  на уже существующие и выборе отмены от продолжения копирования.
This commit is contained in:
savelij13 2026-01-22 17:36:03 +03:00
parent 50a6074f16
commit 8f458146bc
38 changed files with 146 additions and 91 deletions

View File

@ -1,4 +1,11 @@
22.01.2026
FlexNavigator 1.16.06
- ¤«ï ®è¨¡®ª ã ª®â®àëå ­¥â ⥪áâ  ®¯¨á ­¨ï ⥯¥àì ¢ë¤ ¥â ¢á¥£¤ 
⥪á⠮訡ª¨ "Unknown Error".
- ¨á¯à ¢«¥­  ®è¨¡ª  ¯à¨¢®¤ïé ï ª ¢ë«¥â㠯ਠª®¯¨à®¢ ­¨¨ ­¥áª®«ìª¨å ä ©«®¢
­  㦥 áãé¥áâ¢ãî騥 ¨ ¢ë¡®à¥ ®â¬¥­ë ®â ¯à®¤®«¦¥­¨ï ª®¯¨à®¢ ­¨ï.
11.01.2026
FlexNavigator 1.16.05
- ¢ ä㭪樨 ⥪á⮢®£® ¢¢®¤  § ¡«®ª¨à®¢ ­  ®¡à ¡®âª  ª« ¢¨è¨

View File

@ -1,6 +1,7 @@
Flex navigator TODO:
[] ¯à¨ ®è¨¡ª¥ § ¯¨á¨ ¯à¨ ª®¯¨à®¢ ­¨¨ ä ©« 㤠«ï¥âáï ¡¥§ ®ª­  ®¡ ®è¨¡ª¥.
[] ¯« £¨­ CD Player ¨á¯à ¢¨âì ᬥ­ã ¤¨áª .
[] ä ©« á à áè¨à¥­¨¥¬ fln ¯® F3 ¢ë§ë¢ ¥â § ¢¨á ­¨¥.
[] ¨á¯à ¢¨âì £«®¡ «ì­ë© ¨­¤¨ª â®à ¯à®æ¥áá  ª®¯¨à®®¢ ­¨ï, ¯®ª  ¯à¨¢¨à ¥â.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
fn/fn.exe

Binary file not shown.

View File

@ -1,5 +1,5 @@
10.01.2026
11.01.2026
FlexNavigator 1.16.05
- ¢ ä㭪樨 ⥪á⮢®£® ¢¢®¤  § ¡«®ª¨à®¢ ­  ®¡à ¡®âª  ª« ¢¨è¨
ALT, ¢ë§ë¢ «® § ¢¨á ­¨¥ ¯à¨ ¯®¯ë⪥ ᤥ« âì ᬥ­ã ¤¨áª  (ALT/Fx).

View File

@ -1,11 +1,12 @@
; LAST UPDATE: 11.01.2026 savelij
; LAST UPDATE: 18.01.2026 savelij
NUM_FILES_PANEL EQU 17 ; ª®«¨ç¥á⢮ ä ©«®¢ ¢ á⮫¡æ¥ ¯ ­¥«¨
NUM_PAGES_FN EQU 7 ; ª®«¨ç¥á⢮ áâà ­¨æ ¯ ¬ï⨠¤«ï à ¡®âë FN
DateMonthFormat ; ä®à¬ â ¢ë¢®¤  ¬¥áïæ  ¢ ¤ â¥
.Digit EQU 1 ; ¬¥áïæ æ¨äன 02.08.2025
.Text EQU 2 ; ¬¥áïæ â¥ªá⮬ 2 Aug 2025
EXT_BUF_SIZE EQU 0x400 ; à §¬¥à ¡ãä¥à  ¤«ï ä ©«  ext ¤«ï à á¯ ª®¢ª¨
INIT_VAR 0x8000
SETVAR WorkBuffer, 0x400 ; à ¡®ç¨© ¡ãä¥à

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 22.08.2025 savelij
; LAST UPDATE: 18.01.2026 savelij
include macros.a80
@ -182,4 +182,4 @@ MAIN
EXEend:
include fnmain.a80
include fn_main.a80

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 06.07.2025 savelij
; LAST UPDATE: 21.01.2026 savelij
MAKEWINDOW MACRO TYPE
CALL JUMPS.MakeWindow
@ -149,3 +149,12 @@ HDR_FLX MACRO STRING,OFFSET,ENTRY,MODES
ENDIF
DB 3 DUP 0
ENDM
; ¯®¤¬¥­  LD A,0 ­  XOR A, ¨­ ç¥ ¢áâ ¢ª  ª ª ¥áâì
LD_A MACRO NUM
IF NUM = 0
XOR A
ELSE
LD A,NUM
ENDIF
ENDM

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 07.09.2025 savelij
; LAST UPDATE: 18.01.2026 savelij
include fn_const.a80
include fn_macros.a80
@ -379,12 +379,12 @@ ComExit CALL ResDrivers
SPDSS DSSF.FREEMEM
SPDSS DSSF.EXIT,0
include fnwin.a80
include fnprint.a80
include fninput.a80
include fnbar.a80
include fnmouse.a80
include fnsys.a80
include fn_win.a80
include fn_print.a80
include fn_input.a80
include fn_bar.a80
include fn_mouse.a80
include fn_sys.a80
; ‘â àâ
MainStartFN: DI
@ -463,19 +463,19 @@ MouseOnOff LD A,(MouseFlag)
RET
START_SORT
include fnsort.a80
include fn_sort.a80
END_SORT
START_TREE
include fntree.a80
include fn_tree.a80
END_TREE
include fnpanel.a80
include fndos.a80
include fn_panel.a80
include fn_dos.a80
include fnwork.a80
include fnmenu.a80
include fninit.a80
include fndosline.a80
include fntab.a80
include fn_work.a80
include fn_menu.a80
include fn_init.a80
include fn_dosline.a80
include fn_tab.a80
END_BLOCK_1:
DEPHASE ; BASE_ADDR
@ -492,11 +492,11 @@ REZ2_BUFFERS
_MINUSVAR .ENDPATHSRC, WORD ;  ¤à¥á 墮áâ  ¯ã⨠¨áâ®ç­¨ª 
_MINUSVAR .CURR_DIRNAME, WORD ; ⥪ã騩  ¤à¥á ¢ ¯ãâ¨
include rez2_fnfunct.a80
include rez2_fnsearch.a80
include rez2_fnconfig.a80
include rez2_fnerror.a80
include rez2_fntab.a80
include rez2_fn_funct.a80
include rez2_fn_search.a80
include rez2_fn_config.a80
include rez2_fn_error.a80
include rez2_fn_tab.a80
END_BLOCK_2:
DEPHASE ; 0x4000
; ==============resident 2==============
@ -522,14 +522,14 @@ REZ3_BUFFERS
_INIT_VAR 0x8000 ; á ª®­æ  áâà ­¨æë
_MINUSVAR .DOShistory, 0x200 ;times 0x200 db 0
_MINUSVAR .fnedit_ext, WorkBuffer_Size ;times 0x400 db 0
_MINUSVAR .fnview_ext, WorkBuffer_Size ;times 0x400 db 0
_MINUSVAR .fn_ext, WorkBuffer_Size ;times 0x400 db 0
_MINUSVAR .fnedit_ext, EXT_BUF_SIZE ;times 0x400 db 0
_MINUSVAR .fnview_ext, EXT_BUF_SIZE ;times 0x400 db 0
_MINUSVAR .fn_ext, EXT_BUF_SIZE ;times 0x400 db 0
include rez3_fnnext.a80
include rez3_fnmark.a80
include rez3_fnmisc.a80
include rez3_fntab.a80
include rez3_fn_extensions.a80
include rez3_fn_mark.a80
include rez3_fn_misc.a80
include rez3_fn_tab.a80
END_BLOCK_3:
DEPHASE ; 0x4000
; ==============resident 3==============

View File

@ -1,7 +1,7 @@
; LAST UPDATE: 10.01.2026 savelij
; LAST UPDATE: 22.01.2026 savelij
FLEX_VERS
.NAVIGATOR EQU "1.16.05"
.NAVIGATOR EQU "1.16.06"
.EDITOR EQU "1.11"
.VIEWER EQU "1.07"

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 01.08.2025 savelij
; LAST UPDATE: 18.01.2026 savelij
;[]----------------------------------------------------------[]
;<3B>à®æ¥¤ãà  ®âç¨áª¨ 0 íªà ­ 
@ -156,7 +156,7 @@ MakeWindow: EX (SP),IY
JP Z,PutSBdown
CP WINSUBOBJ.RESTOREWIN ; ¢®ááâ ­®¢«¥­¨¥ ç á⨠íªà ­ 
JP Z,RestoreWindow
CP WINSUBOBJ.ADRTEXT
CP WINSUBOBJ.ADRTEXT ; ⥪áâ ¯® 㪠§ ­­®¬ã  ¤à¥áã
JP Z,PutAdrTxtLine
POP HL
POP AF

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 07.09.2025 savelij
; LAST UPDATE: 17.01.2026 savelij
;[]===========================================================[]
CursUp LD A,(IY + PANEL.FILES_ALL)
@ -1466,6 +1466,7 @@ RunFLXfile LD A,(HL)
RET
;[]-----------------------------------------------------------[]
; ¯à®¢¥àª  ¯® à áè¨à¥­¨î ᮣ« á­® ¯à®¯¨á ­­®¬ã ¢ EXT ä ©«¥
TestEXT: PUSH IX
LD IXL,E
LD IXH,D

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 27.06.2025 savelij
; LAST UPDATE: 18.01.2026 savelij
DB 0,0
DB " Flex Navigator",0,0
@ -109,7 +109,7 @@
DB " All files - ᯨ᮪ ¢á¥å ä ©«®¢",0
DB " Execute files - ᯨ᮪ § ¯ã᪠¥¬ëå ä ©«®¢",0
DB " *.* - ãáâ ­®¢¨âì 䨫ìâà ¤«ï ᯨ᪠ ä ©«®¢",0
DB " Filtr... - 䨫ìâà ¤«ï ᯨ᪠ ä ©«®¢",0
DB " Filter... - 䨫ìâà ¤«ï ᯨ᪠ ä ©«®¢",0
DB " Name - á®àâ¨à®¢ âì ¯® ¨¬¥­¨",0
DB " Extention - á®àâ¨à®¢ âì ¯® à áè¨à¥­¨î",0
DB " Date - á®àâ¨à®¢ âì ¯® ¤ â¥",0
@ -121,9 +121,10 @@
DB " Version... - ¨­ä®à¬ æ¨ï ® ¢¥àᨨ Flex Navigator",0,0,0," ",9
DB " ”€‰‹› <20>˜ˆ<CB9C><EFBFBD>ˆ‰",0,0
DB " „«ï ¯®¤ª«î祭¨ï ¢­¥è­¨å ¯à®£à ¬¬ ¤«ï à ¡®âë á ä ©« ¬¨ áãé¥áâ¢ãîâ ä ©«ë",0
DB "à áè¨à¥­¨©. Flex Navigator ¨á¯®«ì§ã¥â âਠ䠩«  à áè¨à¥­¨©:",0,0
DB "à áè¨à¥­¨©. Œ ªá¨¬ «ì­ë© à §¬¥à ä ©«  à áè¨à¥­¨© - 1024 ¡ ©â .",0
DB "Flex Navigator ¨á¯®«ì§ã¥â âਠ䠩«  à áè¨à¥­¨©:",0,0
DB " fn.ext - £« ¢­ë© ä ©« à áè¨à¥­¨©",0
DB " fnview.ext - ä ©« à áè¨à¥­¨© ¯à®áâମâà ",0
DB " fnview.ext - ä ©« à áè¨à¥­¨© ¯à®á¬®âà ",0
DB " fnedit.ext - ä ©« à áè¨à¥­¨© । ªâ®à ",0,0
DB " ”®à¬ â ä ©«®¢ à áè¨à¥­¨©:",0,0
DB " ext: [drive]:\\[path]\\filename.ext parametr",0,0

View File

@ -3,10 +3,11 @@ Flex Navigator для компьютера Sprinter
Собранные файлы забирать из папки fn
`FlexNavigator 1.16.05`
- в функции текстового ввода заблокирована обработка клавиши
ALT, вызывало зависание при попытке сделать смену диска (ALT/Fx).
- убрано удаление в режиме просмотра дерева.
`FlexNavigator 1.16.06`
- для ошибок у которых нет текста описания теперь выдает всегда
текст ошибки "Unknown Error".
- исправлена ошибка приводящая к вылету при копировании нескольких файлов
на уже существующие и выборе отмены от продолжения копирования.
`FileViewer.flx 1.07`
- мелкое исправление позиции вывода даты/времени.

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 01.08.2025 savelij
; LAST UPDATE: 22.01.2026 savelij
; !FIXIT ¯¥à¥¤¥« âì ®¤¨­ ª®¢ë¥ ®ª­  á à §­ë¬ ⥪á⮬ ¤«ï ®è¨¡®ª ¯®¤  ¢â®¬ â¨ç¥áªãî ¯à®æ¥¤ãàã
;[]===========================================================[]
@ -17,18 +17,25 @@ DOSErrorR ;[x] 30/07/23 -bug
JR .INT_ERR
.calc_addr: LD HL,.ErrorWins
.INT_ERR ADD A,A ; *2
ADD A,A ; *4
ADD A,L
.INT_ERR EX DE,HL
LD L,A
ADC A,H
SUB L
LD H,A
LD H,0
ADD HL,HL ; *2
ADD HL,HL ; *4
ADD HL,DE
.goto_addr LD E,(HL)
INC HL
LD D,(HL) ;  ¤à¥á ⥪áâ  á • ¯®§¨æ¨¥©
INC HL
LD A,(DE)
LD A,D
OR E
JR NZ,.L1
LD HL,.UNKerror
LD E,(HL)
INC HL
LD D,(HL)
INC HL
.L1 LD A,(DE)
INC DE
LD C,A ; X ¯®§¨æ¨ï ¬« ¤è¨© ¡ ©â
LD A,(DE)

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 11.01.2026 savelij
; LAST UPDATE: 22.01.2026 savelij
;[]==========================================================[]
CopyFilesR LD A,(IY + PANEL.FILES_ALL)
@ -288,7 +288,7 @@ CopyNextFile LD IX,(COPY.PathCurrFile)
SPDSS DSSF.OPEN,,FILEMODE.R ; ®âªàë⨥ ­  ç⥭¨¥
JP C,CopyError1
LD (COPY.FHandleSrc),A
LD HL,(COPY.PathDst) ; ®âªà뢠¥¬ ä ©« ¯à¨¥¬­¨ª
LD HL,(COPY.PathDst) ; ¬¥­ï¥¬ ¯ãâì ­  ¯ãâì ªã¤  ª®¯¨à®¢ âì
SPDSS DSSF.CHDIR
JP C,CopyError2
LD IX,(COPY.PathCurrFile)
@ -305,12 +305,24 @@ CopyNextFile LD IX,(COPY.PathCurrFile)
LD C,DSSF.CREATE
.L2 LD A,(IX + FileHDR.Attr)
SPDSS ; á®§¤ ­¨¥ ä ©« 
LD (COPY.FHandleDst),A
JR NC,.CopyLp2
CP ERR_DSS.FILE_EXISTS
JP NZ,CopyError2
CALL OverWrite ; ä ©« áãé¥áâ¢ãâ, § ¯à®á ­  ¯¥à¥§ ¯¨áì
.CopyLp2 LD (COPY.FHandleDst),A
LD HL,(COPY.CurrReadBytes)
CALL OverWrite ; ä ©« áãé¥áâ¢ã¥â, § ¯à®á ­  ¯¥à¥§ ¯¨áì
AND A ; OverWrite.REWRITE
JR Z,.CopyLp2 ; ¯à®¤®«¦ âì á ¯¥à¥§ ¯¨áìî
DEC A ; OverWrite.SKIP
JP Z,CopyNextFile.CloseFile1 ; ¯à®¯ã᪠ª®¯¨à®¢ ­¨ï
; ¯à¥à뢠­¨¥ ª®¯¨à®¢ ­¨ï OverWrite.BREAK
LD A,(COPY.FHandleSrc)
SPDSS DSSF.CLOSE
LD A,(COPY.MemID)
SPDSS DSSF.FREEMEM
JP CopyEnd
; ¯¥à¥§ ¯¨áì ä ©«  ¨ ¯à®¤®«¦¥­¨¥
.CopyLp2 LD HL,(COPY.CurrReadBytes)
LD A,H
OR L
LD HL,(COPY.CurrReadBytes + 2)
@ -1000,7 +1012,14 @@ CopyErrorFileDelete:
RET
;--------------------------------------------------------------
OverWrite CALL PointerMousePointer
; ‡ ¯à®á ¯à¨ ª®¯¨à®¢ ­¨¨ ¢ áãé¥áâ¢ãî騩 ä ©« ­  ¯à®¤®«¦¥­¨¥.
OverWrite
_INIT_VAR
_SETVAR .REWRITE ; ¯¥à¥§ ¯¨áì ä ©« 
_SETVAR .SKIP ; ¯à®¯ã᪠ª®¯¨à®¢ ­¨ï
_SETVAR .BREAK ; ¯à¥ªà é¥­¨¥ ª®¯¨à®¢ ­¨ï
CALL PointerMousePointer
MAKEWINDOW WINSUBOBJ.STORE
W_MAIN 180,88,280,56
W_FILL 4,2,272,10,COLORI.GREEN
@ -1036,13 +1055,13 @@ OverWrite CALL PointerMousePointer
LD BC,114
LD A,COLORP.HIGHGRAY + COLORI.BLACK
CALL PrintPathCentr
OvWrtLp LD IX,REZ2TAB.OverWrtTab
.OvWrtLp LD IX,REZ2TAB.OverWrtTab
CALL CheckCoordsMouse
SPDSS DSSF.SCANKEY
JR Z,OvWrtLp
JR Z,.OvWrtLp
LD A,B
OR A
JR NZ,OvWrtLp
JR NZ,.OvWrtLp
LD A,E
CP 0x1B
LD HL,OverExit
@ -1061,7 +1080,7 @@ OvWrtLp LD IX,REZ2TAB.OverWrtTab
LD HL,OverSkip
JR Z,OvrJump
CP 'C'
JR NZ,OvWrtLp
JR NZ,.OvWrtLp
LD HL,OverExit
OvrJump
WINDOWCLOSE
@ -1079,6 +1098,8 @@ OverWrtFile CALL PointerMouseClock
POP HL
LD A,(IX + FileHDR.Attr)
SPDSS DSSF.CREATE
LD (COPY.FHandleDst),A ; ¯à¨ ¯¥à¥§ ¯¨á¨ ®¡­®¢«ï¥¬ 奭¤«¥à ¢ë室­®£® ä ©« 
LD_A OverWrite.REWRITE ; ¢ë室 á ¯¥à¥§ ¯¨áìî ä ©« 
RET
OverSkip CALL PointerMouseClock
@ -1105,21 +1126,24 @@ OverSkip CALL PointerMouseClock
LD (IX + PROGRESSBAR.CURR_PAGE + 2),L
LD (IX + PROGRESSBAR.CURR_PAGE + 3),H
CALL DrawProgressBar
LD HL,CopyNextFile.CloseFile1
EX (SP),HL
; LD HL,CopyNextFile.CloseFile1
; EX (SP),HL
LD A,OverWrite.SKIP ; ¢ë室 á ¯à®¯ã᪮¬ ª®¯¨à®¢ ­¨ï
RET
OverExit INC SP
INC SP
LD IX,(COPY.PathCurrFile)
BIT FileHDR.B_MARK,(IX + FileHDR.Flag)
JP Z,CopyNextFile.CloseFile1
LD A,(COPY.FHandleSrc)
SPDSS DSSF.CLOSE
LD A,(COPY.MemID)
SPDSS DSSF.FREEMEM
POP IY
JP CopyEnd
OverExit LD A,OverWrite.BREAK ; ¢ë室 á ¯à¥ªà é¥­¨¥¬ ª®¯¨à®¢ ­¨ï
RET
; INC SP
; INC SP
; LD IX,(COPY.PathCurrFile)
; BIT FileHDR.B_MARK,(IX + FileHDR.Flag)
; JP Z,CopyNextFile.CloseFile1
; LD A,(COPY.FHandleSrc)
; SPDSS DSSF.CLOSE
; LD A,(COPY.MemID)
; SPDSS DSSF.FREEMEM
; POP IY
; JP CopyEnd
; Š®­¢¥àá¨ï à §¬¥à  ¢ ¡ ©â å ¢ ª®«¨ç¥á⢮ áâà ­¨æ
; <20>  ¢å®¤¥:

View File

@ -1,5 +1,5 @@
; LAST UPDATE: 15.08.2025 savelij
; LAST UPDATE: 18.01.2026 savelij
;[]==========================================================[]
InitExtention: LD HL,INIFILES.ExtName1
@ -26,16 +26,17 @@ InitExt: LD (.EXTdata),DE
PUSH DE
SPDSS DSSF.CLOSE
POP BC
LD HL,WorkBuffer
LD DE,0x0000
LD HL,WorkBuffer ; ¢å®¤­®© ¡ãä¥à
LD DE,0x0000 ; ¡ãä¥à à á¯ ª®¢ ­­®£® ä ©«  à áè¨à¥­¨©
.EXTdata EQU $-2
EXX
LD BC,0x03FE
LD BC,EXT_BUF_SIZE - 2 ; à §¬¥à ¢ë室­®£® ¡ãä¥à 
EXX
.loop: CALL InitExtLine
JR NC,.loop
.loop: CALL InitExtLine ; à á¯ ª®¢ª  ®¤­®£® à áè¨à¥­¨ï
JR NC,.loop ; à á¯ ª®¢ª  á«¥¤ãî饣® à áè¨à¥­¨ï ¥á«¨ ­¥ ª®­ç¨«¨áì
RET
; à á¯ ª®¢ª  ä ©«  à áè¨à¥­¨© (®¤­® à áè¨à¥­¨¥ §  ¢ë§®¢)
InitExtLine: LD (.InExtSv),DE
SUB A
LD (DE),A
@ -59,21 +60,22 @@ InitExtLine: LD (.InExtSv),DE
RET Z
DEC HL
INC BC
LD IXL,0x04
LD IXL,3 + 1 ; à §¬¥à à áè¨à¥­¨ï 3 + 1 ¡ ©â à §¤¥«¨â¥«ï ":"
; ª®¯¨à®¢ ­¨¥ à áè¨à¥­¨ï ä ©« 
.L1: LD A,B
OR C
SCF
RET Z
RET Z ; ª®­â஫ì à §¬¥à  ¢å®¤­®£® ä ©« 
EXX
LD A,B
OR C
SCF
EXX
RET Z
RET Z ; ª®­â஫ì à §¬¥à  ¢ë室­®£® ¡ãä¥à 
INC HL
DEC BC
LD A,(HL)
CP 0x20
CP ' '
JR C,.L4
CP '`'
JR Z,.L4
@ -94,7 +96,7 @@ InitExtLine: LD (.InExtSv),DE
OR C
SCF
EXX
RET Z
RET Z ; ª®­â஫ì à §¬¥à  ¢ë室­®£® ¡ãä¥à 
JR .L2
.L3: LD (DE),A
@ -104,6 +106,7 @@ InitExtLine: LD (.InExtSv),DE
EXX
DEC IXL
JR NZ,.L1
; ª®¯¨à®¢ ­¨¥ áâப¨ § ¯ã᪠ á ¯ à ¬¥âà ¬¨
.L4: LD DE,(.InExtSv)
.L5: LD A,B
OR C
@ -157,7 +160,7 @@ InitExtLine: LD (.InExtSv),DE
JR Z,.L4
CP 0x09
JR Z,.L8
CP 0x20
CP ' '
JR Z,.L8
JR C,.L4
LD (DE),A
@ -180,7 +183,7 @@ InitExtLine: LD (.InExtSv),DE
LD A,(HL)
CP 0x0D
JR Z,.L10
CP 0x20
CP ' '
JR C,.L4
LD (DE),A
INC DE