diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4e12f55b5e..662dcc1de8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,8 +8,12 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
-2005-10-24 12:08 UTC+0100 Viktor Szakats (viktor.szakats/syenar.hu)
+2005-10-24 12:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbtypes.h
+  * harbour/source/vm/maindllp.c
+    ! fixed some declaration I missed in previous commit
 
+2005-10-24 12:08 UTC+0100 Viktor Szakats (viktor.szakats/syenar.hu)
    * hrbdll.bc
    * hrbdll.vc
    * makefile.bc
@@ -55,22 +59,22 @@
   * harbour/source/lang/msgplwin.c
   * harbour/source/rdd/Makefile
   * harbour/source/rdd/dbcmd.c
-  -  harbour/source/rdd/dbf0.prg
+  - harbour/source/rdd/dbf0.prg
   * harbour/source/rdd/dbf1.c
-  -  harbour/source/rdd/delim0.prg
+  - harbour/source/rdd/delim0.prg
   * harbour/source/rdd/delim1.c
   * harbour/source/rdd/rddsys.prg
-  -  harbour/source/rdd/sdf0.prg
+  - harbour/source/rdd/sdf0.prg
   * harbour/source/rdd/sdf1.c
   * harbour/source/rdd/dbfcdx/Makefile
-  -  harbour/source/rdd/dbfcdx/dbfcdx0.prg
+  - harbour/source/rdd/dbfcdx/dbfcdx0.prg
   * harbour/source/rdd/dbfcdx/dbfcdx1.c
-  -  harbour/source/rdd/dbfcdx/sixcdx0.prg
+  - harbour/source/rdd/dbfcdx/sixcdx0.prg
   * harbour/source/rdd/dbfdbt/Makefile
-  -  harbour/source/rdd/dbfdbt/dbfdbt0.prg
+  - harbour/source/rdd/dbfdbt/dbfdbt0.prg
   * harbour/source/rdd/dbfdbt/dbfdbt1.c
   * harbour/source/rdd/dbffpt/Makefile
-  -  harbour/source/rdd/dbffpt/dbffpt0.prg
+  - harbour/source/rdd/dbffpt/dbffpt0.prg
   * harbour/source/rdd/dbffpt/dbffpt1.c
   * harbour/source/rdd/dbfntx/Makefile
   * harbour/source/rdd/dbfntx/dbfntx0.prg
diff --git a/harbour/include/hbtypes.h b/harbour/include/hbtypes.h
index 51b54c8c5d..93970bab00 100644
--- a/harbour/include/hbtypes.h
+++ b/harbour/include/hbtypes.h
@@ -68,14 +68,14 @@ typedef void ( * VM_DLL_EXECUTE ) ( const BYTE * pCode, PHB_SYMB pSymbols );
 typedef BOOL     ( * EXT_IS_ARRAY ) ( int iParam );
 typedef char *   ( * EXT_PARC1 )  ( int iParam );
 typedef char *   ( * EXT_PARC2 )  ( int iParam, ULONG ulArrayIndex );
-typedef PHB_ITEM ( * HB_PARAM)( int iParam, int iMask );
+typedef PHB_ITEM ( * HB_PARAM)( int iParam, LONG iMask );
 typedef PHB_ITEM ( * HB_PARAMERROR)( int iParam );
 typedef int      ( * HB_PCOUNTS )( void );
 typedef void     ( * HB_RET)( void );
-typedef void     ( * HB_RETC)( char * szText );
-typedef void     ( * HB_RETCLEN)( char * szText, ULONG ulLen );
-typedef void     ( * HB_RETDS)( char * szDate );
-typedef void     ( * HB_RETD)( long lYear, long lMonth, long lDay );
+typedef void     ( * HB_RETC)( const char * szText );
+typedef void     ( * HB_RETCLEN)( const char * szText, ULONG ulLen );
+typedef void     ( * HB_RETDS)( const char * szDate );
+typedef void     ( * HB_RETD)( int iYear, int iMonth, int iDay );
 typedef void     ( * HB_RETDL)( long lJulian );
 typedef void     ( * HB_RETL)( int iTrueFalse );
 typedef void     ( * HB_RETND)( double dNumber );
@@ -87,12 +87,11 @@ typedef void     ( * HB_RETNILEN)( int iNumber, int iWidth );
 typedef void     ( * HB_RETNLLEN)( long lNumber, int iWidth );
 typedef void     ( * HB_RETA)( ULONG ulLen );
 typedef ULONG    ( * HB_PARINFA)( int iParamNum, ULONG uiArrayIndex );
-typedef int      ( * HB_PARINFO)( int iParam );
+typedef ULONG    ( * HB_PARINFO)( int iParam );
 typedef ULONG    ( * HB_PARCLEN)( int iParam );
 typedef ULONG    ( * HB_PARCSIZ)( int iParam );
 typedef char *   ( * HB_PARDS)( int iParam );
 typedef char *   ( * HB_PARDSBUFF)( char * szDate,int iParam);
-typedef int      ( * HB_PARINFO)( int iParam );
 typedef int      ( * HB_PARL)( int iParam );
 typedef double   ( * HB_PARND)( int iParam );
 typedef int      ( * HB_PARNI)( int iParam );
@@ -138,4 +137,4 @@ typedef void     ( * HB_XFREE)( void * pMem );                  /* frees memory
 typedef void *   ( * HB_XREALLOC)( void * pMem, ULONG ulSize ); /* reallocates memory */
 typedef ULONG    ( * HB_XSIZE)( void * pMem );                  /* returns the size of an allocated memory block */
 
-#endif /* HB_TYPES_H_ */
\ No newline at end of file
+#endif /* HB_TYPES_H_ */
diff --git a/harbour/source/vm/maindllp.c b/harbour/source/vm/maindllp.c
index 141b72019e..f3127b5c66 100644
--- a/harbour/source/vm/maindllp.c
+++ b/harbour/source/vm/maindllp.c
@@ -164,21 +164,21 @@ int   hb_pcount( void )          /* returns the number of suplied parameters */
    return iReturn;
 }
 
-void hb_retc( char * szText )   /* returns a string */
+void hb_retc( const char * szText )   /* returns a string */
 {
    FARPROC pRetc=GetProcAddress(GetModuleHandle( NULL ), "_hb_retc" );
    if (pRetc)
       ((HB_RETC)pRetc)(szText);
 }
 
-void hb_retclen( char * szText, ULONG ulLen ) /* returns a string with a specific length */
+void hb_retclen( const char * szText, ULONG ulLen ) /* returns a string with a specific length */
 {
    FARPROC pRetclen=GetProcAddress(GetModuleHandle( NULL ), "_hb_retclen" );
    if (pRetclen)
       ((HB_RETCLEN)pRetclen)(szText,ulLen);
 }
 
-void hb_retds( char * szDate )  /* returns a date, must use yyyymmdd format */
+void hb_retds( const char * szDate )  /* returns a date, must use yyyymmdd format */
 {
    FARPROC pRetds=GetProcAddress(GetModuleHandle( NULL ), "_hb_retds" );
    if (pRetds)
@@ -274,13 +274,13 @@ ULONG hb_parinfa( int iParamNum, ULONG uiArrayIndex ) /* retrieve length or elem
    return ulReturn;
 }
 
-int hb_parinfo( int iParam ) /* Determine the param count or data type */
+ULONG hb_parinfo( int iParam ) /* Determine the param count or data type */
 {
-   int iReturn;
+   ULONG ulReturn;
    FARPROC pParinfo=GetProcAddress( GetModuleHandle( NULL ), "_hb_parinfo" );
    if (pParinfo)
-      iReturn=((HB_PARINFO)pParinfo)(iParam);
-   return iReturn;
+      ulReturn=((HB_PARINFO)pParinfo)(iParam);
+   return ulReturn;
 }
 
 ULONG hb_parclen( int iParam, ... ) /* retrieve a string parameter length */