diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2009-05-21 22:52:06 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2009-05-21 22:52:06 (GMT) |
| commit | 90c1a43eb7a8a363aef33e43ff390646b70aff1f (patch) | |
| tree | e391b7ce54b3be4e79d38211fd3d587492c9d7a1 /win | |
| parent | fedc91c632885648cba16921035074ccfe304a7a (diff) | |
| download | tk-90c1a43eb7a8a363aef33e43ff390646b70aff1f.zip tk-90c1a43eb7a8a363aef33e43ff390646b70aff1f.tar.gz tk-90c1a43eb7a8a363aef33e43ff390646b70aff1f.tar.bz2 | |
[Bug 2794778]: Calls to CallWindowProc can lead to other functions
overwriting the event strucure. Therefore preserve a local copy of the
XKeyEvent while looping over the key events.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinMenu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 1a54fd7..1909f34 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinMenu.c,v 1.66 2009/03/25 23:39:35 nijtmans Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.67 2009/05/21 22:52:06 patthoyts Exp $ */ #define OEMRESOURCE @@ -1982,14 +1982,15 @@ TkWinMenuKeyObjCmd( virtualKey = XKeysymToKeycode(winPtr->display, keySym); scanCode = MapVirtualKey(virtualKey, 0); if (0 != scanCode) { + XKeyEvent xkey = eventPtr->xkey; CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSKEYDOWN, virtualKey, (int) ((scanCode << 16) | (1 << 29))); - if (eventPtr->xkey.nbytes > 0) { - for (i = 0; i < eventPtr->xkey.nbytes; i++) { + if (xkey.nbytes > 0) { + for (i = 0; i < xkey.nbytes; i++) { CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSCHAR, - eventPtr->xkey.trans_chars[i], + xkey.trans_chars[i], (int) ((scanCode << 16) | (1 << 29))); } } |