Skip to content

W
wine-winehq
Commit 99cb916d authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

progman: Don't try to access the internals of an icon object.

parent 25d7e0b9
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
programs/progman/grpfile.c
View file @ 99cb916d
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include "windows.h" #include "windows.h"
#include "wine/winuser16.h"
#include "progman.h" #include "progman.h"
#include "mmsystem.h" #include "mmsystem.h"
...@@ -242,7 +241,7 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size, ...@@ -242,7 +241,7 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
LPCSTR iconinfo_ptr, iconANDbits_ptr, iconXORbits_ptr; LPCSTR iconinfo_ptr, iconANDbits_ptr, iconXORbits_ptr;
INT x, y, nIconIndex, iconANDsize, iconXORsize; INT x, y, nIconIndex, iconANDsize, iconXORsize;
INT nHotKey, nCmdShow; INT nHotKey, nCmdShow;
CURSORICONINFO iconinfo; UINT width, height, planes, bpp;
x = GET_SHORT(program_ptr, 0); x = GET_SHORT(program_ptr, 0);
y = GET_SHORT(program_ptr, 2); y = GET_SHORT(program_ptr, 2);
...@@ -261,13 +260,10 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size, ...@@ -261,13 +260,10 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12); iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12);
iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 14); iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 14);
iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 16); iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 16);
iconinfo.ptHotSpot.x = GET_USHORT(iconinfo_ptr, 0); width = GET_USHORT(iconinfo_ptr, 4);
iconinfo.ptHotSpot.y = GET_USHORT(iconinfo_ptr, 2); height = GET_USHORT(iconinfo_ptr, 6);
iconinfo.nWidth = GET_USHORT(iconinfo_ptr, 4); planes = GET_USHORT(iconinfo_ptr, 10);
iconinfo.nHeight = GET_USHORT(iconinfo_ptr, 6); bpp = GET_USHORT(iconinfo_ptr, 11);
iconinfo.nWidthBytes = GET_USHORT(iconinfo_ptr, 8);
iconinfo.bPlanes = GET_USHORT(iconinfo_ptr, 10);
iconinfo.bBitsPerPixel = GET_USHORT(iconinfo_ptr, 11);
break; break;
case 0x000c: case 0x000c:
iconANDsize = GET_USHORT(program_ptr, 8); iconANDsize = GET_USHORT(program_ptr, 8);
...@@ -275,21 +271,16 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size, ...@@ -275,21 +271,16 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12); iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12);
iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 14); iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 14);
iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 16); iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 16);
iconinfo.ptHotSpot.x = GET_USHORT(iconinfo_ptr, 0); width = GET_USHORT(iconinfo_ptr, 4);
iconinfo.ptHotSpot.y = GET_USHORT(iconinfo_ptr, 2); height = GET_USHORT(iconinfo_ptr, 6);
iconinfo.nWidth = GET_USHORT(iconinfo_ptr, 4); planes = GET_USHORT(iconinfo_ptr, 10);
iconinfo.nHeight = GET_USHORT(iconinfo_ptr, 6); bpp = GET_USHORT(iconinfo_ptr, 11);
iconinfo.nWidthBytes = GET_USHORT(iconinfo_ptr, 8) * 8;
iconinfo.bPlanes = GET_USHORT(iconinfo_ptr, 10);
iconinfo.bBitsPerPixel = GET_USHORT(iconinfo_ptr, 11);
} }
if (iconANDbits_ptr + iconANDsize > buffer + size || if (iconANDbits_ptr + iconANDsize > buffer + size ||
iconXORbits_ptr + iconXORsize > buffer + size) return(0); iconXORbits_ptr + iconXORsize > buffer + size) return(0);
hIcon = CreateIcon( Globals.hInstance, iconinfo.nWidth, iconinfo.nHeight, hIcon = CreateIcon( Globals.hInstance, width, height, planes, bpp, iconANDbits_ptr, iconXORbits_ptr );
iconinfo.bPlanes, iconinfo.bBitsPerPixel,
iconANDbits_ptr, iconXORbits_ptr );
lpszName = buffer + GET_USHORT(program_ptr, 18); lpszName = buffer + GET_USHORT(program_ptr, 18);
lpszCmdLine = buffer + GET_USHORT(program_ptr, 20); lpszCmdLine = buffer + GET_USHORT(program_ptr, 20);
...@@ -419,12 +410,19 @@ BOOL GRPFILE_WriteGroupFile(HLOCAL hGroup) ...@@ -419,12 +410,19 @@ BOOL GRPFILE_WriteGroupFile(HLOCAL hGroup)
* GRPFILE_CalculateSizes * GRPFILE_CalculateSizes
*/ */
static VOID GRPFILE_CalculateSizes(PROGRAM *program, static VOID GRPFILE_CalculateSizes(PROGRAM *program, INT *Progs, INT *Icons,
INT *Progs, INT *Icons) UINT *sizeAnd, UINT *sizeXor)
{ {
CURSORICONINFO *iconinfo = LocalLock(program->hIcon); ICONINFO info;
INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes; BITMAP bmp;
INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2);
GetIconInfo( program->hIcon, &info );
GetObjectW( info.hbmMask, sizeof(bmp), &bmp );
*sizeAnd = bmp.bmHeight * ((bmp.bmWidth + 15) / 16 * 2);
GetObjectW( info.hbmColor, sizeof(bmp), &bmp );
*sizeXor = bmp.bmHeight * bmp.bmWidthBytes;
DeleteObject( info.hbmMask );
DeleteObject( info.hbmColor );
*Progs += 24; *Progs += 24;
*Progs += lstrlen(LocalLock(program->hName)) + 1; *Progs += lstrlen(LocalLock(program->hName)) + 1;
...@@ -432,8 +430,8 @@ static VOID GRPFILE_CalculateSizes(PROGRAM *program, ...@@ -432,8 +430,8 @@ static VOID GRPFILE_CalculateSizes(PROGRAM *program,
*Progs += lstrlen(LocalLock(program->hIconFile)) + 1; *Progs += lstrlen(LocalLock(program->hIconFile)) + 1;
*Icons += 12; /* IconInfo */ *Icons += 12; /* IconInfo */
*Icons += sizeAnd; *Icons += *sizeAnd;
*Icons += sizeXor; *Icons += *sizeXor;
} }
/***********************************************************************/ /***********************************************************************/
...@@ -513,6 +511,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) ...@@ -513,6 +511,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
HLOCAL hProgram; HLOCAL hProgram;
INT NumProg, Title, Progs, Icons, Extension; INT NumProg, Title, Progs, Icons, Extension;
INT CurrProg, CurrIcon, nCmdShow, ptr, seqnum; INT CurrProg, CurrIcon, nCmdShow, ptr, seqnum;
DWORD sizeAnd, sizeXor;
BOOL need_extension; BOOL need_extension;
LPCSTR lpszTitle = LocalLock(group->hName); LPCSTR lpszTitle = LocalLock(group->hName);
...@@ -532,7 +531,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) ...@@ -532,7 +531,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
LPCSTR lpszWorkDir = LocalLock(program->hWorkDir); LPCSTR lpszWorkDir = LocalLock(program->hWorkDir);
NumProg++; NumProg++;
GRPFILE_CalculateSizes(program, &Icons, &Extension); GRPFILE_CalculateSizes(program, &Icons, &Extension, &sizeAnd, &sizeXor);
/* Set a flag if an extension is needed */ /* Set a flag if an extension is needed */
if (lpszWorkDir[0] || program->nHotKey || if (lpszWorkDir[0] || program->nHotKey ||
...@@ -585,7 +584,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) ...@@ -585,7 +584,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 2)) if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 2))
return FALSE; return FALSE;
GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon); GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon, &sizeAnd, &sizeXor);
hProgram = program->hNext; hProgram = program->hNext;
} }
...@@ -601,13 +600,13 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) ...@@ -601,13 +600,13 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
while(hProgram) while(hProgram)
{ {
PROGRAM *program = LocalLock(hProgram); PROGRAM *program = LocalLock(hProgram);
CURSORICONINFO *iconinfo = LocalLock(program->hIcon);
LPCSTR Name = LocalLock(program->hName); LPCSTR Name = LocalLock(program->hName);
LPCSTR CmdLine = LocalLock(program->hCmdLine); LPCSTR CmdLine = LocalLock(program->hCmdLine);
LPCSTR IconFile = LocalLock(program->hIconFile); LPCSTR IconFile = LocalLock(program->hIconFile);
INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes; INT next_prog = CurrProg;
INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2); INT next_icon = CurrIcon;
GRPFILE_CalculateSizes(program, &next_prog, &next_icon, &sizeAnd, &sizeXor);
PUT_SHORT(buffer, 0, program->x); PUT_SHORT(buffer, 0, program->x);
PUT_SHORT(buffer, 2, program->y); PUT_SHORT(buffer, 2, program->y);
PUT_SHORT(buffer, 4, program->nIconIndex); PUT_SHORT(buffer, 4, program->nIconIndex);
...@@ -630,7 +629,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) ...@@ -630,7 +629,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
(UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, IconFile, lstrlen(IconFile) + 1)) (UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, IconFile, lstrlen(IconFile) + 1))
return FALSE; return FALSE;
GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon); CurrProg = next_prog;
CurrIcon = next_icon;
hProgram = program->hNext; hProgram = program->hNext;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment