fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-29 13:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

LoadImage() g_hiconX because it is DestroyIcon()d cannot use LoadIcon().

Browse source 
Fix off-by-one class naming problem. More error checking on icon and
    menu creation.
This commit is contained in:
Earle F. Philhower III 2004-04-14 06:12:44 +00:00
parent d3ba886083
commit 5338151acc
4 changed files with 64 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hw/xwin/winmultiwindowwindow.c
View file

@ -500,7 +500,11 @@ winCreateWindowsWindow (WindowPtr pWin)
g_hiconX = (HICON)winOverrideDefaultIcon();
if (!g_hiconX)
g_hiconX = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
g_hiconX = (HICON)LoadImage (g_hInstance,
MAKEINTRESOURCE(IDI_XWIN),
IMAGE_ICON,
0, 0,
LR_DEFAULTSIZE);
/* Try and get the icon from WM_HINTS */
hIcon = winXIconToHICON (pWin);
@ -510,7 +514,7 @@ winCreateWindowsWindow (WindowPtr pWin)
hIcon = g_hiconX;
/* Set standard class name prefix so we can identify window easily */
strncpy (pszClass, WINDOW_CLASS_X, strlen (WINDOW_CLASS_X));
strncpy (pszClass, WINDOW_CLASS_X, sizeof(pszClass));
if (winMultiWindowGetClassHint (pWin, &res_name, &res_class))
{
@ -601,7 +605,6 @@ winCreateWindowsWindow (WindowPtr pWin)
* winDestroyWindowsWindow - Destroy a Windows window associated
* with an X window
*/
static void
winDestroyWindowsWindow (WindowPtr pWin)
{
@ -653,7 +656,7 @@ winDestroyWindowsWindow (WindowPtr pWin)
#endif
/* Only delete if it's not the default */
if (hiconClass != g_hiconX &&
if ((hiconClass != g_hiconX) &&
!winIconIsOverride((unsigned long)hiconClass))
{
iReturn = DestroyIcon (hiconClass);

1
hw/xwin/winmultiwindowwndproc.c
View file

@ -41,7 +41,6 @@
*/
extern Bool g_fCursor;
extern HICON g_hiconX;
extern Bool g_fKeyboardHookLL;

75
hw/xwin/winprefs.c
View file

@ -82,7 +82,7 @@ MakeMenu (char *name,
int i;
int item;
MENUPARSED *m;
HMENU hmenu;
HMENU hmenu, hsub;
for (i=0; i<pref.menuItems; i++)
{
@ -107,6 +107,11 @@ MakeMenu (char *name,
else
{
hmenu = CreatePopupMenu();
if (!hmenu)
{
ErrorF("MakeMenu: Unable to CreatePopupMenu() %s\n", name);
return NULL;
}
item = 0;
}
@ -139,11 +144,13 @@ MakeMenu (char *name,
case CMD_MENU:
/* Recursive! */
InsertMenu (hmenu,
item,
MF_BYPOSITION|MF_POPUP|MF_ENABLED|MF_STRING,
(UINT_PTR)MakeMenu (m->menuItem[i].param, 0, 0),
m->menuItem[i].text);
hsub = MakeMenu (m->menuItem[i].param, 0, 0);
if (hsub)
InsertMenu (hmenu,
item,
MF_BYPOSITION|MF_POPUP|MF_ENABLED|MF_STRING,
(UINT_PTR)hsub,
m->menuItem[i].text);
break;
}
@ -165,6 +172,12 @@ static BOOL CALLBACK
ReloadEnumWindowsProc (HWND hwnd, LPARAM lParam)
{
HICON hicon;
Window wid;
if (!hwnd) {
ErrorF("ReloadEnumWindowsProc: hwnd==NULL!\n");
return FALSE;
}
/* It's our baby, either clean or dirty it */
if (lParam==FALSE)
@ -175,9 +188,10 @@ ReloadEnumWindowsProc (HWND hwnd, LPARAM lParam)
SetClassLong (hwnd, GCL_HICON, (LONG)LoadIcon (NULL, IDI_APPLICATION));
/* If it's generated on-the-fly, get rid of it, will regen */
if (!winIconIsOverride((unsigned long)hicon) && hicon!=g_hiconX)
if (!winIconIsOverride((unsigned long)hicon) && (hicon!=g_hiconX))
DestroyIcon (hicon);
/* Remove any menu additions, use bRevert flag */
GetSystemMenu (hwnd, TRUE);
@ -185,9 +199,11 @@ ReloadEnumWindowsProc (HWND hwnd, LPARAM lParam)
}
else
{
/* Make the icon default, dynamic, of from xwinrc */
/* Make the icon default, dynamic, or from xwinrc */
SetClassLong (hwnd, GCL_HICON, (LONG)g_hiconX);
winUpdateIcon ((Window)GetProp (hwnd, WIN_WID_PROP));
wid = (Window)GetProp (hwnd, WIN_WID_PROP);
if (wid)
winUpdateIcon (wid);
/* Update the system menu for this window */
SetupSysMenu ((unsigned long)hwnd);
@ -243,7 +259,8 @@ ReloadPrefs (void)
pref.iconItems = 0;
/* Free global default X icon */
DestroyIcon (g_hiconX);
if (g_hiconX)
DestroyIcon (g_hiconX);
/* Reset the custom command IDs */
g_cmdid = STARTMENUID;
@ -253,8 +270,13 @@ ReloadPrefs (void)
/* Define global icon, load it */
g_hiconX = (HICON)winOverrideDefaultIcon();
/* Use LoadImage so we get a non-shared, safe-to-kill resource */
if (!g_hiconX)
g_hiconX = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
g_hiconX = (HICON)LoadImage (g_hInstance,
MAKEINTRESOURCE(IDI_XWIN),
IMAGE_ICON,
0, 0,
LR_DEFAULTSIZE);
#ifdef XWIN_MULTIWINDOW
/* Rebuild the icons and menus */
@ -478,8 +500,8 @@ winOverrideDefaultIcon()
{
hicon = LoadImageComma (pref.defaultIconName, 0, 0, LR_DEFAULTSIZE);
if (hicon==NULL)
ErrorF ("winOverrideDefaultIcon: LoadIcon(%s) failed\n",
pref.defaultIconName);
ErrorF ("winOverrideDefaultIcon: LoadImageComma(%s) failed\n",
pref.defaultIconName);
return (unsigned long)hicon;
}
@ -501,19 +523,19 @@ winTaskbarIcon(void)
if (pref.trayIconName[0])
{
hicon = LoadImageComma (pref.trayIconName,
GetSystemMetrics (SM_CXSMICON),
GetSystemMetrics (SM_CYSMICON),
0 );
GetSystemMetrics (SM_CXSMICON),
GetSystemMetrics (SM_CYSMICON),
0 );
}
/* Otherwise return the default */
if (!hicon)
hicon = (HICON) LoadImage (g_hInstance,
MAKEINTRESOURCE(IDI_XWIN),
IMAGE_ICON,
GetSystemMetrics (SM_CXSMICON),
GetSystemMetrics (SM_CYSMICON),
0);
MAKEINTRESOURCE(IDI_XWIN),
IMAGE_ICON,
GetSystemMetrics (SM_CXSMICON),
GetSystemMetrics (SM_CYSMICON),
0);
return (unsigned long)hicon;
}
@ -623,7 +645,7 @@ winOverrideIcon (unsigned long longWin)
hicon = LoadImageComma (pref.icon[i].iconFile, 0, 0, LR_DEFAULTSIZE);
if (hicon==NULL)
ErrorF ("winOverrideIcon: LoadIcon(%s) failed\n",
ErrorF ("winOverrideIcon: LoadImageComma(%s) failed\n",
pref.icon[i].iconFile);
pref.icon[i].hicon = (unsigned long)hicon;
@ -695,11 +717,18 @@ LoadPreferences ()
strcat (fname, ".XWinrc");
prefFile = fopen (fname, "r");
if (prefFile)
ErrorF ("winPrefsLoadPreferences: %s\n", fname);
}
/* No home file found, check system default */
if (!prefFile)
prefFile = fopen (PROJECTROOT"/lib/X11/system.XWinrc", "r");
{
prefFile = fopen (PROJECTROOT"/lib/X11/system.XWinrc", "r");
if (prefFile)
ErrorF ("winPrefsLoadPreferences: %s\n",
PROJECTROOT"/lib/X11/system.XWinrc");
}
/* If we could open it, then read the settings and close it */
if (prefFile)

6
hw/xwin/winwin32rootless.c
View file

@ -257,7 +257,11 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
g_hiconX = (HICON)winOverrideDefaultIcon();
if (!g_hiconX)
g_hiconX = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
g_hiconX = (HICON)LoadImage (g_hInstance,
MAKEINTRESOURCE(IDI_XWIN),
IMAGE_ICON,
0, 0,
LR_DEFAULTSIZE);
/* Try and get the icon from WM_HINTS */
hIcon = winXIconToHICON (pFrame->win);