From dd2a134ad316c9dd04d01b4964584079a84cdea9 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Tue, 25 Feb 2025 02:31:27 +1000
Subject: [PATCH] =?UTF-8?q?EXEC:=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD=D0=BE=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=B0=20EXE=20=D0=B1=D0=B5=D0=B7=20=D0=B7=D0=B0=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=B7=D1=87=D0=B8=D0=BA=D0=B0=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B4=20=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSS/API/Attribute.asm | 2 +-
 DSS/API/Create.asm    | 8 ++++++--
 DSS/API/Delete.asm    | 2 +-
 DSS/API/Execute.ASM   | 7 ++++---
 DSS/API/Find.asm      | 2 +-
 DSS/API/Open.asm      | 1 -
 DSS/API/Rename.asm    | 1 -
 DSS/API/diskINF.asm   | 2 +-
 DSS/build.txt         | 2 +-
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/DSS/API/Attribute.asm b/DSS/API/Attribute.asm
index 32d7e02..41343d6 100644
--- a/DSS/API/Attribute.asm
+++ b/DSS/API/Attribute.asm
@@ -15,7 +15,7 @@ ATTRIB:		;!TEST Current Dir ;[x] 15/10/23
 		 POP	BC
 		 POP	HL
 		 RET	C
-.old_EXE:	 LD	A,C
+		 LD	A,C
 		;
 		;
 		INC	B
diff --git a/DSS/API/Create.asm b/DSS/API/Create.asm
index e978370..acf7260 100644
--- a/DSS/API/Create.asm
+++ b/DSS/API/Create.asm
@@ -12,7 +12,7 @@ CREATE:		;!TEST Current Dir ;[x] 15/10/23	;CREATE_FN:
 		 POP	BC
 		 POP	HL
 		 RET	C
-.old_EXE:	 LD	A,C
+		 LD	A,C
 		;
 		CALL	.Prepare
 		RET	C
@@ -40,7 +40,7 @@ CREATE:		;!TEST Current Dir ;[x] 15/10/23	;CREATE_FN:
 		 POP	BC
 		 POP	HL
 		 RET	C
-.old_EXE_:	 LD	A,C
+		 LD	A,C
 		;
 		CALL	.Prepare
 		RET	C
@@ -98,6 +98,10 @@ CREATE:		;!TEST Current Dir ;[x] 15/10/23	;CREATE_FN:
 		 CALL	CHECK_64kb_CLUSTER
 		 RET	C
 		;
+		; [ ] 25/02/2025 - файл не создастся, если нет свободного манипулятора
+		CALL	GET_FM
+		RET	C
+		;
 		JP	MASK
 		;
 ; [x] fixed a bug with incorrect search when there were too many files in the directory 12/03/2024
diff --git a/DSS/API/Delete.asm b/DSS/API/Delete.asm
index d11adf1..e5e92f0 100644
--- a/DSS/API/Delete.asm
+++ b/DSS/API/Delete.asm
@@ -8,7 +8,7 @@ DEL_FN:		;Current Dir ;[x] 15/10/23
 		 POP	HL
 		 RET	C
 		;
-.old_EXE:	 CALL	SetPath_GetName			; тест на допуст. имя и настр. на диск
+		 CALL	SetPath_GetName			; тест на допуст. имя и настр. на диск
 		 RET	C
 		 ; [ ] 26/06/2024
 		  CALL	CHECK_64kb_CLUSTER
diff --git a/DSS/API/Execute.ASM b/DSS/API/Execute.ASM
index abd4928..71264ef 100644
--- a/DSS/API/Execute.ASM
+++ b/DSS/API/Execute.ASM
@@ -219,6 +219,7 @@ EXEC02:		LD	(EXE_FM),A
 		LD	(_ret),HL
 		JP	_TST_PROC
 	;
+; Запуск без загрузчика
 .RET_1:		LD	DE,(CORE_BUFFERS.EXEBUFF.LD_ADDR)
 		XOR	A
 		LD	H,A
@@ -228,9 +229,8 @@ EXEC02:		LD	(EXE_FM),A
 		LD	HL,(CORE_BUFFERS.EXEBUFF.LD_ADDR)	; буфер
 		LD	A,(EXE_FM)				; дескр. файла
 		CALL	READ					; чтение из файла
-		;!TEST ;[x] no close source EXE file before start 08/11/23
-		 ; LD	A,(EXE_FM)				; дескр. файла
-		 ; CALL	CLOSE					; закрыть файл
+		LD	A,(EXE_FM)				; дескр. файла
+		CALL	CLOSE_FN				; закрыть файл
 		;
 		JP	_TST_PROC_2
 	;
@@ -291,6 +291,7 @@ NOINK2:		LD	HL,_RET_2
 		LD	(_ret),HL
 		JR	_TST_PROC
 		;
+;  Запуск с загрузчиком
 _RET_2:		LD	HL,(CORE_BUFFERS.EXEBUFF.LD_ADDR)	; буфер
 		LD	DE,(CORE_BUFFERS.EXEBUFF.LOADER)	; число чит. байт
 		LD	A,(EXE_FM)		; дескр. файла
diff --git a/DSS/API/Find.asm b/DSS/API/Find.asm
index 1b3466e..ece270c 100644
--- a/DSS/API/Find.asm
+++ b/DSS/API/Find.asm
@@ -19,7 +19,7 @@ F_FIRST_FN:	CALL	F_FIRST.INIT_VARS
 		 CALL	DIR_PATH_CHECK
 		 RET	C
 		;
-.old_EXE:	POP	HL
+		POP	HL
 		JR	F_FIRST.begin
 		;
 F_FIRST:	CALL	.INIT_VARS
diff --git a/DSS/API/Open.asm b/DSS/API/Open.asm
index 4d97c24..1380eb9 100644
--- a/DSS/API/Open.asm
+++ b/DSS/API/Open.asm
@@ -19,7 +19,6 @@ OPEN_FN:	;!TEST Current Dir ;[x] 15/10/23
 		 CALL	DIR_PATH_CHECK.forceCheck
 		 POP	HL
 		 RET	C
-.old_EXE:	 ;JR	.start
 		 ;!FIXIT сделать как в mkdir или rmdir?
 ;R008		;
 .start:		CALL	SetPath_GetName
diff --git a/DSS/API/Rename.asm b/DSS/API/Rename.asm
index 00769dd..928356c 100644
--- a/DSS/API/Rename.asm
+++ b/DSS/API/Rename.asm
@@ -17,7 +17,6 @@ RENAME:		;!TEST Current Dir ;[x] 15/10/23
 		 POP	HL
 		 RET	C
 		;
-.old_EXE:	;
 		 ; !TODO воткнуть тут SetPath_GetName, чтоб можно было удалять по относительным путям? 
 		;
 		; [ ] 26/06/2024
diff --git a/DSS/API/diskINF.asm b/DSS/API/diskINF.asm
index 3e9c421..f802a6d 100644
--- a/DSS/API/diskINF.asm
+++ b/DSS/API/diskINF.asm
@@ -132,7 +132,7 @@ DISKINF:	LD	C,B
 		;JR	Z,CURRDS	;R06
 .CurrentDisk:	LD	A,(CORE_BUFFERS.CurrentPath)
 		SUB	'A'
-.old_EXE:	LD	HL,CORE_BUFFERS.FatBuffer.DRIVE
+		LD	HL,CORE_BUFFERS.FatBuffer.DRIVE
 		CP	(HL)
 		JR	Z,.CheckFreeSpace
 		;
diff --git a/DSS/build.txt b/DSS/build.txt
index 3f10ffe..19c7bdb 100644
--- a/DSS/build.txt
+++ b/DSS/build.txt
@@ -1 +1 @@
-15
\ No newline at end of file
+16
\ No newline at end of file