diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4ad6164a96..02fb5e6839 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-12 16:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/gtwin/gtwin.c
+    * Using HB_SIZEOFARRAY().
+
+  * include/hbapi.h
+    * Typo in comment.
+
+  * ChangeLog
+    + Added missing item to prev.
+
+  * contrib/hbwin/tests/testmapi.prg
+    ! Fixed missing SVN props.
+    ! Added missing SVN ID.
+    * Formatting.
+    ; TOFIX: This example expects arrays and logical value from command line,
+             so it won't work.
+
 2009-12-12 15:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbwinuni.h
     + Added HB_ARRAYGETSTR().
@@ -28,6 +45,7 @@
   * contrib/hbwin/Makefile
   * contrib/hbwin/mapi.c
     + Added to Makefile.
+    * Renamed HB_MAPISENDMAIL() to WIN_MAPISENDMAIL().
     ! Added SVN ID.
     ! Added SVN props.
     ! Added License header. (pls add your name to copyright headers)
diff --git a/harbour/contrib/hbwin/tests/testmapi.prg b/harbour/contrib/hbwin/tests/testmapi.prg
index 9e4694801a..29e09b29dd 100644
--- a/harbour/contrib/hbwin/tests/testmapi.prg
+++ b/harbour/contrib/hbwin/tests/testmapi.prg
@@ -1,15 +1,19 @@
-function main( cSubject, cBody, lMailConf, lFromUser, aSender, aDest, aFiles )
-
-   local nRet := HB_MAPISendMail( cSubject,                        ; // subject
-                                  cBody,                           ; // menssage
-                                  nil,                             ; // type of message
-                                  DtoS( Date() ) + " " + Time(),   ; // send date
-                                  "",                              ; // conversation ID
-                                  lMailConf,                       ; // acknowledgment
-                                  lFromUser,                       ; // user intervention
-                                  aSender,                         ; // sender
-                                  aDest,                           ; // destinators
-                                  aFiles                           ; // attach
-                                )
-
-return nRet == 0
+/*
+ * $Id$
+ */
+
+PROCEDURE Main( cSubject, cBody, lMailConf, lFromUser, aSender, aDest, aFiles )
+
+   ? win_MAPISendMail( cSubject,                        ; // subject
+                       cBody,                           ; // menssage
+                       NIL,                             ; // type of message
+                       DToS( Date() ) + " " + Time(),   ; // send date
+                       "",                              ; // conversation ID
+                       lMailConf,                       ; // acknowledgment
+                       lFromUser,                       ; // user intervention
+                       aSender,                         ; // sender
+                       aDest,                           ; // destinators
+                       aFiles                           ; // attach
+                     )
+
+   RETURN
diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h
index 31cf6aa81d..39e896017f 100644
--- a/harbour/include/hbapi.h
+++ b/harbour/include/hbapi.h
@@ -122,7 +122,7 @@ HB_EXTERN_BEGIN
  * know that sth is wrong and has to be fixed.
  * the version below which check only chosen bits allow compiler to
  * use some optimizations if used CPU supports it. F.e. on standard
- * x86 machines they can safe few CPU cycles. [druzus]
+ * x86 machines they can save few CPU cycles. [druzus]
  */
 
 #define HB_IS_NIL( p )        HB_IS_OF_TYPE( p, HB_IT_NIL )
diff --git a/harbour/src/rtl/gtwin/gtwin.c b/harbour/src/rtl/gtwin/gtwin.c
index 7111537445..3fffea5753 100644
--- a/harbour/src/rtl/gtwin/gtwin.c
+++ b/harbour/src/rtl/gtwin/gtwin.c
@@ -1614,12 +1614,11 @@ static BOOL hb_gt_win_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
          TCHAR buff[ 256 ];
          DWORD dwLen;
 
-         dwLen = GetConsoleTitle( buff, sizeof( buff ) / sizeof( TCHAR ) );
+         dwLen = GetConsoleTitle( buff, HB_SIZEOFARRAY( buff ) );
          pInfo->pResult = HB_ITEMPUTSTRLEN( pInfo->pResult, buff, dwLen );
          if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
          {
             void * hTitle;
-
             SetConsoleTitle( HB_ITEMGETSTR( pInfo->pNewVal, &hTitle, NULL ) );
             hb_strfree( hTitle );
          }