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
GETPIXELPROC MyGetPixel = GetPixel;\r
SETPIXELPROC MySetPixel = (SETPIXELPROC)SetPixelV;\r
\r
-void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD dwFlags, DWORD dwAlpha);\r
+void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD *dwPalette, DWORD dwFlags, DWORD dwAlpha);\r
\r
extern HINSTANCE hStorm;\r
\r
SFileCloseFile(hFile);\r
return (HANDLE)-1;\r
}\r
- GrpFile = (char *)VirtualAlloc(0,fsz,MEM_COMMIT,PAGE_READWRITE);\r
+ GrpFile = (char *)malloc(fsz);\r
if (GrpFile) {\r
SFileSetFilePointer(hFile,0,0,FILE_BEGIN);\r
SFileReadFile(hFile,GrpFile,fsz,0,0);\r
CloseHandle(hFile);\r
return (HANDLE)-1;\r
}\r
- GrpFile = (char *)VirtualAlloc(0,fsz,MEM_COMMIT,PAGE_READWRITE);\r
+ GrpFile = (char *)malloc(fsz);\r
if (GrpFile) {\r
SetFilePointer(hFile,0,0,FILE_BEGIN);\r
ReadFile(hFile,GrpFile,fsz,&tsz,0);\r
BOOL GRPAPI WINAPI DestroyGrp(HANDLE hGrp)\r
{\r
if (!hGrp || hGrp==INVALID_HANDLE_VALUE) return FALSE;\r
- VirtualFree(hGrp,0,MEM_RELEASE);\r
+ free(hGrp);\r
return TRUE;\r
}\r
\r
@@ -187,124 +187,180 @@ BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WOR
GRPHEADER *GrpFile = (GRPHEADER *)hGrp;\r
nFrame %= GrpFile->nFrames;\r
FRAMEHEADER *GrpFrame = &((FRAMEHEADER *)(((char *)GrpFile)+6))[nFrame];\r
+ FRAMEHEADER *GrpFrames = &((FRAMEHEADER *)(((char *)GrpFile)+6))[0];\r
+ int FrameSize = 0xFFFFFF;\r
DWORD Right,Bottom;\r
if (dwFlags&HORIZONTAL_FLIP) Right = nXDest+GrpFile->wMaxWidth-1-GrpFrame->Left;\r
if (dwFlags&VERTICAL_FLIP) Bottom = nYDest+GrpFile->wMaxHeight-1-GrpFrame->Top;\r
nXDest += GrpFrame->Left;\r
nYDest += GrpFrame->Top;\r
WORD *GrpOffsets = ((WORD *)(((char *)GrpFile)+GrpFrame->Offset));\r
+ BYTE *GrpRaw = (BYTE *)GrpOffsets;\r
BYTE *RowData;\r
WORD x,ofs;\r
DWORD y;\r
WORD i;\r
+ int j;\r
+ if (nFrame + 1 < GrpFile->nFrames) {\r
+ for (i = 0; i + 1 < GrpFile->nFrames; i++) {\r
+ j = GrpFrames[i].Offset - GrpFrame->Offset;\r
+ if (j > 0 && j < FrameSize)\r
+ FrameSize = j;\r
+ }\r
+ }\r
+ if (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
+ FrameSize = j;\r
+ }\r
+ if (FrameSize == GrpFrames[0].Width * GrpFrames[0].Height)\r
+ FrameSize = GrpFrame->Width * GrpFrame->Height;\r
+ }\r
if (!(dwFlags&HORIZONTAL_FLIP) && !(dwFlags&VERTICAL_FLIP)) {\r
- for (y=0;y<GrpFrame->Height;y++) {\r
- RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
- x=0; ofs=0;\r
- while (x<GrpFrame->Width) {\r
- if (!(RowData[ofs] & 0x80)) {\r
- if (!(RowData[ofs] & 0x40)) {\r
- for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
+ if (FrameSize != GrpFrame->Width * GrpFrame->Height) {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,nYDest+y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
+ }\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,nYDest+y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
- ofs+=RowData[ofs]+1;\r
}\r
else {\r
- for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
- }\r
- ofs+=2;\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
}\r
}\r
- else {\r
- x+=RowData[ofs]-128;\r
- ofs++;\r
+ }\r
+ }\r
+ else {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ for (x=0;x<GrpFrame->Width;x++) {\r
+ SetPix(hdcDest,nXDest+x,nYDest+y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);\r
}\r
}\r
}\r
}\r
else if (dwFlags&HORIZONTAL_FLIP && !(dwFlags&VERTICAL_FLIP)) {\r
- for (y=0;y<GrpFrame->Height;y++) {\r
- RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
- x=0; ofs=0;\r
- while (x<GrpFrame->Width) {\r
- if (!(RowData[ofs] & 0x80)) {\r
- if (!(RowData[ofs] & 0x40)) {\r
- for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
+ if (FrameSize != GrpFrame->Width * GrpFrame->Height) {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,nYDest+y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
+ }\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,nYDest+y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
- ofs+=RowData[ofs]+1;\r
}\r
else {\r
- for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
- }\r
- ofs+=2;\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
}\r
}\r
- else {\r
- x+=RowData[ofs]-128;\r
- ofs++;\r
+ }\r
+ }\r
+ else {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ for (x=0;x<GrpFrame->Width;x++) {\r
+ SetPix(hdcDest,Right-x,nYDest+y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);\r
}\r
}\r
}\r
}\r
else if (!(dwFlags&HORIZONTAL_FLIP) && dwFlags&VERTICAL_FLIP) {\r
- for (y=0;y<GrpFrame->Height;y++) {\r
- RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
- x=0; ofs=0;\r
- while (x<GrpFrame->Width) {\r
- if (!(RowData[ofs] & 0x80)) {\r
- if (!(RowData[ofs] & 0x40)) {\r
- for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
+ if (FrameSize != GrpFrame->Width * GrpFrame->Height) {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,Bottom-y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
+ }\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,Bottom-y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
- ofs+=RowData[ofs]+1;\r
}\r
else {\r
- for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
- }\r
- ofs+=2;\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
}\r
}\r
- else {\r
- x+=RowData[ofs]-128;\r
- ofs++;\r
+ }\r
+ }\r
+ else {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ for (x=0;x<GrpFrame->Width;x++) {\r
+ SetPix(hdcDest,nXDest+x,Bottom-y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);\r
}\r
}\r
}\r
}\r
else {\r
- for (y=0;y<GrpFrame->Height;y++) {\r
- RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
- x=0; ofs=0;\r
- while (x<GrpFrame->Width) {\r
- if (!(RowData[ofs] & 0x80)) {\r
- if (!(RowData[ofs] & 0x40)) {\r
- for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
+ if (FrameSize != GrpFrame->Width * GrpFrame->Height) {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,Bottom-y,RowData[ofs+i],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
+ }\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,Bottom-y,RowData[ofs+1],dwPalette,dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
- ofs+=RowData[ofs]+1;\r
}\r
else {\r
- for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
- }\r
- ofs+=2;\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
}\r
}\r
- else {\r
- x+=RowData[ofs]-128;\r
- ofs++;\r
+ }\r
+ }\r
+ else {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ for (x=0;x<GrpFrame->Width;x++) {\r
+ SetPix(hdcDest,Right-x,Bottom-y,GrpRaw[y * GrpFrame->Width + x],dwPalette,dwFlags,dwAlpha);\r
}\r
}\r
}\r
\r
void GRPAPI WINAPI SetFunctionGetPixel(GETPIXELPROC lpGetPixelProc)\r
{\r
- MyGetPixel = lpGetPixelProc;\r
+ if (!lpGetPixelProc)\r
+ MyGetPixel = GetPixel;\r
+ else\r
+ MyGetPixel = lpGetPixelProc;\r
}\r
\r
void GRPAPI WINAPI SetFunctionSetPixel(SETPIXELPROC lpSetPixelProc)\r
{\r
- MySetPixel = lpSetPixelProc;\r
+ if (!lpSetPixelProc)\r
+ MySetPixel = (SETPIXELPROC)SetPixelV;\r
+ else\r
+ MySetPixel = lpSetPixelProc;\r
}\r
\r
-void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD dwFlags, DWORD dwAlpha)\r
+void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD *dwPalette, DWORD dwFlags, DWORD dwAlpha)\r
{\r
- if (dwFlags&SHADOW_COLOR) {\r
- clrColor = (dwFlags >> 8) & 0x00FFFFFF;\r
- }\r
- if (dwFlags&ALPHA_BLEND) {\r
- DWORD dwColor = MyGetPixel(hDC,X,Y);\r
+ if (!(dwFlags&USE_INDEX)) {\r
+ if (dwFlags&SHADOW_COLOR) {\r
+ clrColor = (dwFlags >> 8) & 0x00FFFFFF;\r
+ }\r
+ else {\r
+ clrColor = dwPalette[clrColor];\r
+ }\r
+ if (dwFlags&ALPHA_BLEND) {\r
+ DWORD dwColor = MyGetPixel(hDC,X,Y);\r
\r
- // Old alpha\r
- /*((BYTE *)&dwColor)[0]*=1-((float)((BYTE *)&dwAlpha)[0]/256);\r
- ((BYTE *)&dwColor)[1]*=1-((float)((BYTE *)&dwAlpha)[1]/256);\r
- ((BYTE *)&dwColor)[2]*=1-((float)((BYTE *)&dwAlpha)[2]/256);\r
- ((BYTE *)&clrColor)[0]*=(float)((BYTE *)&dwAlpha)[0]/256;\r
- ((BYTE *)&clrColor)[1]*=(float)((BYTE *)&dwAlpha)[1]/256;\r
- ((BYTE *)&clrColor)[2]*=(float)((BYTE *)&dwAlpha)[2]/256;\r
- ((BYTE *)&clrColor)[0]+=((BYTE *)&dwColor)[0];\r
- ((BYTE *)&clrColor)[1]+=((BYTE *)&dwColor)[1];\r
- ((BYTE *)&clrColor)[2]+=((BYTE *)&dwColor)[2];*/\r
+ // Old alpha\r
+ /*((BYTE *)&dwColor)[0]*=1-((float)((BYTE *)&dwAlpha)[0]/256);\r
+ ((BYTE *)&dwColor)[1]*=1-((float)((BYTE *)&dwAlpha)[1]/256);\r
+ ((BYTE *)&dwColor)[2]*=1-((float)((BYTE *)&dwAlpha)[2]/256);\r
+ ((BYTE *)&clrColor)[0]*=(float)((BYTE *)&dwAlpha)[0]/256;\r
+ ((BYTE *)&clrColor)[1]*=(float)((BYTE *)&dwAlpha)[1]/256;\r
+ ((BYTE *)&clrColor)[2]*=(float)((BYTE *)&dwAlpha)[2]/256;\r
+ ((BYTE *)&clrColor)[0]+=((BYTE *)&dwColor)[0];\r
+ ((BYTE *)&clrColor)[1]+=((BYTE *)&dwColor)[1];\r
+ ((BYTE *)&clrColor)[2]+=((BYTE *)&dwColor)[2];*/\r
\r
- /* blendedcolor =\r
- ( ( forecolor * ( 1 - alpha ) ) >> 8 )\r
- + ( ( backcolor * ( 256 - alpha ) ) >> 8 ) */\r
- ((BYTE *)&clrColor)[0] =\r
- ( ( ((BYTE *)&clrColor)[0] * ( ((BYTE *)&dwAlpha)[0] + 1 ) ) >> 8 )\r
- + ( ( ((BYTE *)&dwColor)[0] * ( 256 - ((BYTE *)&dwAlpha)[0] ) ) >> 8 );\r
- ((BYTE *)&clrColor)[1] =\r
- ( ( ((BYTE *)&clrColor)[1] * ( ((BYTE *)&dwAlpha)[1] + 1 ) ) >> 8 )\r
- + ( ( ((BYTE *)&dwColor)[1] * ( 256 - ((BYTE *)&dwAlpha)[1] ) ) >> 8 );\r
- ((BYTE *)&clrColor)[2] =\r
- ( ( ((BYTE *)&clrColor)[2] * ( ((BYTE *)&dwAlpha)[2] + 1 ) ) >> 8 )\r
- + ( ( ((BYTE *)&dwColor)[2] * ( 256 - ((BYTE *)&dwAlpha)[2] ) ) >> 8 );\r
+ /* blendedcolor =\r
+ ( ( forecolor * ( 1 - alpha ) ) >> 8 )\r
+ + ( ( backcolor * ( 256 - alpha ) ) >> 8 ) */\r
+ ((BYTE *)&clrColor)[0] =\r
+ ( ( ((BYTE *)&clrColor)[0] * ( ((BYTE *)&dwAlpha)[0] + 1 ) ) >> 8 )\r
+ + ( ( ((BYTE *)&dwColor)[0] * ( 256 - ((BYTE *)&dwAlpha)[0] ) ) >> 8 );\r
+ ((BYTE *)&clrColor)[1] =\r
+ ( ( ((BYTE *)&clrColor)[1] * ( ((BYTE *)&dwAlpha)[1] + 1 ) ) >> 8 )\r
+ + ( ( ((BYTE *)&dwColor)[1] * ( 256 - ((BYTE *)&dwAlpha)[1] ) ) >> 8 );\r
+ ((BYTE *)&clrColor)[2] =\r
+ ( ( ((BYTE *)&clrColor)[2] * ( ((BYTE *)&dwAlpha)[2] + 1 ) ) >> 8 )\r
+ + ( ( ((BYTE *)&dwColor)[2] * ( 256 - ((BYTE *)&dwAlpha)[2] ) ) >> 8 );\r
+ }\r
}\r
MySetPixel(hDC,X,Y,clrColor);\r
}\r