From 1fcfce3619f7f4e9bafc5b4b61bc5f25bd40c3f7 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Mon, 5 May 2025 05:39:34 +1000
Subject: [PATCH] =?UTF-8?q?-bug:=20=D0=9E=D0=BF=D1=8F=D1=82=D1=8C=20=D0=A1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B5=D0=BB=D0=B8=D0=B9=20=D0=BD=D0=B0=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BB.=20=D0=9E=D0=BF=D1=8F=D1=82=D1=8C=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=20=D1=81=20=D0=BC=D0=B5=D1=82=D0=BA=D0=BE=D0=B9=20=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=B0))=20-fix:=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BE=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D1=82=D1=8C=20=D0=B4=D0=BB=D1=8F=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D1=81=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BC=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSS/API/diskINF.asm |  6 +++---
 DSS/FS/FAT.asm      | 10 +++++++++-
 DSS/build.txt       |  2 +-
 Shared_Includes     |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/DSS/API/diskINF.asm b/DSS/API/diskINF.asm
index 95edd5e..8fb2559 100644
--- a/DSS/API/diskINF.asm
+++ b/DSS/API/diskINF.asm
@@ -242,11 +242,11 @@ FAT_STRING:	DB	'FAT12'
 ; DE - буфер
 GET_LABEL:	PUSH	DE
 		LD	HL,.LABEL_MASK				; "\*.*" имя метки
-		LD	A,FAT_ATTR.VOLUME_ID			; атрибут метки тома
+		LD	A,FAT_ATTR.ItIsVolID			; атрибут метки тома
 		LD	B,high Dss.F_First.FATname
 		CALL	F_FIRST
 		POP	DE
-		LD	HL,CORE_BUFFERS.FS_Buffer.BPB_LABEL
+.from_BPB:	LD	HL,CORE_BUFFERS.FS_Buffer.BPB_LABEL
 		RET	C
 		; [ ] 07/03/2025 костыль для атрибута 0. Настоял Савелий))
 		 LD	HL,BUFFER_FIND.REC_Attr
@@ -254,7 +254,7 @@ GET_LABEL:	PUSH	DE
 		 LD	A,(HL)
 		 OR	A
 		 SCF
-		 RET	Z
+		 JR	Z,.from_BPB
 		;
 		LD	HL,BUFFER_FIND.REC_Name
 		ADD	HL,DE
diff --git a/DSS/FS/FAT.asm b/DSS/FS/FAT.asm
index 90e021d..4a76892 100644
--- a/DSS/FS/FAT.asm
+++ b/DSS/FS/FAT.asm
@@ -165,10 +165,18 @@ SEARCH:
 		CP	#E5		;!HARDCODE #E5 - запись в директории свободна, так как файл/директория были удалены
 		JR	Z,.next_record
 		LD	A,(IX+FAT_DIRECTORY_RECORD.ATTRIBUT)
+		LD	D,A
 		AND	C
 		JR	NZ,.next_record
 		;
-.not_zero_attr:	LD	HL,MASKARE
+		LD	A,C
+		INC	A
+		JR	NZ,.found_attr
+		; A=0
+		OR	D
+		JR	NZ,.next_record
+		;
+.found_attr:	LD	HL,MASKARE
 		LD	D,XH
 		LD	E,XL
 		LD	B,11
diff --git a/DSS/build.txt b/DSS/build.txt
index d2e1cef..abc4eff 100644
--- a/DSS/build.txt
+++ b/DSS/build.txt
@@ -1 +1 @@
-44
\ No newline at end of file
+46
\ No newline at end of file
diff --git a/Shared_Includes b/Shared_Includes
index 68e156a..89efc04 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 68e156a69e848e7b01656cdf67122022999d75ee
+Subproject commit 89efc04ac63ae8b6a3b79c4a0e521fc967636a64