Skip to content
Permalink
Browse files

Fixed bug 4043 - SDL_windowswindow.c incorrect icon height

Needed to allocate space for the mask in the ICONIMAGE structure
  • Loading branch information
slouken committed Jan 15, 2018
1 parent a0c4eb2 commit 0cba68479448193e0bb3db8338b20b04a5adbb6c
Showing with 7 additions and 3 deletions.
  1. +7 −3 src/video/windows/SDL_windowswindow.c
@@ -438,11 +438,12 @@ WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
HICON hicon = NULL;
BYTE *icon_bmp;
int icon_len, y;
int icon_len, mask_len, y;
SDL_RWops *dst;

/* Create temporary bitmap buffer */
icon_len = 40 + icon->h * icon->w * sizeof(Uint32);
/* Create temporary buffer for ICONIMAGE structure */
mask_len = (icon->h * (icon->w + 7)/8);
icon_len = 40 + icon->h * icon->w * sizeof(Uint32) + mask_len;
icon_bmp = SDL_stack_alloc(BYTE, icon_len);
dst = SDL_RWFromMem(icon_bmp, icon_len);
if (!dst) {
@@ -471,6 +472,9 @@ WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
SDL_RWwrite(dst, src, icon->w * sizeof(Uint32), 1);
}

/* Write the mask */
SDL_memset(icon_bmp + icon_len - mask_len, 0xFF, mask_len);

hicon = CreateIconFromResource(icon_bmp, icon_len, TRUE, 0x00030000);

SDL_RWclose(dst);

0 comments on commit 0cba684

Please sign in to comment.