From 8e1d09d5edf6c24697333afc70ad5054665b49d1 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Thu, 2 Nov 2017 18:46:10 +0000 Subject: 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 --- windirstat/Controls/ColorButton.cpp | 2 +- windirstat/Controls/ColorButton.h | 2 +- windirstat/Controls/TreeListControl.cpp | 2 +- windirstat/Controls/TreeListControl.h | 2 +- windirstat/Controls/graphview.cpp | 2 +- windirstat/Controls/graphview.h | 2 +- windirstat/Controls/myimagelist.cpp | 2 +- windirstat/Controls/myimagelist.h | 2 +- windirstat/Controls/ownerdrawnlistcontrol.cpp | 2 +- windirstat/Controls/ownerdrawnlistcontrol.h | 2 +- windirstat/Controls/pacman.cpp | 2 +- windirstat/Controls/pacman.h | 2 +- windirstat/Controls/sortinglistcontrol.cpp | 2 +- windirstat/Controls/sortinglistcontrol.h | 2 +- windirstat/Controls/treemap.cpp | 74 ++++---- windirstat/Controls/treemap.h | 26 +-- windirstat/Controls/typeview.cpp | 4 +- windirstat/Controls/typeview.h | 2 +- windirstat/Controls/xyslider.cpp | 2 +- windirstat/Controls/xyslider.h | 2 +- windirstat/Dialogs/AboutDlg.h | 2 +- windirstat/Dialogs/DeleteWarningDlg.cpp | 2 +- windirstat/Dialogs/DeleteWarningDlg.h | 2 +- windirstat/Dialogs/SelectDrivesDlg.cpp | 2 +- windirstat/Dialogs/SelectDrivesDlg.h | 2 +- windirstat/Dialogs/aboutdlg.cpp | 10 +- windirstat/FileFindWDS.cpp | 2 +- windirstat/FileFindWDS.h | 2 +- windirstat/ModalApiShuttle.cpp | 2 +- windirstat/ModalApiShuttle.h | 2 +- windirstat/ModalShellApi.cpp | 2 +- windirstat/ModalShellApi.h | 2 +- windirstat/PageCleanups.cpp | 2 +- windirstat/PageCleanups.h | 2 +- windirstat/PageGeneral.cpp | 2 +- windirstat/PageGeneral.h | 2 +- windirstat/PageTreelist.cpp | 2 +- windirstat/PageTreelist.h | 2 +- windirstat/PageTreemap.cpp | 2 +- windirstat/PageTreemap.h | 2 +- windirstat/WorkLimiter.h | 2 +- windirstat/dirstatdoc.cpp | 12 +- windirstat/dirstatdoc.h | 2 +- windirstat/dirstatview.cpp | 4 +- windirstat/dirstatview.h | 2 +- windirstat/getosplatformstring.cpp | 211 +++++++++++++-------- windirstat/getosplatformstring.h | 2 +- windirstat/globalhelpers.cpp | 22 +-- windirstat/globalhelpers.h | 2 +- windirstat/helpmap.h | 2 +- windirstat/item.cpp | 21 +- windirstat/item.h | 4 +- windirstat/layout.cpp | 2 +- windirstat/layout.h | 2 +- windirstat/mainframe.cpp | 12 +- windirstat/mainframe.h | 2 +- windirstat/mountpoints.cpp | 4 +- windirstat/mountpoints.h | 2 +- windirstat/options.cpp | 4 +- windirstat/options.h | 2 +- windirstat/osspecific.cpp | 2 +- windirstat/osspecific.h | 2 +- windirstat/res/wdsr0405/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj | 88 +++++++++ .../res/wdsr0405/wdsr0405.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0405/wdsr0405.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0405/windirstat-utf8.rc | 2 - windirstat/res/wdsr0405/windirstat.rc | 2 - windirstat/res/wdsr0407/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj | 88 +++++++++ .../res/wdsr0407/wdsr0407.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0407/wdsr0407.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0407/windirstat-utf8.rc | 2 - windirstat/res/wdsr0407/windirstat.rc | 2 - windirstat/res/wdsr040a/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj | 88 +++++++++ .../res/wdsr040a/wdsr040a.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr040a/wdsr040a.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr040a/windirstat-utf8.rc | 2 - windirstat/res/wdsr040a/windirstat.rc | 2 - windirstat/res/wdsr040b/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj | 88 +++++++++ .../res/wdsr040b/wdsr040b.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr040b/wdsr040b.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr040b/windirstat-utf8.rc | 2 - windirstat/res/wdsr040b/windirstat.rc | 2 - windirstat/res/wdsr040c/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj | 88 +++++++++ .../res/wdsr040c/wdsr040c.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr040c/wdsr040c.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr040c/windirstat-utf8.rc | 2 - windirstat/res/wdsr040c/windirstat.rc | 2 - windirstat/res/wdsr040e/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj | 88 +++++++++ .../res/wdsr040e/wdsr040e.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr040e/wdsr040e.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr040e/windirstat-utf8.rc | 2 - windirstat/res/wdsr040e/windirstat.rc | 2 - windirstat/res/wdsr0410/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj | 88 +++++++++ .../res/wdsr0410/wdsr0410.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0410/wdsr0410.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0410/windirstat-utf8.rc | 2 - windirstat/res/wdsr0410/windirstat.rc | 2 - windirstat/res/wdsr0413/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj | 88 +++++++++ .../res/wdsr0413/wdsr0413.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0413/wdsr0413.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0413/windirstat-utf8.rc | 2 - windirstat/res/wdsr0413/windirstat.rc | 2 - windirstat/res/wdsr0415/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj | 88 +++++++++ .../res/wdsr0415/wdsr0415.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0415/wdsr0415.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0415/windirstat-utf8.rc | 2 - windirstat/res/wdsr0415/windirstat.rc | 2 - windirstat/res/wdsr0416/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj | 88 +++++++++ .../res/wdsr0416/wdsr0416.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0416/wdsr0416.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0416/windirstat.rc | 2 - windirstat/res/wdsr0419/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj | 88 +++++++++ .../res/wdsr0419/wdsr0419.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0419/wdsr0419.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0419/windirstat-utf8.rc | 2 - windirstat/res/wdsr0419/windirstat.rc | 2 - windirstat/res/wdsr0425/res/windirstat.rc2 | 51 +---- windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj | 88 +++++++++ .../res/wdsr0425/wdsr0425.vs15.vcxproj.filters | 54 ++++++ windirstat/res/wdsr0425/wdsr0425.vs8.vcproj | 176 +++++++++++++++++ windirstat/res/wdsr0425/windirstat-utf8.rc | 2 - windirstat/res/wdsr0425/windirstat.rc | 2 - windirstat/res/windirstat.manifest | 30 ++- windirstat/res/windirstat.rc2 | 97 +++------- windirstat/selectobject.h | 2 +- windirstat/set.h | 2 +- windirstat/stdafx.cpp | 72 ++++--- windirstat/stdafx.h | 15 +- windirstat/windirstat-utf8.rc | 2 - windirstat/windirstat.cpp | 17 +- windirstat/windirstat.h | 2 +- windirstat/windirstat.rc | 2 - windirstat/windirstat.vs15.vcxproj | 43 +++-- windirstat/windirstat.vs15.vcxproj.filters | 45 ++--- windirstat/windirstat.vs8.vcproj | 48 +++-- 146 files changed, 4268 insertions(+), 1089 deletions(-) create mode 100644 windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj create mode 100644 windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0405/wdsr0405.vs8.vcproj create mode 100644 windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj create mode 100644 windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0407/wdsr0407.vs8.vcproj create mode 100644 windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj create mode 100644 windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr040a/wdsr040a.vs8.vcproj create mode 100644 windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj create mode 100644 windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr040b/wdsr040b.vs8.vcproj create mode 100644 windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj create mode 100644 windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr040c/wdsr040c.vs8.vcproj create mode 100644 windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj create mode 100644 windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr040e/wdsr040e.vs8.vcproj create mode 100644 windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj create mode 100644 windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0410/wdsr0410.vs8.vcproj create mode 100644 windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj create mode 100644 windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0413/wdsr0413.vs8.vcproj create mode 100644 windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj create mode 100644 windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0415/wdsr0415.vs8.vcproj create mode 100644 windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj create mode 100644 windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0416/wdsr0416.vs8.vcproj create mode 100644 windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj create mode 100644 windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0419/wdsr0419.vs8.vcproj create mode 100644 windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj create mode 100644 windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj.filters create mode 100644 windirstat/res/wdsr0425/wdsr0425.vs8.vcproj (limited to 'windirstat') 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 *bitmap = new CArray; - 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 *bitmap = new CArray; - 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 *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 *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 *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 *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 *bitmap, Item // No squarification. Children are arranged alternately horizontally and vertically. // -void CTreemap::Simple_DrawChildren(CArray *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 *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 *bitmap, Item *item, const RenderRectangle(bitmap, rc, surface, item->TmiGetGraphColor()); } -void CTreemap::RenderRectangle(CArray *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 *bitmap, const CRect& } } -void CTreemap::DrawSolidRect(CArray *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 *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 *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 *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 CColorRefArray; +typedef CArray 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& 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& 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 *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 *bitmap, + CColorRefArray &bitmap, Item *parent, const double *surface, double h, @@ -203,15 +205,15 @@ protected: ); // KDirStat-like squarification - void KDirStat_DrawChildren(CArray *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& childWidth, CArray& rows, CArray& childrenPerRow); double KDirStat_CalcutateNextRow(Item *parent, const int nextChild, double width, int& childrenUsed, CArray& childWidth); // Classical SequoiaView-like squarification - void SequoiaView_DrawChildren(CArray *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 *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 *bitmap, Item *item, const double *surface); + void RenderLeaf(CColorRefArray &bitmap, Item *item, const double *surface); // Either calls DrawCushion() or DrawSolidRect() - void RenderRectangle(CArray *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 *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 *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 diff --git a/windirstat/Dialogs/AboutDlg.h b/windirstat/Dialogs/AboutDlg.h index 0b59154..7020650 100644 --- a/windirstat/Dialogs/AboutDlg.h +++ b/windirstat/Dialogs/AboutDlg.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/Dialogs/DeleteWarningDlg.cpp b/windirstat/Dialogs/DeleteWarningDlg.cpp index a8b8dd8..11d5d43 100644 --- a/windirstat/Dialogs/DeleteWarningDlg.cpp +++ b/windirstat/Dialogs/DeleteWarningDlg.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/Dialogs/DeleteWarningDlg.h b/windirstat/Dialogs/DeleteWarningDlg.h index 261b1f7..dce0514 100644 --- a/windirstat/Dialogs/DeleteWarningDlg.h +++ b/windirstat/Dialogs/DeleteWarningDlg.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/Dialogs/SelectDrivesDlg.cpp b/windirstat/Dialogs/SelectDrivesDlg.cpp index 1620dfb..09c344f 100644 --- a/windirstat/Dialogs/SelectDrivesDlg.cpp +++ b/windirstat/Dialogs/SelectDrivesDlg.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/Dialogs/SelectDrivesDlg.h b/windirstat/Dialogs/SelectDrivesDlg.h index c0911a0..1084980 100644 --- a/windirstat/Dialogs/SelectDrivesDlg.h +++ b/windirstat/Dialogs/SelectDrivesDlg.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/Dialogs/aboutdlg.cpp b/windirstat/Dialogs/aboutdlg.cpp index 1d1f39d..5ed8296 100644 --- a/windirstat/Dialogs/aboutdlg.cpp +++ b/windirstat/Dialogs/aboutdlg.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 @@ -142,13 +142,13 @@ void CAboutDlg::CMyTabControl::SetPageText(int tab) { case TAB_ABOUT: { - text.FormatMessage(IDS_ABOUT_ABOUTTEXTss, GetAuthorEmail(), GetWinDirStatHomepage()); + text.FormatMessage(IDS_ABOUT_ABOUTTEXTss, GetAuthorEmail().GetString(), GetWinDirStatHomepage().GetString()); } break; case TAB_AUTHORS: { CString translators; - text.FormatMessage(IDS_ABOUT_AUTHORSTEXTs, GetDevelList()); + text.FormatMessage(IDS_ABOUT_AUTHORSTEXTs, GetDevelList().GetString()); text += GetTranslatorList(); } break; @@ -167,6 +167,7 @@ void CAboutDlg::CMyTabControl::SetPageText(int tab) { ASSERT(0); } + break; } CRect rc; m_text.GetWindowRect(rc); @@ -264,7 +265,7 @@ CString CAboutDlg::GetAppVersion() USES_CONVERSION; CString s; - s.Format(_T("WinDirStat %s"), A2T(VN_STRING_EXE)); + s.Format(_T("WinDirStat %s"), _T("1.x.y.z")); // FIXME return s; } @@ -382,7 +383,6 @@ void CAboutDlg::OnGetMinMaxInfo(MINMAXINFO* mmi) { m_layout.OnGetMinMaxInfo(mmi); CDialog::OnGetMinMaxInfo(mmi); - } void CAboutDlg::OnDestroy() diff --git a/windirstat/FileFindWDS.cpp b/windirstat/FileFindWDS.cpp index 4d29bb7..6993f8e 100644 --- a/windirstat/FileFindWDS.cpp +++ b/windirstat/FileFindWDS.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/FileFindWDS.h b/windirstat/FileFindWDS.h index 1405588..7295fff 100644 --- a/windirstat/FileFindWDS.h +++ b/windirstat/FileFindWDS.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/ModalApiShuttle.cpp b/windirstat/ModalApiShuttle.cpp index da8f50f..2565511 100644 --- a/windirstat/ModalApiShuttle.cpp +++ b/windirstat/ModalApiShuttle.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/ModalApiShuttle.h b/windirstat/ModalApiShuttle.h index f970127..6d1ef4e 100644 --- a/windirstat/ModalApiShuttle.h +++ b/windirstat/ModalApiShuttle.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/ModalShellApi.cpp b/windirstat/ModalShellApi.cpp index fd752ad..4a4d19f 100644 --- a/windirstat/ModalShellApi.cpp +++ b/windirstat/ModalShellApi.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/ModalShellApi.h b/windirstat/ModalShellApi.h index c6c0122..231f110 100644 --- a/windirstat/ModalShellApi.h +++ b/windirstat/ModalShellApi.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/PageCleanups.cpp b/windirstat/PageCleanups.cpp index 838d1e6..0d13433 100644 --- a/windirstat/PageCleanups.cpp +++ b/windirstat/PageCleanups.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/PageCleanups.h b/windirstat/PageCleanups.h index d0e2121..40e16a1 100644 --- a/windirstat/PageCleanups.h +++ b/windirstat/PageCleanups.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/PageGeneral.cpp b/windirstat/PageGeneral.cpp index b0879cf..165df68 100644 --- a/windirstat/PageGeneral.cpp +++ b/windirstat/PageGeneral.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/PageGeneral.h b/windirstat/PageGeneral.h index 7f1b8dd..45f1f41 100644 --- a/windirstat/PageGeneral.h +++ b/windirstat/PageGeneral.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/PageTreelist.cpp b/windirstat/PageTreelist.cpp index 8bdfef8..0caf25d 100644 --- a/windirstat/PageTreelist.cpp +++ b/windirstat/PageTreelist.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/PageTreelist.h b/windirstat/PageTreelist.h index c490e1d..f051b67 100644 --- a/windirstat/PageTreelist.h +++ b/windirstat/PageTreelist.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/PageTreemap.cpp b/windirstat/PageTreemap.cpp index d2034fe..98a5b0c 100644 --- a/windirstat/PageTreemap.cpp +++ b/windirstat/PageTreemap.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/PageTreemap.h b/windirstat/PageTreemap.h index cfeb4de..7594bfe 100644 --- a/windirstat/PageTreemap.h +++ b/windirstat/PageTreemap.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/WorkLimiter.h b/windirstat/WorkLimiter.h index c494599..6c8d61b 100644 --- a/windirstat/WorkLimiter.h +++ b/windirstat/WorkLimiter.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/dirstatdoc.cpp b/windirstat/dirstatdoc.cpp index 1772d03..d512b29 100644 --- a/windirstat/dirstatdoc.cpp +++ b/windirstat/dirstatdoc.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 @@ -928,7 +928,7 @@ void CDirstatDoc::AskForConfirmation(const USERDEFINEDCLEANUP *udc, CItem *item) } CString msg; - msg.FormatMessage(udc->recurseIntoSubdirectories ? IDS_RUDC_CONFIRMATIONss : IDS_UDC_CONFIRMATIONss, udc->title, item->GetPath()); + msg.FormatMessage(udc->recurseIntoSubdirectories ? IDS_RUDC_CONFIRMATIONss : IDS_UDC_CONFIRMATIONss, udc->title.GetString(), item->GetPath().GetString()); if(IDYES != AfxMessageBox(msg, MB_YESNO)) { @@ -949,7 +949,7 @@ void CDirstatDoc::PerformUserDefinedCleanup(const USERDEFINEDCLEANUP *udc, CItem { if(!FolderExists(path) && !DriveExists(path)) { - MdThrowStringExceptionF(IDS_THEDIRECTORYsDOESNOTEXIST, path); + MdThrowStringExceptionF(IDS_THEDIRECTORYsDOESNOTEXIST, path.GetString()); } } else @@ -958,7 +958,7 @@ void CDirstatDoc::PerformUserDefinedCleanup(const USERDEFINEDCLEANUP *udc, CItem if(!::PathFileExists(path)) { - MdThrowStringExceptionF(IDS_THEFILEsDOESNOTEXIST, path); + MdThrowStringExceptionF(IDS_THEFILEsDOESNOTEXIST, path.GetString()); } } @@ -1036,7 +1036,7 @@ void CDirstatDoc::CallUserDefinedCleanup(bool isDirectory, const CString& format CString app = GetCOMSPEC(); CString cmdline; - cmdline.Format(_T("%s /C %s"), GetBaseNameFromPath(app), userCommandLine); + cmdline.Format(_T("%s /C %s"), GetBaseNameFromPath(app).GetString(), userCommandLine.GetString()); CString directory = isDirectory ? currentPath : GetFolderNameFromPath(currentPath); STARTUPINFO si; @@ -1064,7 +1064,7 @@ void CDirstatDoc::CallUserDefinedCleanup(bool isDirectory, const CString& format if(!b) { MdThrowStringExceptionF(IDS_COULDNOTCREATEPROCESSssss, - app, cmdline, directory, MdGetWinErrorText(::GetLastError()) + app.GetString(), cmdline.GetString(), directory.GetString(), MdGetWinErrorText(::GetLastError()).GetString() ); return; } diff --git a/windirstat/dirstatdoc.h b/windirstat/dirstatdoc.h index b849980..5c4c7bf 100644 --- a/windirstat/dirstatdoc.h +++ b/windirstat/dirstatdoc.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/dirstatview.cpp b/windirstat/dirstatview.cpp index e8f7d37..4dddf1f 100644 --- a/windirstat/dirstatview.cpp +++ b/windirstat/dirstatview.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 @@ -192,7 +192,7 @@ CString CDirstatView::GenerateReport() continue; } - report.AppendFormat(_T("%s %s\r\n"), PadWidthBlanks(FormatLongLongHuman(item->GetSize()), 11), item->GetReportPath()); + report.AppendFormat(_T("%s %s\r\n"), PadWidthBlanks(FormatLongLongHuman(item->GetSize()), 11).GetString(), item->GetReportPath().GetString()); } } report += _T("\r\n\r\n"); diff --git a/windirstat/dirstatview.h b/windirstat/dirstatview.h index 91d2aa1..3dd3340 100644 --- a/windirstat/dirstatview.h +++ b/windirstat/dirstatview.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/getosplatformstring.cpp b/windirstat/getosplatformstring.cpp index 2f2a2b9..fbbeca6 100644 --- a/windirstat/getosplatformstring.cpp +++ b/windirstat/getosplatformstring.cpp @@ -1,83 +1,128 @@ -// getosplatformstring.cpp - Implementation of GetOsPlatformString() -// -// WinDirStat - Directory Statistics -// Copyright (C) 2003-2005 Bernhard Seifert -// Copyright (C) 2004-2016 WinDirStat team (windirstat.info) -// -// 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 -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// - -#include "stdafx.h" -#include "windirstat.h" -#include "getosplatformstring.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#endif - -CString GetOsPlatformString() -{ - CString ret; - - OSVERSIONINFO osvi; - ZeroMemory(&osvi, sizeof(osvi)); - osvi.dwOSVersionInfoSize = sizeof(osvi); - - if(!GetVersionEx(&osvi)) - { - return LoadString(IDS__UNKNOWN_); - } - - // FIXME: Update this to include Windows Vista/2008 and 7/2008 R2 - switch (osvi.dwPlatformId) - { - case VER_PLATFORM_WIN32_NT: - if(osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) - { - ret = _T("Windows Server 2003"); - } - else if(osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) - { - ret = _T("Windows XP"); - } - else if(osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) - { - ret = _T("Windows 2000"); - } - else if(osvi.dwMajorVersion <= 4) - { - ret = _T("Windows NT"); - } - else - { - ret.Format(_T("Windows %u.%u"), osvi.dwMajorVersion, osvi.dwMinorVersion); - } - if(_tcslen(osvi.szCSDVersion) > 0) - { - CString s; - s.Format(_T(" (%s)"), osvi.szCSDVersion); - ret += s; - } - break; - - default: - { - ret.Format(_T(""), osvi.dwPlatformId); - } - break; - } - - return ret; -} +// getosplatformstring.cpp - Implementation of GetOsPlatformString() +// +// WinDirStat - Directory Statistics +// Copyright (C) 2003-2005 Bernhard Seifert +// 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 +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// + +#include "stdafx.h" +#include "windirstat.h" +#include "getosplatformstring.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + +namespace { + typedef _Return_type_success_(return >= 0) LONG NTSTATUS; + /*lint -save -e624 */ // Don't complain about different typedefs. + typedef NTSTATUS *PNTSTATUS; + /*lint -restore */ // Resume checking for different typedefs. +} + +CString GetOsPlatformString() +{ + static NTSTATUS (WINAPI* RtlGetVersion)(LPOSVERSIONINFOEXW); + + if(!RtlGetVersion) + { + *(FARPROC*)&RtlGetVersion = GetProcAddress(GetModuleHandle(_T("ntdll.dll")), "RtlGetVersion"); + ASSERT(RtlGetVersion != NULL); + if(!RtlGetVersion) + { + return LoadString(IDS__UNKNOWN_); + } + } + OSVERSIONINFOEXW osvi = { sizeof(OSVERSIONINFOEXW), 0, 0, 0, 0,{ 0 } }; + + CString ret; + + NTSTATUS ntStatus = RtlGetVersion(&osvi); + if(ntStatus < 0) + { + return LoadString(IDS__UNKNOWN_); // FIXME: include the status code + } + + LPCTSTR lpszMajorName = NULL; + + switch (osvi.dwPlatformId) + { + case VER_PLATFORM_WIN32_NT: + switch(osvi.dwMajorVersion) + { + case 5: + if(osvi.dwMinorVersion == 0) + lpszMajorName = (VER_NT_WORKSTATION == osvi.wProductType) ? _T("2000") : _T("2000 Server"); + else + if(osvi.dwMinorVersion == 1) + lpszMajorName = _T("XP"); + else + if(osvi.dwMinorVersion == 2) + lpszMajorName = (VER_NT_WORKSTATION == osvi.wProductType) ? _T("XP x64") : _T("Server 2003"); + break; + case 6: + if(osvi.dwMinorVersion == 0) + lpszMajorName = (VER_NT_WORKSTATION == osvi.wProductType) ? _T("Vista") : _T("Server 2008"); + else + if(osvi.dwMinorVersion == 1) + lpszMajorName = (VER_NT_WORKSTATION == osvi.wProductType) ? _T("7") : _T("Server 2008 R2"); + else + if(osvi.dwMinorVersion == 2) + lpszMajorName = (VER_NT_WORKSTATION == osvi.wProductType) ? _T("8") : _T("Server 2012"); + else + if(osvi.dwMinorVersion == 3) + lpszMajorName = (VER_NT_WORKSTATION == osvi.wProductType) ? _T("8.1") : _T("Server 2012 R2"); + break; + case 10: + if(osvi.dwMinorVersion == 0) + lpszMajorName = (VER_NT_WORKSTATION == osvi.wProductType) ? _T("10") : _T("Server 2016"); + break; + default: + break; + } + + if(!lpszMajorName) + { + if(osvi.wServicePackMajor) + ret.Format(_T("Windows %u.%u.%u, SP %u"), osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber, osvi.wServicePackMajor); + else + ret.Format(_T("Windows %u.%u.%u"), osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber); + } + else + { + if(osvi.wServicePackMajor) + ret.Format(_T("Windows %s [%u.%u.%u], SP %u"), lpszMajorName, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber, osvi.wServicePackMajor); + else + ret.Format(_T("Windows %s [%u.%u.%u]"), lpszMajorName, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber); + } + if(osvi.szCSDVersion[0]) + { + CString s; + s.Format(_T(" (%s)"), osvi.szCSDVersion); + ret += s; + } + break; + + default: + { + ret.Format(_T(""), osvi.dwPlatformId); + } + break; + } + + return ret; +} diff --git a/windirstat/getosplatformstring.h b/windirstat/getosplatformstring.h index 2cfa6cc..6c377ab 100644 --- a/windirstat/getosplatformstring.h +++ b/windirstat/getosplatformstring.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/globalhelpers.cpp b/windirstat/globalhelpers.cpp index 7e3a87a..4481b7c 100644 --- a/windirstat/globalhelpers.cpp +++ b/windirstat/globalhelpers.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) // Copyright (C) 2010 Chris Wimmer // // This program is free software; you can redistribute it and/or modify @@ -46,7 +46,7 @@ namespace CString s; if(n > 0) { - s.Format(_T("%s%03d"), GetLocaleThousandSeparator(), rest); + s.Format(_T("%s%03d"), GetLocaleThousandSeparator().GetString(), rest); } else { @@ -153,23 +153,23 @@ CString FormatLongLongHuman(ULONGLONG n) if(TB != 0 || GB == base - 1 && MB >= half) { - s.Format(_T("%s %s"), FormatDouble(TB + GB/base), GetSpec_TB()); + s.Format(_T("%s %s"), FormatDouble(TB + GB/base).GetString(), GetSpec_TB().GetString()); } else if(GB != 0 || MB == base - 1 && KB >= half) { - s.Format(_T("%s %s"), FormatDouble(GB + MB/base), GetSpec_GB()); + s.Format(_T("%s %s"), FormatDouble(GB + MB/base).GetString(), GetSpec_GB().GetString()); } else if(MB != 0 || KB == base - 1 && B >= half) { - s.Format(_T("%s %s"), FormatDouble(MB + KB/base), GetSpec_MB()); + s.Format(_T("%s %s"), FormatDouble(MB + KB/base).GetString(), GetSpec_MB().GetString()); } else if(KB != 0) { - s.Format(_T("%s %s"), FormatDouble(KB + B/base), GetSpec_KB()); + s.Format(_T("%s %s"), FormatDouble(KB + B/base).GetString(), GetSpec_KB().GetString()); } else if(B != 0) { - s.Format(_T("%d %s"), (int)B, GetSpec_Bytes()); + s.Format(_T("%d %s"), (int)B, GetSpec_Bytes().GetString()); } else { @@ -195,7 +195,7 @@ CString FormatDouble(double d) // "98,4" or "98.4" int r = (int)(10 * fmod(d, 1)); CString s; - s.Format(_T("%d%s%d"), i, GetLocaleDecimalSeparator(), r); + s.Format(_T("%d%s%d"), i, GetLocaleDecimalSeparator().GetString(), r); return s; } @@ -348,7 +348,7 @@ CString FormatVolumeNameOfRootPath(CString rootPath) CString FormatVolumeName(CString rootPath, CString volumeName) { CString ret; - ret.Format(_T("%s (%s)"), volumeName, rootPath.Left(2)); + ret.Format(_T("%s (%s)"), volumeName.GetString(), rootPath.Left(2).GetString()); return ret; } @@ -424,7 +424,7 @@ void ShellExecuteWithAssocDialog(HWND hwnd, LPCTSTR filename) if(!bExecuted) { - MdThrowStringExceptionF(_T("ShellExecute failed: %1!s!"), MdGetWinErrorText(::GetLastError())); + MdThrowStringExceptionF(_T("ShellExecute failed: %1!s!"), MdGetWinErrorText(::GetLastError()).GetString()); } } @@ -585,7 +585,7 @@ CString MyQueryDosDevice(LPCTSTR drive) if(dw == 0) { - VTRACE(_T("QueryDosDevice(%s) failed: %s"), d, MdGetWinErrorText(::GetLastError())); + VTRACE(_T("QueryDosDevice(%s) failed: %s"), d.GetString(), MdGetWinErrorText(::GetLastError()).GetString()); return wds::strEmpty; } diff --git a/windirstat/globalhelpers.h b/windirstat/globalhelpers.h index e4d1139..995a877 100644 --- a/windirstat/globalhelpers.h +++ b/windirstat/globalhelpers.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) // Copyright (C) 2010 Chris Wimmer // // This program is free software; you can redistribute it and/or modify diff --git a/windirstat/helpmap.h b/windirstat/helpmap.h index d140bd9..9021335 100644 --- a/windirstat/helpmap.h +++ b/windirstat/helpmap.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/item.cpp b/windirstat/item.cpp index 789cb04..c06e107 100644 --- a/windirstat/item.cpp +++ b/windirstat/item.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 @@ -44,7 +44,9 @@ namespace CItem::CItem(ITEMTYPE type, LPCTSTR name, bool dontFollow) : m_type(type) + , m_etype(static_cast(type & ~ITF_FLAGS)) , m_name(name) + , m_extension_cached(false) , m_size(0) , m_files(0) , m_subdirs(0) @@ -53,7 +55,6 @@ CItem::CItem(ITEMTYPE type, LPCTSTR name, bool dontFollow) , m_readJobs(0) , m_attributes(0) { - m_etype = (ITEMTYPE)(m_type & ~ITF_FLAGS); // returned by GetType if(GetType() == IT_FILE || dontFollow || GetType() == IT_FREESPACE || GetType() == IT_UNKNOWN || GetType() == IT_MYCOMPUTER) { SetReadJobDone(); @@ -161,18 +162,18 @@ CString CItem::GetText(int subitem) const if(m_readJobs == 1) s.LoadString(IDS_ONEREADJOB); else - s.FormatMessage(IDS_sREADJOBS, FormatCount(m_readJobs)); + s.FormatMessage(IDS_sREADJOBS, FormatCount(m_readJobs).GetString()); } break; case COL_PERCENTAGE: if(GetOptions()->IsShowTimeSpent() && MustShowReadJobs() || IsRootItem()) { - s.Format(_T("[%s s]"), FormatMilliseconds(GetTicksWorked())); + s.Format(_T("[%s s]"), FormatMilliseconds(GetTicksWorked()).GetString()); } else { - s.Format(_T("%s%%"), FormatDouble(GetFraction() * 100)); + s.Format(_T("%s%%"), FormatDouble(GetFraction() * 100).GetString()); } break; @@ -527,7 +528,7 @@ void CItem::UpdateLastChange() int i = path.ReverseFind(wds::chrBackslash); CString basename = path.Mid(i + 1); CString pattern; - pattern.Format(_T("%s\\..\\%s"), path, basename); + pattern.Format(_T("%s\\..\\%s"), path.GetString(), basename.GetString()); CFileFindWDS finder; BOOL b = finder.FindFile(pattern); if(!b) @@ -1428,7 +1429,7 @@ void CItem::RefreshRecycler() system.ReleaseBuffer(); if(!b) { - VTRACE(_T("GetVolumeInformation(%s) failed."), GetPath()); + VTRACE(_T("GetVolumeInformation(%s) failed."), GetPath().GetString()); return; // nix zu machen } @@ -1443,7 +1444,7 @@ void CItem::RefreshRecycler() } else { - VTRACE(_T("%s: unknown file system type %s"), GetPath(), system); + VTRACE(_T("%s: unknown file system type %s"), GetPath().GetString(), system.GetString()); return; // nix zu machen. } @@ -1456,7 +1457,7 @@ void CItem::RefreshRecycler() } if(i >= GetChildrenCount()) { - VTRACE(_T("%s: Recycler(%s) not found."), GetPath(), recycler); + VTRACE(_T("%s: Recycler(%s) not found."), GetPath().GetString(), recycler.GetString()); return; // nicht gefunden } @@ -1613,7 +1614,7 @@ void CItem::RecurseCollectExtensionData(CExtensionData *ed) { GetWDSApp()->PeriodicalUpdateRamUsage(); - auto type = GetType(); + ITEMTYPE type = GetType(); if(IsLeaf(type)) { if(type == IT_FILE) diff --git a/windirstat/item.h b/windirstat/item.h index 53810e6..abb635c 100644 --- a/windirstat/item.h +++ b/windirstat/item.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 @@ -222,7 +222,7 @@ private: ITEMTYPE m_etype; CString m_name; // Display name mutable CString m_extension; // Cache of extension (it's used often) - mutable bool m_extension_cached = false; + mutable bool m_extension_cached; ULONGLONG m_size; // OwnSize, if IT_FILE or IT_FREESPACE, or IT_UNKNOWN; SubtreeTotal else. ULONGLONG m_files; // # Files in subtree ULONGLONG m_subdirs; // # Folder in subtree diff --git a/windirstat/layout.cpp b/windirstat/layout.cpp index 86eec23..2134dff 100644 --- a/windirstat/layout.cpp +++ b/windirstat/layout.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/layout.h b/windirstat/layout.h index 5a8b5c6..e80821d 100644 --- a/windirstat/layout.h +++ b/windirstat/layout.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/mainframe.cpp b/windirstat/mainframe.cpp index cef0bba..9b8b6c6 100644 --- a/windirstat/mainframe.cpp +++ b/windirstat/mainframe.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 @@ -35,8 +35,6 @@ #include "pagetreemap.h" #include "pagegeneral.h" -#include - #include "mainframe.h" #ifdef _DEBUG @@ -561,7 +559,7 @@ void CMainFrame::UpdateProgress() { int pos = (int)((double) m_progressPos * 100 / m_progressRange); m_progress.SetPos(pos); - titlePrefix.Format(_T("%d%% %s"), pos, suspended); + titlePrefix.Format(_T("%d%% %s"), pos, suspended.GetString()); #ifdef SUPPORT_W7_TASKBAR if(m_TaskbarList && (m_TaskbarButtonState != TBPF_PAUSED)) { @@ -947,11 +945,11 @@ void CMainFrame::UpdateCleanupMenu(CMenu *menu) CString info; if(items == 1) { - info.FormatMessage(IDS__ONEITEMss, FormatBytes(bytes), GetOptions()->IsHumanFormat() && bytes != 0 ? wds::strEmpty : wds::strBlankSpace + GetSpec_Bytes()); + info.FormatMessage(IDS__ONEITEMss, FormatBytes(bytes).GetString(), GetOptions()->IsHumanFormat() && bytes != 0 ? wds::strEmpty : wds::strBlankSpace + GetSpec_Bytes()); } else { - info.FormatMessage(IDS__sITEMSss, FormatCount(items), FormatBytes(bytes), GetOptions()->IsHumanFormat() && bytes != 0 ? wds::strEmpty : wds::strBlankSpace + GetSpec_Bytes()); + info.FormatMessage(IDS__sITEMSss, FormatCount(items).GetString(), FormatBytes(bytes).GetString(), GetOptions()->IsHumanFormat() && bytes != 0 ? wds::strEmpty : wds::strBlankSpace + GetSpec_Bytes()); } s += info; @@ -1030,7 +1028,7 @@ void CMainFrame::AppendUserDefinedCleanups(CMenu *menu) for(int i = 0; i < indices.GetSize(); i++) { CString string; - string.FormatMessage(IDS_UDCsCTRLd, GetOptions()->GetUserDefinedCleanup(indices[i])->title, indices[i]); + string.FormatMessage(IDS_UDCsCTRLd, GetOptions()->GetUserDefinedCleanup(indices[i])->title.GetString(), indices[i]); UINT flags = MF_GRAYED | MF_DISABLED; if( diff --git a/windirstat/mainframe.h b/windirstat/mainframe.h index 3a31813..ccdbd9e 100644 --- a/windirstat/mainframe.h +++ b/windirstat/mainframe.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/mountpoints.cpp b/windirstat/mountpoints.cpp index 0d934dd..d160349 100644 --- a/windirstat/mountpoints.cpp +++ b/windirstat/mountpoints.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 @@ -247,7 +247,7 @@ bool CReparsePoints::IsVolumeMountPoint(CString volume, CString path) PointVolumeArray *pva; if(!m_volume.Lookup(volume, pva)) { - VTRACE(_T("CMountPoints: Volume(%s) unknown!"), volume); + VTRACE(_T("CMountPoints: Volume(%s) unknown!"), volume.GetString()); return false; } diff --git a/windirstat/mountpoints.h b/windirstat/mountpoints.h index ec0d829..aee7a7a 100644 --- a/windirstat/mountpoints.h +++ b/windirstat/mountpoints.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/options.cpp b/windirstat/options.cpp index 3a677fa..f8f338a 100644 --- a/windirstat/options.cpp +++ b/windirstat/options.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 @@ -865,7 +865,7 @@ CString COptions::GetReportSuffix() CString COptions::GetReportDefaultSuffix() { CString suffix = LoadString(IDS_DISKUSAGEREPORTGENERATEDBYWINDIRSTAT); - suffix.AppendFormat(_T("http://%s/\r\n"), GetWinDirStatHomepage()); + suffix.AppendFormat(_T("https://%s/\r\n"), GetWinDirStatHomepage().GetString()); return suffix; } diff --git a/windirstat/options.h b/windirstat/options.h index 2cc1eb2..434f005 100644 --- a/windirstat/options.h +++ b/windirstat/options.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/osspecific.cpp b/windirstat/osspecific.cpp index 54b87da..3d038f5 100644 --- a/windirstat/osspecific.cpp +++ b/windirstat/osspecific.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/osspecific.h b/windirstat/osspecific.h index 25abc28..0d89170 100644 --- a/windirstat/osspecific.h +++ b/windirstat/osspecific.h @@ -3,7 +3,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/res/wdsr0405/res/windirstat.rc2 b/windirstat/res/wdsr0405/res/windirstat.rc2 index bd3113c..765f220 100644 --- a/windirstat/res/wdsr0405/res/windirstat.rc2 +++ b/windirstat/res/wdsr0405/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0405.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Czech Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0405" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0405.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x405, 1251 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj b/windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj new file mode 100644 index 0000000..6f4b93f --- /dev/null +++ b/windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {C3F39C58-7FC4-4243-82B2-A3572235AE02} + wdsr0405 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0405\ + wdsr0405 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0405;MODNAME=wdsr0405;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0405;MODNAME=wdsr0405;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0405.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0405\wdsr0405.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj.filters b/windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj.filters new file mode 100644 index 0000000..2001305 --- /dev/null +++ b/windirstat/res/wdsr0405/wdsr0405.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {F9B065F8-F7F1-BBFD-1E7F-10426E4479DE} + + + {A952EE64-059E-519F-32AD-9362A2979F47} + + + {41FA6779-E6A6-6B6F-52FB-C8586DCDEAC8} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0405/wdsr0405.vs8.vcproj b/windirstat/res/wdsr0405/wdsr0405.vs8.vcproj new file mode 100644 index 0000000..bfd1b37 --- /dev/null +++ b/windirstat/res/wdsr0405/wdsr0405.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0405/windirstat-utf8.rc b/windirstat/res/wdsr0405/windirstat-utf8.rc index 4570620..e9bc8e9 100644 --- a/windirstat/res/wdsr0405/windirstat-utf8.rc +++ b/windirstat/res/wdsr0405/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0405/windirstat.rc b/windirstat/res/wdsr0405/windirstat.rc index aedc224..f68bd3c 100644 --- a/windirstat/res/wdsr0405/windirstat.rc +++ b/windirstat/res/wdsr0405/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0407/res/windirstat.rc2 b/windirstat/res/wdsr0407/res/windirstat.rc2 index 695dfe7..765f220 100644 --- a/windirstat/res/wdsr0407/res/windirstat.rc2 +++ b/windirstat/res/wdsr0407/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0407.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat German Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0407" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0407.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x407, 1252 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj b/windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj new file mode 100644 index 0000000..9146568 --- /dev/null +++ b/windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {C8D9E4F9-7051-4B41-A5AB-F68F3FCE42E8} + wdsr0407 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0407\ + wdsr0407 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0407;MODNAME=wdsr0407;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0407;MODNAME=wdsr0407;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0407.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0407\wdsr0407.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj.filters b/windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj.filters new file mode 100644 index 0000000..f6bea56 --- /dev/null +++ b/windirstat/res/wdsr0407/wdsr0407.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {937D02D3-A6F2-B4A7-1FA7-1C2D36AEBF3D} + + + {F6F8A42E-6327-EF2E-6D3D-BA41959E1008} + + + {CF8E463A-D035-BB1B-E397-030A4F9977DE} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0407/wdsr0407.vs8.vcproj b/windirstat/res/wdsr0407/wdsr0407.vs8.vcproj new file mode 100644 index 0000000..5409c07 --- /dev/null +++ b/windirstat/res/wdsr0407/wdsr0407.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0407/windirstat-utf8.rc b/windirstat/res/wdsr0407/windirstat-utf8.rc index 19445ce..3c7352d 100644 --- a/windirstat/res/wdsr0407/windirstat-utf8.rc +++ b/windirstat/res/wdsr0407/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0407/windirstat.rc b/windirstat/res/wdsr0407/windirstat.rc index 9f6e95f..78817c3 100644 --- a/windirstat/res/wdsr0407/windirstat.rc +++ b/windirstat/res/wdsr0407/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040a/res/windirstat.rc2 b/windirstat/res/wdsr040a/res/windirstat.rc2 index e87c427..765f220 100644 --- a/windirstat/res/wdsr040a/res/windirstat.rc2 +++ b/windirstat/res/wdsr040a/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr040a.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Spanish Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr040a" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr040a.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x40a, 1251 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj b/windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj new file mode 100644 index 0000000..10df441 --- /dev/null +++ b/windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {23B76347-204C-4DE6-A311-F562CEF5D89C} + wdsr040a + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040a\ + wdsr040a + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x040a;MODNAME=wdsr040a;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x040a;MODNAME=wdsr040a;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr040a.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040a\wdsr040a.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj.filters b/windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj.filters new file mode 100644 index 0000000..7263847 --- /dev/null +++ b/windirstat/res/wdsr040a/wdsr040a.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {081EC6CE-980C-9FF9-E164-68B1EB4777D1} + + + {4A62C74B-D223-0E1B-6535-23E6B46A6E05} + + + {07A638B3-6914-B90D-2954-E6772DC9A2A2} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr040a/wdsr040a.vs8.vcproj b/windirstat/res/wdsr040a/wdsr040a.vs8.vcproj new file mode 100644 index 0000000..77a3fb8 --- /dev/null +++ b/windirstat/res/wdsr040a/wdsr040a.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040a/windirstat-utf8.rc b/windirstat/res/wdsr040a/windirstat-utf8.rc index 43771b4..5358223 100644 --- a/windirstat/res/wdsr040a/windirstat-utf8.rc +++ b/windirstat/res/wdsr040a/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040a/windirstat.rc b/windirstat/res/wdsr040a/windirstat.rc index e124d53..7e6704a 100644 --- a/windirstat/res/wdsr040a/windirstat.rc +++ b/windirstat/res/wdsr040a/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040b/res/windirstat.rc2 b/windirstat/res/wdsr040b/res/windirstat.rc2 index 376be18..f9523a4 100644 --- a/windirstat/res/wdsr040b/res/windirstat.rc2 +++ b/windirstat/res/wdsr040b/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -21,53 +22,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr040b.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WinDirStat Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Finnish Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr040b" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr040b.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x40b, 1252 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_FINNISH, SUBLANG_FINNISH_FINLAND -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj b/windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj new file mode 100644 index 0000000..3ccbcc8 --- /dev/null +++ b/windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {C7A5D1EC-35D3-4754-A815-2C527CACD584} + wdsr040b + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040b\ + wdsr040b + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x040b;MODNAME=wdsr040b;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x040b;MODNAME=wdsr040b;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr040b.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040b\wdsr040b.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj.filters b/windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj.filters new file mode 100644 index 0000000..aa3f220 --- /dev/null +++ b/windirstat/res/wdsr040b/wdsr040b.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {39AD7CFC-74BB-B104-4936-C16479BE0E35} + + + {98A685F2-FA2B-E94C-3D28-8C3310E359A2} + + + {AD22D2BD-CE38-F955-044E-0F5CE90B0EED} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr040b/wdsr040b.vs8.vcproj b/windirstat/res/wdsr040b/wdsr040b.vs8.vcproj new file mode 100644 index 0000000..1885269 --- /dev/null +++ b/windirstat/res/wdsr040b/wdsr040b.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040b/windirstat-utf8.rc b/windirstat/res/wdsr040b/windirstat-utf8.rc index 2741ff5..8786520 100644 --- a/windirstat/res/wdsr040b/windirstat-utf8.rc +++ b/windirstat/res/wdsr040b/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040b/windirstat.rc b/windirstat/res/wdsr040b/windirstat.rc index 3cb17c8..bd363ef 100644 --- a/windirstat/res/wdsr040b/windirstat.rc +++ b/windirstat/res/wdsr040b/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040c/res/windirstat.rc2 b/windirstat/res/wdsr040c/res/windirstat.rc2 index 3988809..765f220 100644 --- a/windirstat/res/wdsr040c/res/windirstat.rc2 +++ b/windirstat/res/wdsr040c/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr040c.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat French Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr040c" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr040c.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x40c, 1252 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj b/windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj new file mode 100644 index 0000000..3869a77 --- /dev/null +++ b/windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {DA4DDD24-67BC-4A9D-87D3-18C73E5CAF31} + wdsr040c + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040c\ + wdsr040c + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x040c;MODNAME=wdsr040c;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x040c;MODNAME=wdsr040c;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr040c.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040c\wdsr040c.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj.filters b/windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj.filters new file mode 100644 index 0000000..3ac07de --- /dev/null +++ b/windirstat/res/wdsr040c/wdsr040c.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {915BCD7E-C2A6-91B0-BD72-CE32633C6AE2} + + + {CD13B791-FDCF-EB66-D80D-A8C3CAF7A9B9} + + + {B621C87F-C8A8-3C78-7B03-BEF282B7A0C1} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr040c/wdsr040c.vs8.vcproj b/windirstat/res/wdsr040c/wdsr040c.vs8.vcproj new file mode 100644 index 0000000..a5e2333 --- /dev/null +++ b/windirstat/res/wdsr040c/wdsr040c.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040c/windirstat-utf8.rc b/windirstat/res/wdsr040c/windirstat-utf8.rc index 34942bd..186a232 100644 --- a/windirstat/res/wdsr040c/windirstat-utf8.rc +++ b/windirstat/res/wdsr040c/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040c/windirstat.rc b/windirstat/res/wdsr040c/windirstat.rc index 82a7312..9f050d4 100644 --- a/windirstat/res/wdsr040c/windirstat.rc +++ b/windirstat/res/wdsr040c/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040e/res/windirstat.rc2 b/windirstat/res/wdsr040e/res/windirstat.rc2 index f0a4d96..765f220 100755 --- a/windirstat/res/wdsr040e/res/windirstat.rc2 +++ b/windirstat/res/wdsr040e/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr040e.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Hungarian Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr040e" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr040e.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x40e, 1250 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj b/windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj new file mode 100644 index 0000000..db6587d --- /dev/null +++ b/windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {2A75AA20-BFFE-4D1C-8AEC-274823223919} + wdsr040e + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040e\ + wdsr040e + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x040e;MODNAME=wdsr040e;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x040e;MODNAME=wdsr040e;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr040e.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr040e\wdsr040e.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj.filters b/windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj.filters new file mode 100644 index 0000000..0f2387a --- /dev/null +++ b/windirstat/res/wdsr040e/wdsr040e.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {769AFD56-797A-C030-0040-0B625C9BC8D3} + + + {EA4F6F25-E9B9-BC8F-A70B-25599B29E389} + + + {275D8A5B-50A0-799F-C848-7CE6056FB169} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr040e/wdsr040e.vs8.vcproj b/windirstat/res/wdsr040e/wdsr040e.vs8.vcproj new file mode 100644 index 0000000..4315d66 --- /dev/null +++ b/windirstat/res/wdsr040e/wdsr040e.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr040e/windirstat-utf8.rc b/windirstat/res/wdsr040e/windirstat-utf8.rc index 612b124..fdf8115 100644 --- a/windirstat/res/wdsr040e/windirstat-utf8.rc +++ b/windirstat/res/wdsr040e/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr040e/windirstat.rc b/windirstat/res/wdsr040e/windirstat.rc index a4d92d1..ea742dd 100755 --- a/windirstat/res/wdsr040e/windirstat.rc +++ b/windirstat/res/wdsr040e/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0410/res/windirstat.rc2 b/windirstat/res/wdsr0410/res/windirstat.rc2 index 324710b..765f220 100644 --- a/windirstat/res/wdsr0410/res/windirstat.rc2 +++ b/windirstat/res/wdsr0410/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0410.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Italian Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0410" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0410.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x410, 1251 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj b/windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj new file mode 100644 index 0000000..c315580 --- /dev/null +++ b/windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {FD4194A7-EA1E-4466-A80B-AB4D8D17F33C} + wdsr0410 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0410\ + wdsr0410 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0410;MODNAME=wdsr0410;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0410;MODNAME=wdsr0410;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0410.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0410\wdsr0410.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj.filters b/windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj.filters new file mode 100644 index 0000000..b937176 --- /dev/null +++ b/windirstat/res/wdsr0410/wdsr0410.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {4BC52DC9-DB5E-518C-8833-23D344D8EA93} + + + {F26A4721-270D-8C7F-6CB7-0D882E472037} + + + {CCA9D317-5B97-751F-C26B-CCE40C7334E9} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0410/wdsr0410.vs8.vcproj b/windirstat/res/wdsr0410/wdsr0410.vs8.vcproj new file mode 100644 index 0000000..ffe3f35 --- /dev/null +++ b/windirstat/res/wdsr0410/wdsr0410.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0410/windirstat-utf8.rc b/windirstat/res/wdsr0410/windirstat-utf8.rc index 38c4f4f..2c288e9 100644 --- a/windirstat/res/wdsr0410/windirstat-utf8.rc +++ b/windirstat/res/wdsr0410/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0410/windirstat.rc b/windirstat/res/wdsr0410/windirstat.rc index 4a8b79f..3714ada 100644 --- a/windirstat/res/wdsr0410/windirstat.rc +++ b/windirstat/res/wdsr0410/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0413/res/windirstat.rc2 b/windirstat/res/wdsr0413/res/windirstat.rc2 index 3a3ad52..765f220 100644 --- a/windirstat/res/wdsr0413/res/windirstat.rc2 +++ b/windirstat/res/wdsr0413/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0413.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Dutch Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0413" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0413.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x413, 1252 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_DUTCH, SUBLANG_DUTCH -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj b/windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj new file mode 100644 index 0000000..9d973e7 --- /dev/null +++ b/windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {70A55EB7-E109-41DE-81B4-0DF2B72DCDE9} + wdsr0413 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0413\ + wdsr0413 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0413;MODNAME=wdsr0413;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0413;MODNAME=wdsr0413;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0413.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0413\wdsr0413.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj.filters b/windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj.filters new file mode 100644 index 0000000..e2fbff8 --- /dev/null +++ b/windirstat/res/wdsr0413/wdsr0413.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {2F3F9284-F9ED-5288-F72D-6FBB5DBD01BE} + + + {811FDA86-CCAC-89AE-47BB-3BDCE5A1984B} + + + {64F18C6C-995B-4DC9-31F9-B8997486D171} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0413/wdsr0413.vs8.vcproj b/windirstat/res/wdsr0413/wdsr0413.vs8.vcproj new file mode 100644 index 0000000..9fce301 --- /dev/null +++ b/windirstat/res/wdsr0413/wdsr0413.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0413/windirstat-utf8.rc b/windirstat/res/wdsr0413/windirstat-utf8.rc index 8d1a819..2b4bbdc 100644 --- a/windirstat/res/wdsr0413/windirstat-utf8.rc +++ b/windirstat/res/wdsr0413/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0413/windirstat.rc b/windirstat/res/wdsr0413/windirstat.rc index 26c1eee..5946db0 100644 --- a/windirstat/res/wdsr0413/windirstat.rc +++ b/windirstat/res/wdsr0413/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -36,7 +35,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0415/res/windirstat.rc2 b/windirstat/res/wdsr0415/res/windirstat.rc2 index 5e807ad..765f220 100755 --- a/windirstat/res/wdsr0415/res/windirstat.rc2 +++ b/windirstat/res/wdsr0415/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0415.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Polish Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0415" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0415.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x415, 1250 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj b/windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj new file mode 100644 index 0000000..3c736b0 --- /dev/null +++ b/windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {70C09DAA-6F6D-4AAC-955F-ACD602A667CE} + wdsr0415 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0415\ + wdsr0415 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0415;MODNAME=wdsr0415;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0415;MODNAME=wdsr0415;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0415.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0415\wdsr0415.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj.filters b/windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj.filters new file mode 100644 index 0000000..6244460 --- /dev/null +++ b/windirstat/res/wdsr0415/wdsr0415.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {CD8A72BD-4671-C000-2CF0-F7E71469E62A} + + + {CB13C98E-452D-03F2-A045-90DFD378DA2E} + + + {E12632FC-28CE-389F-44DA-16CB01753CF7} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0415/wdsr0415.vs8.vcproj b/windirstat/res/wdsr0415/wdsr0415.vs8.vcproj new file mode 100644 index 0000000..6b499a5 --- /dev/null +++ b/windirstat/res/wdsr0415/wdsr0415.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0415/windirstat-utf8.rc b/windirstat/res/wdsr0415/windirstat-utf8.rc index 994acd6..ce69e4b 100644 --- a/windirstat/res/wdsr0415/windirstat-utf8.rc +++ b/windirstat/res/wdsr0415/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0415/windirstat.rc b/windirstat/res/wdsr0415/windirstat.rc index 8b923df..9fcdfe3 100755 --- a/windirstat/res/wdsr0415/windirstat.rc +++ b/windirstat/res/wdsr0415/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0416/res/windirstat.rc2 b/windirstat/res/wdsr0416/res/windirstat.rc2 index 1dd2f9d..765f220 100644 --- a/windirstat/res/wdsr0416/res/windirstat.rc2 +++ b/windirstat/res/wdsr0416/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0416.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Portuguese (Brazil) Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0416" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0416.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x416, 1252 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj b/windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj new file mode 100644 index 0000000..839115f --- /dev/null +++ b/windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {025A9D90-4C61-4D34-8BEC-8A1A044B80EB} + wdsr0416 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0416\ + wdsr0416 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0416;MODNAME=wdsr0416;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0416;MODNAME=wdsr0416;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0416.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0416\wdsr0416.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj.filters b/windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj.filters new file mode 100644 index 0000000..8c8cbc9 --- /dev/null +++ b/windirstat/res/wdsr0416/wdsr0416.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {CB8AF061-B758-E3FB-3ECA-675C47CB7DCB} + + + {F433DB4A-1AFE-28FF-1FB5-A8FFB39E8C28} + + + {D5A2FE8B-DF52-9F86-BE1E-908CF4F12833} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0416/wdsr0416.vs8.vcproj b/windirstat/res/wdsr0416/wdsr0416.vs8.vcproj new file mode 100644 index 0000000..17e8f40 --- /dev/null +++ b/windirstat/res/wdsr0416/wdsr0416.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0416/windirstat.rc b/windirstat/res/wdsr0416/windirstat.rc index 8a103cd..8bf2258 100644 --- a/windirstat/res/wdsr0416/windirstat.rc +++ b/windirstat/res/wdsr0416/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0419/res/windirstat.rc2 b/windirstat/res/wdsr0419/res/windirstat.rc2 index ca269e0..765f220 100644 --- a/windirstat/res/wdsr0419/res/windirstat.rc2 +++ b/windirstat/res/wdsr0419/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -22,53 +23,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0419.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Russian Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0419" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0419.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x419, 1251 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj b/windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj new file mode 100644 index 0000000..dfbde4b --- /dev/null +++ b/windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {7F06AAC4-9FBE-412F-B1D7-CB37AB8F311D} + wdsr0419 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0419\ + wdsr0419 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0419;MODNAME=wdsr0419;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0419;MODNAME=wdsr0419;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0419.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0419\wdsr0419.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj.filters b/windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj.filters new file mode 100644 index 0000000..0752889 --- /dev/null +++ b/windirstat/res/wdsr0419/wdsr0419.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {90659885-3BED-08C7-2E46-50D796FCD9AB} + + + {50676B7A-23DC-FA21-BB2E-770A39DC9441} + + + {B4A227AB-1A6C-8AA2-4E9A-AECF3FEDB46F} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0419/wdsr0419.vs8.vcproj b/windirstat/res/wdsr0419/wdsr0419.vs8.vcproj new file mode 100644 index 0000000..6be6b61 --- /dev/null +++ b/windirstat/res/wdsr0419/wdsr0419.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0419/windirstat-utf8.rc b/windirstat/res/wdsr0419/windirstat-utf8.rc index fdc4ac6..cdc3c32 100644 --- a/windirstat/res/wdsr0419/windirstat-utf8.rc +++ b/windirstat/res/wdsr0419/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0419/windirstat.rc b/windirstat/res/wdsr0419/windirstat.rc index 6827891..cdc83ad 100644 --- a/windirstat/res/wdsr0419/windirstat.rc +++ b/windirstat/res/wdsr0419/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0425/res/windirstat.rc2 b/windirstat/res/wdsr0425/res/windirstat.rc2 index 472740a..f9523a4 100644 --- a/windirstat/res/wdsr0425/res/windirstat.rc2 +++ b/windirstat/res/wdsr0425/res/windirstat.rc2 @@ -2,6 +2,7 @@ // // WinDirStat - Directory Statistics // Copyright (C) 2003-2005 Bernhard Seifert +// 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 @@ -21,53 +22,3 @@ #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// wdsr0425.dll - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_DLL - PRODUCTVERSION VN_PRODVERSION_DLL - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WinDirStat Team (windirstat.info)" - VALUE "FileDescription", "WinDirStat Estonian Resources" - VALUE "FileVersion", VN_STRING_DLL - VALUE "InternalName", "wdsr0425" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "wdsr0425.dll" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_DLL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x425, 1252 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_ESTONIAN, SUBLANG_ESTONIAN_ESTONIA -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - diff --git a/windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj b/windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj new file mode 100644 index 0000000..903058b --- /dev/null +++ b/windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj @@ -0,0 +1,88 @@ + + + + + Release + Win32 + + + + {2FADC62C-C670-4963-8B69-70ECA7987B93} + wdsr0425 + Win32Proj + + + + DynamicLibrary + true + Unicode + v141 + + + + + + + + + + ..\..\..\build\ + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0425\ + wdsr0425 + .wdslng + true + false + false + + + + Disabled + WDS_RESLANG=0x0425;MODNAME=wdsr0425;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + true + + Level3 + false + + CompileAsC + + + WDS_RESLANG=0x0425;MODNAME=wdsr0425;%(PreprocessorDefinitions) + ..\..\..;$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories) + + + Windows + false + $(OutDir)wdsr0425.wdslng + ..\..\..\intermediate\vs2017_$(ProjectName)_wdsr0425\wdsr0425.wdslng + MachineX86 + /noentry %(AdditionalOptions) + + + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj.filters b/windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj.filters new file mode 100644 index 0000000..648108b --- /dev/null +++ b/windirstat/res/wdsr0425/wdsr0425.vs15.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {A955F311-C33D-B9C4-19EB-E09386BC9B0E} + + + {4713A9F6-93C3-E80B-F4B3-7C8C2CBE26FB} + + + {D159FBBB-A9EF-DC8C-29FB-CA20A0BC8D78} + + + + + + Resource Files + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + Resource Files\embedded + + + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + diff --git a/windirstat/res/wdsr0425/wdsr0425.vs8.vcproj b/windirstat/res/wdsr0425/wdsr0425.vs8.vcproj new file mode 100644 index 0000000..2fbc84b --- /dev/null +++ b/windirstat/res/wdsr0425/wdsr0425.vs8.vcproj @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windirstat/res/wdsr0425/windirstat-utf8.rc b/windirstat/res/wdsr0425/windirstat-utf8.rc index fd94b7b..242a46d 100644 --- a/windirstat/res/wdsr0425/windirstat-utf8.rc +++ b/windirstat/res/wdsr0425/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/res/wdsr0425/windirstat.rc b/windirstat/res/wdsr0425/windirstat.rc index 0704fc7..19971ff 100644 --- a/windirstat/res/wdsr0425/windirstat.rc +++ b/windirstat/res/wdsr0425/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""common/version.h""\r\n" "\0" END diff --git a/windirstat/res/windirstat.manifest b/windirstat/res/windirstat.manifest index 71fd27c..c1788d7 100644 --- a/windirstat/res/windirstat.manifest +++ b/windirstat/res/windirstat.manifest @@ -2,30 +2,22 @@ + - - - - - WinDirStat - Windows Directory Statistics - - - - - - - + + + + + + + \ No newline at end of file diff --git a/windirstat/res/windirstat.rc2 b/windirstat/res/windirstat.rc2 index 1583182..cbb061d 100644 --- a/windirstat/res/windirstat.rc2 +++ b/windirstat/res/windirstat.rc2 @@ -1,74 +1,25 @@ -// windirstat.rc2 - resources Microsoft Visual C++ does not edit directly -// -// WinDirStat - Directory Statistics -// Copyright (C) 2003-2005 Bernhard Seifert -// -// 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 -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// windirstat.rc2 - resources Microsoft Visual C++ does not edit directly // - - -#ifdef APSTUDIO_INVOKED -#error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// windirstat.exe - Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VN_FILEVERSION_EXE - PRODUCTVERSION VN_PRODVERSION_EXE - FILEFLAGSMASK 0x3fL - FILEFLAGS VN_FILEFLAG_EXE - FILEOS VN_FILEOS_EXE - FILETYPE VFT_APP - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "WDS Team" - VALUE "FileDescription", "Windows Directory Statistics" - VALUE "FileVersion", VN_STRING_EXE - VALUE "InternalName", "windirstat" - VALUE "LegalCopyright", VN_COPYRIGHTSTRING - VALUE "OriginalFilename", "windirstat.exe" - VALUE "ProductName", "WinDirStat" - VALUE "ProductVersion", VN_STRING_EXE - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - -#include "../../common/common_rsrcstr.h" - -STRINGTABLE -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -BEGIN - IDS_RESOURCEVERSION IDSS_RESOURCEDLL - IDS_FROMsPLATFORMs IDSS_FROMsPLATFORMs - IDS_SEV_CRITICAL IDSS_SEV_CRITICAL - IDS_SEV_GRAVE IDSS_SEV_GRAVE - IDS_SEV_NORMAL IDSS_SEV_NORMAL - IDS_SEV_WISH IDSS_SEV_WISH - IDS_SEV_FEEDBACK IDSS_SEV_FEEDBACK - IDS_TRANSLATORS IDSS_TRANSLATORS -END - +// WinDirStat - Directory Statistics +// Copyright (C) 2003-2005 Bernhard Seifert +// 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 +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// + + +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED diff --git a/windirstat/selectobject.h b/windirstat/selectobject.h index aadf71a..aa9ad0c 100644 --- a/windirstat/selectobject.h +++ b/windirstat/selectobject.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/set.h b/windirstat/set.h index 299fe80..029475f 100644 --- a/windirstat/set.h +++ b/windirstat/set.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/stdafx.cpp b/windirstat/stdafx.cpp index 098236d..d8e8b87 100644 --- a/windirstat/stdafx.cpp +++ b/windirstat/stdafx.cpp @@ -1,30 +1,42 @@ -// stdafx.cpp - source file that includes just the standard includes -// windirstat.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information -// -// WinDirStat - Directory Statistics -// Copyright (C) 2003-2005 Bernhard Seifert -// Copyright (C) 2004-2016 WinDirStat team (windirstat.info) -// -// 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 -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// - -#include "stdafx.h" - -#if !defined(HAVE_WIN7_SDK) || !HAVE_WIN7_SDK -# if _MSC_VER <= 1500 -# pragma message ("WARNING: You're building a feature-incomplete WinDirStat ('#define HAVE_WIN7_SDK' missing or 0). Refer to https://bitbucket.org/windirstat/windirstat/wiki/Building for details on how to build with this version of Visual Studio.") -# endif // Visual C/C++ 2008 and below -#endif // HAVE_WIN7_SDK +// stdafx.cpp - source file that includes just the standard includes +// windirstat.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information +// +// WinDirStat - Directory Statistics +// Copyright (C) 2003-2005 Bernhard Seifert +// 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 +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// + +#include "stdafx.h" + +#if !defined(HAVE_WIN7_SDK) || !HAVE_WIN7_SDK +# if _MSC_VER <= 1500 +# pragma message ("WARNING: You're building a feature-incomplete WinDirStat ('#define HAVE_WIN7_SDK' missing or 0). Refer to https://bitbucket.org/windirstat/windirstat/wiki/Building for details on how to build with this version of Visual Studio.") +# endif // Visual C/C++ 2008 and below +#endif // HAVE_WIN7_SDK + +#if defined(_UNICODE) || defined(UNICODE) +# if defined _M_IX86 +# pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") +# elif defined _M_IA64 +# pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"") +# elif defined _M_X64 +# pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"") +# else +# pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") +# endif +#endif diff --git a/windirstat/stdafx.h b/windirstat/stdafx.h index 22c6830..8245bf3 100644 --- a/windirstat/stdafx.h +++ b/windirstat/stdafx.h @@ -4,7 +4,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 @@ -30,11 +30,14 @@ # define SUPPORT_ELEVATION 1 #endif // HAVE_WIN7_SDK -#define _WIN32_WINNT _WIN32_WINNT_WINXP - -#ifndef VC_EXTRALEAN -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers -#endif +#ifndef _WIN32_WINNT +# ifdef WINVER +# define _WIN32_WINNT WINVER +# else +# define _WIN32_WINNT _WIN32_WINNT_WINXP +# define WINVER _WIN32_WINNT_WINXP +# endif // WINVER +#endif // !_WIN32_WINNT #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/windirstat/windirstat-utf8.rc b/windirstat/windirstat-utf8.rc index 4ce4bf7..66de6d0 100644 --- a/windirstat/windirstat-utf8.rc +++ b/windirstat/windirstat-utf8.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/windirstat.cpp b/windirstat/windirstat.cpp index e05efbf..30f3e04 100644 --- a/windirstat/windirstat.cpp +++ b/windirstat/windirstat.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) // Copyright (C) 2010 Chris Wimmer // // This program is free software; you can redistribute it and/or modify @@ -30,7 +30,10 @@ #include "graphview.h" #include "osspecific.h" #include "WorkLimiter.h" +#pragma warning(push) +#pragma warning(disable : 4091) #include // for mini dumps +#pragma warning(pop) #ifdef _DEBUG # include @@ -51,12 +54,12 @@ CDirstatApp *GetWDSApp() CString GetAuthorEmail() { - return _T("team") _T("\x40") _T("windirstat.info"); // FIXME into common string file + return _T("team") _T("\x40") _T("windirstat.net"); // FIXME into common string file } CString GetWinDirStatHomepage() { - return _T("windirstat.info"); // FIXME into common string file + return _T("windirstat.net"); // FIXME into common string file } CMyImageList* GetMyImageList() @@ -214,7 +217,7 @@ void CDirstatApp::RestartApplication() if(!success) { CString s; - s.FormatMessage(IDS_CREATEPROCESSsFAILEDs, GetAppFileName(), MdGetWinErrorText(::GetLastError())); + s.FormatMessage(IDS_CREATEPROCESSsFAILEDs, GetAppFileName().GetString(), MdGetWinErrorText(::GetLastError()).GetString()); AfxMessageBox(s); return; } @@ -331,7 +334,7 @@ CString CDirstatApp::FindAuxiliaryFileByLangid(LPCTSTR prefix, LPCTSTR suffix, L number.Format(_T("%04x"), langid); CString exactName; - exactName.Format(_T("%s%s%s"), prefix, number, suffix); + exactName.Format(_T("%s%s%s"), prefix, number.GetString(), suffix); CString exactPath = GetAppFolder() + _T("\\") + exactName; if(::PathFileExists(exactPath) && (!checkResource || IsCorrectResourceDll(exactPath))) @@ -462,7 +465,7 @@ CString CDirstatApp::GetCurrentProcessMemoryInfo() CString n = PadWidthBlanks(FormatBytes(m_workingSet), 11); CString s; - s.FormatMessage(IDS_RAMUSAGEs, n); + s.FormatMessage(IDS_RAMUSAGEs, n.GetString()); return s; } @@ -528,7 +531,7 @@ BOOL CDirstatApp::InitInstance() } else { - VTRACE(_T("LoadLibrary(%s) failed: %u"), resourceDllPath, ::GetLastError()); + VTRACE(_T("LoadLibrary(%s) failed: %u"), resourceDllPath.GetString(), ::GetLastError()); } } // else: We use our built-in English resources. diff --git a/windirstat/windirstat.h b/windirstat/windirstat.h index 5430db0..e3fbb99 100644 --- a/windirstat/windirstat.h +++ b/windirstat/windirstat.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) // Copyright (C) 2010 Chris Wimmer // // This program is free software; you can redistribute it and/or modify diff --git a/windirstat/windirstat.rc b/windirstat/windirstat.rc index 465a530..21198fc 100644 --- a/windirstat/windirstat.rc +++ b/windirstat/windirstat.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" -#include "../common/version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -45,7 +44,6 @@ END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" - "#include ""../common/version.h""\r\n" "\0" END diff --git a/windirstat/windirstat.vs15.vcxproj b/windirstat/windirstat.vs15.vcxproj index 53b8593..8574c43 100644 --- a/windirstat/windirstat.vs15.vcxproj +++ b/windirstat/windirstat.vs15.vcxproj @@ -28,28 +28,28 @@ Application true Unicode - v141_xp + v141 Static Application true Unicode - v141_xp + v141 Static Application false Unicode - v141_xp + v141 Static Application false Unicode - v141_xp + v141 Static @@ -100,7 +100,7 @@ Disabled ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories) - _DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds32D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) false EnableFastChecks true @@ -114,7 +114,7 @@ $(OutDir)wds32D.pdb - _DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds32D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories) @@ -126,14 +126,14 @@ /delayload:psapi.dll /pdbaltpath:%_PDB% %(AdditionalOptions) - if not exist "$(SolutionDir)common\buildnumber.h" "$(SolutionDir)common\buildinc.cmd" "$(SolutionDir)common" + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" Disabled ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories) - _DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds64D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) false EnableFastChecks true @@ -147,7 +147,7 @@ $(OutDir)wds64D.pdb - _DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds64D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories) @@ -159,7 +159,7 @@ /delayload:psapi.dll /pdbaltpath:%_PDB% %(AdditionalOptions) - if not exist "$(SolutionDir)common\buildnumber.h" "$(SolutionDir)common\buildinc.cmd" "$(SolutionDir)common" + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" @@ -167,7 +167,7 @@ /Oi /Ot %(AdditionalOptions) Full ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories) - NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds32;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) false true MultiThreaded @@ -180,7 +180,7 @@ $(OutDir)wds32.pdb - NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds32;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories) @@ -194,7 +194,7 @@ /delayload:psapi.dll /pdbaltpath:%_PDB% /release %(AdditionalOptions) - if not exist "$(SolutionDir)common\buildnumber.h" "$(SolutionDir)common\buildinc.cmd" "$(SolutionDir)common" + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" @@ -202,7 +202,7 @@ /Oi /Ot %(AdditionalOptions) Full ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories) - NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds64;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) false true MultiThreaded @@ -215,7 +215,7 @@ $(OutDir)wds64.pdb - NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions) + MODNAME=wds64;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions) ..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories) @@ -229,15 +229,13 @@ /delayload:psapi.dll /pdbaltpath:%_PDB% /release %(AdditionalOptions) - if not exist "$(SolutionDir)common\buildnumber.h" "$(SolutionDir)common\buildinc.cmd" "$(SolutionDir)common" + if not exist "$(SolutionDir)common\hgid.h" call "$(SolutionDir)\common\hgid.cmd" - - - + @@ -321,6 +319,8 @@ + + @@ -352,6 +352,7 @@ + CompileAsC @@ -366,15 +367,15 @@ - - + + diff --git a/windirstat/windirstat.vs15.vcxproj.filters b/windirstat/windirstat.vs15.vcxproj.filters index ca459a4..df3c648 100644 --- a/windirstat/windirstat.vs15.vcxproj.filters +++ b/windirstat/windirstat.vs15.vcxproj.filters @@ -2,40 +2,40 @@ - {598B3024-43D3-D346-8CC0-DF031DD99C45} + {48D5D65E-28F5-D53D-186F-23FD908A412F} - {8B891203-6A34-DF44-86F2-F4D841DE30E8} + {A3F39BA6-CC65-7544-398B-3F818D687ACE} - {0DDEF8B3-A408-7544-AE32-EDB514AE253C} + {6DC87E6B-4990-1F63-4AC3-166E48564572} - {0458F963-7EB9-D44D-9999-7A0B7B596875} + {240FBEEC-022C-367E-4F3C-332BBB836A2F} - {6CB6BCE5-97EA-DB40-8E71-CFF2CAE4F805} + {58B807A6-D922-7836-CD41-082C57F30F2D} - {278AB985-1947-8246-859D-B7C2A32C1602} + {ED9704D9-CF24-8B4E-26A4-D7DDA6351EDB} - {C7B1A375-EC91-9B4C-91F7-584EA925C513} + {4556325F-FBA9-4E61-8B92-CB3E0ADCEDA8} - {DB7E3165-CAF5-9C4D-A7DC-D1A403006E86} + {463565AC-33C1-91A1-6035-48A265809213} - {372521BF-EF6D-0E4C-B1F6-951B3061996B} + {E1C05760-1E9F-D184-92A0-4B6CF146078C} - {1557F2DD-38BD-6847-9FCE-9BAB9011CA52} + {8B94EBAA-F5FC-2C67-17EA-B0CF28E72DB4} - {22C2FF0E-A896-A941-94AA-68522EC5B8C1} + {FAE48057-9708-D7A8-F523-7E1B9962C744} - {C0801C97-2E0E-514F-A8D3-CF690DD8F4DA} + {38E10655-D178-C918-DFD7-45CB0E3F34CF} @@ -68,13 +68,10 @@ - - Special Files - - + Special Files - + Special Files @@ -88,19 +85,13 @@ - - Header Files\Common - Header Files\Common - - Header Files\Common - Header Files\Common - + Header Files\Common @@ -291,6 +282,9 @@ Source Files + + Source Files + Source Files @@ -344,5 +338,8 @@ Resource Files + + Resource Files + diff --git a/windirstat/windirstat.vs8.vcproj b/windirstat/windirstat.vs8.vcproj index 7a502c3..f1f53f3 100644 --- a/windirstat/windirstat.vs8.vcproj +++ b/windirstat/windirstat.vs8.vcproj @@ -28,7 +28,7 @@ > - - - - @@ -427,7 +419,7 @@ > + + @@ -856,6 +852,10 @@ RelativePath="osspecific.cpp" > + + @@ -865,16 +865,12 @@ Name="Special Files" Filter="" > - -