diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f9edf74e50..63c15de310 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-18 18:48 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbapirdd.h
+    ! redefined RDD method table to use HB_ERRCODE instead of USHORT
+
 2009-11-18 18:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/vm/dlmalloc.c
     ! added workaround for unnecessary checking results of function which
diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h
index cb3c62eb08..93760bed8e 100644
--- a/harbour/include/hbapirdd.h
+++ b/harbour/include/hbapirdd.h
@@ -588,54 +588,54 @@ typedef AREA * LPAREA;
 
 /*--------------------* Virtual Method Table *----------------------*/
 
-typedef USHORT ( * DBENTRYP_V     )( AREAP area );
-typedef USHORT ( * DBENTRYP_BP    )( AREAP area, BOOL * param );
-typedef USHORT ( * DBENTRYP_B     )( AREAP area, BOOL param );
-typedef USHORT ( * DBENTRYP_L     )( AREAP area, LONG param );
-typedef USHORT ( * DBENTRYP_UL    )( AREAP area, ULONG param );
-typedef USHORT ( * DBENTRYP_I     )( AREAP area, PHB_ITEM param );
-typedef USHORT ( * DBENTRYP_SI    )( AREAP area, USHORT index, PHB_ITEM param );
-typedef USHORT ( * DBENTRYP_VO    )( AREAP area, LPDBOPENINFO param );
-typedef USHORT ( * DBENTRYP_VT    )( AREAP area, LPDBTRANSINFO param );
-typedef USHORT ( * DBENTRYP_VF    )( AREAP area, LPDBFIELDINFO param );
-typedef USHORT ( * DBENTRYP_VL    )( AREAP area, LPDBLOCKINFO param );
-typedef USHORT ( * DBENTRYP_VR    )( AREAP area, LPDBRELINFO param );
-typedef USHORT ( * DBENTRYP_VS    )( AREAP area, LPDBSORTINFO param );
-typedef USHORT ( * DBENTRYP_VFI   )( AREAP area, LPDBFILTERINFO param );
-typedef USHORT ( * DBENTRYP_VEI   )( AREAP area, LPDBEVALINFO param );
-typedef USHORT ( * DBENTRYP_VLO   )( AREAP area, LPDBSCOPEINFO param );
-typedef USHORT ( * DBENTRYP_VOC   )( AREAP area, LPDBORDERCREATEINFO param );
-typedef USHORT ( * DBENTRYP_VOO   )( AREAP area, LPDBORDERCONDINFO param );
-typedef USHORT ( * DBENTRYP_VOS   )( AREAP area, LPDBORDSCOPEINFO param );
-typedef USHORT ( * DBENTRYP_VOI   )( AREAP area, LPDBORDERINFO param );
-typedef USHORT ( * DBENTRYP_SVOI  )( AREAP area, USHORT index, LPDBORDERINFO param );
-typedef USHORT ( * DBENTRYP_SP    )( AREAP area, USHORT * param );
-typedef USHORT ( * DBENTRYP_P     )( AREAP area, const BYTE * param );
-typedef USHORT ( * DBENTRYP_CP    )( AREAP area, char * param );
-typedef USHORT ( * DBENTRYP_CC    )( AREAP area, const char * param );
-typedef USHORT ( * DBENTRYP_PP    )( AREAP area, BYTE ** param );
-typedef USHORT ( * DBENTRYP_S     )( AREAP area, USHORT param );
-typedef USHORT ( * DBENTRYP_LP    )( AREAP area, LONG * param );
-typedef USHORT ( * DBENTRYP_ULP   )( AREAP area, ULONG * param );
-typedef USHORT ( * DBENTRYP_SVP   )( AREAP area, USHORT index, void * param );
-typedef USHORT ( * DBENTRYP_SSP   )( AREAP area, USHORT index, USHORT * param );
-typedef USHORT ( * DBENTRYP_SCP   )( AREAP area, USHORT index, char * param );
-typedef USHORT ( * DBENTRYP_SCCS  )( AREAP area, USHORT index, const char * param, USHORT p3 );
-typedef USHORT ( * DBENTRYP_VSP   )( AREAP area, USHORT action, ULONG lRecord );
-typedef USHORT ( * DBENTRYP_SVL   )( AREAP area, USHORT index, ULONG * param );
-typedef USHORT ( * DBENTRYP_SSI   )( AREAP area, USHORT p1, USHORT p2, PHB_ITEM p3 );
-typedef USHORT ( * DBENTRYP_ISI   )( AREAP area, PHB_ITEM p1, USHORT p2, PHB_ITEM p3 );
-typedef USHORT ( * DBENTRYP_BIB   )( AREAP area, BOOL p1, PHB_ITEM p2, BOOL p3 );
-typedef USHORT ( * DBENTRYP_VPL   )( AREAP area, void * p1, LONG p2 );
-typedef USHORT ( * DBENTRYP_VPLP  )( AREAP area, void * p1, LONG * p2 );
-typedef USHORT ( * DBENTRYP_LSP   )( AREAP area, ULONG p1, BOOL * p2 );
+typedef HB_ERRCODE ( * DBENTRYP_V     )( AREAP area );
+typedef HB_ERRCODE ( * DBENTRYP_BP    )( AREAP area, BOOL * param );
+typedef HB_ERRCODE ( * DBENTRYP_B     )( AREAP area, BOOL param );
+typedef HB_ERRCODE ( * DBENTRYP_L     )( AREAP area, LONG param );
+typedef HB_ERRCODE ( * DBENTRYP_UL    )( AREAP area, ULONG param );
+typedef HB_ERRCODE ( * DBENTRYP_I     )( AREAP area, PHB_ITEM param );
+typedef HB_ERRCODE ( * DBENTRYP_SI    )( AREAP area, USHORT index, PHB_ITEM param );
+typedef HB_ERRCODE ( * DBENTRYP_VO    )( AREAP area, LPDBOPENINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VT    )( AREAP area, LPDBTRANSINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VF    )( AREAP area, LPDBFIELDINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VL    )( AREAP area, LPDBLOCKINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VR    )( AREAP area, LPDBRELINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VS    )( AREAP area, LPDBSORTINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VFI   )( AREAP area, LPDBFILTERINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VEI   )( AREAP area, LPDBEVALINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VLO   )( AREAP area, LPDBSCOPEINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VOC   )( AREAP area, LPDBORDERCREATEINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VOO   )( AREAP area, LPDBORDERCONDINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VOS   )( AREAP area, LPDBORDSCOPEINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_VOI   )( AREAP area, LPDBORDERINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_SVOI  )( AREAP area, USHORT index, LPDBORDERINFO param );
+typedef HB_ERRCODE ( * DBENTRYP_SP    )( AREAP area, USHORT * param );
+typedef HB_ERRCODE ( * DBENTRYP_P     )( AREAP area, const BYTE * param );
+typedef HB_ERRCODE ( * DBENTRYP_CP    )( AREAP area, char * param );
+typedef HB_ERRCODE ( * DBENTRYP_CC    )( AREAP area, const char * param );
+typedef HB_ERRCODE ( * DBENTRYP_PP    )( AREAP area, BYTE ** param );
+typedef HB_ERRCODE ( * DBENTRYP_S     )( AREAP area, USHORT param );
+typedef HB_ERRCODE ( * DBENTRYP_LP    )( AREAP area, LONG * param );
+typedef HB_ERRCODE ( * DBENTRYP_ULP   )( AREAP area, ULONG * param );
+typedef HB_ERRCODE ( * DBENTRYP_SVP   )( AREAP area, USHORT index, void * param );
+typedef HB_ERRCODE ( * DBENTRYP_SSP   )( AREAP area, USHORT index, USHORT * param );
+typedef HB_ERRCODE ( * DBENTRYP_SCP   )( AREAP area, USHORT index, char * param );
+typedef HB_ERRCODE ( * DBENTRYP_SCCS  )( AREAP area, USHORT index, const char * param, USHORT p3 );
+typedef HB_ERRCODE ( * DBENTRYP_VSP   )( AREAP area, USHORT action, ULONG lRecord );
+typedef HB_ERRCODE ( * DBENTRYP_SVL   )( AREAP area, USHORT index, ULONG * param );
+typedef HB_ERRCODE ( * DBENTRYP_SSI   )( AREAP area, USHORT p1, USHORT p2, PHB_ITEM p3 );
+typedef HB_ERRCODE ( * DBENTRYP_ISI   )( AREAP area, PHB_ITEM p1, USHORT p2, PHB_ITEM p3 );
+typedef HB_ERRCODE ( * DBENTRYP_BIB   )( AREAP area, BOOL p1, PHB_ITEM p2, BOOL p3 );
+typedef HB_ERRCODE ( * DBENTRYP_VPL   )( AREAP area, void * p1, LONG p2 );
+typedef HB_ERRCODE ( * DBENTRYP_VPLP  )( AREAP area, void * p1, LONG * p2 );
+typedef HB_ERRCODE ( * DBENTRYP_LSP   )( AREAP area, ULONG p1, BOOL * p2 );
 
 /* this methods DO USE take a Workarea but an RDDNODE */
 
-typedef USHORT ( * DBENTRYP_R     )( struct _RDDNODE * pRDD );
-typedef USHORT ( * DBENTRYP_RVVL  )( struct _RDDNODE * pRDD, PHB_ITEM p1, PHB_ITEM p2, ULONG p3 );
-typedef USHORT ( * DBENTRYP_RVVVL )( struct _RDDNODE * pRDD, PHB_ITEM p1, PHB_ITEM p2, PHB_ITEM p3, ULONG p4 );
-typedef USHORT ( * DBENTRYP_RSLV  )( struct _RDDNODE * pRDD, USHORT index, ULONG p1, PHB_ITEM p2 );
+typedef HB_ERRCODE ( * DBENTRYP_R     )( struct _RDDNODE * pRDD );
+typedef HB_ERRCODE ( * DBENTRYP_RVVL  )( struct _RDDNODE * pRDD, PHB_ITEM p1, PHB_ITEM p2, ULONG p3 );
+typedef HB_ERRCODE ( * DBENTRYP_RVVVL )( struct _RDDNODE * pRDD, PHB_ITEM p1, PHB_ITEM p2, PHB_ITEM p3, ULONG p4 );
+typedef HB_ERRCODE ( * DBENTRYP_RSLV  )( struct _RDDNODE * pRDD, USHORT index, ULONG p1, PHB_ITEM p2 );
 /*--------------------* Virtual Method Table *----------------------*/
 
 typedef struct _RDDFUNCS