Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/windirstat/windirstat.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorOliver Schneider <oliver@assarbad.net>2017-11-02 21:46:10 +0300
committerOliver Schneider <oliver@assarbad.net>2017-11-02 21:46:10 +0300
commit8e1d09d5edf6c24697333afc70ad5054665b49d1 (patch)
tree529fa4fdc526838e5edb86dd62d67deb8f8a11a0 /common
parent30dd07c538311096910adee20844b6ddcd541366 (diff)
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
Diffstat (limited to 'common')
-rw-r--r--common/BUILD1
-rw-r--r--common/buildinc.cmd16
-rw-r--r--common/common_rsrcstr.h40
-rw-r--r--common/commonhelpers.cpp4
-rw-r--r--common/commonhelpers.h2
-rw-r--r--common/cotaskmem.h2
-rw-r--r--common/hgid.cmd10
-rw-r--r--common/mdexceptions.h4
-rw-r--r--common/premake4.exebin536896 -> 541048 bytes
-rw-r--r--common/produce_vsprojects.cmd5
-rw-r--r--common/tracer.cpp4
-rw-r--r--common/tracer.h4
-rw-r--r--common/version.h263
-rw-r--r--common/version.rc114
-rw-r--r--common/wds_constants.cpp8
-rw-r--r--common/wds_constants.h2
16 files changed, 241 insertions, 238 deletions
diff --git a/common/BUILD b/common/BUILD
deleted file mode 100644
index 4ea5de6..0000000
--- a/common/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-548
diff --git a/common/buildinc.cmd b/common/buildinc.cmd
deleted file mode 100644
index 197ee64..0000000
--- a/common/buildinc.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-setlocal
-set WORKPATH=%1
-if {%WORKPATH%}=={} set WORKPATH=.
-set BUILD=%WORKPATH%\BUILD
-set outfile=%WORKPATH%\buildnumber.h
-for /f "" %%i in ('type "%BUILD%"') do (
- set BUILDNR=%%i
- )
-set /a BUILDNR=%BUILDNR%+1
-echo New build number is %BUILDNR% ...
-echo // Automatically created file! > %outfile%
-echo #define LINKCOUNT %BUILDNR% >> %outfile%
-echo. >> %outfile%
-echo %BUILDNR% > %BUILD%
-endlocal
diff --git a/common/common_rsrcstr.h b/common/common_rsrcstr.h
deleted file mode 100644
index b5f1053..0000000
--- a/common/common_rsrcstr.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// common_rsrcstr.h
-//
-// 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
-//
-
-#ifndef __COMMON_RSRCSTR_H_VER__
-#define __COMMON_RSRCSTR_H_VER__ 2014021723
-#if (defined(_MSC_VER) && (_MSC_VER >= 1020)) || defined(__MCPP)
-#pragma once
-#endif // Check for "#pragma once" support
-
-#define IDSS_TRANSLATORS L"<list too long>"
-
-// Version of resource DLL
-#define IDSS_RESOURCEDLL "Resource Version 5"
-// Version information in feedback always appears in English
-#define IDSS_FROMsPLATFORMs "From: %1!s!. Platform: %2!s!.\r\n\r\n"
-#define IDSS_SEV_CRITICAL "Critical Bug"
-#define IDSS_SEV_GRAVE "Serious Bug"
-#define IDSS_SEV_NORMAL "Bug"
-#define IDSS_SEV_WISH "Wish"
-#define IDSS_SEV_FEEDBACK "Feedback"
-
-#endif // __COMMON_RSRCSTR_H_VER__
diff --git a/common/commonhelpers.cpp b/common/commonhelpers.cpp
index 69362e5..6d5750a 100644
--- a/common/commonhelpers.cpp
+++ b/common/commonhelpers.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
@@ -83,7 +83,7 @@ BOOL ShellExecuteThrow(HWND hwnd, LPCTSTR lpVerb, LPCTSTR lpFile, LPCTSTR lpPara
bResult = ShellExecuteNoThrow(hwnd, lpVerb, lpFile, lpParameters, lpDirectory, nShowCmd);
if(!bResult)
{
- MdThrowStringExceptionF(_T("ShellExecute failed: %1!s!"), MdGetWinErrorText(::GetLastError()));
+ MdThrowStringExceptionF(_T("ShellExecute failed: %1!s!"), MdGetWinErrorText(::GetLastError()).GetString());
}
return bResult;
}
diff --git a/common/commonhelpers.h b/common/commonhelpers.h
index 0743824..43ffa6c 100644
--- a/common/commonhelpers.h
+++ b/common/commonhelpers.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/common/cotaskmem.h b/common/cotaskmem.h
index 9de1af6..be750de 100644
--- a/common/cotaskmem.h
+++ b/common/cotaskmem.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/common/hgid.cmd b/common/hgid.cmd
new file mode 100644
index 0000000..71126ed
--- /dev/null
+++ b/common/hgid.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal ENABLEEXTENSIONS & pushd .
+set HGTIPFILE="%~dp0hgid.h"
+echo.> %HGTIPFILE%
+for /f %%i in ('hg id -i') do @echo #define HG_REV_ID "%%i">> %HGTIPFILE%
+for /f %%i in ('hg id -n') do @echo #define HG_REV_NO %%i>> %HGTIPFILE%
+for /f %%i in ('hg id -n') do @echo #define HG_REV_NO_NUMERIC %%i -0>> %HGTIPFILE%
+for /f %%i in ('hg log -l 1 -r . -T {node}') do @echo #define HG_FULLID "%%i">> %HGTIPFILE%
+if exist %HGTIPFILE% type %HGTIPFILE%
+popd & endlocal & goto :EOF
diff --git a/common/mdexceptions.h b/common/mdexceptions.h
index 36e4045..38d3126 100644
--- a/common/mdexceptions.h
+++ b/common/mdexceptions.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
@@ -89,7 +89,7 @@ inline CString MdGetWinErrorText(HRESULT hr)
if(NULL == dw)
{
CString s(MAKEINTRESOURCE(AFX_IDP_NO_ERROR_AVAILABLE));
- sRet.Format(_T("%s (0x%08lx)"), s, hr);
+ sRet.Format(_T("%s (0x%08lx)"), s.GetString(), hr);
}
else
{
diff --git a/common/premake4.exe b/common/premake4.exe
index 6e49607..611084b 100644
--- a/common/premake4.exe
+++ b/common/premake4.exe
Binary files differ
diff --git a/common/produce_vsprojects.cmd b/common/produce_vsprojects.cmd
index 6287dbd..574a480 100644
--- a/common/produce_vsprojects.cmd
+++ b/common/produce_vsprojects.cmd
@@ -13,16 +13,17 @@ set REPOROOT=%~dp0..
set COMMON=%~dp0
:: Change into the repository root
setlocal & pushd "%REPOROOT%"
+set OPTIONS=--resources
if "%~1" == "--full" (set OPTIONS=--resources --sdk71)
if "%~1" == "--sdk71" (set OPTIONS=--sdk71)
if "%~1" == "--resources" (set OPTIONS=--resources)
if "%~1" == "--dev" (set OPTIONS=--dev --sdk71)
-set DEFAULT_VSVERSIONS=2005 2008 2010 2012 2013 2015 2017
+set DEFAULT_VSVERSIONS=2005 2017
set VSVERSIONS=%*
if "%VSVERSIONS%" == "" set VSVERSIONS=%DEFAULT_VSVERSIONS%
for %%i in (%VSVERSIONS%) do @(
for %%j in (%DEFAULT_VSVERSIONS%) do @(
- if "%%i" == "%%j" "%COMMON%premake4.exe" --xp %OPTIONS% vs%%i
+ if "%%i" == "%%j" "%COMMON%premake4.exe" %OPTIONS% vs%%i
)
)
:: Back to normal
diff --git a/common/tracer.cpp b/common/tracer.cpp
index 3a2979f..35bcd1b 100644
--- a/common/tracer.cpp
+++ b/common/tracer.cpp
@@ -3,7 +3,7 @@
// NOTE: this file is under MIT license as opposed to the project as a whole.
//
// WinDirStat - Directory Statistics
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
-// Author(s): - oliver -> http://windirstat.info/contact/oliver/
+// Author(s): - oliver -> http://windirstat.net/contact/oliver/
//
#ifndef __TRACER_CPP_VER__
diff --git a/common/tracer.h b/common/tracer.h
index b105382..d85bfa7 100644
--- a/common/tracer.h
+++ b/common/tracer.h
@@ -3,7 +3,7 @@
// NOTE: this file is under MIT license as opposed to the project as a whole.
//
// WinDirStat - Directory Statistics
-// Copyright (C) 2004-2016 WinDirStat team (windirstat.info)
+// Copyright (C) 2004-2017 WinDirStat Team (windirstat.net)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
-// Author(s): - oliver -> http://windirstat.info/contact/oliver/
+// Author(s): - oliver -> http://windirstat.net/contact/oliver/
//
#ifndef __TRACER_H_VER__
diff --git a/common/version.h b/common/version.h
index d3754a1..edb2847 100644
--- a/common/version.h
+++ b/common/version.h
@@ -1,164 +1,99 @@
-// version.h - Version number. Used by all resource scripts and by aboutdlg.cpp.
-//
-// 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
-//
-
-/*-------------------------------------------------------------------
- This file defines the following:
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- - VN_FILEFLAG_EXE (contains information about RC or debug build)
- - VN_STRING_EXE (contains info about unicode and debug)
- - VN_STRING_DLL (just major.minor.rev.build)
- - VN_FILEVERSION_EXE and VN_PRODVERSION_EXE (only different from
- the DLL version if a development release)
- - VN_FILEVERSION_DLL and VN_PRODVERSION_DLL (numeric representation
- of VN_STRING_DLL)
- - VN_FILEOS_EXE (this depends on Unicode and ANSI!
- For Unicode: VN_FILEOS_EXE == VOS_NT_WINDOWS32
- For ANSI : VN_FILEOS_EXE == VOS__WINDOWS32 )
- - VN_COPYRIGHTSTRING (copyright to include in the VERSIONINFO)
- - VN_RESOURCEDLL (version of resource DLLs must be the same for DLL
- and EXE at runtime)
- -------------------------------------------------------------------*/
-
-//-------------------------------------------------------------------
-// Build categories. Uncomment _one_ line.
-//
-#ifndef __WDS_VERSION_H__
-#define __WDS_VERSION_H__
-
-#define BC_DEVEL // Development version. The usual setting. File version is 0.0.0.buildno.
-//#define BC_RELEASECANDIDATE // Release candidate. Version number is relevant but not yet official. About-box shows x.y.zrcn. File version is x.y.z.buildno.
-//#define BC_RELEASE // Set this only during official builds. About-box shows x.y.z. File version is x.y.z.buildno
-
-// A release version must not contain debug information. Raise an error!
-#if defined(_DEBUG) && defined(BC_RELEASE)
- #error BC_RELEASE _and_ _DEBUG are defined. This must not happen. Releases contain no debug information.
-#endif
-
-// This will not change to often, but the years need to be modified
-// regularly, so it can be in one central place
-#define VN_COPYRIGHTSTRING "Copyright (C) 2003-2005 Bernhard Seifert, (C) 2004-2014 WinDirStat team"
-
-//-------------------------------------------------------------------
-// Version number. Relevant for BC_RELEASECANDIDATE and BC_RELEASE.
-//
-#define VERNUM_MAJOR 1
-#define VERNUM_MINOR 3
-#define VERNUM_REVISION 0
-// The following line is automatically incremented by linkcounter.exe.
-// Format: #define blank LINKCOUNT blanks decimal
-// Reset this to zero only when you increment VERNUM_MAJOR/MINOR/REVISION.
-
-#include <common/buildnumber.h>
-
-//-------------------------------------------------------------------
-// Release candidate number. Relevant for BC_RELEASECANDIDATE.
-//
-#define VERNUM_CANDIDATE 1
-
-
-
-/////////////////////////////////////////////////////////////////////
-// Derived values from here. Do not edit.
-
-#define VN_BUILD LINKCOUNT
-
-#define PPSX(s) #s
-#define PPS(s) PPSX(s)
-
-#ifdef _UNICODE
- #define UASPEC "Unicode"
- // OS version is only relevant for the EXE
- #define VN_FILEOS_EXE VOS_NT_WINDOWS32
-#else
- #define UASPEC "Ansi"
- // OS version is only relevant for the EXE
- #define VN_FILEOS_EXE VOS__WINDOWS32
-#endif
-
-#ifdef _DEBUG
- #define DRSPEC " Debug"
-#else
- #define DRSPEC ""
-#endif
-
-#define VERVARIANT " (" UASPEC DRSPEC ")"
-
-// This is just major.minor.rev.build always!
-#define VN_STRING_DLL PPS(VERNUM_MAJOR) "." PPS(VERNUM_MINOR) "." PPS(VERNUM_REVISION) "." PPS(VN_BUILD)
-
-#if defined(BC_DEVEL)
-
- #define VN_MAJOR 0
- #define VN_MINOR 0
- #define VN_REVISION 0
- #define VN_FILEFLAG 0
- #define VN_STRING_DLL PPS(VERNUM_MAJOR) "." PPS(VERNUM_MINOR) "." PPS(VERNUM_REVISION) "." PPS(VN_BUILD)
- // The variant (debug or not/ Unicode or not) is not relevant for resource DLLs, but for EXEs
- #define VN_STRING_EXE VN_STRING_DLL " devel" VERVARIANT
-
-#elif defined(BC_RELEASECANDIDATE)
-
- #define VN_MAJOR VERNUM_MAJOR
- #define VN_MINOR VERNUM_MINOR
- #define VN_REVISION VERNUM_REVISION
- #define VN_FILEFLAG VS_FF_PRERELEASE
- // The variant (debug or not/ Unicode or not) is not relevant for resource DLLs, but for EXEs
- #define VN_STRING_EXE VN_STRING_DLL "rc" PPS(VERNUM_CANDIDATE) VERVARIANT
-
-#elif defined(BC_RELEASE)
-
- #define VN_MAJOR VERNUM_MAJOR
- #define VN_MINOR VERNUM_MINOR
- #define VN_REVISION VERNUM_REVISION
- #define VN_FILEFLAG 0
- // The variant (debug or not/ Unicode or not) is not relevant for resource DLLs, but for EXEs
- #define VN_STRING_EXE VN_STRING_DLL VERVARIANT
-
-#endif
-
-// EXE files have a different version number in development releases
-#define VN_FILEVERSION_EXE VN_MAJOR,VN_MINOR,VN_REVISION,VN_BUILD
-#define VN_PRODVERSION_EXE VN_FILEVERSION_EXE
-// Resource DLLs need no different version number
-#define VN_FILEVERSION_DLL VERNUM_MAJOR,VERNUM_MINOR,VERNUM_REVISION,VN_BUILD
-#define VN_PRODVERSION_DLL VN_FILEVERSION_DLL
-
-// Whether debug or not is not relevant for resource DLLs
-#ifdef _DEBUG
- #define VN_FILEFLAG_EXE VS_FF_DEBUG | VN_FILEFLAG
-#else
- #define VN_FILEFLAG_EXE VN_FILEFLAG
-#endif
-
-#ifdef BC_DEVEL
-#define IDSS_CHECKUPDATESRV "localhost"
-#else
-#define IDSS_CHECKUPDATESRV "windirstat.info"
-#endif
-#define IDSS_CHECKUPDATEURI "checkupdate.php"
-#define IDXS_CHECKUPDATEPORT 80
-
-// ...nothing else.
-#undef BC_DEVEL
-#undef BC_RELEASECANDIDATE
-#undef BC_RELEASE
-
-#endif // __WDS_VERSION_H__
+// 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
+//
+
+#ifndef __VERSION_H_VER__
+#define __VERSION_H_VER__ 2017110223
+#if (defined(_MSC_VER) && (_MSC_VER >= 1020)) || defined(__MCPP)
+#pragma once
+#endif /* Check for "#pragma once" support */
+
+#include "hgid.h"
+
+#if defined(WDS_RESLANG) && (WDS_RESLANG > 0)
+# if (WDS_RESLANG == 0x0405)
+# define TEXT_RESLANG Czech
+# elif (WDS_RESLANG == 0x0407)
+# define TEXT_RESLANG German
+# elif (WDS_RESLANG == 0x0409)
+# define TEXT_RESLANG English (US)
+# elif (WDS_RESLANG == 0x040a)
+# define TEXT_RESLANG Spanish
+# elif (WDS_RESLANG == 0x040b)
+# define TEXT_RESLANG Finnish
+# elif (WDS_RESLANG == 0x040c)
+# define TEXT_RESLANG French
+# elif (WDS_RESLANG == 0x040e)
+# define TEXT_RESLANG Hungarian
+# elif (WDS_RESLANG == 0x0410)
+# define TEXT_RESLANG Italian
+# elif (WDS_RESLANG == 0x0413)
+# define TEXT_RESLANG Dutch
+# elif (WDS_RESLANG == 0x0415)
+# define TEXT_RESLANG Polish
+# elif (WDS_RESLANG == 0x0416)
+# define TEXT_RESLANG Portuguese (Brazil)
+# elif (WDS_RESLANG == 0x0419)
+# define TEXT_RESLANG Russian
+# elif (WDS_RESLANG == 0x0425)
+# define TEXT_RESLANG Estonian
+# else
+# error The language you defined does not have a name yet. Adjust the file with this error to include a name.
+# endif
+#endif
+
+#define PRD_MAJVER 1 // major product version
+#define PRD_MINVER 3 // minor product version
+#define PRD_PATCH 0 // patch number
+#define PRD_BUILD HG_REV_NO // build number for product
+#define PRD_BUILD_NUMERIC HG_REV_NO_NUMERIC // build number for product
+#if defined(WDS_RESLANG) && (WDS_RESLANG > 0)
+# define FILE_MAJVER 1 // resource language version, changing this denotes incompatibilities
+# define FILE_MINVER 0
+# define FILE_PATCH 0
+#else
+# define FILE_MAJVER PRD_MAJVER // major file version
+# define FILE_MINVER PRD_MINVER // minor file version
+# define FILE_PATCH PRD_PATCH // patch number
+#endif
+#define FILE_BUILD PRD_BUILD // build number
+#define FILE_BUILD_NUMERIC PRD_BUILD_NUMERIC // build number for product
+#define TEXT_WEBSITE https:/##/windirstat.net // website
+#define TEXT_PRODUCTNAME WinDirStat // product's name
+#if defined(WDS_RESLANG) && (WDS_RESLANG > 0)
+#define TEXT_FILEDESC TEXT_RESLANG language file
+#else
+#define TEXT_FILEDESC Windows Directory Statistics visualizes disk space usage // component description
+#endif
+#if defined(MODNAME)
+# define TEXT_MODULE MODNAME
+# if (WDS_RESLANG)
+# define TEXT_INTERNALNAME MODNAME.wdslng
+# else
+# define TEXT_INTERNALNAME MODNAME.exe
+# endif
+#else
+# error You must define MODNAME in the project!
+#endif
+
+#define TEXT_COMPANY WinDirStat Team (windirstat.net) // company
+#define TEXT_COPYRIGHT \xA9 2003-2005 Bernhard Seifert, \xA9 2004-2017 WinDirStat Team // copyright information
+#define HG_REPOSITORY "https://bitbucket.org/windirstat/windirstat"
+#define STRING_REPORT_DEFECT_URL HG_REPOSITORY "/issues?status=new&status=open"
+
+#endif /* __VERSION_H_VER__ */
diff --git a/common/version.rc b/common/version.rc
new file mode 100644
index 0000000..ba6cd71
--- /dev/null
+++ b/common/version.rc
@@ -0,0 +1,114 @@
+///////////////////////////////////////////////////////////////////////////////
+///
+/// Copyright (c) 2016, 2017 Oliver Schneider (assarbad.net)
+///
+/// Permission is hereby granted, free of charge, to any person obtaining a
+/// copy of this software and associated documentation files (the "Software"),
+/// to deal in the Software without restriction, including without limitation
+/// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+/// and/or sell copies of the Software, and to permit persons to whom the
+/// Software is furnished to do so, subject to the following conditions:
+///
+/// The above copyright notice and this permission notice shall be included in
+/// all copies or substantial portions of the Software.
+///
+/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+/// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+/// DEALINGS IN THE SOFTWARE.
+///
+///////////////////////////////////////////////////////////////////////////////
+#include <winnt.rh>
+#include <verrsrc.h>
+
+#ifdef RC_INVOKED
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#include "version.h"
+
+#define _ANSISTRING(text) #text
+#define ANSISTRING(text) _ANSISTRING(text)
+
+#define _WIDESTRING(text) L##text
+#define WIDESTRING(text) _WIDESTRING(text)
+
+#define PRESET_UNICODE_STRING(symbol, buffer) \
+ UNICODE_STRING symbol = \
+ { \
+ sizeof(WIDESTRING(buffer)) - sizeof(WCHAR), \
+ sizeof(WIDESTRING(buffer)), \
+ WIDESTRING(buffer) \
+ };
+
+#define CREATE_XVER(maj,min,patch,build) maj ## , ## min ## , ## patch ## , ## build
+#define CREATE_FVER(maj,min,patch,build) maj ## . ## min ## . ## patch ## . ## build
+#define CREATE_PVER(maj,min,patch,build) maj ## . ## min ## . ## patch
+
+#if (defined(DBG) && (DBG)) || defined(_DEBUG)
+#define ACTUAL_FILEFLAGS VS_FF_DEBUG
+#else
+#define ACTUAL_FILEFLAGS 0
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION CREATE_XVER(FILE_MAJVER, FILE_MINVER, FILE_PATCH, FILE_BUILD_NUMERIC)
+ PRODUCTVERSION CREATE_XVER(PRD_MAJVER, PRD_MINVER, PRD_PATCH, PRD_BUILD_NUMERIC)
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS ACTUAL_FILEFLAGS
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+#ifdef TEXT_AUTHOR
+ VALUE "Author", ANSISTRING(TEXT_AUTHOR)
+#endif
+#ifdef TEXT_COMMENTS
+ VALUE "Comments", ANSISTRING(TEXT_COMMENTS)
+#endif
+ VALUE "CompanyName", ANSISTRING(TEXT_COMPANY)
+ VALUE "FileDescription", ANSISTRING(TEXT_FILEDESC)
+ VALUE "FileVersion", ANSISTRING(CREATE_FVER(FILE_MAJVER, FILE_MINVER, FILE_PATCH, FILE_BUILD))
+ VALUE "InternalName", ANSISTRING(TEXT_INTERNALNAME)
+ VALUE "LegalCopyright", ANSISTRING(TEXT_COPYRIGHT)
+ VALUE "OriginalFilename", ANSISTRING(TEXT_MODULE)
+ VALUE "ProductName", ANSISTRING(TEXT_PRODUCTNAME)
+ VALUE "ProductVersion", ANSISTRING(CREATE_PVER(PRD_MAJVER, PRD_MINVER, PRD_PATCH, PRD_BUILD))
+#ifdef TEXT_PORTIONSCOPYRIGHT
+ VALUE "Portions Copyright", TEXT_PORTIONSCOPYRIGHT
+#endif
+#ifdef TEXT_SPECIALBUILD
+ VALUE "SpecialBuild", ANSISTRING(TEXT_SPECIALBUILD)
+#endif
+#ifdef TEXT_WEBSITE
+ VALUE "Website", ANSISTRING(TEXT_WEBSITE)
+#endif
+#if defined(HG_REV_ID) && defined(HG_REV_NO)
+ VALUE "Mercurial revision", HG_REV_ID " (" ANSISTRING(HG_REV_NO) ")"
+#endif
+#if defined(HG_FULLID)
+ VALUE "Mercurial revision URL", HG_REPOSITORY "/src/" HG_FULLID
+#endif
+#ifdef HG_REPOSITORY
+ VALUE "Mercurial repository", HG_REPOSITORY
+#endif
+#ifdef STRING_REPORT_DEFECT_URL
+ VALUE "Defect report URL", STRING_REPORT_DEFECT_URL
+#endif
+#if defined(WDS_RESLANG) && (WDS_RESLANG) && defined(TEXT_RESLANG)
+ VALUE "Language", ANSISTRING(TEXT_RESLANG) " (" ANSISTRING(WDS_RESLANG) ")"
+#endif
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
+
+#endif // RC_INVOKED
diff --git a/common/wds_constants.cpp b/common/wds_constants.cpp
index e258fee..007e770 100644
--- a/common/wds_constants.cpp
+++ b/common/wds_constants.cpp
@@ -1,7 +1,7 @@
// wds_constants.cpp
//
// WinDirStat - Directory Statistics
-// 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
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// Author(s): - oliver -> http://windirstat.info/contact/oliver/
+// Author(s): - oliver -> http://windirstat.net/contact/oliver/
//
#include "stdafx.h"
@@ -35,8 +35,8 @@ namespace wds
contact_t authors[] =
{
- { L"Bernhard Seifert", 0, L"https://windirstat.info/contact/bernhard/", L"Creator of the project, original author" },
- { L"Oliver Schneider", 0, L"https://windirstat.info/contact/oliver/", L"Project maintainer" },
+ { L"Bernhard Seifert", 0, L"https://windirstat.net/contact/bernhard/", L"Creator of the project, original author" },
+ { L"Oliver Schneider", 0, L"https://windirstat.net/contact/oliver/", L"Project maintainer" },
{ L"Chris Wimmer", 0, L"http://sourceforge.net/users/dezipaitor", L"Contributor" },
{ 0 },
};
diff --git a/common/wds_constants.h b/common/wds_constants.h
index 1b9a316..966b6df 100644
--- a/common/wds_constants.h
+++ b/common/wds_constants.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