Unverified Commit 7a02b4ab authored by Mike Gabriel's avatar Mike Gabriel

Merge branch 'uli42-pr/fix_stack_smashing' into 3.6.x

parents 2b0976e9 ae037701
...@@ -1188,7 +1188,7 @@ static void transferSelection(int resource) ...@@ -1188,7 +1188,7 @@ static void transferSelection(int resource)
void nxagentCollectPropertyEvent(int resource) void nxagentCollectPropertyEvent(int resource)
{ {
Atom atomReturnType; XlibAtom atomReturnType;
int resultFormat; int resultFormat;
unsigned long ulReturnItems; unsigned long ulReturnItems;
unsigned long ulReturnBytesLeft; unsigned long ulReturnBytesLeft;
......
...@@ -3924,7 +3924,7 @@ void nxagentHandleCollectPropertyEvent(XEvent *X) ...@@ -3924,7 +3924,7 @@ void nxagentHandleCollectPropertyEvent(XEvent *X)
} }
else else
{ {
Atom atomReturnType; XlibAtom atomReturnType;
int resultFormat; int resultFormat;
unsigned long ulReturnItems; unsigned long ulReturnItems;
unsigned long ulReturnBytesLeft; unsigned long ulReturnBytesLeft;
...@@ -3940,8 +3940,8 @@ void nxagentHandleCollectPropertyEvent(XEvent *X) ...@@ -3940,8 +3940,8 @@ void nxagentHandleCollectPropertyEvent(XEvent *X)
if (result == True) if (result == True)
{ {
Window window = nxagentPropertyRequests[resource].window; XlibWindow window = nxagentPropertyRequests[resource].window;
Atom property = nxagentPropertyRequests[resource].property; XlibAtom property = nxagentPropertyRequests[resource].property;
nxagentImportProperty(window, property, atomReturnType, resultFormat, nxagentImportProperty(window, property, atomReturnType, resultFormat,
ulReturnItems, ulReturnBytesLeft, pszReturnData); ulReturnItems, ulReturnBytesLeft, pszReturnData);
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
/* */ /* */
/**************************************************************************/ /**************************************************************************/
/*
* let the types be the Xlib types by undefining _XSERVER64. This
* means, when calling the functions of this file from nxagent (where
* Agent.h has been included) you need to use/provide XlibAtom and
* XlibWindow instead of Atom and Window
*/
#undef _XSERVER64 #undef _XSERVER64
#include <sys/socket.h> #include <sys/socket.h>
......
...@@ -827,19 +827,31 @@ extern int NXCollectProperty( ...@@ -827,19 +827,31 @@ extern int NXCollectProperty(
Display* /* display */, Display* /* display */,
unsigned int /* resource */, unsigned int /* resource */,
Window /* window */, Window /* window */,
#ifdef XlibAtom
XlibAtom /* property */,
#else
Atom /* property */, Atom /* property */,
#endif
long /* long_offset */, long /* long_offset */,
long /* long_length */, long /* long_length */,
Bool /* delete */, Bool /* delete */,
#ifdef XlibAtom
XlibAtom /* req_type */
#else
Atom /* req_type */ Atom /* req_type */
#endif #endif
#endif
); );
extern int NXGetCollectedProperty( extern int NXGetCollectedProperty(
#if NeedFunctionPrototypes #if NeedFunctionPrototypes
Display* /* display */, Display* /* display */,
unsigned int /* resource */, unsigned int /* resource */,
#ifdef XlibAtom
XlibAtom* /* actual_type_return */,
#else
Atom* /* actual_type_return */, Atom* /* actual_type_return */,
#endif
int* /* actual_format_return */, int* /* actual_format_return */,
unsigned long* /* nitems_return */, unsigned long* /* nitems_return */,
unsigned long* /* bytes_after_return */, unsigned long* /* bytes_after_return */,
......
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