X-Git-Url: https://sfsrealm.hopto.org/projects/?a=blobdiff_plain;f=grpapi%2Fgrpapi.cpp;h=6c96c561290fac94dfba899aa2deb14a2561daef;hb=20bc40c88eee9f6da2ba739ecd3f681334862491;hp=6c1e73785f385c893dba3a3038c99068c67e3895;hpb=ec6375429d9d1f0450df767144f93bdb6c0ca261;p=grpapi.git

diff --git a/grpapi/grpapi.cpp b/grpapi/grpapi.cpp
index 6c1e737..6c96c56 100644
--- a/grpapi/grpapi.cpp
+++ b/grpapi/grpapi.cpp
@@ -79,6 +79,23 @@ void GRPAPI WINAPI FreeGrpApi()
 {
 }
 
+/*
+HANDLE hProcessHeap = NULL;
+
+void * SFAlloc(size_t nSize)
+{
+	if (!hProcessHeap) hProcessHeap = GetProcessHeap();
+	if (hProcessHeap) return HeapAlloc(hProcessHeap, 0, nSize);
+	else return NULL;
+}
+
+void SFFree(void *lpMem)
+{
+	if (!hProcessHeap) hProcessHeap = GetProcessHeap();
+	if (hProcessHeap) HeapFree(hProcessHeap, 0, lpMem);
+}
+*/
+
 BOOL GRPAPI WINAPI SetMpqDll(LPCSTR lpDllFileName)
 {
 	if (LoadStorm((char *)lpDllFileName)) return TRUE;
@@ -439,7 +456,7 @@ void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD *dwPalette,
 	MySetPixel(hDC,X,Y,clrColor);
 }
 
-HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMaxWidth, WORD wMaxHeight, DWORD *nGrpSize)
+HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMaxWidth, WORD wMaxHeight, BOOL bNoCompress, DWORD *nGrpSize)
 {
 	GRPHEADER GrpHeader;
 	FRAMEHEADER *lpFrameHeaders;
@@ -455,6 +472,7 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
 	GrpHeader.wMaxHeight = wMaxHeight;
 	lpFrameHeaders = (FRAMEHEADER *)malloc(nFrames * sizeof(FRAMEHEADER));
 	lpFrameData = (FRAMEDATA *)malloc(nFrames * sizeof(FRAMEDATA));
+	nLastOffset = sizeof(GRPHEADER) + nFrames * sizeof(FRAMEHEADER);
 
 	for (i = 0; i < nFrames; i++) {
 		// Search for duplicate frames
@@ -491,20 +509,31 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
 				}
 			}
 		}
+		x2 = x2 - x1 + 1;
+		y2 = y2 - y1 + 1;
+		if ((WORD)x1 > 255) x1 = 255;
+		if ((WORD)y1 > 255) y1 = 255;
+		if ((WORD)x2 > 255) x2 = 255;
+		if ((WORD)y2 > 255) y2 = 255;
 		lpFrameHeaders[i].Left = x1;
 		lpFrameHeaders[i].Top = y1;
-		lpFrameHeaders[i].Width = x2 - x1 + 1;
-		lpFrameHeaders[i].Height = y2 - y1 + 1;
+		lpFrameHeaders[i].Width = x2;
+		lpFrameHeaders[i].Height = y2;
 
-		EncodeFrameData(lpImageData, i, &GrpHeader, &lpFrameHeaders[i], &lpFrameData[i]);
+		if (!bNoCompress) {
+			EncodeFrameData(lpImageData, i, &GrpHeader, &lpFrameHeaders[i], &lpFrameData[i]);
 
-		y = lpFrameHeaders[i].Height;
-		if (y > 0) {
-			y--;
-			nLastOffset = lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y] + lpFrameData[i].lpRowSizes[y];
+			y = lpFrameHeaders[i].Height;
+			if (y > 0) {
+				y--;
+				nLastOffset = lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y] + lpFrameData[i].lpRowSizes[y];
+			}
+			else {
+				nLastOffset = lpFrameHeaders[i].Offset;
+			}
 		}
 		else {
-			nLastOffset = lpFrameHeaders[i].Offset;
+			nLastOffset = lpFrameHeaders[i].Offset + lpFrameHeaders[i].Width * lpFrameHeaders[i].Height;
 		}
 	}
 
@@ -516,18 +545,28 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
 
 	for (i = 0; i < nFrames; i++) {
 		if (lpFrameData[i].lpRowOffsets) {
-			memcpy(lpGrpData + lpFrameHeaders[i].Offset, lpFrameData[i].lpRowOffsets, lpFrameHeaders[i].Height * sizeof(WORD));
+			if (!bNoCompress) {
+				memcpy(lpGrpData + lpFrameHeaders[i].Offset, lpFrameData[i].lpRowOffsets, lpFrameHeaders[i].Height * sizeof(WORD));
 
-			for (y = 0; y < lpFrameHeaders[i].Height; y++) {
-				if (lpFrameData[i].lpRowData[y]) {
-					memcpy(lpGrpData + lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y], lpFrameData[i].lpRowData[y], lpFrameData[i].lpRowSizes[y]);
-					free(lpFrameData[i].lpRowData[y]);
+				for (y = 0; y < lpFrameHeaders[i].Height; y++) {
+					if (lpFrameData[i].lpRowData[y]) {
+						memcpy(lpGrpData + lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y], lpFrameData[i].lpRowData[y], lpFrameData[i].lpRowSizes[y]);
+						free(lpFrameData[i].lpRowData[y]);
+					}
 				}
-			}
 
-			free(lpFrameData[i].lpRowOffsets);
-			free(lpFrameData[i].lpRowSizes);
-			free(lpFrameData[i].lpRowData);
+				free(lpFrameData[i].lpRowOffsets);
+				free(lpFrameData[i].lpRowSizes);
+				free(lpFrameData[i].lpRowData);
+			}
+			else {
+				for (y = 0; y < lpFrameHeaders[i].Height; y++) {
+					for (x = 0; x < lpFrameHeaders[i].Width; x++) {
+						lpGrpData[lpFrameHeaders[i].Offset + y * lpFrameHeaders[i].Width + x] =
+							(BYTE)lpImageData[i * wMaxWidth * wMaxHeight + (lpFrameHeaders[i].Top + y) * wMaxWidth + lpFrameHeaders[i].Left + x];
+					}
+				}
+			}
 		}
 	}
 
@@ -540,7 +579,7 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
 
 void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHeader, FRAMEHEADER *lpFrameHeader, FRAMEDATA *lpFrameData)
 {
-	int x, y, i, j, nBufPos, nRepeat;
+	int x, y, i, nBufPos, nRepeat;
 	LPBYTE lpRowBuf;
 	WORD nLastOffset;
 
@@ -548,12 +587,13 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
 	lpFrameData->lpRowSizes = (WORD *)malloc(lpFrameHeader->Height * sizeof(WORD));
 	lpFrameData->lpRowData = (LPBYTE *)malloc(lpFrameHeader->Height * sizeof(LPBYTE));
 	lpRowBuf = (LPBYTE)malloc(lpFrameHeader->Width * 2);
+	nLastOffset = lpFrameHeader->Height * sizeof(WORD);
 
 	for (y = 0; y < lpFrameHeader->Height; y++) {
 		i = nFrame * lpGrpHeader->wMaxWidth * lpGrpHeader->wMaxHeight + (lpFrameHeader->Top + y) * lpGrpHeader->wMaxWidth;
 
 		/* Fails verification when using this.  Bug in encoder or decoder?  Doesn't provide much benefit.
-		// Search for duplicate rows
+		// Search for duplicate rows (experimental)
 		for (x = 0; x < y; x++) {
 			j = nFrame * lpGrpHeader->wMaxWidth * lpGrpHeader->wMaxHeight + (lpFrameHeader->Top + x) * lpGrpHeader->wMaxWidth;
 			if (memcmp(&lpImageData[i+lpFrameHeader->Left],
@@ -587,7 +627,8 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
 							lpRowBuf[nBufPos]++;
 						}
 						x--;
-						nBufPos++;
+						if (nLastOffset + nBufPos + 1 <= 0xFFFF)
+							nBufPos++;
 						continue;
 					}
 
@@ -598,7 +639,8 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
 						lpRowBuf[nBufPos] = 0x41 + nRepeat;
 						lpRowBuf[nBufPos+1] = (BYTE)lpImageData[i+x];
 						x += nRepeat;
-						nBufPos += 2;
+						if (nLastOffset + nBufPos + 2 <= 0xFFFF)
+							nBufPos += 2;
 					}
 					else {
 						lpRowBuf[nBufPos] = 0;
@@ -615,18 +657,21 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
 							lpRowBuf[nBufPos+lpRowBuf[nBufPos]] = (BYTE)lpImageData[i+x];
 						}
 						x--;
-						nBufPos += 1 + lpRowBuf[nBufPos];
+						if (nLastOffset + nBufPos + 1 + lpRowBuf[nBufPos] <= 0xFFFF)
+							nBufPos += 1 + lpRowBuf[nBufPos];
 					}
 				}
 				else {
 					if (lpImageData[i+x] < 0) {
 						lpRowBuf[nBufPos] = 0x81;
-						nBufPos++;
+						if (nLastOffset + nBufPos + 1 <= 0xFFFF)
+							nBufPos++;
 					}
 					else {
 						lpRowBuf[nBufPos] = 1;
 						lpRowBuf[nBufPos+1] = (BYTE)lpImageData[i+x];
-						nBufPos += 2;
+						if (nLastOffset + nBufPos + 2 <= 0xFFFF)
+							nBufPos += 2;
 					}
 				}
 			}