diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b9b5cf26f1..9dbb3b1b16 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,50 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-19 18:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/gtalleg/tests/hbmk.hbm
+  * contrib/hbmysql/utils/hbmk.hbm
+  * contrib/hbmysql/tests/hbmk.hbm
+  * contrib/hbct/tests/hbmk.hbm
+  * contrib/xhb/tests/hbmk.hbm
+  * contrib/hbodbc/tests/hbmk.hbm
+  * contrib/hbtpathy/tests/hbmk.hbm
+  * contrib/hbmzip/tests/hbmk.hbm
+  * contrib/hbsqlit3/tests/hbmk.hbm
+  * contrib/hbblat/tests/hbmk.hbm
+  * contrib/hbqt/tests/hbmk.hbm
+  * contrib/hbfbird/tests/hbmk.hbm
+  * contrib/hbziparc/tests/hbmk.hbm
+  * contrib/hbxbp/tests/hbmk.hbm
+  * contrib/hbnf/tests/hbmk.hbm
+  * contrib/hbcurl/tests/hbmk.hbm
+  * contrib/hbmemio/tests/hbmk.hbm
+  * contrib/gtqtc/tests/hbmk.hbm
+  * contrib/hbnetio/utils/hbmk.hbm
+  * contrib/hbnetio/tests/hbmk.hbm
+  * contrib/rddsql/tests/hbmk.hbm
+  * contrib/hbhpdf/tests/hbmk.hbm
+  * contrib/rddado/tests/hbmk.hbm
+  * contrib/gtwvg/tests/hbmk.hbm
+  * contrib/hbpgsql/tests/hbmk.hbm
+  * contrib/rddads/tests/hbmk.hbm
+  * contrib/hbclipsm/tests/hbmk.hbm
+  * contrib/hbfimage/tests/hbmk.hbm
+  * contrib/hbgd/tests/hbmk.hbm
+  * contrib/hbmisc/tests/hbmk.hbm
+  * contrib/hbtip/tests/hbmk.hbm
+  * contrib/hbwin/tests/hbmk.hbm
+  * contrib/hbssl/tests/hbmk.hbm
+  * contrib/hbbtree/tests/hbmk.hbm
+    + Added -w3 Harbour switch to all test dirs.
+      (in few places just formatted because it was there)
+    ; TOFIX: All tests should be eventually made fully 
+             warning free, so in the future expect -es2 
+             switch to be added as well.
+
+  * contrib/hbwin/tests/testprn.prg
+    ! Fixed two constant names.
+
 2009-10-19 15:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbwince.c
     ! Typos in comments.
diff --git a/harbour/contrib/gtalleg/tests/hbmk.hbm b/harbour/contrib/gtalleg/tests/hbmk.hbm
index 081a7d708b..98f64e78f5 100644
--- a/harbour/contrib/gtalleg/tests/hbmk.hbm
+++ b/harbour/contrib/gtalleg/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../gtalleg.hbc
+
+-w3
diff --git a/harbour/contrib/gtqtc/tests/hbmk.hbm b/harbour/contrib/gtqtc/tests/hbmk.hbm
index d7d6aca270..cb43b4d478 100644
--- a/harbour/contrib/gtqtc/tests/hbmk.hbm
+++ b/harbour/contrib/gtqtc/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../gtqtc.hbc
+
+-w3
diff --git a/harbour/contrib/gtwvg/tests/hbmk.hbm b/harbour/contrib/gtwvg/tests/hbmk.hbm
index 7fb8cb9184..c3f18429fb 100644
--- a/harbour/contrib/gtwvg/tests/hbmk.hbm
+++ b/harbour/contrib/gtwvg/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../gtwvg.hbc
+
+-w3
diff --git a/harbour/contrib/hbblat/tests/hbmk.hbm b/harbour/contrib/hbblat/tests/hbmk.hbm
index 7f722db514..3a28db00ee 100644
--- a/harbour/contrib/hbblat/tests/hbmk.hbm
+++ b/harbour/contrib/hbblat/tests/hbmk.hbm
@@ -4,4 +4,6 @@
 
 ../hbblat.hbc
 
+-w3
+
 -lhbwin
diff --git a/harbour/contrib/hbbtree/tests/hbmk.hbm b/harbour/contrib/hbbtree/tests/hbmk.hbm
index f306bee45d..d3ae2759a1 100644
--- a/harbour/contrib/hbbtree/tests/hbmk.hbm
+++ b/harbour/contrib/hbbtree/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbbtree.hbc
+
+-w3
diff --git a/harbour/contrib/hbclipsm/tests/hbmk.hbm b/harbour/contrib/hbclipsm/tests/hbmk.hbm
index c25a9fd199..f0ed7ae7aa 100644
--- a/harbour/contrib/hbclipsm/tests/hbmk.hbm
+++ b/harbour/contrib/hbclipsm/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbclipsm.hbc
+
+-w3
diff --git a/harbour/contrib/hbct/tests/hbmk.hbm b/harbour/contrib/hbct/tests/hbmk.hbm
index dd9c7b9e6c..769402b35c 100644
--- a/harbour/contrib/hbct/tests/hbmk.hbm
+++ b/harbour/contrib/hbct/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbct.hbc
+
+-w3
diff --git a/harbour/contrib/hbcurl/tests/hbmk.hbm b/harbour/contrib/hbcurl/tests/hbmk.hbm
index 4c1beb81ab..ddfa9a9c22 100644
--- a/harbour/contrib/hbcurl/tests/hbmk.hbm
+++ b/harbour/contrib/hbcurl/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbcurl.hbc
+
+-w3
diff --git a/harbour/contrib/hbfbird/tests/hbmk.hbm b/harbour/contrib/hbfbird/tests/hbmk.hbm
index b6c20e4abe..f054ac9417 100644
--- a/harbour/contrib/hbfbird/tests/hbmk.hbm
+++ b/harbour/contrib/hbfbird/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbfbird.hbc
+
+-w3
diff --git a/harbour/contrib/hbfimage/tests/hbmk.hbm b/harbour/contrib/hbfimage/tests/hbmk.hbm
index 153c03185a..76bd89dba6 100644
--- a/harbour/contrib/hbfimage/tests/hbmk.hbm
+++ b/harbour/contrib/hbfimage/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbfimage.hbc
+
+-w3
diff --git a/harbour/contrib/hbgd/tests/hbmk.hbm b/harbour/contrib/hbgd/tests/hbmk.hbm
index e5163daff4..28f980b8e5 100644
--- a/harbour/contrib/hbgd/tests/hbmk.hbm
+++ b/harbour/contrib/hbgd/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbgd.hbc
+
+-w3
diff --git a/harbour/contrib/hbhpdf/tests/hbmk.hbm b/harbour/contrib/hbhpdf/tests/hbmk.hbm
index 4317efab7e..d7c62ef685 100644
--- a/harbour/contrib/hbhpdf/tests/hbmk.hbm
+++ b/harbour/contrib/hbhpdf/tests/hbmk.hbm
@@ -4,4 +4,6 @@
 
 ../hbhpdf.hbc
 
+-w3
+
 -lhbct
diff --git a/harbour/contrib/hbmemio/tests/hbmk.hbm b/harbour/contrib/hbmemio/tests/hbmk.hbm
index 6812911f4d..00998bd299 100644
--- a/harbour/contrib/hbmemio/tests/hbmk.hbm
+++ b/harbour/contrib/hbmemio/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbmemio.hbc
+
+-w3
diff --git a/harbour/contrib/hbmisc/tests/hbmk.hbm b/harbour/contrib/hbmisc/tests/hbmk.hbm
index 7556765507..66e9236342 100644
--- a/harbour/contrib/hbmisc/tests/hbmk.hbm
+++ b/harbour/contrib/hbmisc/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbmisc.hbc
+
+-w3
diff --git a/harbour/contrib/hbmysql/tests/hbmk.hbm b/harbour/contrib/hbmysql/tests/hbmk.hbm
index dc540547c8..5e35039065 100644
--- a/harbour/contrib/hbmysql/tests/hbmk.hbm
+++ b/harbour/contrib/hbmysql/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbmysql.hbc
+
+-w3
diff --git a/harbour/contrib/hbmysql/utils/hbmk.hbm b/harbour/contrib/hbmysql/utils/hbmk.hbm
index dc540547c8..5e35039065 100644
--- a/harbour/contrib/hbmysql/utils/hbmk.hbm
+++ b/harbour/contrib/hbmysql/utils/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbmysql.hbc
+
+-w3
diff --git a/harbour/contrib/hbmzip/tests/hbmk.hbm b/harbour/contrib/hbmzip/tests/hbmk.hbm
index 149cf7fef3..d461c8a24c 100644
--- a/harbour/contrib/hbmzip/tests/hbmk.hbm
+++ b/harbour/contrib/hbmzip/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbmzip.hbc
+
+-w3
diff --git a/harbour/contrib/hbnetio/tests/hbmk.hbm b/harbour/contrib/hbnetio/tests/hbmk.hbm
index 5f867f7453..eb4657d729 100644
--- a/harbour/contrib/hbnetio/tests/hbmk.hbm
+++ b/harbour/contrib/hbnetio/tests/hbmk.hbm
@@ -4,3 +4,5 @@
 
 ../hbnetio.hbc
 -mt
+
+-w3
diff --git a/harbour/contrib/hbnetio/utils/hbmk.hbm b/harbour/contrib/hbnetio/utils/hbmk.hbm
index 7b4bfe2bd4..731ba84084 100644
--- a/harbour/contrib/hbnetio/utils/hbmk.hbm
+++ b/harbour/contrib/hbnetio/utils/hbmk.hbm
@@ -4,3 +4,5 @@
 
 ../hbnetio.hbc
 -mt
+
+-w3
diff --git a/harbour/contrib/hbnf/tests/hbmk.hbm b/harbour/contrib/hbnf/tests/hbmk.hbm
index 9ae4ae15ab..920a9efa93 100644
--- a/harbour/contrib/hbnf/tests/hbmk.hbm
+++ b/harbour/contrib/hbnf/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbnf.hbc
+
+-w3
diff --git a/harbour/contrib/hbodbc/tests/hbmk.hbm b/harbour/contrib/hbodbc/tests/hbmk.hbm
index bbe9c8424e..f43c664379 100644
--- a/harbour/contrib/hbodbc/tests/hbmk.hbm
+++ b/harbour/contrib/hbodbc/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbodbc.hbc
+
+-w3
diff --git a/harbour/contrib/hbpgsql/tests/hbmk.hbm b/harbour/contrib/hbpgsql/tests/hbmk.hbm
index b290770621..0ee3bed6ee 100644
--- a/harbour/contrib/hbpgsql/tests/hbmk.hbm
+++ b/harbour/contrib/hbpgsql/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbpgsql.hbc
+
+-w3
diff --git a/harbour/contrib/hbqt/tests/hbmk.hbm b/harbour/contrib/hbqt/tests/hbmk.hbm
index 3771adc655..5227dccb4b 100644
--- a/harbour/contrib/hbqt/tests/hbmk.hbm
+++ b/harbour/contrib/hbqt/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbqt.hbc
+
+-w3
diff --git a/harbour/contrib/hbsqlit3/tests/hbmk.hbm b/harbour/contrib/hbsqlit3/tests/hbmk.hbm
index 66973f989a..73f3c36caf 100644
--- a/harbour/contrib/hbsqlit3/tests/hbmk.hbm
+++ b/harbour/contrib/hbsqlit3/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbsqlit3.hbc
+
+-w3
diff --git a/harbour/contrib/hbssl/tests/hbmk.hbm b/harbour/contrib/hbssl/tests/hbmk.hbm
index 7420eb2518..1247484b7a 100644
--- a/harbour/contrib/hbssl/tests/hbmk.hbm
+++ b/harbour/contrib/hbssl/tests/hbmk.hbm
@@ -2,6 +2,6 @@
 # $Id$
 #
 
--w3
-
 ../hbssl.hbc
+
+-w3
diff --git a/harbour/contrib/hbtip/tests/hbmk.hbm b/harbour/contrib/hbtip/tests/hbmk.hbm
index 119c08e410..c07514ddc7 100644
--- a/harbour/contrib/hbtip/tests/hbmk.hbm
+++ b/harbour/contrib/hbtip/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbtip.hbc
+
+-w3
diff --git a/harbour/contrib/hbtpathy/tests/hbmk.hbm b/harbour/contrib/hbtpathy/tests/hbmk.hbm
index 566bbda45b..483009bb47 100644
--- a/harbour/contrib/hbtpathy/tests/hbmk.hbm
+++ b/harbour/contrib/hbtpathy/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbtpathy.hbc
+
+-w3
diff --git a/harbour/contrib/hbwin/tests/hbmk.hbm b/harbour/contrib/hbwin/tests/hbmk.hbm
index c2b0b7a243..ae1ab8c628 100644
--- a/harbour/contrib/hbwin/tests/hbmk.hbm
+++ b/harbour/contrib/hbwin/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbwin.hbc
+
+-w3
diff --git a/harbour/contrib/hbwin/tests/testprn.prg b/harbour/contrib/hbwin/tests/testprn.prg
index 2b0a32df6d..2ad441ec8b 100644
--- a/harbour/contrib/hbwin/tests/testprn.prg
+++ b/harbour/contrib/hbwin/tests/testprn.prg
@@ -109,12 +109,12 @@ STATIC PROCEDURE PrnTest( cPrinter, cBMPFile )
          oPrinter:NewLine()
          oPrinter:NewLine()
          oPrinter:SetFont("Lucida Console",18, 0)  // Large print
-         oPrinter:SetColor( GREEN )
+         oPrinter:SetColor( RGB_GREEN )
          oPrinter:TextOut("Finally some larger print")
          oPrinter:Box(  0, oPrinter:PosY+100, 100, oPrinter:PosY+200)
          oPrinter:Arc(200, oPrinter:PosY+100, 300, oPrinter:PosY+200)
          oPrinter:Ellipse(400, oPrinter:PosY+100, 500, oPrinter:PosY+200)
-         oPrinter:FillRect(600, oPrinter:PosY+100, 700, oPrinter:PosY+200, RED)
+         oPrinter:FillRect(600, oPrinter:PosY+100, 700, oPrinter:PosY+200, RGB_RED )
 
 //       To print a barcode;
 //       Replace 'BCod39HN' with your own bar code font or any other font
diff --git a/harbour/contrib/hbxbp/tests/hbmk.hbm b/harbour/contrib/hbxbp/tests/hbmk.hbm
index 9a0e9f42f3..9c95e1c8f8 100644
--- a/harbour/contrib/hbxbp/tests/hbmk.hbm
+++ b/harbour/contrib/hbxbp/tests/hbmk.hbm
@@ -2,5 +2,6 @@
 # $Id$
 #
 
--w3
 ../hbxbp.hbc
+
+-w3
diff --git a/harbour/contrib/hbziparc/tests/hbmk.hbm b/harbour/contrib/hbziparc/tests/hbmk.hbm
index ffa3ed4b49..0c8da8270a 100644
--- a/harbour/contrib/hbziparc/tests/hbmk.hbm
+++ b/harbour/contrib/hbziparc/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../hbziparc.hbc
+
+-w3
diff --git a/harbour/contrib/rddado/tests/hbmk.hbm b/harbour/contrib/rddado/tests/hbmk.hbm
index 046964625a..a8c918a41f 100644
--- a/harbour/contrib/rddado/tests/hbmk.hbm
+++ b/harbour/contrib/rddado/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../rddado.hbc
+
+-w3
diff --git a/harbour/contrib/rddads/tests/hbmk.hbm b/harbour/contrib/rddads/tests/hbmk.hbm
index 1e6a4ff771..2341c2f5f3 100644
--- a/harbour/contrib/rddads/tests/hbmk.hbm
+++ b/harbour/contrib/rddads/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../rddads.hbc
+
+-w3
diff --git a/harbour/contrib/rddsql/tests/hbmk.hbm b/harbour/contrib/rddsql/tests/hbmk.hbm
index 4549f0ac62..efb0044a66 100644
--- a/harbour/contrib/rddsql/tests/hbmk.hbm
+++ b/harbour/contrib/rddsql/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../rddsql.hbc
+
+-w3
diff --git a/harbour/contrib/xhb/tests/hbmk.hbm b/harbour/contrib/xhb/tests/hbmk.hbm
index df99903c28..61f6d428d8 100644
--- a/harbour/contrib/xhb/tests/hbmk.hbm
+++ b/harbour/contrib/xhb/tests/hbmk.hbm
@@ -3,3 +3,5 @@
 #
 
 ../xhb.hbc
+
+-w3