X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=df722daeaa8fecd97faba02ecc7bd34ea07d1e41;hb=67103bcf34caaa89876b908820771584b3f4d05c;hp=bb65c4a25b98fc957b3b17aa2a9053ee5ca61f8b;hpb=17998320acbe20dc2bbca909922109fc65e82e9f;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index bb65c4a2..df722dae 100644
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -29,7 +29,7 @@ loaded into the data segment
 
 =============================================================================
 */
-
+
 #include "src/lib/16_ca.h"
 //#include "ID_STRS.H"
 
@@ -216,37 +216,49 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================
 */
 
-boolean CA_FarRead (int handle, byte far *dest, dword length)
-{
+boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
+{
 	boolean flag;
-	if (length>0xffffl)
-		printf("CA_FarRead doesn't support 64K reads yet!\n");
+	dword fat=0;
+	word segm=0;
+	//if(mm->EMSVer<0x40)
+	if(length>0xfffflu)
+	{
+		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
-done:
-		mov	flag,1
-End:
-	}
-	return flag;
+			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
+End:
+		}
+	return flag;
+	}else return 0;//todo: EXPAND!!!
 }
 
 
@@ -260,37 +272,49 @@ End:
 ==========================
 */
 
-boolean CA_FarWrite (int handle, byte far *source, dword length)
-{
+boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
+{
 	boolean flag;
-	if (length>0xffffl)
-		printf("CA_FarWrite doesn't support 64K reads yet!\n");
-
-	__asm
+	dword fat=0;
+	word segm=0;
+	//if(mm->EMSVer<0x40)
+	if(length>0xfffflu)
+	{
+		printf("pee\n");
+		segm=(length%0xfffflu)-1;
+		fat=segm*0xfffflu;
+		length-=fat;
+//		printf("CA_FarRead doesn't support 64K reads yet!\n");
+	}
+
+	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
-done:
-		mov	flag,1
+			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
 End:
-	}
-	return flag;
+		}
+	return flag;
+	}else return 0;
 }
 
 
@@ -304,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;
@@ -313,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;
@@ -334,7 +358,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr)
 ==========================
 */
 
-boolean CA_LoadFile(char *filename, memptr *ptr)
+boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 {
 	int handle;
 	long size;
@@ -343,10 +367,10 @@ boolean CA_LoadFile(char *filename, memptr *ptr)
 		return false;
 
 	size = filelength (handle);
-	MM_GetPtr (ptr,size);
-	if(!CA_FarRead (handle,*ptr,size))
+	MM_GetPtr(ptr,size, mm, mmi);
+	if(!CA_FarRead(handle,*ptr,size, mm))
 	{
-		close (handle);
+		close(handle);
 		return false;
 	}
 	close(handle);
@@ -436,8 +460,8 @@ void CAL_OptimizeNodes(huffnode *table)
 //--------------------------
 // expand less than 64k of data
 //--------------------------
-
-	__asm
+
+	__asm
 	{
 		mov	bx,[headptr]
 
@@ -481,7 +505,7 @@ asm	inc	di					// write a decopmpressed byte out
 asm	mov	bx,[headptr]		// back to the head node for next bit
 
 asm	cmp	di,ax				// done?
-asm	jne	expandshort
+asm	jne	expandshort
 	}
 	}
 	else
@@ -492,8 +516,8 @@ asm	jne	expandshort
 //--------------------------
 
   length--;
-
-	__asm
+
+	__asm
 	{
 asm mov	bx,[headptr]
 asm	mov	cl,1
@@ -551,11 +575,11 @@ asm  	dec	[WORD PTR ss:length+2]
 asm	jns	expand		// when length = ffff ffff, done
 	}
 	}
-
-	__asm
+
+	__asm
 	{
 		mov	ax,ss
-		mov	ds,ax
+		mov	ds,ax
 	}
 
 }*/
@@ -1101,7 +1125,7 @@ void CA_Shutdown(void)
 =
 ======================
 */
-/*++++
+/*++++
 void CA_CacheAudioChunk (int chunk)
 {
 	long	pos,compressed;
@@ -1182,7 +1206,7 @@ done:
 =
 ======================
 */
-/*++++
+/*++++
 void CA_LoadAllSounds (void)
 {
 	unsigned	start,i;