From 7665582530c77c99d0effdd10a40717a2eb2959d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 13 May 2010 08:01:33 +0000
Subject: [PATCH] 2010-05-13 10:01 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * tests/test.prg     ! Implemented missing function.

  * package/winuni/RELNOTES
    * upx 3.04 -> 3.05

  * contrib/hbct/ctcom1.c
    * Minor formatting.
---
 harbour/ChangeLog               | 10 ++++++++++
 harbour/contrib/hbct/ctcom1.c   |  4 ++--
 harbour/package/winuni/RELNOTES |  1 +
 harbour/tests/test.prg          | 27 ++++++++++++++++-----------
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 31c9dcadab..bc1689ba97 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-13 10:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * tests/test.prg
+    ! Implemented missing function.
+
+  * package/winuni/RELNOTES
+    * upx 3.04 -> 3.05
+
+  * contrib/hbct/ctcom1.c
+    * Minor formatting.
+
 2010-05-12 22:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * Two minor cleanups
diff --git a/harbour/contrib/hbct/ctcom1.c b/harbour/contrib/hbct/ctcom1.c
index bee3a7bbde..1c5167dde2 100644
--- a/harbour/contrib/hbct/ctcom1.c
+++ b/harbour/contrib/hbct/ctcom1.c
@@ -382,8 +382,8 @@ HB_FUNC( COM_INIT )
    hb_retl( hb_comInit( iPort, iBaud, iParity, iSize, iStop ) != -1 );
 }
 
-/*  COM_OPEN( <nComPort>, [<nBufferIn>=100] [, <nBufferOut>=0],
- *            [<lTrapMode>] ) -> <lStatus>
+/* COM_OPEN( <nComPort>, [<nBufferIn>=100] [, <nBufferOut>=0],
+ *           [<lTrapMode>] ) -> <lStatus>
  */
 HB_FUNC( COM_OPEN )
 {
diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES
index cdbf46a7c7..a356dfff87 100644
--- a/harbour/package/winuni/RELNOTES
+++ b/harbour/package/winuni/RELNOTES
@@ -81,6 +81,7 @@ Changes since previous (2.0.0) release:
 - Upgraded to mingw 4.5.0 official release.
 - Upgraded to QT 4.6.2 (from 4.5.3).
 - Upgraded to MSVC 2010 (from 2008).
+- upx updated to 3.05.
 
 Changes since previous (2.0.0beta3 20090905) release:
 -----------------------------------------------------------------------
diff --git a/harbour/tests/test.prg b/harbour/tests/test.prg
index 7c0239a76f..6d1d8dbea7 100644
--- a/harbour/tests/test.prg
+++ b/harbour/tests/test.prg
@@ -1,18 +1,23 @@
-//
-// $Id$
-//
+/*
+ * $Id$
+ */
 
-//
+PROCEDURE Main()
 
-procedure main()
-
-   local s := " " + chr(0) + "  mab  " + chr(0) + " "
+   LOCAL s := " " + Chr( 0 ) + "  mab  " + Chr( 0 ) + " "
 
    StrDump( s )
    QOut( s )
 
-   qout( '"' + ltrim(s) + '"' )
-   qout( '"' + rtrim(s) + '"' )
-   qout( '"' + alltrim(s) + '"' )
+   QOut( '"' + LTrim( s ) + '"' )
+   QOut( '"' + RTrim( s ) + '"' )
+   QOut( '"' + AllTrim( s ) + '"' )
 
-return
+   RETURN
+
+STATIC PROCEDURE StrDump( s )
+   LOCAL tmp
+   FOR EACH tmp IN s
+      QOut( Asc( tmp ) )
+   NEXT
+   RETURN