fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2019-02-11 13:43 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* bin/commit.hb
    ! fixed UTC offset formatting

  * contrib/hbwin/win_os.prg
    * updated win_osNetRegOk() for modern MS-Windows versions:
      - on Win7 and upper set
        System\CurrentControlSet\Services\LanmanServer\Parameters\DisableLeasing
        to disable opportunistic locks.
      - do not force SMB1 to disable oplocks on Win7 and upper - new MS-Win10
        does not support SMB1 at all so this setting on the server with
        such system completely disables SMB network and forcing SMB1 on the
        client side blocks access to new Win10 servers.
        Warning! this setting is still activated on Vista so it cannot
                 connect work with new Win10 but I do not know any other
                 working method to disable oplocks in Windows Vista.
    * synced with Viktor's branch

  * contrib/xhb/hbserv.c
    ! added missing return

  * include/harbour.hbx
  * src/harbour.def
  * src/rtl/version.c
    + added new PRG functions:
         hb_osIsWin7(), hb_osIsWin8(), hb_osIsWin81(), hb_osIsWin10()

  * src/rtl/gttrm/gttrm.c
    + added autodetection for few other XTerm compatible terminals
    + respect color extension in TERM name of all XTerm compatible
      terminals

  * utils/hbmk2/hbmk2.prg
    + added support for -cpp=isoXX borowed from Viktor's branch

  * contrib/gtqtc/gtqtc.hbc
  * contrib/gtqtc/gtqtc.hbp
    * use -cpp=iso11 required for QT 5.7.0 or upper
    * extended QT detection and partial syncing with Viktor's branch
This commit is contained in:
Przemysław Czerpak
2019-02-11 13:43:40 +01:00
parent 362b7a32de
commit d0be194907
11 changed files with 181 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/harbour.def
View File

@@ -912,7 +912,11 @@ HB_FUN_HB_OSDRIVESEPARATOR
HB_FUN_HB_OSERROR
HB_FUN_HB_OSFILEMASK
HB_FUN_HB_OSIS64BIT
HB_FUN_HB_OSISWIN10
HB_FUN_HB_OSISWIN2K
HB_FUN_HB_OSISWIN7
HB_FUN_HB_OSISWIN8
HB_FUN_HB_OSISWIN81
HB_FUN_HB_OSISWIN9X
HB_FUN_HB_OSISWINCE
HB_FUN_HB_OSISWINNT

34
src/rtl/gttrm/gttrm.c
View File

@@ -3225,10 +3225,17 @@ static void hb_gt_trm_SetTerm( PHB_GTTRM pTerm )
pTerm->terminal_ext |= TERM_PUTTY;
}
if( ( pTerm->terminal_ext & TERM_PUTTY ) ||
strncmp( szTerm, "xterm", 5 ) == 0 ||
strncmp( szTerm, "rxvt", 4 ) == 0 ||
strncmp( szTerm, "screen", 6 ) == 0 )
if( ( pTerm->terminal_ext & TERM_PUTTY ) || /* PuTTY terminal emulator */
strncmp( szTerm, "xterm", 5 ) == 0 || /* X11 terminal emulator */
strncmp( szTerm, "rxvt", 4 ) == 0 || /* rxvt terminal emulator */
strncmp( szTerm, "gnome", 5 ) == 0 || /* GNOME Terminal */
strncmp( szTerm, "vte", 3 ) == 0 || /* VTE aka GNOME Terminal */
strncmp( szTerm, "konsole", 7 ) == 0 || /* KDE console window */
strncmp( szTerm, "nsterm", 6 ) == 0 || /* Apple Terminal */
strncmp( szTerm, "Apple_Terminal", 14 ) == 0 || /* Apple Terminal */
strncmp( szTerm, "aixterm", 7 ) == 0 || /* IBM Aixterm Terminal Emulator */
strncmp( szTerm, "tmux", 4 ) == 0 || /* tmux terminal multiplexer */
strncmp( szTerm, "screen", 6 ) == 0 ) /* VT 100/ANSI X3.64 virtual terminal */
{
pTerm->Init = hb_gt_trm_AnsiInit;
pTerm->Exit = hb_gt_trm_AnsiExit;
@@ -3245,19 +3252,14 @@ static void hb_gt_trm_SetTerm( PHB_GTTRM pTerm )
pTerm->terminal_type = TERM_XTERM;
if( pTerm->iExtColor == HB_GTTRM_CLRNDF )
{
if( pTerm->terminal_ext & TERM_PUTTY )
if( pTerm->terminal_ext & TERM_PUTTY ||
strstr( szTerm, "+256color" ) != NULL ||
strstr( szTerm, "-256color" ) != NULL )
pTerm->iExtColor = HB_GTTRM_CLR256;
else if( strncmp( szTerm, "xterm", 5 ) == 0 ||
strncmp( szTerm, "rxvt", 4 ) == 0 )
{
if( strstr( szTerm, "+256color" ) != NULL ||
strstr( szTerm, "-256color" ) != NULL )
pTerm->iExtColor = HB_GTTRM_CLR256;
else if( strstr( szTerm, "-88color" ) != NULL )
pTerm->iExtColor = HB_GTTRM_CLRRGB;
else if( strstr( szTerm, "-16color" ) != NULL )
pTerm->iExtColor = HB_GTTRM_CLRAIX;
}
else if( strstr( szTerm, "-88color" ) != NULL )
pTerm->iExtColor = HB_GTTRM_CLRRGB;
else if( strstr( szTerm, "-16color" ) != NULL )
pTerm->iExtColor = HB_GTTRM_CLRAIX;
}
}
else if( strncmp( szTerm, "linux", 5 ) == 0 ||

20
src/rtl/version.c
View File

@@ -214,6 +214,26 @@ HB_FUNC( HB_OSISWINVISTA )
hb_retl( hb_iswinvista() );
}
HB_FUNC( HB_OSISWIN7 )
{
hb_retl( hb_iswin7() );
}
HB_FUNC( HB_OSISWIN8 )
{
hb_retl( hb_iswin8() );
}
HB_FUNC( HB_OSISWIN81 )
{
hb_retl( hb_iswin81() );
}
HB_FUNC( HB_OSISWIN10 )
{
hb_retl( hb_iswin10() );
}
HB_FUNC( HB_OSISWINCE )
{
hb_retl( hb_iswince() );