Current News 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
@@ -216,7 +233,8 @@ BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WOR
FrameSize = j;\r
}\r
}\r
- if (FrameSize == 0xFFFFFF) {\r
+ if (FrameSize == 0xFFFFFF || FrameSize == GrpFrame->Width * GrpFrame->Height) {\r
+ FrameSize = 0xFFFFFF;\r
for (i = 0; i + 1 < GrpFile->nFrames; i++) {\r
j = GrpFrames[i].Offset - GrpFrames[0].Offset;\r
if (j > 0 && j < FrameSize)\r
return TRUE;\r
}\r
\r
+BOOL GRPAPI WINAPI GetGrpFrameInfo(HANDLE hGrp, WORD nFrame, DWORD *nLeft, DWORD *nTop, DWORD *nWidth, DWORD *nHeight)\r
+{\r
+ if (!hGrp || hGrp==INVALID_HANDLE_VALUE) return FALSE;\r
+ FRAMEHEADER *GrpFrame = &((FRAMEHEADER *)(((char *)hGrp)+6))[nFrame];\r
+\r
+ if (nLeft) *nLeft = GrpFrame->Left;\r
+ if (nTop) *nTop = GrpFrame->Top;\r
+ if (nWidth) *nWidth = GrpFrame->Width;\r
+ if (nHeight) *nHeight = GrpFrame->Height;\r
+\r
+ return TRUE;\r
+}\r
+\r
void GRPAPI WINAPI SetFunctionGetPixel(GETPIXELPROC lpGetPixelProc)\r
{\r
if (!lpGetPixelProc)\r
@@ -455,6 +486,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
@@ -491,10 +523,16 @@ 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
if (!bNoCompress) {\r
EncodeFrameData(lpImageData, i, &GrpHeader, &lpFrameHeaders[i], &lpFrameData[i]);\r
@@ -539,7 +577,7 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
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
- lpImageData[i * wMaxWidth * wMaxHeight + (lpFrameHeaders[i].Top + y) * wMaxWidth + lpFrameHeaders[i].Left + x];\r
+ (BYTE)lpImageData[i * wMaxWidth * wMaxHeight + (lpFrameHeaders[i].Top + y) * wMaxWidth + lpFrameHeaders[i].Left + x];\r
}\r
}\r
}\r
@@ -555,7 +593,7 @@ HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMa
\r
void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHeader, FRAMEHEADER *lpFrameHeader, FRAMEDATA *lpFrameData)\r
{\r
- int x, y, i, j, nBufPos, nRepeat;\r
+ int x, y, i, nBufPos, nRepeat;\r
LPBYTE lpRowBuf;\r
WORD nLastOffset;\r
\r
@@ -563,6 +601,7 @@ void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHea
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
@@ -602,7 +641,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
@@ -613,7 +653,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
@@ -630,18 +671,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
|