Merged revision(s) 3579-3682, 3462-3579 from tags/version-4.8.2:

This updates the trunk with changes made in release 4.8.2.

Author: delphidabbler

Docs/ChangeLogs/ChangeLog-v4.txt

@@ -11,6 +11,10 @@
 ; Change Log for CodeSnip Release 4
 ; ------------------------------------------------------------------------------
 
+Release v4.8.2 of 30 October 2013
++ Modified Syntax Highlighter tab of Preferences dialogue box so that "vertical" fonts (whose names begin with "@") no longer appear in list of available fonts.
++ Fixed potential bug in operating system detection code that may fail on Windows 2000.
+
 Release v4.8.1 of 18 September 2013
 + Removed File | Page Setup menu option because some settings made there were being ignored when a file was printed. This is a fix for bug #89 "Setup selections not being remembered" (http://bit.ly/1a3V94x).
 + Updated help file re changes.

Src/3rdParty/PJSysInfo.pas

@@ -983,14 +983,31 @@ function GetEnvVar(const VarName: string): string;
     Result := '';
 end;
 
-// Creates a read only TRegistry instance. On versions of Delphi that don't
-// support passing access flags to TRegistry constructor, registry is opened
-// normally for read/write access.
+// Checks if host OS is Windows 2000 or earlier, included any Win9x OS.
+// This is a helper function for RegCreate and RegOpenKeyReadOnly and avoids
+// avoids using TPJOSInfo to ensure that an infinite loop is not set up with
+// TPJOSInfo calling back into RegCreate.
+function IsWin2000OrEarlier: Boolean;
+begin
+  // NOTE: all Win9x OSs have Win32MajorVersion < 5, so we don't need to check
+  // platform.
+  Result := (Win32MajorVersion < 5) or
+    ((Win32MajorVersion = 5) and (Win32MinorVersion = 0));
+end;
+
+// Creates a read only TRegistry instance. On versions of Delphi or OSs that
+// don't support passing access flags to TRegistry constructor, registry is
+// opened normally for read/write access.
 function RegCreate: TRegistry;
 begin
   {$IFDEF REGACCESSFLAGS}
-  //! fix for issue #14 (http://bit.ly/eWkw9X) suggested by Steffen Schaff
-  Result := TRegistry.Create(KEY_READ or KEY_WOW64_64KEY);
+  //! Fix for issue #14 (http://bit.ly/eWkw9X) suggested by Steffen Schaff.
+  //! Later modified to allow for fact that Windows 2000 fails if
+  //! KEY_WOW64_64KEY is used.
+  if IsWin2000OrEarlier then
+    Result := TRegistry.Create
+  else
+    Result := TRegistry.Create(KEY_READ or KEY_WOW64_64KEY);
   {$ELSE}
   Result := TRegistry.Create;
   {$ENDIF}
@@ -999,19 +1016,32 @@ function RegCreate: TRegistry;
 // Uses registry object to open a key as read only. On versions of Delphi that
 // can't open keys as read only the key is opened normally.
 function RegOpenKeyReadOnly(const Reg: TRegistry; const Key: string): Boolean;
+
+  // Opens registry key using TRegistry.OpenKeyReadOnly if supported, otherwise
+  // uses TRegistry.OpenKey.
+  function TryOpenKeyReadOnly: Boolean;
+  begin
+    {$IFDEF REGOPENREADONLY}
+    Result := Reg.OpenKeyReadOnly(Key);
+    {$ELSE}
+    Result := Reg.OpenKey(Key, False);
+    {$ENDIF}
+  end;
+
 begin
   {$IFDEF REGACCESSFLAGS}
-  //! Fix for problem with OpenKeyReadOnly on 64 bit Windows
-  //! requires Reg has (KEY_READ or KEY_WOW64_64KEY) access flags
-  Result := Reg.OpenKey(Key, False);
+  //! Fix for problem with OpenKeyReadOnly on 64 bit Windows requires Reg has
+  //! (KEY_READ or KEY_WOW64_64KEY) access flags.
+  //! Even though these flags aren't provided on Windows 2000 and earlier, the
+  //! following code should still work
+  if IsWin2000OrEarlier then
+    Result := TryOpenKeyReadOnly
+  else
+    Result := Reg.OpenKey(Key, False);
   {$ELSE}
   // Can't fix Win 64 problem since this version of Delphi does not support
   // customisation of registry access flags.
-  {$IFDEF REGOPENREADONLY}
-  Result := Reg.OpenKeyReadOnly(Key);
-  {$ELSE}
-  Result := Reg.OpenKey(Key, False);
-  {$ENDIF}
+  Result := TryOpenKeyReadOnly;
   {$ENDIF}
 end;
 

Src/UFontHelper.pas

@@ -109,7 +109,7 @@ implementation
   // Delphi
   SysUtils, Windows, Forms,
   // Project
-  UGraphicUtils, USystemInfo;
+  UGraphicUtils, UStrUtils, USystemInfo;
 
 
 { TFontHelper }
@@ -123,7 +123,10 @@ function MonoFontFamilyProc(PLF: PEnumLogFont; PNTM: PNewTextMetric;
     @param List [in] List to which mono-spaced fonts are added.
   }
 begin
-  if (PLF.elfLogFont.lfPitchAndFamily and $F) = FIXED_PITCH then
+  // check for fixed pitch font and filter out all "vertical" fonts that start
+  // with "@" (see http://tinyurl.com/6ul6rfo for details of vertical fonts).
+  if ((PLF.elfLogFont.lfPitchAndFamily and $F) = FIXED_PITCH)
+    and not StrStartsStr('@', PLF.elfLogFont.lfFaceName) then
     List.Add(PLF.elfLogFont.lfFaceName);
   Result := 1;
 end;

Src/VCodeSnip.vi

@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 1, 238
-Product Version #=4, 8, 1, 0
+File Version #=4, 8, 2, 239
+Product Version #=4, 8, 2, 0
 File OS=4
 File Type=1
 File Sub-Type=0

Src/VCodeSnipPortable.vi

@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 1, 238
-Product Version #=4, 8, 1, 0
+File Version #=4, 8, 2, 239
+Product Version #=4, 8, 2, 0
 File OS=4
 File Type=1
 File Sub-Type=0