X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?a=blobdiff_plain;f=grpapi%2Fgrpapi.cpp;h=67726c4c44194dd0a10acc25598ec27070dc662e;hb=553c8149075edf3d6ec191b3cb93c6361ec66a1a;hp=f74612066775a9cf114db3814c9f51cd96905d82;hpb=14362b19599627313cd243bdbc404dc2087d4422;p=grpapi.git

diff --git a/grpapi/grpapi.cpp b/grpapi/grpapi.cpp
index f746120..67726c4 100644
--- a/grpapi/grpapi.cpp
+++ b/grpapi/grpapi.cpp
@@ -1,5 +1,5 @@
 #include "grpapi.h"
-#include "..\\LoadStorm\\storm.h"
+#include "../LoadStorm/storm.h"
 #include <malloc.h>
 
 #ifdef GRPAPI_STATIC
@@ -34,7 +34,19 @@ typedef struct {
 	DWORD Offset;
 } FRAMEHEADER;
 
-void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD dwFlags, DWORD dwAlpha);
+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 bNoCompress);
+BOOL VerifyRow(signed short *lpRawRow, int nWidth, LPBYTE lpEncRow, int nSize, BOOL bNoCompress);
 
 extern HINSTANCE hStorm;
 
@@ -60,7 +72,7 @@ BOOL APIENTRY DllMain( HINSTANCE hInstDLL,
 
 BOOL GRPAPI WINAPI LoadGrpApi()
 {
-	if (hStorm==0) return FALSE;
+	if (!hStorm) return FALSE;
 	else return TRUE;
 }
 
@@ -68,14 +80,37 @@ 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;
+	else return FALSE;
+}
+
 BOOL GRPAPI WINAPI LoadPalette(LPCSTR lpFileName, DWORD *dwPaletteBuffer)
 {
-	if (lpFileName==0 || dwPaletteBuffer==0) return FALSE;
+	if (!lpFileName || !dwPaletteBuffer) return FALSE;
 	HANDLE hFile;
-	if (SFileOpenFileEx!=0 && SFileGetFileSize!=0
-	 && SFileSetFilePointer!=0 && SFileReadFile!=0
-	 && SFileCloseFile!=0) {
-		if (SFileOpenFileEx(0,lpFileName,1,&hFile)==0) return FALSE;
+	if (SFileOpenFileEx && SFileGetFileSize
+	 && SFileSetFilePointer && SFileReadFile
+	 && SFileCloseFile) {
+		if (!SFileOpenFileEx(0,lpFileName,1,&hFile)) return FALSE;
 		DWORD fsz = SFileGetFileSize(hFile,0);
 		SFileSetFilePointer(hFile,0,0,FILE_BEGIN);
 		if (fsz>=1024) {
@@ -126,20 +161,20 @@ BOOL GRPAPI WINAPI LoadPalette(LPCSTR lpFileName, DWORD *dwPaletteBuffer)
 
 HANDLE GRPAPI WINAPI LoadGrp(LPCSTR lpFileName)
 {
-	if (lpFileName==0) return (HANDLE)-1;
+	if (!lpFileName) return (HANDLE)-1;
 	HANDLE hFile;
 	char *GrpFile;
-	if (SFileOpenFileEx!=0 && SFileGetFileSize!=0
-	 && SFileSetFilePointer!=0 && SFileReadFile!=0
-	 && SFileCloseFile!=0) {
-		if (SFileOpenFileEx(0,lpFileName,1,&hFile)==0) return (HANDLE)-1;
+	if (SFileOpenFileEx && SFileGetFileSize
+	 && SFileSetFilePointer && SFileReadFile
+	 && SFileCloseFile) {
+		if (!SFileOpenFileEx(0,lpFileName,1,&hFile)) return (HANDLE)-1;
 		DWORD fsz = SFileGetFileSize(hFile,0);
 		if (fsz<6) {
 			SFileCloseFile(hFile);
 			return (HANDLE)-1;
 		}
-		GrpFile = (char *)VirtualAlloc(0,fsz,MEM_COMMIT,PAGE_READWRITE);
-		if (GrpFile!=0) {
+		GrpFile = (char *)malloc(fsz);
+		if (GrpFile) {
 			SFileSetFilePointer(hFile,0,0,FILE_BEGIN);
 			SFileReadFile(hFile,GrpFile,fsz,0,0);
 		}
@@ -154,8 +189,8 @@ HANDLE GRPAPI WINAPI LoadGrp(LPCSTR lpFileName)
 			CloseHandle(hFile);
 			return (HANDLE)-1;
 		}
-		GrpFile = (char *)VirtualAlloc(0,fsz,MEM_COMMIT,PAGE_READWRITE);
-		if (GrpFile!=0) {
+		GrpFile = (char *)malloc(fsz);
+		if (GrpFile) {
 			SetFilePointer(hFile,0,0,FILE_BEGIN);
 			ReadFile(hFile,GrpFile,fsz,&tsz,0);
 		}
@@ -167,84 +202,202 @@ HANDLE GRPAPI WINAPI LoadGrp(LPCSTR lpFileName)
 
 BOOL GRPAPI WINAPI DestroyGrp(HANDLE hGrp)
 {
-	if (hGrp==0 || hGrp==INVALID_HANDLE_VALUE) return FALSE;
-	VirtualFree(hGrp,0,MEM_RELEASE);
+	if (!hGrp || hGrp==INVALID_HANDLE_VALUE) return FALSE;
+	free(hGrp);
 	return TRUE;
 }
 
 BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WORD nFrame, DWORD *dwPalette, DWORD dwFlags, DWORD dwAlpha)
 {
-	if (hGrp==0 || hGrp==INVALID_HANDLE_VALUE || hdcDest==0 || dwPalette==0) return FALSE;
+	if (!hGrp || hGrp==INVALID_HANDLE_VALUE || hdcDest==0 || (!dwPalette && !(dwFlags&USE_INDEX))) return FALSE;
 	GRPHEADER *GrpFile = (GRPHEADER *)hGrp;
 	nFrame %= GrpFile->nFrames;
 	FRAMEHEADER *GrpFrame = &((FRAMEHEADER *)(((char *)GrpFile)+6))[nFrame];
+	FRAMEHEADER *GrpFrames = &((FRAMEHEADER *)(((char *)GrpFile)+6))[0];
+	int FrameSize = 0xFFFFFF;
 	DWORD Right,Bottom;
 	if (dwFlags&HORIZONTAL_FLIP) Right = nXDest+GrpFile->wMaxWidth-1-GrpFrame->Left;
 	if (dwFlags&VERTICAL_FLIP) Bottom = nYDest+GrpFile->wMaxHeight-1-GrpFrame->Top;
 	nXDest += GrpFrame->Left;
 	nYDest += GrpFrame->Top;
 	WORD *GrpOffsets = ((WORD *)(((char *)GrpFile)+GrpFrame->Offset));
-	for (DWORD y=0;y<GrpFrame->Height;y++) {
-		BYTE *RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));
-		WORD x=0,ofs=0;
-		while (x<GrpFrame->Width) {
-			if (RowData[ofs]<=64) {
-				if ((dwFlags&HORIZONTAL_FLIP)==0 && (dwFlags&VERTICAL_FLIP)==0) {
-					for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);
-						x++;
+	BYTE *GrpRaw = (BYTE *)GrpOffsets;
+	BYTE *RowData;
+	WORD x,ofs;
+	DWORD y, nMaxOffset = 0;
+	WORD i;
+	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 || 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[nFirstNonBlankFrame].Width * GrpFrames[nFirstNonBlankFrame].Height)
+			FrameSize = GrpFrame->Width * GrpFrame->Height;
+	}
+	if (!(dwFlags&HORIZONTAL_FLIP) && !(dwFlags&VERTICAL_FLIP)) {
+		if (FrameSize != GrpFrame->Width * GrpFrame->Height) {
+			for (y=0;y<GrpFrame->Height;y++) {
+				RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));
+				x=0; ofs=0;
+				while (x<GrpFrame->Width) {
+					if (!(RowData[ofs] & 0x80)) {
+						if (!(RowData[ofs] & 0x40)) {
+							for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,nXDest+x,nYDest+y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=RowData[ofs]+1;
+						}
+						else {
+							for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,nXDest+x,nYDest+y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=2;
+						}
 					}
-				}
-				else if (dwFlags&HORIZONTAL_FLIP && (dwFlags&VERTICAL_FLIP)==0) {
-					for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);
-						x++;
+					else {
+						x+=RowData[ofs]-128;
+						ofs++;
 					}
 				}
-				else if ((dwFlags&HORIZONTAL_FLIP)==0 && dwFlags&VERTICAL_FLIP) {
-					for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);
-						x++;
-					}
+			}
+		}
+		else {
+			for (y=0;y<GrpFrame->Height;y++) {
+				for (x=0;x<GrpFrame->Width;x++) {
+					SetPix(hdcDest,nXDest+x,nYDest+y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);
 				}
-				else {
-					for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);
-						x++;
+			}
+		}
+	}
+	else if (dwFlags&HORIZONTAL_FLIP && !(dwFlags&VERTICAL_FLIP)) {
+		if (FrameSize != GrpFrame->Width * GrpFrame->Height) {
+			for (y=0;y<GrpFrame->Height;y++) {
+				RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));
+				x=0; ofs=0;
+				while (x<GrpFrame->Width) {
+					if (!(RowData[ofs] & 0x80)) {
+						if (!(RowData[ofs] & 0x40)) {
+							for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,Right-x,nYDest+y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=RowData[ofs]+1;
+						}
+						else {
+							for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,Right-x,nYDest+y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=2;
+						}
+					}
+					else {
+						x+=RowData[ofs]-128;
+						ofs++;
 					}
 				}
-				ofs+=RowData[ofs]+1;
 			}
-			else if (RowData[ofs]<=128) {
-				if ((dwFlags&HORIZONTAL_FLIP)==0 && (dwFlags&VERTICAL_FLIP)==0) {
-					for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);
-						x++;
-					}
+		}
+		else {
+			for (y=0;y<GrpFrame->Height;y++) {
+				for (x=0;x<GrpFrame->Width;x++) {
+					SetPix(hdcDest,Right-x,nYDest+y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);
 				}
-				else if (dwFlags&HORIZONTAL_FLIP && (dwFlags&VERTICAL_FLIP)==0) {
-					for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);
-						x++;
+			}
+		}
+	}
+	else if (!(dwFlags&HORIZONTAL_FLIP) && dwFlags&VERTICAL_FLIP) {
+		if (FrameSize != GrpFrame->Width * GrpFrame->Height) {
+			for (y=0;y<GrpFrame->Height;y++) {
+				RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));
+				x=0; ofs=0;
+				while (x<GrpFrame->Width) {
+					if (!(RowData[ofs] & 0x80)) {
+						if (!(RowData[ofs] & 0x40)) {
+							for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,nXDest+x,Bottom-y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=RowData[ofs]+1;
+						}
+						else {
+							for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,nXDest+x,Bottom-y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=2;
+						}
 					}
-				}
-				else if ((dwFlags&HORIZONTAL_FLIP)==0 && dwFlags&VERTICAL_FLIP) {
-					for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);
-						x++;
+					else {
+						x+=RowData[ofs]-128;
+						ofs++;
 					}
 				}
-				else {
-					for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
-						SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);
-						x++;
+			}
+		}
+		else {
+			for (y=0;y<GrpFrame->Height;y++) {
+				for (x=0;x<GrpFrame->Width;x++) {
+					SetPix(hdcDest,nXDest+x,Bottom-y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);
+				}
+			}
+		}
+	}
+	else {
+		if (FrameSize != GrpFrame->Width * GrpFrame->Height) {
+			for (y=0;y<GrpFrame->Height;y++) {
+				RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));
+				x=0; ofs=0;
+				while (x<GrpFrame->Width) {
+					if (!(RowData[ofs] & 0x80)) {
+						if (!(RowData[ofs] & 0x40)) {
+							for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,Right-x,Bottom-y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=RowData[ofs]+1;
+						}
+						else {
+							for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {
+								SetPix(hdcDest,Right-x,Bottom-y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);
+								x++;
+							}
+							ofs+=2;
+						}
+					}
+					else {
+						x+=RowData[ofs]-128;
+						ofs++;
 					}
 				}
-				ofs+=2;
 			}
-			else {
-				x+=RowData[ofs]-128;
-				ofs++;
+		}
+		else {
+			for (y=0;y<GrpFrame->Height;y++) {
+				for (x=0;x<GrpFrame->Width;x++) {
+					SetPix(hdcDest,Right-x,Bottom-y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);
+				}
 			}
 		}
 	}
@@ -253,46 +406,368 @@ BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WOR
 
 BOOL GRPAPI WINAPI GetGrpInfo(HANDLE hGrp, GRPHEADER *GrpInfo)
 {
-	if (hGrp==0 || hGrp==INVALID_HANDLE_VALUE || GrpInfo==0) return FALSE;
+	if (!hGrp || hGrp==INVALID_HANDLE_VALUE || !GrpInfo) return FALSE;
 	memcpy(GrpInfo,hGrp,6);
 	return TRUE;
 }
 
-void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD dwFlags, DWORD dwAlpha)
+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)
+		MyGetPixel = GetPixel;
+	else
+		MyGetPixel = lpGetPixelProc;
+}
+
+void GRPAPI WINAPI SetFunctionSetPixel(SETPIXELPROC lpSetPixelProc)
 {
-	if (dwFlags&SHADOW_COLOR) {
-		((BYTE *)&clrColor)[0] = ((BYTE *)&dwFlags)[1];
-		((BYTE *)&clrColor)[1] = ((BYTE *)&dwFlags)[2];
-		((BYTE *)&clrColor)[2] = ((BYTE *)&dwFlags)[3];
-		((BYTE *)&clrColor)[3] = 0;
+	if (!lpSetPixelProc)
+		MySetPixel = (SETPIXELPROC)SetPixelV;
+	else
+		MySetPixel = lpSetPixelProc;
+}
+
+void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD *dwPalette, DWORD dwFlags, DWORD dwAlpha)
+{
+	if (!(dwFlags&USE_INDEX)) {
+		if (dwFlags&SHADOW_COLOR) {
+			clrColor = (dwFlags >> 8) & 0x00FFFFFF;
+		}
+		else {
+			clrColor = dwPalette[clrColor];
+		}
+		if (dwFlags&ALPHA_BLEND) {
+			DWORD dwColor = MyGetPixel(hDC,X,Y);
+
+			// Old alpha
+			/*((BYTE *)&dwColor)[0]*=1-((float)((BYTE *)&dwAlpha)[0]/256);
+			((BYTE *)&dwColor)[1]*=1-((float)((BYTE *)&dwAlpha)[1]/256);
+			((BYTE *)&dwColor)[2]*=1-((float)((BYTE *)&dwAlpha)[2]/256);
+			((BYTE *)&clrColor)[0]*=(float)((BYTE *)&dwAlpha)[0]/256;
+			((BYTE *)&clrColor)[1]*=(float)((BYTE *)&dwAlpha)[1]/256;
+			((BYTE *)&clrColor)[2]*=(float)((BYTE *)&dwAlpha)[2]/256;
+			((BYTE *)&clrColor)[0]+=((BYTE *)&dwColor)[0];
+			((BYTE *)&clrColor)[1]+=((BYTE *)&dwColor)[1];
+			((BYTE *)&clrColor)[2]+=((BYTE *)&dwColor)[2];*/
+
+			/* blendedcolor =
+				 ( ( forecolor * ( 1 - alpha ) ) >> 8 )
+			   + ( ( backcolor * ( 256 - alpha ) ) >> 8 ) */
+			((BYTE *)&clrColor)[0] =
+				( ( ((BYTE *)&clrColor)[0] * ( ((BYTE *)&dwAlpha)[0] + 1 ) ) >> 8 )
+				+ ( ( ((BYTE *)&dwColor)[0] * ( 256 - ((BYTE *)&dwAlpha)[0] ) ) >> 8 );
+			((BYTE *)&clrColor)[1] =
+				( ( ((BYTE *)&clrColor)[1] * ( ((BYTE *)&dwAlpha)[1] + 1 ) ) >> 8 )
+				+ ( ( ((BYTE *)&dwColor)[1] * ( 256 - ((BYTE *)&dwAlpha)[1] ) ) >> 8 );
+			((BYTE *)&clrColor)[2] =
+				( ( ((BYTE *)&clrColor)[2] * ( ((BYTE *)&dwAlpha)[2] + 1 ) ) >> 8 )
+				+ ( ( ((BYTE *)&dwColor)[2] * ( 256 - ((BYTE *)&dwAlpha)[2] ) ) >> 8 );
+		}
+	}
+	MySetPixel(hDC,X,Y,clrColor);
+}
+
+HANDLE GRPAPI WINAPI CreateGrp(signed short *lpImageData, WORD nFrames, WORD wMaxWidth, WORD wMaxHeight, BOOL bNoCompress, DWORD *nGrpSize)
+{
+	GRPHEADER GrpHeader;
+	FRAMEHEADER *lpFrameHeaders;
+	FRAMEDATA *lpFrameData;
+	LPBYTE lpGrpData;
+	int i, j, x, y, x1, x2, y1, y2;
+	DWORD nLastOffset;
+
+	if (!lpImageData || !nGrpSize) return (HANDLE)-1;
+
+	GrpHeader.nFrames = nFrames;
+	GrpHeader.wMaxWidth = wMaxWidth;
+	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++) {
+		lpFrameHeaders[i].Offset = nLastOffset;
+
+		// Scan frame to find dimensions of used part
+		x1 = y1 = 0x10000;
+		x2 = y2 = -1;
+		for (y = 0; y < wMaxHeight; y++) {
+			for (x = 0; x < wMaxWidth; x++) {
+				if (lpImageData[i * wMaxWidth * wMaxHeight + y * wMaxWidth + x] >= 0) {
+					if (x < x1) x1 = x;
+					if (x > x2) x2 = x;
+					if (y < y1) y1 = y;
+					if (y > y2) y2 = y;
+				}
+			}
+		}
+		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;
+		lpFrameHeaders[i].Height = y2;
+
+		EncodeFrameData(lpImageData, i, &GrpHeader, &lpFrameHeaders[i], &lpFrameData[i], bNoCompress);
+
+		// Search for duplicate frames
+		for (j = 0; j < i; j++) {
+			if (lpFrameData[j].lpRowOffsets && lpFrameHeaders[i].Width == lpFrameHeaders[j].Width && lpFrameHeaders[i].Height == lpFrameHeaders[j].Height && lpFrameData[i].Size == lpFrameData[j].Size) {
+				for (y = 0; y < lpFrameHeaders[i].Height; y++) {
+					if (!lpFrameData[i].lpRowData[y] && !lpFrameData[j].lpRowData[y])
+						continue;
+
+					if ((!lpFrameData[i].lpRowData[y] && lpFrameData[j].lpRowData[y]) || (lpFrameData[i].lpRowData[y] && !lpFrameData[j].lpRowData[y]) || lpFrameData[i].lpRowSizes[y] != lpFrameData[j].lpRowSizes[y])
+						break;
+
+					if (memcmp(lpFrameData[i].lpRowData[y], lpFrameData[j].lpRowData[y], lpFrameData[i].lpRowSizes[y]) != 0)
+						break;
+				}
+
+				if (y == lpFrameHeaders[i].Height) {
+					break;
+				}
+			}
+		}
+
+		if (j < i) {
+			// Duplicate frame found, free stored frame data and change offset
+			for (y = 0; y < lpFrameHeaders[i].Height; y++) {
+				if (lpFrameData[i].lpRowData[y]) {
+					free(lpFrameData[i].lpRowData[y]);
+				}
+			}
+
+			free(lpFrameData[i].lpRowOffsets);
+			free(lpFrameData[i].lpRowSizes);
+			free(lpFrameData[i].lpRowData);
+
+			lpFrameHeaders[i].Offset = lpFrameHeaders[j].Offset;
+			lpFrameData[i].lpRowOffsets = 0;
+			lpFrameData[i].lpRowSizes = 0;
+			lpFrameData[i].lpRowData = 0;
+			lpFrameData[i].Size = 0;
+			continue;
+		}
+
+		nLastOffset = lpFrameHeaders[i].Offset + lpFrameData[i].Size;
 	}
-	if (dwFlags&ALPHA_BLEND) {
-		DWORD dwColor = GetPixel(hDC,X,Y);
-
-		// Old alpha
-		/*((BYTE *)&dwColor)[0]*=1-((float)((BYTE *)&dwAlpha)[0]/256);
-		((BYTE *)&dwColor)[1]*=1-((float)((BYTE *)&dwAlpha)[1]/256);
-		((BYTE *)&dwColor)[2]*=1-((float)((BYTE *)&dwAlpha)[2]/256);
-		((BYTE *)&clrColor)[0]*=(float)((BYTE *)&dwAlpha)[0]/256;
-		((BYTE *)&clrColor)[1]*=(float)((BYTE *)&dwAlpha)[1]/256;
-		((BYTE *)&clrColor)[2]*=(float)((BYTE *)&dwAlpha)[2]/256;
-		((BYTE *)&clrColor)[0]+=((BYTE *)&dwColor)[0];
-		((BYTE *)&clrColor)[1]+=((BYTE *)&dwColor)[1];
-		((BYTE *)&clrColor)[2]+=((BYTE *)&dwColor)[2];*/
-
-		/* blendedcolor =
-		     ( ( forecolor * ( 1 - alpha ) ) >> 8 )
-		   + ( ( backcolor * ( 256 - alpha ) ) >> 8 ) */
-		((BYTE *)&clrColor)[0] =
-			( ( ((BYTE *)&clrColor)[0] * ( ((BYTE *)&dwAlpha)[0] + 1 ) ) >> 8 )
-			+ ( ( ((BYTE *)&dwColor)[0] * ( 256 - ((BYTE *)&dwAlpha)[0] ) ) >> 8 );
-		((BYTE *)&clrColor)[1] =
-			( ( ((BYTE *)&clrColor)[1] * ( ((BYTE *)&dwAlpha)[1] + 1 ) ) >> 8 )
-			+ ( ( ((BYTE *)&dwColor)[1] * ( 256 - ((BYTE *)&dwAlpha)[1] ) ) >> 8 );
-		((BYTE *)&clrColor)[2] =
-			( ( ((BYTE *)&clrColor)[2] * ( ((BYTE *)&dwAlpha)[2] + 1 ) ) >> 8 )
-			+ ( ( ((BYTE *)&dwColor)[2] * ( 256 - ((BYTE *)&dwAlpha)[2] ) ) >> 8 );
+
+	lpGrpData = (LPBYTE)malloc(nLastOffset);
+
+	// Write completed GRP to buffer
+	memcpy(lpGrpData, &GrpHeader, sizeof(GRPHEADER));
+	memcpy(lpGrpData + sizeof(GRPHEADER), lpFrameHeaders, nFrames * sizeof(FRAMEHEADER));
+
+	for (i = 0; i < nFrames; i++) {
+		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++) {
+				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);
+		}
 	}
-	SetPixelV(hDC,X,Y,clrColor);
+
+	free(lpFrameHeaders);
+	free(lpFrameData);
+
+	*nGrpSize = nLastOffset;
+	return (HANDLE)lpGrpData;
 }
 
+void EncodeFrameData(signed short *lpImageData, WORD nFrame, GRPHEADER *lpGrpHeader, FRAMEHEADER *lpFrameHeader, FRAMEDATA *lpFrameData, BOOL bNoCompress)
+{
+	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 (!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;
+						}
+
+						// 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;
+							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 {
+						if (lpImageData[i+x] < 0) {
+							lpRowBuf[nBufPos] = 0x81;
+							if (nLastOffset + nBufPos + 1 <= 0xFFFF)
+								nBufPos++;
+						}
+						else {
+							lpRowBuf[nBufPos] = 1;
+							lpRowBuf[nBufPos+1] = (BYTE)(lpImageData[i+x]);
+							if (nLastOffset + nBufPos + 2 <= 0xFFFF)
+								nBufPos += 2;
+						}
+					}
+				}
+				else {
+					lpRowBuf[nBufPos] = (BYTE)(lpImageData[i+x]);
+					if (nLastOffset + nBufPos + 1 <= 0xFFFF)
+						nBufPos++;
+				}
+			}
+		}
+
+#ifdef _DEBUG
+		if (!VerifyRow(&lpImageData[i+lpFrameHeader->Left], lpFrameHeader->Width, lpRowBuf, nBufPos, bNoCompress)) {
+			nBufPos = nBufPos;
+		}
+#endif
+
+		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 bNoCompress)
+{
+	int i,x=0,ofs=0;
+	while (x < nWidth && ofs < nSize) {
+		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;
+				}
+			}
+			else {
+				for (i=0;i<lpEncRow[ofs]-128 && x<nWidth;i++) {
+					if (lpRawRow[x] >= 0) return FALSE;
+				}
+				x+=lpEncRow[ofs]-128;
+				ofs++;
+			}
+		}
+		else {
+			if (lpEncRow[ofs] != (BYTE)lpRawRow[x]) return FALSE;
+			x++;
+			ofs++;
+		}
+	}
+
+	if (x != nWidth || ofs != nSize) return FALSE;
+
+	return TRUE;
+}
+#endif