From dc66765645cee370ec0bd2655d7fb0b6e2687e53 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 27 May 2010 13:22:44 +0000
Subject: [PATCH] 2010-05-27 15:21 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/xhb/xhbfunc.c     + Added XHB_NETNAME(),
 XHB_MEMOWRIT()

  * contrib/xhb/hbcompat.ch
    ! Fixed MEMOWRIT() translation. Someone pls test it with
      real xhb.

  * contrib/xhb/hbcompat.ch
  * contrib/xhb/xhb.ch
    ! Moved xhb_*() function dependent translations to xhb.ch.
      (since the promise is that hbcompat.ch translations don't
      need xhb lib)
---
 harbour/ChangeLog               | 15 +++++++
 harbour/contrib/xhb/hbcompat.ch | 79 +++++++++++++++------------------
 harbour/contrib/xhb/xhb.ch      |  5 +++
 harbour/contrib/xhb/xhbfunc.c   | 22 +++++++++
 4 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3b065223af..bdff13b265 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-27 15:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/xhb/xhbfunc.c
+    + Added XHB_NETNAME(), XHB_MEMOWRIT()
+
+  * contrib/xhb/hbcompat.ch
+    ! Fixed MEMOWRIT() translation. Someone pls test it with
+      real xhb.
+
+  * contrib/xhb/hbcompat.ch
+  * contrib/xhb/xhb.ch
+    ! Moved xhb_*() function dependent translations to xhb.ch.
+      (since the promise is that hbcompat.ch translations don't
+      need xhb lib)
+
 2010-05-27 14:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/xhb/hbcompat.ch
     * Grouped together all translations which cannot be
@@ -88,6 +102,7 @@
     ; NOTE: This method, as is now, has some advantages:
             - doesn't require modification of app source code.
             - doesn't require knowledge about hbcompat.ch.
+            - works in macros
             and disadvantages:
             - is slightly slower [DONE]
             - will pull unnecessary code parts into the executable [DONE]
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
index e309959221..cb9b58ace5 100644
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -276,12 +276,7 @@
 
    #xtranslate GetEnv([<x,...>])               => hb_GetEnv(<x>)
    #xtranslate SetKey([<x,...>])               => hb_SetKey(<x>)
-   #xtranslate MemoWrit(<x>,<y>,<z>)           => iif( hb_isLogical(<z>) .AND. <z>, MemoWrit(<x>,<y>), hb_MemoWrit(<x>,<y>) )
-
-   /* _SET_TRACE* / TraceLog() */
-   #xtranslate Set(_SET_TRACE [,<x,...>])      => xhb_setTrace( <x> )
-   #xtranslate Set(_SET_TRACEFILE [,<x,...>])  => xhb_setTraceFile( <x> )
-   #xtranslate Set(_SET_TRACESTACK [,<x,...>]) => xhb_setTraceStack( <x> )
+   #xtranslate MemoWrit(<x>,<y>,<z>)           => iif( hb_isLogical(<z>) .AND. ! <z>, hb_MemoWrit(<x>,<y>), MemoWrit(<x>,<y>) )
 
    /* TEXT INTO <varname> */
    #xcommand TEXT INTO <v> => #pragma __text|<v>+=%s+HB_OSNEWLINE();<v>:=""
@@ -328,50 +323,50 @@
 
    /* These also have wrapper function in xhb lib */
 
-   #xtranslate gtSetClipboard(<x>)         => hb_gtInfo( HB_GTI_CLIPBOARDDATA, <x> )
-   #xtranslate gtGetClipboard()            => hb_gtInfo( HB_GTI_CLIPBOARDDATA )
-   #xtranslate gtGetClipBoardSize()        => Len( hb_gtInfo( HB_GTI_CLIPBOARDDATA ) )
-   #xtranslate gtPasteClipBoard()          => hb_gtInfo( HB_GTI_CLIPBOARDPASTE )
-   #xtranslate gtProcessMessages()         => NextKey()
-   #xtranslate gfxPrimitive([<x,...>])     => hb_gfxPrimitive(<x>)
-   #xtranslate gfxText([<x,...>])          => hb_gfxText(<x>)
+   #xtranslate gtSetClipboard(<x>)             => hb_gtInfo( HB_GTI_CLIPBOARDDATA, <x> )
+   #xtranslate gtGetClipboard()                => hb_gtInfo( HB_GTI_CLIPBOARDDATA )
+   #xtranslate gtGetClipBoardSize()            => Len( hb_gtInfo( HB_GTI_CLIPBOARDDATA ) )
+   #xtranslate gtPasteClipBoard()              => hb_gtInfo( HB_GTI_CLIPBOARDPASTE )
+   #xtranslate gtProcessMessages()             => NextKey()
+   #xtranslate gfxPrimitive([<x,...>])         => hb_gfxPrimitive(<x>)
+   #xtranslate gfxText([<x,...>])              => hb_gfxText(<x>)
 
-   #xtranslate hb_openProcess([<x,...>])   => hb_processOpen(<x>)
-   #xtranslate hb_closeProcess([<x,...>])  => hb_processClose(<x>)
+   #xtranslate hb_openProcess([<x,...>])       => hb_processOpen(<x>)
+   #xtranslate hb_closeProcess([<x,...>])      => hb_processClose(<x>)
 
-   #xtranslate hb_isregexstring([<x>])     => hb_isregex(<x>)
-   #xtranslate pvalue([<x,...>])           => hb_pvalue(<x>)
-   #xtranslate methodName([<x,...>])       => hb_methodName(<x>)
-   #xtranslate libLoad([<x,...>])          => hb_libLoad(<x>)
-   #xtranslate libFree([<x,...>])          => hb_libFree(<x>)
-   #xtranslate hb_checksum([<x,...>])      => hb_adler32(<x>)
-   #xtranslate setLastKey([<x,...>])       => hb_setLastKey(<x>)
-   #xtranslate CStr([<x,...>])             => hb_CStr(<x>)
-   #xtranslate ValToPrgExp([<x,...>])      => hb_valToExp(<x>)
-   #xtranslate IsDirectory(<x>)            => hb_dirExists(<x>)
-   #xtranslate SecondsSleep([<x,...>])     => hb_idleSleep(<x>)
-   #xtranslate FileSize(<x>)               => hb_FSize(<x>)
-   #xtranslate WildMatch([<x,...>])        => hb_WildMatch(<x>)
-   #xtranslate hb_DeserialNext(<x>)        => hb_Deserialize(<x>)
-   #xtranslate hb_funcptr(<x>)             => __dynsn2sym(<x>)
+   #xtranslate hb_isregexstring([<x>])         => hb_isregex(<x>)
+   #xtranslate pvalue([<x,...>])               => hb_pvalue(<x>)
+   #xtranslate methodName([<x,...>])           => hb_methodName(<x>)
+   #xtranslate libLoad([<x,...>])              => hb_libLoad(<x>)
+   #xtranslate libFree([<x,...>])              => hb_libFree(<x>)
+   #xtranslate hb_checksum([<x,...>])          => hb_adler32(<x>)
+   #xtranslate setLastKey([<x,...>])           => hb_setLastKey(<x>)
+   #xtranslate CStr([<x,...>])                 => hb_CStr(<x>)
+   #xtranslate ValToPrgExp([<x,...>])          => hb_valToExp(<x>)
+   #xtranslate IsDirectory(<x>)                => hb_dirExists(<x>)
+   #xtranslate SecondsSleep([<x,...>])         => hb_idleSleep(<x>)
+   #xtranslate FileSize(<x>)                   => hb_FSize(<x>)
+   #xtranslate WildMatch([<x,...>])            => hb_WildMatch(<x>)
+   #xtranslate hb_DeserialNext(<x>)            => hb_Deserialize(<x>)
+   #xtranslate hb_funcptr(<x>)                 => __dynsn2sym(<x>)
 
-   #xtranslate HexToNum([<c,...>])         => hb_HexToNum(<c>)
-   #xtranslate NumToHex([<n,...>])         => hb_NumToHex(<n>)
-   #xtranslate HexToStr([<c,...>])         => hb_HexToStr(<c>)
-   #xtranslate StrToHex([<c,...>])         => hb_StrToHex(<c>)
+   #xtranslate HexToNum([<c,...>])             => hb_HexToNum(<c>)
+   #xtranslate NumToHex([<n,...>])             => hb_NumToHex(<n>)
+   #xtranslate HexToStr([<c,...>])             => hb_HexToStr(<c>)
+   #xtranslate StrToHex([<c,...>])             => hb_StrToHex(<c>)
 
-   #xtranslate ISPOINTER( <xValue> )       => hb_ISPOINTER( <xValue> )
+   #xtranslate ISPOINTER( <xValue> )           => hb_ISPOINTER( <xValue> )
 
-   #xtranslate hb_SetIniComment([<x,...>]) => hb_IniSetComment(<x>)
-   #xtranslate hb_ReadIni([<x,...>])       => hb_IniRead(<x>)
-   #xtranslate hb_WriteIni([<x,...>])      => hb_IniWrite(<x>)
+   #xtranslate hb_SetIniComment([<x,...>])     => hb_IniSetComment(<x>)
+   #xtranslate hb_ReadIni([<x,...>])           => hb_IniRead(<x>)
+   #xtranslate hb_WriteIni([<x,...>])          => hb_IniWrite(<x>)
 
-   #xtranslate DisableWaitLocks([<x>])     => hb_DisableWaitLocks(<x>)
+   #xtranslate DisableWaitLocks([<x>])         => hb_DisableWaitLocks(<x>)
 
-   #xtranslate HBCONSOLELOCK()             => hb_gtLock()
-   #xtranslate HBCONSOLEUNLOCK()           => hb_gtUnLock()
+   #xtranslate HBCONSOLELOCK()                 => hb_gtLock()
+   #xtranslate HBCONSOLEUNLOCK()               => hb_gtUnLock()
 
-   #xtranslate hb_CMDARGARGV([<x,...>])    => hb_ARGV(<x>)
+   #xtranslate hb_CMDARGARGV([<x,...>])        => hb_ARGV(<x>)
 
    #xtranslate RAScan([<x,...>])               => hb_RAScan(<x>)
 
diff --git a/harbour/contrib/xhb/xhb.ch b/harbour/contrib/xhb/xhb.ch
index a7c80588f6..4aceb762c0 100644
--- a/harbour/contrib/xhb/xhb.ch
+++ b/harbour/contrib/xhb/xhb.ch
@@ -64,6 +64,11 @@
    #xtranslate __Keyboard([<x,...>])           => xhb__Keyboard(<x>)
    #xtranslate __CopyFile([<x,...>])           => xhb_CopyFile(<x>)
 
+   /* _SET_TRACE* / TraceLog() */
+   #xtranslate Set(_SET_TRACE [,<x,...>])      => xhb_setTrace( <x> )
+   #xtranslate Set(_SET_TRACEFILE [,<x,...>])  => xhb_setTraceFile( <x> )
+   #xtranslate Set(_SET_TRACESTACK [,<x,...>]) => xhb_setTraceStack( <x> )
+
 #endif
 
 #endif /* __HARBOUR__ */
diff --git a/harbour/contrib/xhb/xhbfunc.c b/harbour/contrib/xhb/xhbfunc.c
index 61fd504dd3..006888760d 100644
--- a/harbour/contrib/xhb/xhbfunc.c
+++ b/harbour/contrib/xhb/xhbfunc.c
@@ -298,6 +298,28 @@ HB_FUNC( HB_EXEC )
       hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
 
+HB_FUNC_EXTERN( HB_USERNAME );
+HB_FUNC_EXTERN( NETNAME );
+
+HB_FUNC( XHB_NETNAME )
+{
+   if( ISNUM( 1 ) && hb_parni( 1 ) == 1 )
+      HB_FUNC_EXEC( HB_USERNAME )
+   else
+      HB_FUNC_EXEC( NETNAME )
+}
+
+HB_FUNC_EXTERN( HB_MEMOWRIT );
+HB_FUNC_EXTERN( MEMOWRIT );
+
+HB_FUNC( XHB_MEMOWRIT )
+{
+   if( ISLOG( 3 ) && ! hb_parl( 3 ) )
+      HB_FUNC_EXEC( HB_MEMOWRIT )
+   else
+      HB_FUNC_EXEC( MEMOWRIT )
+}
+
 HB_FUNC_EXTERN( HB_PVALUE             ) ; HB_FUNC( PVALUE                   ) { HB_FUNC_EXEC( HB_PVALUE             ); }
 HB_FUNC_EXTERN( HB_METHODNAME         ) ; HB_FUNC( METHODNAME               ) { HB_FUNC_EXEC( HB_METHODNAME         ); }
 HB_FUNC_EXTERN( HB_LIBLOAD            ) ; HB_FUNC( LIBLOAD                  ) { HB_FUNC_EXEC( HB_LIBLOAD            ); }