andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

https://bugs.freedesktop.org/show_bug.cgi?id=5138 Check for NULL pointer

Browse Source
This commit is contained in:
Alan Hourihane 2006-03-03 09:43:42 +00:00
parent 054c291b27
commit 06f01623fd
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xwin/ChangeLog
View File

@ -1,3 +1,10 @@
2006-03-03 Alan Hourihane <alanh@fairlite.demon.co.uk>
* winmultiwindowicons.c: (winXIconToHICON), (winUpdateIcon):
* winwin32rootlesswindow.c: (winMWExtWMUpdateIcon):
https://bugs.freedesktop.org/show_bug.cgi?id=5138
Check for NULL pointer
2005-07-05 Alexander Gottwald <ago at freedesktop dot org>
* winmultiwindowwm.c:

7
hw/xwin/winmultiwindowicons.c
View File

@ -282,7 +282,7 @@ winXIconToHICON (WindowPtr pWin, int iconSize)
winMultiWindowGetWMHints (pWin, &hints);
if (!hints.icon_pixmap) return NULL;
iconPtr = LookupIDByType (hints.icon_pixmap, RT_PIXMAP);
iconPtr = (PixmapPtr) LookupIDByType (hints.icon_pixmap, RT_PIXMAP);
if (!iconPtr) return NULL;
@ -311,7 +311,7 @@ winXIconToHICON (WindowPtr pWin, int iconSize)
memset (mask, 0, maskStride * iconSize);
winScaleXBitmapToWindows (iconSize, effBPP, iconPtr, image);
maskPtr = LookupIDByType (hints.icon_mask, RT_PIXMAP);
maskPtr = (PixmapPtr) LookupIDByType (hints.icon_mask, RT_PIXMAP);
if (maskPtr)
{
@ -369,7 +369,8 @@ winUpdateIcon (Window id)
WindowPtr pWin;
HICON hIcon, hiconOld;
pWin = LookupIDByType (id, RT_WINDOW);
pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
if (!pWin) return;
hIcon = (HICON)winOverrideIcon ((unsigned long)pWin);
if (!hIcon)

2
hw/xwin/winwin32rootlesswindow.c
View File

@ -164,7 +164,7 @@ winMWExtWMUpdateIcon (Window id)
WindowPtr pWin;
HICON hIcon, hiconOld;
pWin = LookupIDByType (id, RT_WINDOW);
pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
hIcon = (HICON)winOverrideIcon ((unsigned long)pWin);
if (!hIcon)