griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GHOST/X11: Incorrect WM_STATE access

Browse Source 
This worked by accident because of struct padding,
treat state as a CARD32 as documented.

Matches wine-x11 usage.
This commit is contained in:
Campbell Barton
2016-11-20 08:58:41 +11:00
parent dd82d70bc5
commit 53a1b48321
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@@ -861,24 +861,32 @@ void GHOST_WindowX11::icccmSetState(int state)
int GHOST_WindowX11::icccmGetState(void) const
{
Atom *prop_ret;
struct {
CARD32 state;
XID icon;
} *prop_ret;
unsigned long bytes_after, num_ret;
Atom type_ret;
int format_ret, st;
int ret, format_ret;
CARD32 st;
prop_ret = NULL;
st = XGetWindowProperty(
ret = XGetWindowProperty(
m_display, m_window, m_system->m_atom.WM_STATE, 0, 2,
False, m_system->m_atom.WM_STATE, &type_ret,
&format_ret, &num_ret, &bytes_after, ((unsigned char **)&prop_ret));
if ((st == Success) && (prop_ret) && (num_ret == 2))
st = prop_ret[0];
else
if ((ret == Success) && (prop_ret != NULL) && (num_ret == 2)) {
st = prop_ret->state;
}
else {
st = NormalState;
}
if (prop_ret)
if (prop_ret) {
XFree(prop_ret);
return (st);
}
return st;
}
void GHOST_WindowX11::netwmMaximized(bool set)