fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / uiactioncmn.cpp

diff --git a/src/common/uiactioncmn.cpp b/src/common/uiactioncmn.cpp
index 20c4141cab6787e00e926e48d7f6867364fb2f3b..bfd5135e0c845fa01449846c06242caa1b1cdf2f 100644 (file)
--- a/src/common/uiactioncmn.cpp
+++ b/src/common/uiactioncmn.cpp
@@ -1,11 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/uiactioncmn.cpp
 // Purpose:     wxUIActionSimulator common implementation
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/uiactioncmn.cpp
 // Purpose:     wxUIActionSimulator common implementation

-// Author:      Kevin Ollivier
+// Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin

 // Modified by:
 // Created:     2010-03-06
 // Modified by:
 // Created:     2010-03-06

-// RCS-ID:      $Id: menu.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Kevin Ollivier
 // Copyright:   (c) Kevin Ollivier

+//              (c) 2010 Steven Lamerton
+//              (c) 2010 Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,15 +17,6 @@
 
 #include "wx/uiaction.h"
 
 
 #include "wx/uiaction.h"
 

-wxUIActionSimulator::wxUIActionSimulator()
-{
-}
-
-wxUIActionSimulator::~wxUIActionSimulator()
-{
-}
-
-

 bool wxUIActionSimulator::MouseClick(int button)
 {
     MouseDown(button);
 bool wxUIActionSimulator::MouseClick(int button)
 {
     MouseDown(button);


@@ -42,7 +35,9 @@ bool wxUIActionSimulator::MouseDblClick(int button)
     return true;
 }
 
     return true;
 }
 

-bool wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2, int button)
+bool
+wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
+                                   int button)

 {
     MouseMove(x1, y1);
     MouseDown(button);
 {
     MouseMove(x1, y1);
     MouseDown(button);


@@ -52,10 +47,98 @@ bool wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2, int
     return true;
 }
 
     return true;
 }
 

-bool  wxUIActionSimulator::Char(int keycode, bool shiftDown, bool cmdDown, bool altDown)
+bool
+wxUIActionSimulator::Key(int keycode, int modifiers, bool isDown)
+{
+    wxASSERT_MSG( (modifiers & wxMOD_ALTGR) != wxMOD_ALTGR,
+        "wxMOD_ALTGR is not implemented" );
+    wxASSERT_MSG( !(modifiers & wxMOD_META ),
+        "wxMOD_META is not implemented" );
+    wxASSERT_MSG( !(modifiers & wxMOD_WIN ),
+        "wxMOD_WIN is not implemented" );
+
+    if ( isDown )
+        SimulateModifiers(modifiers, true);
+
+    bool rc = DoKey(keycode, modifiers, isDown);
+
+    if ( !isDown )
+        SimulateModifiers(modifiers, false);
+
+    return rc;
+}
+
+void wxUIActionSimulator::SimulateModifiers(int modifiers, bool isDown)
+{
+    if ( modifiers & wxMOD_SHIFT )
+        DoKey(WXK_SHIFT, modifiers, isDown);
+    if ( modifiers & wxMOD_ALT )
+        DoKey(WXK_ALT, modifiers, isDown);
+    if ( modifiers & wxMOD_CONTROL )
+        DoKey(WXK_CONTROL, modifiers, isDown);
+}
+
+bool wxUIActionSimulator::Char(int keycode, int modifiers)
+{
+    switch(keycode)
+    {
+    case '0':
+        keycode = '0';
+        break;
+    case '1':
+        keycode = '1';
+        break;
+    case '2':
+        keycode = '2';
+        break;
+    case '3':
+        keycode = '3';
+        break;
+    case '4':
+        keycode = '4';
+        break;
+    case '5':
+        keycode = '5';
+        break;
+    case '6':
+        keycode = '6';
+        break;
+    case '7':
+        keycode = '7';
+        break;
+    case '8':
+        keycode = '8';
+        break;
+    case '9':
+        keycode = '9';
+        break;
+    case '+':
+        keycode = '+';
+        break;
+    case '-':
+        keycode = '-';
+        break;
+    case '.':
+        keycode = '.';
+        break;
+    default:
+        break;
+    };
+
+    Key(keycode, modifiers, true);
+    Key(keycode, modifiers, false);
+
+    return true;
+}
+
+bool wxUIActionSimulator::Text(const char *s)

 {
 {

-    Key(keycode, false, shiftDown, cmdDown, altDown);
-    Key(keycode, true, shiftDown, cmdDown, altDown);
+    while ( *s != '\0' )
+    {
+        const char ch = *s++;
+        if ( !Char(ch, isupper(ch) ? wxMOD_SHIFT : 0) )
+            return false;
+    }

 
     return true;
 }
 
     return true;
 }