X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_ca.c;h=df722daeaa8fecd97faba02ecc7bd34ea07d1e41;hb=d1ce94441d5e0bffafeb959c505bf3d3975a0a35;hp=e2963290a8a8f40d2e42861c58e6d252245a76a7;hpb=942039e324656f9af2f87697d2e7f53af93d05ad;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index e2963290..df722dae 100644
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -216,43 +216,49 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================
 */
 
-boolean CA_FarRead (int handle, byte huge *dest, dword length)
+boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
 {
 	boolean flag;
 	dword fat=0;
-	word segm=0;
-	while(length>0xffffl)
+	word segm=0;
+	//if(mm->EMSVer<0x40)
+	if(length>0xfffflu)
 	{
-		fat=length-0xffffl;
-		segm++;
+		printf("pee\n");
+		segm=(length%0xfffflu)-1;
+		fat=segm*0xfffflu;
+		length-=fat;
 //		printf("CA_FarRead doesn't support 64K reads yet!\n");
 	}
-
-	__asm
+
+	if(!fat&&!segm)
 	{
-		push	ds
-		mov	bx,[handle]
-		mov	cx,[WORD PTR length]
-		mov	dx,[WORD PTR dest]
-		mov	ds,[WORD PTR dest+2]
-		mov	ah,0x3f				// READ w/handle
-		int	21h
-		pop	ds
-		jnc	good
-		mov	errno,ax
-		mov	flag,0
-		jmp End
+		__asm
+		{
+			push	ds
+			mov	bx,[handle]
+			mov	cx,[WORD PTR length]
+			mov	dx,[WORD PTR dest]
+			mov	ds,[WORD PTR dest+2]
+			mov	ah,0x3f				// READ w/handle
+			int	21h
+			pop	ds
+			jnc	good
+			mov	errno,ax
+			mov	flag,0
+			jmp End
 good:
-		cmp	ax,[WORD PTR length]
-		je	done
-//		errno = EINVFMT;			// user manager knows this is bad read
-		mov	flag,0
-		jmp End
+			cmp	ax,[WORD PTR length]
+			je	done
+//			errno = EINVFMT;			// user manager knows this is bad read
+			mov	flag,0
+			jmp End
 done:
-		mov	flag,1
+			mov	flag,1
 End:
-	}
-	return flag;
+		}
+	return flag;
+	}else return 0;//todo: EXPAND!!!
 }
 
 
@@ -266,43 +272,49 @@ End:
 ==========================
 */
 
-boolean CA_FarWrite (int handle, byte huge *source, dword length)
+boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
 {
 	boolean flag;
 	dword fat=0;
-	word segm=0;
-	while(length>0xffffl)
+	word segm=0;
+	//if(mm->EMSVer<0x40)
+	if(length>0xfffflu)
 	{
-		fat=length-0xffffl;
-		segm++;
+		printf("pee\n");
+		segm=(length%0xfffflu)-1;
+		fat=segm*0xfffflu;
+		length-=fat;
 //		printf("CA_FarRead doesn't support 64K reads yet!\n");
 	}
-
-	__asm
+
+	if(!fat&&!segm)
 	{
-		push	ds
-		mov	bx,[handle]
-		mov	cx,[WORD PTR length]
-		mov	dx,[WORD PTR source]
-		mov	ds,[WORD PTR source+2]
-		mov	ah,0x40			// WRITE w/handle
-		int	21h
-		pop	ds
-		jnc	good
-		mov	errno,ax
-		mov flag,0
-		jmp End
+		__asm
+		{
+			push	ds
+			mov	bx,[handle]
+			mov	cx,[WORD PTR length]
+			mov	dx,[WORD PTR source]
+			mov	ds,[WORD PTR source+2]
+			mov	ah,0x40			// WRITE w/handle
+			int	21h
+			pop	ds
+			jnc	good
+			mov	errno,ax
+			mov flag,0
+			jmp End
 good:
-		cmp	ax,[WORD PTR length]
-		je	done
-	//errno = ENOMEM;				// user manager knows this is bad write
-		mov	flag,0
-		jmp End
+			cmp	ax,[WORD PTR length]
+			je	done
+			//errno = ENOMEM;				// user manager knows this is bad write
+			mov	flag,0
+			jmp End
 done:
-		mov	flag,1
+			mov	flag,1
 End:
-	}
-	return flag;
+		}
+	return flag;
+	}else return 0;
 }
 
 
@@ -316,7 +328,7 @@ End:
 ==========================
 */
 
-boolean CA_ReadFile(char *filename, memptr *ptr)
+boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 {
 	int handle;
 	dword size;
@@ -325,7 +337,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr)
 		return false;
 
 	size = filelength(handle);
-	if(!CA_FarRead(handle,*ptr,size))
+	if(!CA_FarRead(handle,*ptr,size, mm))
 	{
 		close(handle);
 		return false;
@@ -356,7 +368,7 @@ boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 
 	size = filelength (handle);
 	MM_GetPtr(ptr,size, mm, mmi);
-	if(!CA_FarRead(handle,*ptr,size))
+	if(!CA_FarRead(handle,*ptr,size, mm))
 	{
 		close(handle);
 		return false;