diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6036c11a69..d537cddd45 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-22 08:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * hbwhat32/_winsys.c
+   * hbwhat32/_wincomm.c
+     ! Warnings.
+
+   * source/rtl/net.c
+     ! Fixed GPF in NETNAME() under DOS (in error condition only).
+     ! Fixed GPF in NETNAME()/HB_USERNAME() on unsupported 
+       platforms.
+
 2008-05-22 08:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    - contrib/hbmisc/dbftools.c
    * contrib/hbmisc/common.mak
@@ -57,7 +67,7 @@
      + Redirects .lib creation (implib, lib) output to log file.
 
    * contrib/xhb/hbcompat.ch
-     + Added some more converions for xhb code.
+     + Added some more conversions for xhb code.
 
    * contrib/rddads/ads1.c
      + Added two TODOs. (to adsDrop and adsExists)
diff --git a/harbour/contrib/hbwhat32/_wincomm.c b/harbour/contrib/hbwhat32/_wincomm.c
index 3e43bcb61c..c9ba976e94 100644
--- a/harbour/contrib/hbwhat32/_wincomm.c
+++ b/harbour/contrib/hbwhat32/_wincomm.c
@@ -324,8 +324,8 @@ vi = hb_itemGetNI   ( hb_arrayGetItemPtr(wArray, s ));
 //------------------------------------------------------------------------------------------
 HB_FUNC( ADDLISTVIEWITEMS )
 {
-   PHB_ITEM hArray;
-   char *caption;
+// PHB_ITEM hArray;
+   char *caption = NULL;
    LV_ITEM LI;
    HWND h;
    int l;
@@ -334,8 +334,8 @@ HB_FUNC( ADDLISTVIEWITEMS )
 
    h = (HWND) hb_parnl( 1 ) ;
    l = hb_parinfa( 2, 0 ) - 1 ;
-   hArray = hb_param( 2, HB_IT_ARRAY );
    c = ListView_GetItemCount (h);
+// hArray = hb_param( 2, HB_IT_ARRAY );
 //   caption  = hb_itemGetCPtr ( hArray->item.asArray.value->pItems );
 
    LI.mask=LVIF_TEXT ;
@@ -376,7 +376,6 @@ HB_FUNC( LISTVIEWRESET )
 //------------------------------------------------------------------------------------------
 HB_FUNC( LISTVIEW_GETFIRSTITEM )
 {
-   hb_retni ( ListView_GetNextItem( (HWND) hb_parnl( 1 )  , -1 ,LVNI_ALL | LVNI_SELECTED) + 1);
+   hb_retni( ListView_GetNextItem( (HWND) hb_parnl( 1 ), -1, LVNI_ALL | LVNI_SELECTED ) + 1 );
 }
 //------------------------------------------------------------------------------------------
-
diff --git a/harbour/contrib/hbwhat32/_winsys.c b/harbour/contrib/hbwhat32/_winsys.c
index 6617973301..7b2786f2a0 100644
--- a/harbour/contrib/hbwhat32/_winsys.c
+++ b/harbour/contrib/hbwhat32/_winsys.c
@@ -410,8 +410,7 @@ HB_FUNC( HIWORD )
 
 HB_FUNC( MAKELONG )
 {
-
-   hb_retnl( ((LONG) (((WORD) (hb_parni(1))) | ((DWORD) ((WORD) (hb_parni(2)))) << 16)) ) ;
+   hb_retnl( (LONG) (((WORD) (hb_parni(1))) | (((DWORD) ((WORD) (hb_parni(2)))) << 16)) ) ;
 }
 
 //-------------------------------------------------------------------//
diff --git a/harbour/source/rtl/net.c b/harbour/source/rtl/net.c
index 986961199e..5fea54e712 100644
--- a/harbour/source/rtl/net.c
+++ b/harbour/source/rtl/net.c
@@ -143,7 +143,7 @@ char * hb_netname( void )
          HB_DOS_INT86X( 0x21, &regs, &regs, &sregs );
       }
 
-      return regs.h.ch == 0 ? "" : pszValue;
+      return regs.h.ch == 0 ? hb_strdup( "" ) : pszValue;
 #  endif
 
 #elif defined(HB_OS_WIN_32)
@@ -157,7 +157,7 @@ char * hb_netname( void )
 
 #else
 
-   return NULL;
+   return hb_strdup( "" );
 
 #endif
 }
@@ -187,7 +187,7 @@ char * hb_username( void )
 
 #else
 
-   return NULL;
+   return hb_strdup( "" );
 
 #endif
 }