fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-05-14 01:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* source/rtl/memoedit.prg
    ! Fixed infinite loop in code below (this was a long time problem):
      ---
      MemoEdit( "Please press F2 for infinite loop", 0, 0, MaxRow(), MaxCol(), .F., "FunCtr" )
      FUNCTION FunCtr()
         RETURN 0
      ---
      Patch provided by Xavi [jarabal]. Thank you.

  * contrib/hbwin/oleauto.prg
  * contrib/hbwin/olecore.c
    * Minor formatting.
This commit is contained in:
Viktor Szakats
2009-05-13 23:37:18 +00:00
parent 3f43a1ee38
commit a16ef8604f
4 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,20 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-14 01:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/memoedit.prg
! Fixed infinite loop in code below (this was a long time problem):
---
MemoEdit( "Please press F2 for infinite loop", 0, 0, MaxRow(), MaxCol(), .F., "FunCtr" )
FUNCTION FunCtr()
RETURN 0
---
Patch provided by Xavi [jarabal]. Thank you.
* contrib/hbwin/oleauto.prg
* contrib/hbwin/olecore.c
* Minor formatting.
2009-05-14 01:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/rddads/ads1.c
* enable workaround code added in previous commit only for ACE 9.00.

10
harbour/contrib/hbwin/oleauto.prg
View File

@@ -50,19 +50,20 @@
*
*/
#define HB_CLS_NOTOBJECT // avoid definition of method: INIT
#define HB_CLS_NOTOBJECT /* avoid definition of method: INIT */
#include "hbclass.ch"
REQUEST __GETMESSAGE
CLASS HB_OleAuto
DATA __hObj
DATA __hObjEnum
CREATE CLASS HB_OleAuto
VAR __hObj
VAR __hObjEnum
METHOD __enumStart( enum, lDescend )
METHOD __enumSkip( enum, lDescend )
METHOD __enumStop()
ERROR HANDLER __OnError()
ENDCLASS
@@ -121,4 +122,3 @@ FUNC CreateObject( ... )
oOle:__hObj := hOle
ENDIF
RETURN oOle

2
harbour/contrib/hbwin/olecore.c
View File

@@ -154,7 +154,7 @@ static wchar_t* AnsiToWide( const char* szString )
int iLen;
wchar_t* szWide;
iLen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, szString, -1, NULL, 0 );
iLen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, szString, -1, NULL, 0 );
szWide = ( wchar_t* ) hb_xgrab( iLen * sizeof( wchar_t ) );
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, szString, -1, szWide, iLen );
return szWide;

36
harbour/source/rtl/memoedit.prg
View File

@@ -60,17 +60,19 @@
// A specialized HBEditor which can simulate MemoEdit() behaviour
CREATE CLASS HBMemoEditor INHERIT HBEditor
VAR xUserFunction // User Function called to change default MemoEdit() behaviour
VAR lCallKeyboardHook AS LOGICAL INIT .F. // To avoid recursive calls in endless loop. [jarabal]
METHOD MemoInit( xUserFunction ) // This method is called after ::New() returns to perform ME_INIT actions
METHOD Edit() // Calls super:Edit( nKey ) but is needed to handle configurable keys
METHOD KeyboardHook( nKey ) // Gets called every time there is a key not handled directly by HBEditor
METHOD IdleHook() // Gets called every time there are no more keys to hanlde
VAR xUserFunction // User Function called to change default MemoEdit() behaviour
METHOD HandleUserKey( nKey, nUserKey ) // Handles keys returned to MemoEdit() by user function
METHOD xDo( nStatus ) // Calls xUserFunction saving and restoring cursor position and shape
METHOD MemoInit( xUserFunction ) // This method is called after ::New() returns to perform ME_INIT actions
METHOD Edit() // Calls super:Edit( nKey ) but is needed to handle configurable keys
METHOD KeyboardHook( nKey ) // Gets called every time there is a key not handled directly by HBEditor
METHOD IdleHook() // Gets called every time there are no more keys to hanlde
METHOD MoveCursor( nKey ) // Redefined to properly managed CTRL-W
METHOD HandleUserKey( nKey, nUserKey ) // Handles keys returned to MemoEdit() by user function
METHOD xDo( nStatus ) // Calls xUserFunction saving and restoring cursor position and shape
METHOD MoveCursor( nKey ) // Redefined to properly managed CTRL-W
ENDCLASS
@@ -149,7 +151,11 @@ METHOD KeyboardHook( nKey ) CLASS HBMemoEditor
LOCAL nCol
IF ISCHARACTER( ::xUserFunction )
::HandleUserKey( nKey, ::xDo( iif( ::lDirty, ME_UNKEYX, ME_UNKEY ) ) )
IF ! ::lCallKeyboardHook // To avoid recursive calls in endless loop. [jarabal]
::lCallKeyboardHook := .T.
::HandleUserKey( nKey, ::xDo( iif( ::lDirty, ME_UNKEYX, ME_UNKEY ) ) )
::lCallKeyboardHook := .F.
ENDIF
ELSE
IF nKey == K_ESC
IF ::lDirty .AND. Set( _SET_SCOREBOARD )
@@ -187,28 +193,22 @@ METHOD IdleHook() CLASS HBMemoEditor
METHOD HandleUserKey( nKey, nUserKey ) CLASS HBMemoEditor
// HBEditor does not handle these keys and would call ::KeyboardHook() causing infinite loop
LOCAL aUnHandledKeys := { K_CTRL_J, K_CTRL_K, K_CTRL_L, K_CTRL_N, K_CTRL_O,;
K_CTRL_P, K_CTRL_Q, K_CTRL_T, K_CTRL_U, K_F1 }
DO CASE
// I won't reach this point during ME_INIT since ME_DEFAULT ends initialization phase of MemoEdit()
CASE nUserKey == ME_DEFAULT
// HBEditor is not able to handle keys with a value higher than 256, but I have to tell him
// that user wants to save text
IF ( nKey <= 256 .OR. nKey == K_ALT_W ) .AND. AScan( aUnHandledKeys, nKey ) == 0
IF ( nKey <= 256 .OR. nKey == K_ALT_W )
::super:Edit( nKey )
ENDIF
// TOFIX: Not CA-Cl*pper compatible, see teditor.prg
CASE ( nUserKey >= 1 .AND. nUserKey <= 31 ) .OR. nUserKey == K_ALT_W
IF AScan( aUnHandledKeys, nUserKey ) == 0
::super:Edit( nUserKey )
ENDIF
::super:Edit( nUserKey )
CASE nUserKey == ME_DATA
IF nKey <= 256 .AND. AScan( aUnHandledKeys, nKey ) == 0
IF nKey <= 256
::super:Edit( nKey )
ENDIF