Fixes to code and premake4.lua, fixes based on code analysis results, updates to 3rd party libs

* New SQlite amalgamation
* Updating other third-party libs
* New premake4.exe
* Fixes to the premake4.lua script and projects
* Adding language resource projects to solutions
* Some sanity checks added to treemap.cpp
* Using refs now instead of pointers in treemap.cpp (probably should be reviewed as it looks like there are more candidates in there)
* Added Windows 10 to manifest file
* Glitch in stdafx.h corrected
* Script which produces the projects now defaults to only VS2005 and VS2017
* Deterministic filter UUIDs for VS201x
* Fixed a handful of issues in code addressed
* XP platform toolset doesn't allow for code analysis, using default again
* Addressed a number of warnings from code analysis

20 files changed, 70 insertions, 68 deletions

diff --git a/windirstat/Controls/ColorButton.cpp b/windirstat/Controls/ColorButton.cpp
index 632a734..372addd 100644
--- a/windirstat/Controls/ColorButton.cpp
+++ b/windirstat/Controls/ColorButton.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/ColorButton.h b/windirstat/Controls/ColorButton.h
index a174a62..a39e8b6 100644
--- a/windirstat/Controls/ColorButton.h
+++ b/windirstat/Controls/ColorButton.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/TreeListControl.cpp b/windirstat/Controls/TreeListControl.cpp
index ba1ba10..f469b10 100644
--- a/windirstat/Controls/TreeListControl.cpp
+++ b/windirstat/Controls/TreeListControl.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/TreeListControl.h b/windirstat/Controls/TreeListControl.h
index b9d1a48..2a554a9 100644
--- a/windirstat/Controls/TreeListControl.h
+++ b/windirstat/Controls/TreeListControl.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/graphview.cpp b/windirstat/Controls/graphview.cpp
index db72836..5856fe5 100644
--- a/windirstat/Controls/graphview.cpp
+++ b/windirstat/Controls/graphview.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/graphview.h b/windirstat/Controls/graphview.h
index 356a6f8..0838c45 100644
--- a/windirstat/Controls/graphview.h
+++ b/windirstat/Controls/graphview.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/myimagelist.cpp b/windirstat/Controls/myimagelist.cpp
index 961dcce..235435a 100644
--- a/windirstat/Controls/myimagelist.cpp
+++ b/windirstat/Controls/myimagelist.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/myimagelist.h b/windirstat/Controls/myimagelist.h
index 851067b..07066d3 100644
--- a/windirstat/Controls/myimagelist.h
+++ b/windirstat/Controls/myimagelist.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/ownerdrawnlistcontrol.cpp b/windirstat/Controls/ownerdrawnlistcontrol.cpp
index 48f6c8b..860a30a 100644
--- a/windirstat/Controls/ownerdrawnlistcontrol.cpp
+++ b/windirstat/Controls/ownerdrawnlistcontrol.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/ownerdrawnlistcontrol.h b/windirstat/Controls/ownerdrawnlistcontrol.h
index 3701d8e..af8c213 100644
--- a/windirstat/Controls/ownerdrawnlistcontrol.h
+++ b/windirstat/Controls/ownerdrawnlistcontrol.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/pacman.cpp b/windirstat/Controls/pacman.cpp
index ca95dd6..a083b25 100644
--- a/windirstat/Controls/pacman.cpp
+++ b/windirstat/Controls/pacman.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/pacman.h b/windirstat/Controls/pacman.h
index 01e4fd5..0bc6daa 100644
--- a/windirstat/Controls/pacman.h
+++ b/windirstat/Controls/pacman.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/sortinglistcontrol.cpp b/windirstat/Controls/sortinglistcontrol.cpp
index 6de005b..a57a0af 100644
--- a/windirstat/Controls/sortinglistcontrol.cpp
+++ b/windirstat/Controls/sortinglistcontrol.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/sortinglistcontrol.h b/windirstat/Controls/sortinglistcontrol.h
index 3a2c82f..3f47836 100644
--- a/windirstat/Controls/sortinglistcontrol.h
+++ b/windirstat/Controls/sortinglistcontrol.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/treemap.cpp b/windirstat/Controls/treemap.cpp
index 0264f5d..8dcecf6 100644
--- a/windirstat/Controls/treemap.cpp
+++ b/windirstat/Controls/treemap.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -325,31 +325,30 @@ void CTreemap::DrawTreemap(CDC *pdc, CRect rc, Item *root, const Options *option
 
         // Create a temporary CDC that represents only the tree map
         CDC dcTreeView;
-        dcTreeView.CreateCompatibleDC(pdc);
+        VERIFY(dcTreeView.CreateCompatibleDC(pdc));
 
-        // This temporary CDC will be filled with this bitmap
+        // This bitmap will be blitted onto the temporary DC
         CBitmap bmp;
 
         // That bitmap in turn will be created from this array
-        CArray<COLORREF, COLORREF> *bitmap = new CArray<COLORREF, COLORREF>;
-        bitmap->SetSize(rc.Width() * rc.Height());
+        CColorRefArray bitmap_bits;
+        bitmap_bits.SetSize(rc.Width() * rc.Height());
 
         // Recursively draw the tree graph
-        RecurseDrawGraph(bitmap, root, rc, true, surface, m_options.height, 0);
+        RecurseDrawGraph(bitmap_bits, root, rc, true, surface, m_options.height, 0);
 
         // Fill the bitmap with the array
-        bmp.CreateBitmap(rc.Width(), rc.Height(), 1, 32, &(*bitmap)[0]);
+        VERIFY(bmp.CreateBitmap(rc.Width(), rc.Height(), 1, 32, &bitmap_bits[0]));
 
         // Render bitmap to the temporary CDC
         dcTreeView.SelectObject(&bmp);
 
         // And lastly, draw the temporary CDC to the real one
-        pdc->BitBlt(rc.TopLeft().x, rc.TopLeft().y, rc.Width(), rc.Height(), &dcTreeView, 0, 0, SRCCOPY);
+        VERIFY(pdc->BitBlt(rc.TopLeft().x, rc.TopLeft().y, rc.Width(), rc.Height(), &dcTreeView, 0, 0, SRCCOPY));
 
         // Free memory
-        bmp.DeleteObject();
-        dcTreeView.DeleteDC();
-        delete bitmap;
+        VERIFY(bmp.DeleteObject());
+        VERIFY(dcTreeView.DeleteDC());
 
 
 #ifdef STRONGDEBUG  // slow, but finds bugs!
@@ -385,10 +384,10 @@ void CTreemap::DrawTreemapDoubleBuffered(CDC *pdc, const CRect& rc, Item *root,
     CDC dc;
     VERIFY(dc.CreateCompatibleDC(pdc));
 
-    CBitmap bm;
-    VERIFY(bm.CreateCompatibleBitmap(pdc, rc.Width(), rc.Height()));
+    CBitmap bmp;
+    VERIFY(bmp.CreateCompatibleBitmap(pdc, rc.Width(), rc.Height()));
 
-    CSelectObject sobmp(&dc, &bm);
+    CSelectObject sobmp(&dc, &bmp);
 
     CRect rect(CPoint(0, 0), rc.Size());
 
@@ -518,43 +517,42 @@ void CTreemap::DrawColorPreview(CDC *pdc, const CRect& rc, COLORREF color, const
 
     // Create a temporary CDC that represents only the tree map
     CDC dcTreeView;
-    dcTreeView.CreateCompatibleDC(pdc);
+    VERIFY(dcTreeView.CreateCompatibleDC(pdc));
 
-    // This temporary CDC will be filled with this bitmap
+    // This bitmap will be blitted onto the temporary DC
     CBitmap bmp;
 
     // That bitmap in turn will be created from this array
-    CArray<COLORREF, COLORREF> *bitmap = new CArray<COLORREF, COLORREF>;
-    bitmap->SetSize(rc.Width() * rc.Height());
+    CColorRefArray bitmap_bits;
+    bitmap_bits.SetSize(rc.Width() * rc.Height());
 
     // Recursively draw the tree graph
-    RenderRectangle(bitmap, CRect(0, 0, rc.Width(), rc.Height()), surface, color);
+    RenderRectangle(bitmap_bits, CRect(0, 0, rc.Width(), rc.Height()), surface, color);
 
     // Fill the bitmap with the array
-    bmp.CreateBitmap(rc.Width(), rc.Height(), 1, 32, &(*bitmap)[0]);
+    VERIFY(bmp.CreateBitmap(rc.Width(), rc.Height(), 1, 32, &bitmap_bits[0]));
 
     // Render bitmap to the temporary CDC
     dcTreeView.SelectObject(&bmp);
 
     // And lastly, draw the temporary CDC to the real one
-    pdc->BitBlt(rc.TopLeft().x, rc.TopLeft().y, rc.Width(), rc.Height(), &dcTreeView, 0, 0, SRCCOPY);
+    VERIFY(pdc->BitBlt(rc.TopLeft().x, rc.TopLeft().y, rc.Width(), rc.Height(), &dcTreeView, 0, 0, SRCCOPY));
 
     if(m_options.grid)
     {
         CPen pen(PS_SOLID, 1, m_options.gridColor);
         CSelectObject sopen(pdc, &pen);
         CSelectStockObject sobrush(pdc, NULL_BRUSH);
-        pdc->Rectangle(rc);
+        VERIFY(pdc->Rectangle(rc));
     }
 
     // Free memory
-    bmp.DeleteObject();
-    dcTreeView.DeleteDC();
-    delete bitmap;
+    VERIFY(bmp.DeleteObject());
+    VERIFY(dcTreeView.DeleteDC());
 }
 
 void CTreemap::RecurseDrawGraph(
-    CArray<COLORREF, COLORREF> *bitmap,
+    CColorRefArray &bitmap,
     Item *item,
     const CRect& rc,
     bool asroot,
@@ -616,7 +614,7 @@ void CTreemap::RecurseDrawGraph(
 // pointers, factory methods and explicit destruction. It's not worth.
 
 void CTreemap::DrawChildren(
-    CArray<COLORREF, COLORREF> *bitmap,
+    CColorRefArray &bitmap,
     Item *parent,
     const double *surface,
     double h,
@@ -649,7 +647,7 @@ void CTreemap::DrawChildren(
 // I learned this squarification style from the KDirStat executable.
 // It's the most complex one here but also the clearest, imho.
 //
-void CTreemap::KDirStat_DrawChildren(CArray<COLORREF, COLORREF> *bitmap, Item *parent, const double *surface, double h, DWORD /*flags*/)
+void CTreemap::KDirStat_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD /*flags*/)
 {
     WEAK_ASSERT(parent->TmiGetChildrenCount() > 0);
 
@@ -873,7 +871,7 @@ double CTreemap::KDirStat_CalcutateNextRow(Item *parent, const int nextChild, do
 
 // The classical squarification method.
 //
-void CTreemap::SequoiaView_DrawChildren(CArray<COLORREF, COLORREF> *bitmap, Item *parent, const double *surface, double h, DWORD /*flags*/)
+void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD /*flags*/)
 {
     // Rest rectangle to fill
     CRect remaining(parent->TmiGetRectangle());
@@ -1072,7 +1070,7 @@ void CTreemap::SequoiaView_DrawChildren(CArray<COLORREF, COLORREF> *bitmap, Item
 
 // No squarification. Children are arranged alternately horizontally and vertically.
 //
-void CTreemap::Simple_DrawChildren(CArray<COLORREF, COLORREF> *bitmap, Item *parent, const double *surface, double h, DWORD flags)
+void CTreemap::Simple_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD flags)
 {
 #if 1
     WEAK_ASSERT(0); // Not used in WinDirStat.
@@ -1160,7 +1158,7 @@ bool CTreemap::IsCushionShading()
         && m_options.scaleFactor > 0.0;
 }
 
-void CTreemap::RenderLeaf(CArray<COLORREF, COLORREF> *bitmap, Item *item, const double *surface)
+void CTreemap::RenderLeaf(CColorRefArray &bitmap, Item *item, const double *surface)
 {
     CRect rc = item->TmiGetRectangle();
 
@@ -1177,7 +1175,7 @@ void CTreemap::RenderLeaf(CArray<COLORREF, COLORREF> *bitmap, Item *item, const
     RenderRectangle(bitmap, rc, surface, item->TmiGetGraphColor());
 }
 
-void CTreemap::RenderRectangle(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc, const double *surface, DWORD color)
+void CTreemap::RenderRectangle(CColorRefArray &bitmap, const CRect& rc, const double *surface, DWORD color)
 {
     double brightness = m_options.brightness;
 
@@ -1210,7 +1208,7 @@ void CTreemap::RenderRectangle(CArray<COLORREF, COLORREF> *bitmap, const CRect&
     }
 }
 
-void CTreemap::DrawSolidRect(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc, COLORREF col, double brightness)
+void CTreemap::DrawSolidRect(CColorRefArray &bitmap, const CRect& rc, COLORREF col, double brightness)
 {
     int red = RGB_GET_RVALUE(col);
     int green = RGB_GET_GVALUE(col);
@@ -1225,13 +1223,15 @@ void CTreemap::DrawSolidRect(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc
     CColorSpace::NormalizeColor(red, green, blue);
 
     for (int iy = rc.top; iy < rc.bottom; iy++)
-    for (int ix = rc.left; ix < rc.right; ix++)
     {
-        (*bitmap)[ix + iy * m_renderArea.Width()] = BGR(blue, green, red);
+        for (int ix = rc.left; ix < rc.right; ix++)
+        {
+            bitmap[ix + iy * m_renderArea.Width()] = BGR(blue, green, red);
+        }
     }
 }
 
-void CTreemap::DrawCushion(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc, const double *surface, COLORREF col, double brightness)
+void CTreemap::DrawCushion(CColorRefArray &bitmap, const CRect& rc, const double *surface, COLORREF col, double brightness)
 {
     // Cushion parameters
     const double Ia = m_options.ambientLight;
@@ -1282,7 +1282,7 @@ void CTreemap::DrawCushion(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc,
         CColorSpace::NormalizeColor(red, green, blue);
 
         // ... and set!
-        (*bitmap)[ix + iy * m_renderArea.Width()] = BGR(blue, green, red);
+        bitmap[ix + iy * m_renderArea.Width()] = BGR(blue, green, red);
     }
 }
 
diff --git a/windirstat/Controls/treemap.h b/windirstat/Controls/treemap.h
index 99cfe48..83b52f0 100644
--- a/windirstat/Controls/treemap.h
+++ b/windirstat/Controls/treemap.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -46,6 +46,8 @@ protected:
     static void DistributeFirst(int& first, int& second, int& third);
 };
 
+typedef CArray<COLORREF, COLORREF> CColorRefArray;
+typedef CArray<COLORREF, COLORREF&> CColorRefRArray;
 
 //
 // CTreemap. Can create a treemap. Knows 3 squarification methods:
@@ -144,10 +146,10 @@ public:
 
 public:
     // Get a good palette of 13 colors (7 if system has 256 colors)
-    static void GetDefaultPalette(CArray<COLORREF, COLORREF&>& palette);
+    static void GetDefaultPalette(CColorRefRArray& palette);
 
     // Create a equally-bright palette from a set of arbitrary colors
-    static void EqualizeColors(const COLORREF *colors, int count, CArray<COLORREF, COLORREF&>& out);
+    static void EqualizeColors(const COLORREF *colors, int count, CColorRefRArray& out);
 
     // Good values
     static Options GetDefaultOptions();
@@ -184,7 +186,7 @@ public:
 protected:
     // The recursive drawing function
     void RecurseDrawGraph(
-        CArray<COLORREF, COLORREF> *bitmap,
+        CColorRefArray &bitmap,
         Item *item,
         const CRect& rc,
         bool asroot,
@@ -195,7 +197,7 @@ protected:
 
     // This function switches to KDirStat-, SequoiaView- or Simple_DrawChildren
     void DrawChildren(
-        CArray<COLORREF, COLORREF> *bitmap,
+        CColorRefArray &bitmap,
         Item *parent,
         const double *surface,
         double h,
@@ -203,15 +205,15 @@ protected:
     );
 
     // KDirStat-like squarification
-    void KDirStat_DrawChildren(CArray<COLORREF, COLORREF> *bitmap, Item *parent, const double *surface, double h, DWORD flags);
+    void KDirStat_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD flags);
     bool KDirStat_ArrangeChildren(Item *parent, CArray<double, double>& childWidth, CArray<double, double>& rows, CArray<int, int>& childrenPerRow);
     double KDirStat_CalcutateNextRow(Item *parent, const int nextChild, double width, int& childrenUsed, CArray<double, double>& childWidth);
 
     // Classical SequoiaView-like squarification
-    void SequoiaView_DrawChildren(CArray<COLORREF, COLORREF> *bitmap, Item *parent, const double *surface, double h, DWORD flags);
+    void SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD flags);
 
     // No squarification (simple style, not used in WinDirStat)
-    void Simple_DrawChildren(CArray<COLORREF, COLORREF> *bitmap, Item *parent, const double *surface, double h, DWORD flags);
+    void Simple_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD flags);
 
     // Sets brightness to a good value, if system has only 256 colors
     void SetBrightnessFor256();
@@ -220,17 +222,17 @@ protected:
     bool IsCushionShading();
 
     // Leaves space for grid and then calls RenderRectangle()
-    void RenderLeaf(CArray<COLORREF, COLORREF> *bitmap, Item *item, const double *surface);
+    void RenderLeaf(CColorRefArray &bitmap, Item *item, const double *surface);
 
     // Either calls DrawCushion() or DrawSolidRect()
-    void RenderRectangle(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc, const double *surface, DWORD color);
+    void RenderRectangle(CColorRefArray &bitmap, const CRect& rc, const double *surface, DWORD color);
     // void RenderRectangle(CDC *pdc, const CRect& rc, const double *surface, DWORD color);
 
     // Draws the surface using SetPixel()
-    void DrawCushion(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc, const double *surface, COLORREF col, double brightness);
+    void DrawCushion(CColorRefArray &bitmap, const CRect& rc, const double *surface, COLORREF col, double brightness);
 
     // Draws the surface using FillSolidRect()
-    void DrawSolidRect(CArray<COLORREF, COLORREF> *bitmap, const CRect& rc, COLORREF col, double brightness);
+    void DrawSolidRect(CColorRefArray &bitmap, const CRect& rc, COLORREF col, double brightness);
 
     // Adds a new ridge to surface
     static void AddRidge(const CRect& rc, double *surface, double h);
diff --git a/windirstat/Controls/typeview.cpp b/windirstat/Controls/typeview.cpp
index 6618dd4..29db0c4 100644
--- a/windirstat/Controls/typeview.cpp
+++ b/windirstat/Controls/typeview.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -148,7 +148,7 @@ CString CExtensionListControl::CListItem::GetDescription() const
 CString CExtensionListControl::CListItem::GetBytesPercent() const
 {
     CString s;
-    s.Format(_T("%s%%"), FormatDouble(GetBytesFraction() * 100));
+    s.Format(_T("%s%%"), FormatDouble(GetBytesFraction() * 100).GetString());
     return s;
 }
 
diff --git a/windirstat/Controls/typeview.h b/windirstat/Controls/typeview.h
index a1c215a..4efd2d5 100644
--- a/windirstat/Controls/typeview.h
+++ b/windirstat/Controls/typeview.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/xyslider.cpp b/windirstat/Controls/xyslider.cpp
index ac405eb..64ce63a 100644
--- a/windirstat/Controls/xyslider.cpp
+++ b/windirstat/Controls/xyslider.cpp
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/windirstat/Controls/xyslider.h b/windirstat/Controls/xyslider.h
index c048852..7328bf4 100644
--- a/windirstat/Controls/xyslider.h
+++ b/windirstat/Controls/xyslider.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by