X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?a=blobdiff_plain;f=grpapi%2Fgrpapi.cpp;h=f35e7f5232a61eb8aa2c91286458281e6b69d187;hb=ca10c9926586fd5f6cc080b1986aee0bcdeb06c0;hp=2cb5e2eb17adf19357846729fc0433335fbf1eff;hpb=0df810495ce1e922f22278469a15014e9b5de5aa;p=grpapi.git

diff --git a/grpapi/grpapi.cpp b/grpapi/grpapi.cpp
index 2cb5e2e..f35e7f5 100644
--- a/grpapi/grpapi.cpp
+++ b/grpapi/grpapi.cpp
@@ -38,14 +38,15 @@ typedef struct {
 	WORD *lpRowOffsets;
 	WORD *lpRowSizes;
 	LPBYTE *lpRowData;
+	DWORD Size;
 } FRAMEDATA;
 
 GETPIXELPROC MyGetPixel = GetPixel;
 SETPIXELPROC MySetPixel = (SETPIXELPROC)SetPixelV;
 
 void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD *dwPalette, DWORD dwFlags, DWORD dwAlpha);
-void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHeader, FRAMEHEADER *lpFrameHeader, FRAMEDATA *lpFrameData);
-BOOL VerifyRow(signed short *lpRawRow, int nWidth, LPBYTE lpEncRow, int nSize);
+void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHeader, FRAMEHEADER *lpFrameHeader, FRAMEDATA *lpFrameData, BOOL bNoCompress);
+BOOL VerifyRow(signed short *lpRawRow, int nWidth, LPBYTE lpEncRow, int nSize, BOOL bNoCompress);
 
 extern HINSTANCE hStorm;
 
@@ -79,6 +80,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;
@@ -206,23 +224,33 @@ BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WOR
 	BYTE *GrpRaw = (BYTE *)GrpOffsets;
 	BYTE *RowData;
 	WORD x,ofs;
-	DWORD y;
+	DWORD y, nMaxOffset = 0;
 	WORD i;
-	int j;
-	if (nFrame + 1 < GrpFile->nFrames) {
-		for (i = 0; i + 1 < GrpFile->nFrames; i++) {
-			j = GrpFrames[i].Offset - GrpFrame->Offset;
-			if (j > 0 && j < FrameSize)
-				FrameSize = j;
-		}
+	int j, nFirstNonBlankFrame = 0;
+	for (i = 0; i < GrpFile->nFrames; i++) {
+		j = GrpFrames[i].Offset - GrpFrame->Offset;
+		if (j > 0 && j < FrameSize)
+			FrameSize = j;
+		if (GrpFrames[i].Offset > nMaxOffset)
+			nMaxOffset = GrpFrames[i].Offset;
 	}
-	if (FrameSize == 0xFFFFFF) {
-		for (i = 0; i + 1 < GrpFile->nFrames; i++) {
-			j = GrpFrames[i].Offset - GrpFrames[0].Offset;
+	if (FrameSize == 0xFFFFFF || FrameSize == GrpFrame->Width * GrpFrame->Height) {
+		FrameSize = 0xFFFFFF;
+		for (i = 0; i < GrpFile->nFrames; i++) {
+			if (GrpFrames[i].Width != 0 && GrpFrames[i].Height != 0 && GrpFrames[i].Offset != GrpFrame->Offset && GrpFrames[i].Offset != nMaxOffset) {
+				nFirstNonBlankFrame = i;
+				break;
+			}
+		}
+		if (i == GrpFile->nFrames)
+			nFirstNonBlankFrame = nFrame;
+
+		for (i = 0; i < GrpFile->nFrames; i++) {
+			j = GrpFrames[i].Offset - GrpFrames[nFirstNonBlankFrame].Offset;
 			if (j > 0 && j < FrameSize)
 				FrameSize = j;
 		}
-		if (FrameSize == GrpFrames[0].Width * GrpFrames[0].Height)
+		if (FrameSize == GrpFrames[nFirstNonBlankFrame].Width * GrpFrames[nFirstNonBlankFrame].Height)
 			FrameSize = GrpFrame->Width * GrpFrame->Height;
 	}
 	if (!(dwFlags&HORIZONTAL_FLIP) && !(dwFlags&VERTICAL_FLIP)) {
@@ -383,6 +411,19 @@ BOOL GRPAPI WINAPI GetGrpInfo(HANDLE hGrp, GRPHEADER *GrpInfo)
 	return TRUE;
 }
 
+BOOL GRPAPI WINAPI GetGrpFrameInfo(HANDLE hGrp, WORD nFrame, DWORD *nLeft, DWORD *nTop, DWORD *nWidth, DWORD *nHeight)
+{
+	if (!hGrp || hGrp==INVALID_HANDLE_VALUE) return FALSE;
+	FRAMEHEADER *GrpFrame = &((FRAMEHEADER *)(((char *)hGrp)+6))[nFrame];
+
+	if (nLeft) *nLeft = GrpFrame->Left;
+	if (nTop) *nTop = GrpFrame->Top;
+	if (nWidth) *nWidth = GrpFrame->Width;
+	if (nHeight) *nHeight = GrpFrame->Height;
+
+	return TRUE;
+}
+
 void GRPAPI WINAPI SetFunctionGetPixel(GETPIXELPROC lpGetPixelProc)
 {
 	if (!lpGetPixelProc)
@@ -439,7 +480,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 +496,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
@@ -467,15 +509,11 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
 
 		if (j < i) {
 			memcpy(&lpFrameHeaders[i], &lpFrameHeaders[j], sizeof(FRAMEHEADER));
+			lpFrameData[i].lpRowOffsets = 0;
 			continue;
 		}
 
-		if (i == 0) {
-			lpFrameHeaders[i].Offset = sizeof(GRPHEADER) + nFrames * sizeof(FRAMEHEADER);
-		}
-		else {
-			lpFrameHeaders[i].Offset = nLastOffset;
-		}
+		lpFrameHeaders[i].Offset = nLastOffset;
 
 		// Scan frame to find dimensions of used part
 		x1 = y1 = 0x10000;
@@ -490,21 +528,19 @@ 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]);
-
-		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;
-		}
+		EncodeFrameData(lpImageData, i, &GrpHeader, &lpFrameHeaders[i], &lpFrameData[i], bNoCompress);
+		nLastOffset = lpFrameHeaders[i].Offset + lpFrameData[i].Size;
 	}
 
 	lpGrpData = (LPBYTE)malloc(nLastOffset);
@@ -514,22 +550,20 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
 	memcpy(lpGrpData + sizeof(GRPHEADER), lpFrameHeaders, nFrames * sizeof(FRAMEHEADER));
 
 	for (i = 0; i < nFrames; i++) {
-		if (lpFrameHeaders[i].Offset) {
-			memcpy(lpGrpData + lpFrameHeaders[i].Offset, lpFrameData[i].lpRowOffsets, lpFrameHeaders[i].Height * sizeof(WORD));
+		if (lpFrameData[i].lpRowOffsets) {
+			if (!bNoCompress)
+				memcpy(lpGrpData + lpFrameHeaders[i].Offset, lpFrameData[i].lpRowOffsets, lpFrameHeaders[i].Height * sizeof(WORD));
 
 			for (y = 0; y < lpFrameHeaders[i].Height; y++) {
-				memcpy(lpGrpData + lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y], lpFrameData[i].lpRowData[y], lpFrameData[i].lpRowSizes[y]);
-				free(lpFrameData[i].lpRowData[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);
-
-			for (j = i + 1; j < nFrames; j++) {
-				if (lpFrameHeaders[i].Offset == lpFrameHeaders[j].Offset)
-					lpFrameHeaders[j].Offset = 0;
-			}
 		}
 	}
 
@@ -540,120 +574,167 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
 	return (HANDLE)lpGrpData;
 }
 
-void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHeader, FRAMEHEADER *lpFrameHeader, FRAMEDATA *lpFrameData)
+void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHeader, FRAMEHEADER *lpFrameHeader, FRAMEDATA *lpFrameData, BOOL bNoCompress)
 {
-	int x, y, i, nBufPos, nRepeat;
+	int x, y, i, j, nBufPos, nRepeat;
 	LPBYTE lpRowBuf;
+	WORD nLastOffset = 0;
 
 	lpFrameData->lpRowOffsets = (WORD *)malloc(lpFrameHeader->Height * sizeof(WORD));
 	lpFrameData->lpRowSizes = (WORD *)malloc(lpFrameHeader->Height * sizeof(WORD));
 	lpFrameData->lpRowData = (LPBYTE *)malloc(lpFrameHeader->Height * sizeof(LPBYTE));
 	lpRowBuf = (LPBYTE)malloc(lpFrameHeader->Width * 2);
 
+	if (!bNoCompress)
+		nLastOffset = lpFrameHeader->Height * sizeof(WORD);
+
 	for (y = 0; y < lpFrameHeader->Height; y++) {
 		i = nFrame * lpGrpHeader->wMaxWidth * lpGrpHeader->wMaxHeight + (lpFrameHeader->Top + y) * lpGrpHeader->wMaxWidth;
+
+		if (!bNoCompress) {
+			// Search for duplicate rows
+			for (x = 0; x < y; x++) {
+				j = nFrame * lpGrpHeader->wMaxWidth * lpGrpHeader->wMaxHeight + (lpFrameHeader->Top + x) * lpGrpHeader->wMaxWidth;
+				if (memcmp(&lpImageData[i+lpFrameHeader->Left],
+						   &lpImageData[j+lpFrameHeader->Left],
+						   lpGrpHeader->wMaxWidth * sizeof(short)) == 0)
+					break;
+			}
+
+			if (x < y) {
+				lpFrameData->lpRowOffsets[y] = lpFrameData->lpRowOffsets[x];
+				lpFrameData->lpRowSizes[y] = 0;
+				lpFrameData->lpRowData[y] = 0;
+
+#ifdef _DEBUG
+				if (!VerifyRow(&lpImageData[i+lpFrameHeader->Left], lpFrameHeader->Width, lpFrameData->lpRowData[x], lpFrameData->lpRowSizes[x], bNoCompress)) {
+					nBufPos = nBufPos;
+				}
+#endif
+
+				continue;
+			}
+		}
+
 		nBufPos = 0;
 		if (lpFrameHeader->Width > 0) {
 			for (x = lpFrameHeader->Left; x < lpFrameHeader->Left + lpFrameHeader->Width; x++) {
-				if (x < lpFrameHeader->Left + lpFrameHeader->Width - 1) {
-					if (lpImageData[i+x] < 0) {
-						lpRowBuf[nBufPos] = 0x80;
-						for (; lpImageData[i+x] < 0 && x < lpFrameHeader->Left + lpFrameHeader->Width && lpRowBuf[nBufPos] < 0xFF; x++) {
-							lpRowBuf[nBufPos]++;
+				if (!bNoCompress) {
+					if (x < lpFrameHeader->Left + lpFrameHeader->Width - 1) {
+						if (lpImageData[i+x] < 0) {
+							lpRowBuf[nBufPos] = 0x80;
+							for (; lpImageData[i+x] < 0 && x < lpFrameHeader->Left + lpFrameHeader->Width && lpRowBuf[nBufPos] < 0xFF; x++) {
+								lpRowBuf[nBufPos]++;
+							}
+							x--;
+							if (nLastOffset + nBufPos + 1 <= 0xFFFF)
+								nBufPos++;
+							continue;
 						}
-						x--;
-						nBufPos++;
-						continue;
-					}
 
-					// Count repeating pixels, nRepeat = number of pixels - 1, ignore if there are less than 4 duplicates
-					for (nRepeat = 0; lpImageData[i+x+nRepeat] == lpImageData[i+x+nRepeat+1] && x+nRepeat < lpFrameHeader->Left + lpFrameHeader->Width - 1 && nRepeat < 0x3F; nRepeat++) {}
+						// Count repeating pixels, nRepeat = number of pixels - 1, ignore if there are less than 4 duplicates
+						for (nRepeat = 0; lpImageData[i+x+nRepeat] == lpImageData[i+x+nRepeat+1] && x+nRepeat < lpFrameHeader->Left + lpFrameHeader->Width - 1 && nRepeat < 0x3E; nRepeat++) {}
 
-					if (nRepeat > 2) {
-						lpRowBuf[nBufPos] = 0x41 + nRepeat;
-						lpRowBuf[nBufPos+1] = (BYTE)lpImageData[i+x];
-						x += nRepeat;
-						nBufPos += 2;
+						if (nRepeat > 2) {
+							lpRowBuf[nBufPos] = 0x41 + nRepeat;
+							lpRowBuf[nBufPos+1] = (BYTE)(lpImageData[i+x]);
+							x += nRepeat;
+							if (nLastOffset + nBufPos + 2 <= 0xFFFF)
+								nBufPos += 2;
+						}
+						else {
+							lpRowBuf[nBufPos] = 0;
+							for (; lpImageData[i+x] >= 0 && x < lpFrameHeader->Left + lpFrameHeader->Width && lpRowBuf[nBufPos] < 0x3F; x++) {
+								// Count repeating pixels, ignore if there are less than 4 duplicates
+								for (nRepeat = 0; lpImageData[i+x+nRepeat] == lpImageData[i+x+nRepeat+1] && x+nRepeat < lpFrameHeader->Left + lpFrameHeader->Width - 1 && nRepeat < 3; nRepeat++) {}
+								if (nRepeat > 2) break;
+
+								lpRowBuf[nBufPos]++;
+								lpRowBuf[nBufPos+lpRowBuf[nBufPos]] = (BYTE)(lpImageData[i+x]);
+							}
+							if (lpImageData[i+x] >= 0 && x == lpFrameHeader->Left + lpFrameHeader->Width - 1 && lpRowBuf[nBufPos] < 0x3F) {
+								lpRowBuf[nBufPos]++;
+								lpRowBuf[nBufPos+lpRowBuf[nBufPos]] = (BYTE)(lpImageData[i+x]);
+							}
+							x--;
+							if (nLastOffset + nBufPos + 1 + lpRowBuf[nBufPos] <= 0xFFFF)
+								nBufPos += 1 + lpRowBuf[nBufPos];
+						}
 					}
 					else {
-						lpRowBuf[nBufPos] = 0;
-						for (; lpImageData[i+x] >= 0 && x < lpFrameHeader->Left + lpFrameHeader->Width && lpRowBuf[nBufPos] < 0x3F; x++) {
-							// Count repeating pixels, ignore if there are less than 4 duplicates
-							for (nRepeat = 0; lpImageData[i+x+nRepeat] == lpImageData[i+x+nRepeat+1] && x+nRepeat < lpFrameHeader->Left + lpFrameHeader->Width - 1 && nRepeat < 3; nRepeat++) {}
-							if (nRepeat > 2) break;
-
-							lpRowBuf[nBufPos]++;
-							lpRowBuf[nBufPos+lpRowBuf[nBufPos]] = (BYTE)lpImageData[i+x];
+						if (lpImageData[i+x] < 0) {
+							lpRowBuf[nBufPos] = 0x81;
+							if (nLastOffset + nBufPos + 1 <= 0xFFFF)
+								nBufPos++;
 						}
-						if (lpImageData[i+x] >= 0 && x == lpFrameHeader->Left + lpFrameHeader->Width - 1 && lpRowBuf[nBufPos] < 0x3F) {
-							lpRowBuf[nBufPos]++;
-							lpRowBuf[nBufPos+lpRowBuf[nBufPos]] = (BYTE)lpImageData[i+x];
+						else {
+							lpRowBuf[nBufPos] = 1;
+							lpRowBuf[nBufPos+1] = (BYTE)(lpImageData[i+x]);
+							if (nLastOffset + nBufPos + 2 <= 0xFFFF)
+								nBufPos += 2;
 						}
-						x--;
-						nBufPos += 1 + lpRowBuf[nBufPos];
 					}
 				}
 				else {
-					if (lpImageData[i+x] < 0) {
-						lpRowBuf[nBufPos] = 0x81;
+					lpRowBuf[nBufPos] = (BYTE)(lpImageData[i+x]);
+					if (nLastOffset + nBufPos + 1 <= 0xFFFF)
 						nBufPos++;
-					}
-					else {
-						lpRowBuf[nBufPos] = 1;
-						lpRowBuf[nBufPos+1] = (BYTE)lpImageData[i+x];
-						nBufPos += 2;
-					}
 				}
 			}
 		}
 
 #ifdef _DEBUG
-		if (!VerifyRow(&lpImageData[i+lpFrameHeader->Left], lpFrameHeader->Width, lpRowBuf, nBufPos)) {
+		if (!VerifyRow(&lpImageData[i+lpFrameHeader->Left], lpFrameHeader->Width, lpRowBuf, nBufPos, bNoCompress)) {
 			nBufPos = nBufPos;
 		}
 #endif
 
-		if (y == 0) {
-			lpFrameData->lpRowOffsets[y] = lpFrameHeader->Height * sizeof(WORD);
-		}
-		else {
-			lpFrameData->lpRowOffsets[y] = lpFrameData->lpRowOffsets[y-1] + lpFrameData->lpRowSizes[y-1];
-		}
+		lpFrameData->lpRowOffsets[y] = nLastOffset;
+		nLastOffset = lpFrameData->lpRowOffsets[y] + nBufPos;
 
 		lpFrameData->lpRowSizes[y] = nBufPos;
 		lpFrameData->lpRowData[y] = (LPBYTE)malloc(nBufPos);
 		memcpy(lpFrameData->lpRowData[y], lpRowBuf, nBufPos);
 	}
 
+	lpFrameData->Size = nLastOffset;
+
 	free(lpRowBuf);
 }
 
 #ifdef _DEBUG
-BOOL VerifyRow(signed short *lpRawRow, int nWidth, LPBYTE lpEncRow, int nSize)
+BOOL VerifyRow(signed short *lpRawRow, int nWidth, LPBYTE lpEncRow, int nSize, BOOL bNoCompress)
 {
 	int i,x=0,ofs=0;
 	while (x < nWidth && ofs < nSize) {
-		if (!(lpEncRow[ofs] & 0x80)) {
-			if (!(lpEncRow[ofs] & 0x40)) {
-				for (i=1;i<=lpEncRow[ofs] && x<nWidth;i++) {
-					if (lpEncRow[ofs+i] != (BYTE)lpRawRow[x]) return FALSE;
-					x++;
+		if (!bNoCompress) {
+			if (!(lpEncRow[ofs] & 0x80)) {
+				if (!(lpEncRow[ofs] & 0x40)) {
+					for (i=1;i<=lpEncRow[ofs] && x<nWidth;i++) {
+						if (lpEncRow[ofs+i] != (BYTE)lpRawRow[x]) return FALSE;
+						x++;
+					}
+					ofs+=lpEncRow[ofs]+1;
+				}
+				else {
+					for (i=0;i<lpEncRow[ofs]-64 && x<nWidth;i++) {
+						if (lpEncRow[ofs+1] != (BYTE)lpRawRow[x]) return FALSE;
+						x++;
+					}
+					ofs+=2;
 				}
-				ofs+=lpEncRow[ofs]+1;
 			}
 			else {
-				for (i=0;i<lpEncRow[ofs]-64 && x<nWidth;i++) {
-					if (lpEncRow[ofs+1] != (BYTE)lpRawRow[x]) return FALSE;
-					x++;
+				for (i=0;i<lpEncRow[ofs]-128 && x<nWidth;i++) {
+					if (lpRawRow[x] >= 0) return FALSE;
 				}
-				ofs+=2;
+				x+=lpEncRow[ofs]-128;
+				ofs++;
 			}
 		}
 		else {
-			for (i=0;i<lpEncRow[ofs]-128 && x<nWidth;i++) {
-				if (lpRawRow[x] >= 0) return FALSE;
-			}
-			x+=lpEncRow[ofs]-128;
+			if (lpEncRow[ofs] != (BYTE)lpRawRow[x]) return FALSE;
+			x++;
 			ofs++;
 		}
 	}