Revert to original ZXCC exact size model.

Fixed error introduced in previous update
agn453 · Mar 15, 2022 · e74e3ab · e74e3ab
1 parent 8f3eab8
commit e74e3ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/bin/z80.c b/bin/z80.c
@@ -15,9 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+#include "zxcc.h"   // put first before calling windows include files                          
 #include<stdio.h>
-#include "zxcc.h"
+
 
 #define parity(a) (partable[a])
 

diff --git a/cpmredir/lib/cpmredir.c b/cpmredir/lib/cpmredir.c
@@ -151,7 +151,7 @@ cpm_word fcb_open(cpm_byte* fcb, cpm_byte* dma)
 				 */
 
 	/* Get the file length */
-	redir_wr32(fcb + LENGTH_OFFSET, zxlseek(handle, 0, SEEK_CUR));
+	redir_wr32(fcb + LENGTH_OFFSET, zxlseek(handle, 0, SEEK_END));
 	zxlseek(handle, 0, SEEK_SET);
 
 	/* Set the last record byte count */
@@ -170,7 +170,7 @@ cpm_word fcb_close(cpm_byte* fcb)
 	SHOWNAME("fcb_close")
 
 		if ((handle = redir_verify_fcb(fcb)) < 0) return -1;
-	redir_Msg("         (at   %lx)\n", zxlseek(handle, 0, SEEK_END));
+	redir_Msg("         (at   %lx)\n", zxlseek(handle, 0, SEEK_CUR));
 
 	if (fcb[0] & 0x80)	/* Close directory */
 	{
@@ -489,10 +489,8 @@ cpm_word fcb_randwr(cpm_byte* fcb, cpm_byte* dma)
 		/* Update the file length */
 	len = redir_rd32(fcb + LENGTH_OFFSET);
 	/* PMO: Bug fix, account for the data just written */
-	if (len < offs + rv) {
+	if (len < offs + rv)
 		redir_wr32(fcb + LENGTH_OFFSET, offs + rv);
-		fcb[0x20] = (offs + rv) % 256;
-	}
 
 	if (rv < redir_rec_len) return 1;	/* disk full */
 	return 0;
@@ -768,8 +766,7 @@ cpm_word fcb_chmod(cpm_byte* fcb, cpm_byte* dma)
 		newoffs = offs = ((st.st_size + 127) / 128) * 128;
 		if (fcb[0x20] & 0x7F)
 		{
-			newoffs -= fcb[0x20] & 0x7f;
-			//newoffs -= (0x80 - (fcb[0x20] & 0x7F));
+			newoffs -= (0x80 - (fcb[0x20] & 0x7F));
 		}
 		if (newoffs == st.st_size)
 		{

diff --git a/winbuild/zxcc/zxcc.vcxproj b/winbuild/zxcc/zxcc.vcxproj
@@ -169,7 +169,7 @@ call "$(SolutionDir)Scripts\install.cmd" "$(SolutionDir)external\$(PlatformTarge
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);USE_CPMIO;DEBUG;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);USE_CPMIO;DEBUG</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <AdditionalIncludeDirectories>..\include;..\..\cpmio\include;..\..\cpmredir\include</AdditionalIncludeDirectories>