Merge branch 'release/4.14.0'

Release v4.14.0 build 253

Author: DelphiDabbler

Diff for: Docs/ChangeLogs/ChangeLog-v4.txt

@@ -11,6 +11,16 @@
 ; Change Log for CodeSnip Release 4
 ; ------------------------------------------------------------------------------
 
+Release v4.14.0 of 19 March 2016
++ Changes to About Box's "Paths" tab:
+  - Added new buttons to display the contents of the system and per-user config files.
+  - Renamed tab as "Paths & Files".
++ Implemented feature request #83 (https://sourceforge.net/p/codesnip/feature-requests/83/) to enable the name and port of any web service test server to be passed on command line by using the new "--test-server" command line option. This replaces hard-wired test server name & port that was activated using the now removed "-localhost" command line switch.
++ Fixed bug #96: "Some open / save dialogues too small" (https://sourceforge.net/p/codesnip/bugs/96/). The height of customised dialogue boxes was increased.
++ Updated operating system detection code to detect Windows 10 TH2.
++ New photo of Sophie the dog added to the Easter egg slide show!
++ Updated help file re About Box changes.
+
 Release v4.13.2 of 20 February 2016
 + Updated and corrected hints displayed in main window.
 + Changed some menu options and associated dialogue box captions.

Diff for: README.md

@@ -2,6 +2,15 @@
 
 A code bank designed with Pascal in mind.
 
+* [Overview](#overview)
+* [Installation](#installation)
+* [Bugs & Feature Requests](#bugs--feature-requests)
+* [Support](#support)
+* [Source Code](#source-code)
+* [Change Log](#change-log)
+* [CodeSnip 5 Development](#codesnip-5-development)
+* [Donate](#donate)
+
 ## Overview
 
 CodeSnip is an open source code bank for storing and viewing your code snippets. While it can manage snippets in any source language, it is focussed mainly on Pascal and Delphi code for which additional features are available.
@@ -18,21 +27,47 @@ CodeSnip requires Windows 2000 or later and Internet Explorer 6 or later, althou
 
 CodeSnip is installed and removed using a standard Windows installer. Administrator privileges are required for installation.
 
+## Bugs & Feature Requests
+
+Bugs can be reported using the [Bug Tracker](https://sourceforge.net/p/codesnip/bugs/) on SourceForge. Info on how best to report bugs is provided on the tracker.
+
+Feature requests can be made on the [Feature Request Tracker](https://sourceforge.net/p/codesnip/feature-requests/) on SourceForge. Once again info on how to proceed is provided.
+
+> In time the bug and feature request trackers will be moved to GitHub.
+
+## Support
+
+There's quite a lot of support available for CodeSnip:
+
+* A comprehensive help file.
+* A [read-me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt)<sup>*</sup> that discusses installation, configuration, updating and known issues.
+* A dedicated set of [web pages](http://delphidabbler.com/url/codesnip-home).
+* An [FAQ](http://wiki.delphidabbler.com/index.php/FAQs/CodeSnipAppUsing).
+* A [discussion group](https://sourceforge.net/p/codesnip/discussion) on SourceForge (albeit barely used!).
+* An [RSS news feed](http://delphidabbler.com/feeds/site-news-feed?id=codesnip). This can also be accessed via the program.
+* A [Google+ page](https://plus.google.com/u/0/b/108251259814638768561/108251259814638768561/posts).
+* A [Blog](http://codesnip-app.blogspot.co.uk/).
+* A [privacy statement](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/Privacy.txt)<sup>*</sup> that provides information about any personal information stored by the program and what info is transmitted over the net.
+
+There's also plenty of info available on how to compile CodeSnip from source - see below.
+
+<sup>*</sup> These links take you to the most recent version of the documents -- they can change from release to release.
+
 ## Source Code
 
 Up to and including release 4.13.1 the project's source code was maintained in a Subversion repository on [SourceForge](https://sourceforge.net/p/codesnip/code/). The Subversion repo was converted to Git on 21 5 October 2015 and imported to GitHub. All releases from v3.0.0 are marked by tags in the form `version-x.x.x` where `x.x.x` is the version number.
 
-> Note that any branches that were created and deleted in the Subversion repo are missing from the Git history. So, for full details of the the project's history from v3.0.0 to v4.13.1 please refer to the old Subversion repo on SourceForge. 
+> Note that any branches that were created and deleted in the Subversion repo are missing from the Git history. So, for full details of the the project's history from v3.0.0 to v4.13.1 please refer to the old Subversion repo on SourceForge.
 
-Following tag `version-4.13.1` the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model/) methodology was adopted, with the exception that development work on CodeSnip v5 exists outside Git Flow in the `pagoda` and `parsnip` branches (See below for details).
+Following tag `version-4.13.1` the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model/) methodology was adopted, with the exception that development work on CodeSnip v5 exists outside Git Flow in the `pagoda` branch (See below for details).
 
-Up to and including release 4.13.1, `master` is simply a copy of the old Subversion `trunk` and, as such, contains various development commits. After release 4.13.1, and the addition of this read-me file, `master` contains only commits relating to an actual release.
+Up to and including release 4.13.1, `master` is simply a copy of the old Subversion `trunk` and, as such, contains various development commits along with numerous commits related to management of Subversion. After release 4.13.1, and the addition of this read-me file, `master` contains only commits relating to an actual release.
 
 ### Contributions
 
 Contributions are welcome. Just fork the repo and create a feature branch off the `develop` branch. Commit your changes to your feature branch then submit a pull request when ready.
 
-If you are contributing to CodeSnip 5 development please create your feature branch off the `pagoda` branch instead. **Don't use the `parsnip` branch.**
+If you are contributing to CodeSnip 5 development please create your feature branch off the `pagoda` branch instead.
 
 ### Compiling
 
@@ -46,11 +81,11 @@ The program's current change log can be found in the file `Docs/ChangeLogs/Chang
 
 ## License
 
-The program's EULA which gives full details of the license applying to the latest release can be found in the file `Docs\License.html` in the `master` branch. The license has changed between releases, so if you need to see an older one, select the appropriate `version-x.x.x` and read the older version of the file.
+The program's EULA which gives full details of the license applying to the latest release can be found in the file `Docs\License.html` in the `master` branch. The license has changed between releases, so if you need to see an older one, select the appropriate `version-x.x.x` tag and read the older version of the file.
 
 Most of the original code is made available under the [Mozilla Public License v2](https://www.mozilla.org/MPL/2.0/).
 
-The [CodeSnip Compiling & Source Code FAQ](http://wiki.delphidabbler.com/index.php/FAQs/CodeSnipAppSource) may be useful if you have any queries about re-using CodeSnip source in other projects. 
+The [CodeSnip Compiling & Source Code FAQ](http://wiki.delphidabbler.com/index.php/FAQs/CodeSnipAppSource) may be useful if you have any queries about re-using CodeSnip source in other projects.
 
 ## CodeSnip 5 Development
 
@@ -62,4 +97,8 @@ At present the direction CodeSnip is being taken is to:
 2. Increase the focus on the user's own code while downplaying the importance of code downloaded from the DelphiDabbler [Code Snippets database](http://snippets.delphidabbler.com/). This will still be available but will be very much an add on, like [SWAG](http://swag.delphidabbler.com/) is at present.
 3. Remove the program's dependency on web services provided by [DelphiDabbler.com](http://delphidabbler.com) given the current uncertainty over that websites future.
 
-Comments on these ideas are welcome - just create an [issue](https://github.com/delphidabbler/codesnip/issues) and label it "CodeSnip 5 pagoda".
+Comments on these ideas are welcome - just create a [feature request](https://sourceforge.net/p/codesnip/feature-requests/) and select the `v5 (pagoda)` milestone.
+
+## Donate
+
+If you've found the program useful please consider making a donation to help cover costs. Donations are accepted by [PayPal](http://delphidabbler.com/url/donate-cs) in British Pounds (GBP) -- [see  common exchange rates](http://www.xe.com/currency/gbp-british-pound).

Diff for: Src/3rdParty/PJSysInfo.pas

@@ -5,8 +5,8 @@
  *
  * Copyright (C) 2001-2015, Peter Johnson (@delphidabbler).
  *
- * $Rev$
- * $Date$
+ * $Rev: 2002 $
+ * $Date: 2015-11-30 14:45:35 +0000 (Mon, 30 Nov 2015) $
  *
  * This unit contains various static classes, constants, type definitions and
  * global variables for use in providing information about the host computer and
@@ -27,12 +27,6 @@
  *     OS. When run on Windows 8.1 and later details of the actual host
  *     operating system are always returned and the emulated OS is ignored.
  *
- *  4: ** IMPORTANT **
- *     This version of the code was an attempt to get it to detect and report
- *     Windows 10. Try as I might, I can't get this to work. So this version
- *     is released as beta code to use at your own risk. If anyone can fix it,
- *     please let me know.
- *
  * ACKNOWLEDGEMENTS
  *
  * Thanks to the following who have contributed to this project:
@@ -576,11 +570,25 @@   TPJOSInfo = class(TObject)
     class function MinorVersion: Integer;
 
     ///  <summary>Returns the host OS's build number.</summary>
+    ///  <remarks>A return value of 0 indicates that the build number can't be
+    ///  found.</remarks>
     class function BuildNumber: Integer;
 
     ///  <summary>Returns the name of any installed OS service pack.</summary>
     class function ServicePack: string;
 
+    ///  <summary>Returns the name of any installed OS service pack along with
+    ///  other similar, detectable, updates.</summary>
+    ///  <remarks>
+    ///  <para>Windows has added significant OS updates that bump the build
+    ///  number but do not declare themselves as service packs: e.g. the Windows
+    ///  10 TH2 update.</para>
+    ///  <para>This method is used to report such updates in addition to
+    ///  updates that declare themselves as service packs, while the ServicePack
+    ///  method only reports declared 'official' service packs.</para>
+    ///  </remarks>
+    class function ServicePackEx: string;
+
     ///  <summary>Returns the major version number of any NT platform service
     ///  pack.</summary>
     ///  <remarks>0 is returned in no service pack is installed, if the host OS
@@ -1201,6 +1209,11 @@ implementation
   InternalCSDVersion: string = '';
   // Internal variable recording processor architecture information
   InternalProcessorArchitecture: Word = 0;
+  // Internal variable recording additional update information.
+  // ** This was added because Windows 10 TH2 doesn't declare itself as a
+  //    service pack, but is a significant update.
+  // ** At present this variable is only used for Windows 10.
+  InternalExtraUpdateInfo: string = '';
 
 // Flag required when opening registry with specified access flags
 {$IFDEF REGACCESSFLAGS}
@@ -1211,7 +1224,7 @@ implementation
 // Tests Windows version (major, minor, service pack major & service pack minor)
 // against the given values using the given comparison condition and return
 // True if the given version matches the current one or False if not
-// Assumes VerifyVersionInfo API function is available
+// Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available
 // Adapted from code from VersionHelpers.pas
 // by Achim Kalwa <[email protected]> 2014-01-05
 function TestWindowsVersion(wMajorVersion, wMinorVersion,
@@ -1255,8 +1268,25 @@ function TestWindowsVersion(wMajorVersion, wMinorVersion,
   );
 end;
 
+// Checks if given build number matches that of the current OS.
+// Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available
+function IsBuildNumber(BuildNumber: DWORD): Boolean;
+var
+  OSVI: TOSVersionInfoEx;
+  POSVI: POSVersionInfoEx;
+  ConditionalMask: UInt64;
+begin
+  Assert(Assigned(VerSetConditionMask) and Assigned(VerifyVersionInfo));
+  FillChar(OSVI, SizeOf(OSVI), 0);
+  OSVI.dwOSVersionInfoSize := SizeOf(OSVI);
+  OSVI.dwBuildNumber := BuildNumber;
+  POSVI := @OSVI;
+  ConditionalMask := VerSetConditionMask(0, VER_BUILDNUMBER, VER_EQUAL);
+  Result := VerifyVersionInfo(POSVI, VER_BUILDNUMBER, ConditionalMask);
+end;
+
 // Checks if the OS has the given product type.
-// Assumes VerifyVersionInfo and VerSetConditionMask API functions are available
+// Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available
 function IsWindowsProductType(ProductType: Byte): Boolean;
 var
   ConditionalMask: UInt64;
@@ -1445,23 +1475,6 @@ function GetCurrentVersionRegStr(ValName: string): string;
   Result := GetRegistryString(HKEY_LOCAL_MACHINE, cWdwCurrentVer, ValName);
 end;
 
-// Reads build number from registry for NT OSs only.
-function GetNTBuildNumberFromReg: LongWord;
-var
-  BuildStr: string;
-begin
-  BuildStr := GetRegistryString(
-    HKEY_LOCAL_MACHINE, CurrentVersionRegKeys[True], 'CurrentBuildNumber'
-  );
-  Result := StrToIntDef(BuildStr, 0);
-  if Result <> 0 then
-    Exit;
-  BuildStr := GetRegistryString(
-    HKEY_LOCAL_MACHINE, CurrentVersionRegKeys[True], 'CurrentBuild'
-  );
-  Result := StrToIntDef(BuildStr, 0);
-end;
-
 // Initialise global variables with extended OS version information if possible.
 procedure InitPlatformIdEx;
 
@@ -1477,6 +1490,18 @@ procedure InitPlatformIdEx;
   GetVersionEx: TGetVersionEx;      // pointer to GetVersionEx API function
   GetProductInfo: TGetProductInfo;  // pointer to GetProductInfo API function
   SI: TSystemInfo;                  // structure from GetSystemInfo API call
+const
+  // Known windows build numbers.
+  // Source: https://en.wikipedia.org/wiki/Windows_NT
+  // for Vista and Win 7 we have to add service pack number to these values to
+  // get actual build number
+  WinVistaBaseBuild = 6000;
+  Win7BaseBuild = 7600;
+  // for Win 8 onwards we just use the build numbers as is
+  Win8Build = 9200;
+  Win8Point1Build = 9600;
+  Win10TH1Build = 10240;
+  Win10TH2Build = 10586;
 begin
   // Load version query functions used externally to this routine
   VerSetConditionMask := LoadKernelFunc('VerSetConditionMask');
@@ -1505,49 +1530,68 @@ procedure InitPlatformIdEx;
       InternalMajorVersion, InternalMinorVersion,
       Win32ServicePackMajor, Win32ServicePackMinor
     );
-    if Win32ServicePackMajor > 0 then
-      // tried to read this info from registry, but for some weird reason the
-      // required value is reported as not existant by TRegistry, even though it
-      // is present in registry
-      InternalCSDVersion := Format('Service Pack %d', [Win32ServicePackMajor]);
     // NOTE: It's going to be very slow to test for all possible build numbers,
-    // so I've just hard wired them using the information at
+    // so I've just narrowed the search down using the information at
     // http://en.wikipedia.org/wiki/Windows_NT
     case InternalMajorVersion of
       6:
       begin
         case InternalMinorVersion of
-          {$IFDEF DEBUG_NEW_API}
           0:
-            InternalBuildNumber := 6000 + Win32ServicePackMajor; // Vista
+            // Vista
+            InternalBuildNumber := WinVistaBaseBuild + Win32ServicePackMajor;
           1:
-            InternalBuildNumber := 7600 + Win32ServicePackMajor; // Windows 7
+            // Windows 7
+            InternalBuildNumber := Win7BaseBuild + Win32ServicePackMajor;
           2:
+            // Windows 8 (no known SPs)
             if Win32ServicePackMajor = 0 then
-              InternalBuildNumber := 9200;  // Windows 8 (no known SPs)
-          {$ENDIF}
+              InternalBuildNumber := Win8Build;
           3:
+            // Windows 8.1 (no known SPs)
             if Win32ServicePackMajor = 0 then
-              InternalBuildNumber := 9600;  // Windows 8.1 (no known SPs)
+              InternalBuildNumber := Win8Point1Build;
 
         end;
+        if Win32ServicePackMajor > 0 then
+          // ** Tried to read this info from registry, but for some weird
+          //    reason the required value is reported as non-existant by
+          //    TRegistry, even though it is present in registry.
+          // ** Seems there is some kind of regitry "spoofing" going on (see
+          //    below.
+          InternalCSDVersion := Format(
+            'Service Pack %d', [Win32ServicePackMajor]
+          );
       end;
       10:
       begin
         case InternalMinorVersion of
           0:
           begin
             // TODO: Revist when server version released to check if same build
-            // number
-            if Win32ServicePackMajor = 0 then
-              InternalBuildNumber := 10240;  // Windows 10 (no known SPs)
+            // number(s)
+            // Windows 10 TH1 branch release
+            if IsBuildNumber(Win10TH1Build) then
+              InternalBuildNumber := Win10TH1Build
+            // Windows 10 TH2 branch release
+            else if IsBuildNumber(Win10TH2Build) then
+            begin
+              InternalBuildNumber := Win10TH2Build;
+              InternalExtraUpdateInfo := 'TH2: November Update';
+            end;
           end;
         end;
       end;
     end;
-    // Failed to "guess" at build number: get it from registry
-    if InternalBuildNumber = 0 then
-      InternalBuildNumber := GetNTBuildNumberFromReg;
+
+    // ** If InternalBuildNumber is 0 when we get here then we failed to get it
+    //    We no longer look in registry as of SVN commit r2001, because this is
+    //    can get spoofed. E.g. when running on Windows 10 TH2 registry call is
+    //    returning build number of 7600 even though regedit reveals it to be
+    //    10586 !
+    //    So we must now consider a build number of 0 as indicating an unknown
+    //    build number.
+    // ** Seems like more registry spoofing (see above).
 
     // Test possible product types to see which one we have
     if IsWindowsProductType(VER_NT_WORKSTATION) then
@@ -2327,6 +2371,15 @@ class function TPJOSInfo.ServicePack: string;
   end;
 end;
 
+class function TPJOSInfo.ServicePackEx: string;
+begin
+  Result := ServicePack;
+  if Result = '' then
+    Result := InternalExtraUpdateInfo
+  else
+    Result := Result + ', ' + InternalExtraUpdateInfo;
+end;
+
 class function TPJOSInfo.ServicePackMajor: Integer;
 begin
   Result := Win32ServicePackMajor;

Diff for: Src/FirstRun.UInstallInfo.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2008-2016, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -170,13 +170,12 @@ constructor TInstallInfo.Create;
 
 function TInstallInfo.CurrentCommonConfigFileName: string;
 begin
-  Result := IncludeTrailingPathDelimiter(TAppInfo.CommonAppDir)
-    + 'Common.config';
+  Result := TAppInfo.AppConfigFileName;
 end;
 
 class function TInstallInfo.CurrentUserConfigFileName: string;
 begin
-  Result := MakeFullUserPath(UserConfigFileNames[CurrentVersionID]);
+  Result := TAppInfo.UserConfigFileName;
 end;
 
 class function TInstallInfo.CurrentUserDatabaseDir: string;