Archived News
Search News Discussion Forum
Old Forum Install Programs More Downloads...
Troubleshooting Source Code
Format Specs.
Misc. Information
Non-SF Stuff
Links
Small banner for links to this site:
diff --git a/grpapi/grpapi.cpp b/grpapi/grpapi.cpp
--- a/grpapi/grpapi.cpp
+++ b/grpapi/grpapi.cpp
{\r
}\r
\r
+/*\r
+HANDLE hProcessHeap = NULL;\r
+\r
+void * SFAlloc(size_t nSize)\r
+{\r
+ if (!hProcessHeap) hProcessHeap = GetProcessHeap();\r
+ if (hProcessHeap) return HeapAlloc(hProcessHeap, 0, nSize);\r
+ else return NULL;\r
+}\r
+\r
+void SFFree(void *lpMem)\r
+{\r
+ if (!hProcessHeap) hProcessHeap = GetProcessHeap();\r
+ if (hProcessHeap) HeapFree(hProcessHeap, 0, lpMem);\r
+}\r
+*/\r
+\r
BOOL GRPAPI WINAPI SetMpqDll(LPCSTR lpDllFileName)\r
{\r
if (LoadStorm((char *)lpDllFileName)) return TRUE;\r
@@ -439,7 +456,7 @@ void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD *dwPalette,
MySetPixel(hDC,X,Y,clrColor);\r
}\r
\r
-HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMaxWidth, WORD wMaxHeight, DWORD *nGrpSize)\r
+HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMaxWidth, WORD wMaxHeight, BOOL bNoCompress, DWORD *nGrpSize)\r
{\r
GRPHEADER GrpHeader;\r
FRAMEHEADER *lpFrameHeaders;\r
@@ -455,6 +472,7 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
GrpHeader.wMaxHeight = wMaxHeight;\r
lpFrameHeaders = (FRAMEHEADER *)malloc(nFrames * sizeof(FRAMEHEADER));\r
lpFrameData = (FRAMEDATA *)malloc(nFrames * sizeof(FRAMEDATA));\r
+ nLastOffset = sizeof(GRPHEADER) + nFrames * sizeof(FRAMEHEADER);\r
\r
for (i = 0; i < nFrames; i++) {\r
// Search for duplicate frames\r
@@ -467,6 +485,7 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
\r
if (j < i) {\r
memcpy(&lpFrameHeaders[i], &lpFrameHeaders[j], sizeof(FRAMEHEADER));\r
+ lpFrameData[i].lpRowOffsets = 0;\r
continue;\r
}\r
\r
@@ -490,20 +509,31 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
}\r
}\r
}\r
+ x2 = x2 - x1 + 1;\r
+ y2 = y2 - y1 + 1;\r
+ if ((WORD)x1 > 255) x1 = 255;\r
+ if ((WORD)y1 > 255) y1 = 255;\r
+ if ((WORD)x2 > 255) x2 = 255;\r
+ if ((WORD)y2 > 255) y2 = 255;\r
lpFrameHeaders[i].Left = x1;\r
lpFrameHeaders[i].Top = y1;\r
- lpFrameHeaders[i].Width = x2 - x1 + 1;\r
- lpFrameHeaders[i].Height = y2 - y1 + 1;\r
+ lpFrameHeaders[i].Width = x2;\r
+ lpFrameHeaders[i].Height = y2;\r
\r
- EncodeFrameData(lpImageData, i, &GrpHeader, &lpFrameHeaders[i], &lpFrameData[i]);\r
+ if (!bNoCompress) {\r
+ EncodeFrameData(lpImageData, i, &GrpHeader, &lpFrameHeaders[i], &lpFrameData[i]);\r
\r
- y = lpFrameHeaders[i].Height;\r
- if (y > 0) {\r
- y--;\r
- nLastOffset = lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y] + lpFrameData[i].lpRowSizes[y];\r
+ y = lpFrameHeaders[i].Height;\r
+ if (y > 0) {\r
+ y--;\r
+ nLastOffset = lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y] + lpFrameData[i].lpRowSizes[y];\r
+ }\r
+ else {\r
+ nLastOffset = lpFrameHeaders[i].Offset;\r
+ }\r
}\r
else {\r
- nLastOffset = lpFrameHeaders[i].Offset;\r
+ nLastOffset = lpFrameHeaders[i].Offset + lpFrameHeaders[i].Width * lpFrameHeaders[i].Height;\r
}\r
}\r
\r
@@ -514,21 +544,28 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
memcpy(lpGrpData + sizeof(GRPHEADER), lpFrameHeaders, nFrames * sizeof(FRAMEHEADER));\r
\r
for (i = 0; i < nFrames; i++) {\r
- if (lpFrameHeaders[i].Offset) {\r
- memcpy(lpGrpData + lpFrameHeaders[i].Offset, lpFrameData[i].lpRowOffsets, lpFrameHeaders[i].Height * sizeof(WORD));\r
+ if (lpFrameData[i].lpRowOffsets) {\r
+ if (!bNoCompress) {\r
+ memcpy(lpGrpData + lpFrameHeaders[i].Offset, lpFrameData[i].lpRowOffsets, lpFrameHeaders[i].Height * sizeof(WORD));\r
+\r
+ for (y = 0; y < lpFrameHeaders[i].Height; y++) {\r
+ if (lpFrameData[i].lpRowData[y]) {\r
+ memcpy(lpGrpData + lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y], lpFrameData[i].lpRowData[y], lpFrameData[i].lpRowSizes[y]);\r
+ free(lpFrameData[i].lpRowData[y]);\r
+ }\r
+ }\r
\r
- for (y = 0; y < lpFrameHeaders[i].Height; y++) {\r
- memcpy(lpGrpData + lpFrameHeaders[i].Offset + lpFrameData[i].lpRowOffsets[y], lpFrameData[i].lpRowData[y], lpFrameData[i].lpRowSizes[y]);\r
- free(lpFrameData[i].lpRowData[y]);\r
+ free(lpFrameData[i].lpRowOffsets);\r
+ free(lpFrameData[i].lpRowSizes);\r
+ free(lpFrameData[i].lpRowData);\r
}\r
-\r
- free(lpFrameData[i].lpRowOffsets);\r
- free(lpFrameData[i].lpRowSizes);\r
- free(lpFrameData[i].lpRowData);\r
-\r
- for (j = i + 1; j < nFrames; j++) {\r
- if (lpFrameHeaders[i].Offset == lpFrameHeaders[j].Offset)\r
- lpFrameHeaders[j].Offset = 0;\r
+ else {\r
+ for (y = 0; y < lpFrameHeaders[i].Height; y++) {\r
+ for (x = 0; x < lpFrameHeaders[i].Width; x++) {\r
+ lpGrpData[lpFrameHeaders[i].Offset + y * lpFrameHeaders[i].Width + x] =\r
+ (BYTE)lpImageData[i * wMaxWidth * wMaxHeight + (lpFrameHeaders[i].Top + y) * wMaxWidth + lpFrameHeaders[i].Left + x];\r
+ }\r
+ }\r
}\r
}\r
}\r
@@ -544,14 +581,42 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
{\r
int x, y, i, nBufPos, nRepeat;\r
LPBYTE lpRowBuf;\r
+ WORD nLastOffset;\r
\r
lpFrameData->lpRowOffsets = (WORD *)malloc(lpFrameHeader->Height * sizeof(WORD));\r
lpFrameData->lpRowSizes = (WORD *)malloc(lpFrameHeader->Height * sizeof(WORD));\r
lpFrameData->lpRowData = (LPBYTE *)malloc(lpFrameHeader->Height * sizeof(LPBYTE));\r
lpRowBuf = (LPBYTE)malloc(lpFrameHeader->Width * 2);\r
+ nLastOffset = lpFrameHeader->Height * sizeof(WORD);\r
\r
for (y = 0; y < lpFrameHeader->Height; y++) {\r
i = nFrame * lpGrpHeader->wMaxWidth * lpGrpHeader->wMaxHeight + (lpFrameHeader->Top + y) * lpGrpHeader->wMaxWidth;\r
+\r
+ /* Fails verification when using this. Bug in encoder or decoder? Doesn't provide much benefit.\r
+ // Search for duplicate rows (experimental)\r
+ for (x = 0; x < y; x++) {\r
+ j = nFrame * lpGrpHeader->wMaxWidth * lpGrpHeader->wMaxHeight + (lpFrameHeader->Top + x) * lpGrpHeader->wMaxWidth;\r
+ if (memcmp(&lpImageData[i+lpFrameHeader->Left],\r
+ &lpImageData[j+lpFrameHeader->Left],\r
+ lpGrpHeader->wMaxWidth * sizeof(short)) == 0)\r
+ break;\r
+ }\r
+\r
+ if (x < y) {\r
+ lpFrameData->lpRowOffsets[y] = lpFrameData->lpRowOffsets[x];\r
+ lpFrameData->lpRowSizes[y] = 0;\r
+ lpFrameData->lpRowData[y] = 0;\r
+\r
+#ifdef _DEBUG\r
+ if (!VerifyRow(&lpImageData[i+lpFrameHeader->Left], lpFrameHeader->Width, lpFrameData->lpRowData[x], lpFrameData->lpRowSizes[x])) {\r
+ nBufPos = nBufPos;\r
+ }\r
+#endif\r
+\r
+ continue;\r
+ }\r
+ */\r
+\r
nBufPos = 0;\r
if (lpFrameHeader->Width > 0) {\r
for (x = lpFrameHeader->Left; x < lpFrameHeader->Left + lpFrameHeader->Width; x++) {\r
@@ -562,7 +627,8 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
lpRowBuf[nBufPos]++;\r
}\r
x--;\r
- nBufPos++;\r
+ if (nLastOffset + nBufPos + 1 <= 0xFFFF)\r
+ nBufPos++;\r
continue;\r
}\r
\r
@@ -573,7 +639,8 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
lpRowBuf[nBufPos] = 0x41 + nRepeat;\r
lpRowBuf[nBufPos+1] = (BYTE)lpImageData[i+x];\r
x += nRepeat;\r
- nBufPos += 2;\r
+ if (nLastOffset + nBufPos + 2 <= 0xFFFF)\r
+ nBufPos += 2;\r
}\r
else {\r
lpRowBuf[nBufPos] = 0;\r
@@ -590,18 +657,21 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
lpRowBuf[nBufPos+lpRowBuf[nBufPos]] = (BYTE)lpImageData[i+x];\r
}\r
x--;\r
- nBufPos += 1 + lpRowBuf[nBufPos];\r
+ if (nLastOffset + nBufPos + 1 + lpRowBuf[nBufPos] <= 0xFFFF)\r
+ nBufPos += 1 + lpRowBuf[nBufPos];\r
}\r
}\r
else {\r
if (lpImageData[i+x] < 0) {\r
lpRowBuf[nBufPos] = 0x81;\r
- nBufPos++;\r
+ if (nLastOffset + nBufPos + 1 <= 0xFFFF)\r
+ nBufPos++;\r
}\r
else {\r
lpRowBuf[nBufPos] = 1;\r
lpRowBuf[nBufPos+1] = (BYTE)lpImageData[i+x];\r
- nBufPos += 2;\r
+ if (nLastOffset + nBufPos + 2 <= 0xFFFF)\r
+ nBufPos += 2;\r
}\r
}\r
}\r
@@ -617,9 +687,11 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
lpFrameData->lpRowOffsets[y] = lpFrameHeader->Height * sizeof(WORD);\r
}\r
else {\r
- lpFrameData->lpRowOffsets[y] = lpFrameData->lpRowOffsets[y-1] + lpFrameData->lpRowSizes[y-1];\r
+ lpFrameData->lpRowOffsets[y] = nLastOffset;\r
}\r
\r
+ nLastOffset = lpFrameData->lpRowOffsets[y] + nBufPos;\r
+\r
lpFrameData->lpRowSizes[y] = nBufPos;\r
lpFrameData->lpRowData[y] = (LPBYTE)malloc(nBufPos);\r
memcpy(lpFrameData->lpRowData[y], lpRowBuf, nBufPos);\r