From 931b46fe6ce51700d445453004e76e3fc1ce1e63 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 22 Oct 2010 17:08:40 +0000 Subject: [PATCH] 2010-10-23 19:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/win_os.prg ! Fixed all Vista stuff to also apply to above Vista. --- harbour/ChangeLog | 4 ++++ harbour/contrib/hbwin/win_os.prg | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6826e1c16b..082955399d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-23 19:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/win_os.prg + ! Fixed all Vista stuff to also apply to above Vista. + 2010-10-22 10:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbide.hbp ! -3rd=file= => -3rd=hbide_file= diff --git a/harbour/contrib/hbwin/win_os.prg b/harbour/contrib/hbwin/win_os.prg index 6e2f4b6d72..5a82c7f328 100644 --- a/harbour/contrib/hbwin/win_os.prg +++ b/harbour/contrib/hbwin/win_os.prg @@ -79,7 +79,7 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista ) lDoVista := .T. ENDIF - IF ! lDoVista .AND. hb_osIsWinVista() + IF ! lDoVista .AND. win_osIsVistaOrUpper() /* do nothing */ ELSEIF hb_osIsWin9x() bRetVal := win_regQuery( WIN_HKEY_LOCAL_MACHINE, "System\CurrentControlSet\Services\VxD\VREDIR", "DiscardCacheOnOpen", 1, lSetIt ) @@ -98,7 +98,7 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista ) bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeySrv, "SharingViolationDelay", 0, lSetIt ) bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeySrv, "SharingViolationRetries", 0, lSetIt ) - IF hb_osIsWinVista() + IF win_osIsVistaOrUpper() /* If SMB2 is enabled turning off oplocks does not work, so SMB2 is required to be turned off on Server. */ bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeySrv, "SMB2", 0, lSetIt ) ENDIF @@ -110,7 +110,7 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista ) bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "UtilizeNtCaching", 0, lSetIt ) bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "UseLockReadUnlock", 0, lSetIt ) - IF hb_osIsWinVista() + IF win_osIsVistaOrUpper() bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "FileInfoCacheLifetime", 0, lSetIt ) bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "FileNotFoundCacheLifetime", 0, lSetIt ) bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "DirectoryCacheLifetime", 0, lSetIt )