diff options
| author | Oliver Schneider <oliver@assarbad.net> | 2017-11-24 00:18:15 +0300 |
|---|---|---|
| committer | Oliver Schneider <oliver@assarbad.net> | 2017-11-24 00:18:15 +0300 |
| commit | 76ed1ebfcd5ddc6c40bce6e193c4d8d49a35a61c (patch) | |
| tree | 8ee7da777703095a7cc8b97acbb46d599b5be7ae | |
| parent | ea449d28c1582161a3007e8c168dd56b7ce867d3 (diff) | |
Rearranged some build flags in premake4.lua
Fixed up produce_vsprojects.cmd to heed the command line arguments
Reverted to original RGB_GET_?VALUE macros to prevent an exception in debug builds
Removing more parts referring to the CHM help file
Removing WEAK_ASSERT
Using --full to produce the checked in solutions
Fixed constant length to account for terminating zero
26 files changed, 449 insertions, 223 deletions
diff --git a/common/produce_vsprojects.cmd b/common/produce_vsprojects.cmd index 574a480..ab00d6d 100644 --- a/common/produce_vsprojects.cmd +++ b/common/produce_vsprojects.cmd @@ -12,15 +12,20 @@ set REPOROOT=%~dp0.. :: Directory in which this script resides ($REPOROOT/common)
set COMMON=%~dp0
:: Change into the repository root
-setlocal & pushd "%REPOROOT%"
+setlocal enableextensions & 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 VSVERSIONS=
+for %%i in (%*) do @(
+ if "%%~i" == "--full" call :SetVar OPTIONS "--resources --sdk71"
+ if "%%~i" == "--sdk" call :SetVar OPTIONS "--sdk71"
+ if "%%~i" == "--res" call :SetVar OPTIONS "--resources"
+ if "%%~i" == "--dev" call :SetVar OPTIONS "--dev --sdk71"
+ call :AppendVSVer VSVERSIONS "%%~i"
+)
set DEFAULT_VSVERSIONS=2005 2017
-set VSVERSIONS=%*
+echo %VSVERSIONS%
if "%VSVERSIONS%" == "" set VSVERSIONS=%DEFAULT_VSVERSIONS%
+echo Generating for %VSVERSIONS%, options: %OPTIONS%
for %%i in (%VSVERSIONS%) do @(
for %%j in (%DEFAULT_VSVERSIONS%) do @(
if "%%i" == "%%j" "%COMMON%premake4.exe" %OPTIONS% vs%%i
@@ -28,3 +33,31 @@ for %%i in (%VSVERSIONS%) do @( )
:: Back to normal
popd & endlocal
+goto :EOF
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::: / SetVar subroutine
+::: Param1 == name of the variable, Param2 == value to be set for the variable
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:SetVar
+:: Get the name of the variable we are working with
+setlocal enableextensions&set VAR_NAME=%1
+endlocal & set %VAR_NAME%=%~2
+goto :EOF
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::: \ SetVar subroutine
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::: / AppendVSVer subroutine
+::: Param1 == value to be appended to the variable
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:AppendVSVer
+:: Get the name of the variable we are working with
+setlocal enableextensions&set ADDVAL= %~1
+if not "%ADDVAL:~1,3%" == "vs" set ADDVAL=
+endlocal & set VSVERSIONS=%VSVERSIONS%%ADDVAL%
+goto :EOF
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::: \ AppendVSVer subroutine
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/common/wds_constants.h b/common/wds_constants.h index 96e0066..6a3e7f6 100644 --- a/common/wds_constants.h +++ b/common/wds_constants.h @@ -20,7 +20,7 @@ // #ifndef __WDS_CONSTANTS_H_VER__ -#define __WDS_CONSTANTS_H_VER__ 2017112218 +#define __WDS_CONSTANTS_H_VER__ 2017112319 #if (defined(_MSC_VER) && (_MSC_VER >= 1020)) || defined(__MCPP) #pragma once #endif // Check for "#pragma once" support @@ -83,7 +83,7 @@ namespace wds /* don't need FILE_ATTRIBUTE_NO_SCRUB_DATA */ const LPCTSTR strAttributeEA = _T("+"); /*FILE_ATTRIBUTE_EA*/ - const int iLangCodeLength = _countof(STR_RESOURCE_PREFIX); + const int iLangCodeLength = _countof(STR_RESOURCE_PREFIX) - 1; const int iNumDriveLetters = (chrCapZ - chrCapA) + 1; } diff --git a/premake4.lua b/premake4.lua index 3010bd8..9bb3220 100644 --- a/premake4.lua +++ b/premake4.lua @@ -368,8 +368,8 @@ solution (iif(release, slnname, "windirstat")) kind ("WindowedApp")
location ("windirstat")
targetname ("wds")
- flags {"StaticRuntime", "Unicode", "MFC", "NativeWChar", "ExtraWarnings", "NoRTTI", "WinMain", "NoMinimalRebuild", "NoIncrementalLink", "NoEditAndContinue"}
- targetdir (iif(release, slnname, "build"))
+ flags {"StaticRuntime", "Unicode", "MFC", "NativeWChar", "ExtraWarnings", "NoRTTI", "WinMain",}
+ targetdir (iif(release, slnname, iif(action == "vs2005", "build", "build." .. action)))
includedirs {".", "windirstat", "common", "windirstat/Controls", "windirstat/Dialogs", "3rdparty/lua/src"}
objdir (int_dir)
links {"psapi", "delayimp", pfx.."luajit2"}
@@ -444,11 +444,11 @@ solution (iif(release, slnname, "windirstat")) configuration {"Debug"}
defines {"_DEBUG", "VTRACE_TO_CONSOLE=1", "VTRACE_DETAIL=2"}
flags {"Symbols"}
- linkoptions {"/nodefaultlib:libcmt"}
+ linkoptions {"/nodefaultlib:libcmt",}
configuration {"Release"}
defines ("NDEBUG")
- flags {"Optimize", "Symbols"}
+ flags {"Optimize", "Symbols", "NoMinimalRebuild", "NoIncrementalLink", "NoEditAndContinue"}
linkoptions {"/release"}
buildoptions {"/Oi", "/Ot"}
@@ -475,7 +475,7 @@ solution (iif(release, slnname, "windirstat")) location ("sandbox/luaconf")
targetname ("luaconf")
flags {"StaticRuntime", "Unicode", "MFC", "NativeWChar", "ExtraWarnings", "NoRTTI", "WinMain", "NoMinimalRebuild", "NoIncrementalLink", "NoEditAndContinue"}
- targetdir (iif(release, slnname, "build"))
+ targetdir (iif(release, slnname, iif(action == "vs2005", "build", "build." .. action)))
includedirs {"windirstat", "common", "3rdparty/lua/src", "sandbox/luaconf"}
objdir (int_dir)
libdirs {"$(IntDir)"}
@@ -562,7 +562,7 @@ solution (iif(release, slnname, "windirstat")) location (nmdir)
flags {"NoImportLib", "Unicode", "NoManifest", "NoExceptions", "NoPCH", "NoIncrementalLink"}
objdir (int_dir)
- targetdir (iif(release, slnname, "build"))
+ targetdir (iif(release, slnname, iif(action == "vs2005", "build", "build." .. action)))
targetname ("wdsr" .. nmpfx)
targetextension (".wdslng")
resdefines {"WDS_RESLANG=0x" .. nmpfx, "MODNAME=wdsr" .. nmpfx}
diff --git a/sandbox/luaconf/luaconf.vs15.vcxproj b/sandbox/luaconf/luaconf.vs15.vcxproj new file mode 100644 index 0000000..0d7d22a --- /dev/null +++ b/sandbox/luaconf/luaconf.vs15.vcxproj @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{66A24518-ACE0-4C57-96B0-FF9F324E0985}</ProjectGuid>
+ <RootNamespace>luaconf</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
+ <UseOfMfc>Static</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
+ <UseOfMfc>Static</UseOfMfc>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>..\..\build.vs2017\</OutDir>
+ <IntDir>..\..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>
+ <TargetName>luaconf32</TargetName>
+ <TargetExt>.exe</TargetExt>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>..\..\build.vs2017\</OutDir>
+ <IntDir>..\..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>
+ <TargetName>luaconf64</TargetName>
+ <TargetExt>.exe</TargetExt>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalOptions>/Oi /Ot %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Full</Optimization>
+ <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader></PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <ProgramDataBaseFileName>$(OutDir)luaconf32.pdb</ProgramDataBaseFileName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>DebugFull</GenerateDebugInformation> + <FullProgramDatabaseFile>true</FullProgramDatabaseFile>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <OutputFile>$(OutDir)luaconf32.exe</OutputFile>
+ <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalOptions>/pdbaltpath:%_PDB% /release %(AdditionalOptions)</AdditionalOptions>
+ </Link>
+ <PreBuildEvent>
+ <Command>copy "$(ProjectDir)lua_conf.lua" "$(TargetDir)\"</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalOptions>/Oi /Ot %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Full</Optimization>
+ <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader></PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <ProgramDataBaseFileName>$(OutDir)luaconf64.pdb</ProgramDataBaseFileName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>DebugFull</GenerateDebugInformation> + <FullProgramDatabaseFile>true</FullProgramDatabaseFile>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <OutputFile>$(OutDir)luaconf64.exe</OutputFile>
+ <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <TargetMachine>MachineX64</TargetMachine>
+ <AdditionalOptions>/pdbaltpath:%_PDB% /release %(AdditionalOptions)</AdditionalOptions>
+ </Link>
+ <PreBuildEvent>
+ <Command>copy "$(ProjectDir)lua_conf.lua" "$(TargetDir)\"</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="lua_conf.h" />
+ <ClInclude Include="Resource.h" />
+ <ClInclude Include="stdafx.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\windirstat\WDS_Lua_C.c">
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ClCompile Include="lua_conf.cpp">
+ </ClCompile>
+ <ClCompile Include="stdafx.cpp">
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="lua_conf.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\3rdparty\lua\src\luajit2.vs15.vcxproj">
+ <Project>{9F35C2BB-DF1E-400A-A829-AE34E1C91A70}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/sandbox/luaconf/luaconf.vs15.vcxproj.filters b/sandbox/luaconf/luaconf.vs15.vcxproj.filters new file mode 100644 index 0000000..8563d0a --- /dev/null +++ b/sandbox/luaconf/luaconf.vs15.vcxproj.filters @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{406BDAE1-5AC4-B4BF-4DD4-0ECD5C4E27E7}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{7429986C-3649-FF21-6404-3AA834EA5FF5}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{C28FFC99-BC2F-F4B8-2FAD-5D46C8E7AADC}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="lua_conf.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="stdafx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\windirstat\WDS_Lua_C.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="lua_conf.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="lua_conf.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
diff --git a/sandbox/luaconf/luaconf.vs8.vcproj b/sandbox/luaconf/luaconf.vs8.vcproj index 0e62022..7786d7e 100644 --- a/sandbox/luaconf/luaconf.vs8.vcproj +++ b/sandbox/luaconf/luaconf.vs8.vcproj @@ -47,7 +47,7 @@ AdditionalOptions="/Oi /Ot"
Optimization="3"
AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."
- PreprocessorDefinitions="NDEBUG;WINVER=0x0500"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -65,7 +65,7 @@ <Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/nologo /l409"
- PreprocessorDefinitions="NDEBUG;WINVER=0x0500"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501"
AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir)"
/>
<Tool
@@ -77,7 +77,7 @@ AdditionalDependencies="..\..\..\..\build\luajit2_$(PlatformName).lib"
OutputFile="$(OutDir)\luaconf32.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="$(IntDir)"
+ AdditionalLibraryDirectories="$(IntDir);$(IntDir)"
GenerateDebugInformation="true"
ProgramDataBaseFileName="$(OutDir)\luaconf32.pdb"
SubSystem="1"
@@ -140,7 +140,7 @@ AdditionalOptions="/Oi /Ot"
Optimization="3"
AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."
- PreprocessorDefinitions="NDEBUG;WINVER=0x0500"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -158,7 +158,7 @@ <Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/nologo /l409"
- PreprocessorDefinitions="NDEBUG;WINVER=0x0500"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501"
AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir)"
/>
<Tool
@@ -170,7 +170,7 @@ AdditionalDependencies="..\..\..\..\build\luajit2_$(PlatformName).lib"
OutputFile="$(OutDir)\luaconf64.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="$(IntDir)"
+ AdditionalLibraryDirectories="$(IntDir);$(IntDir)"
GenerateDebugInformation="true"
ProgramDataBaseFileName="$(OutDir)\luaconf64.pdb"
SubSystem="1"
diff --git a/windirstat/Controls/treemap.cpp b/windirstat/Controls/treemap.cpp index cf40972..f91dd00 100644 --- a/windirstat/Controls/treemap.cpp +++ b/windirstat/Controls/treemap.cpp @@ -42,13 +42,14 @@ static const double PALETTE_BRIGHTNESS = 0.6; double CColorSpace::GetColorBrightness(COLORREF color) { - return (RGB_GET_RVALUE(color) + RGB_GET_GVALUE(color) + RGB_GET_BVALUE(color)) / 255.0 / 3.0; + COLORREF const crIndividualIntensitySum = RGB_GET_RVALUE(color) + RGB_GET_GVALUE(color) + RGB_GET_BVALUE(color); + return crIndividualIntensitySum / 255.0 / 3.0; } COLORREF CColorSpace::MakeBrightColor(COLORREF color, double brightness) { - WEAK_ASSERT(brightness >= 0.0); - WEAK_ASSERT(brightness <= 1.0); + ASSERT(brightness >= 0.0); + ASSERT(brightness <= 1.0); double dred = (RGB_GET_RVALUE(color) & 0xFF) / 255.0; double dgreen = (RGB_GET_GVALUE(color) & 0xFF) / 255.0; @@ -80,7 +81,7 @@ bool CColorSpace::Is256Colors() void CColorSpace::NormalizeColor(int& red, int& green, int& blue) { - WEAK_ASSERT(red + green + blue <= 3 * 255); + ASSERT(red + green + blue <= 3 * 255); if(red > 255) { @@ -108,14 +109,14 @@ void CColorSpace::DistributeFirst(int& first, int& second, int& third) const int j = second - 255; second = 255; third += j; - WEAK_ASSERT(third <= 255); + ASSERT(third <= 255); } else if(third > 255) { const int j = third - 255; third = 255; second += j; - WEAK_ASSERT(second <= 255); + ASSERT(second <= 255); } } @@ -222,7 +223,7 @@ CTreemap::CTreemap(Callback *callback) void CTreemap::SetOptions(const Options *options) { - WEAK_ASSERT(options != NULL); + ASSERT(options != NULL); m_options = *options; // Derive normalized vector here for performance @@ -256,7 +257,7 @@ void CTreemap::RecurseCheckTree(Item *item) { if(item->TmiIsLeaf()) { - WEAK_ASSERT(item->TmiGetChildrenCount() == 0); + ASSERT(item->TmiGetChildrenCount() == 0); } else { @@ -268,7 +269,7 @@ void CTreemap::RecurseCheckTree(Item *item) sum += child->TmiGetSize(); RecurseCheckTree(child); } - WEAK_ASSERT(sum == item->TmiGetSize()); + ASSERT(sum == item->TmiGetSize()); } } #endif @@ -358,7 +359,7 @@ void CTreemap::DrawTreemap(CDC *pdc, CRect rc, Item *root, const Options *option { for(int y = rc.top; y < rc.bottom - m_options.grid; y++) { - WEAK_ASSERT(FindItemByPoint(root, CPoint(x, y)) != NULL); + ASSERT(FindItemByPoint(root, CPoint(x, y)) != NULL); } } #endif @@ -399,7 +400,7 @@ void CTreemap::DrawTreemapDoubleBuffered(CDC *pdc, const CRect& rc, Item *root, CTreemap::Item *CTreemap::FindItemByPoint(Item *item, CPoint point) { - WEAK_ASSERT(item != NULL); + ASSERT(item != NULL); const CRect& rc = item->TmiGetRectangle(); if(!rc.PtInRect(point)) @@ -416,7 +417,7 @@ CTreemap::Item *CTreemap::FindItemByPoint(Item *item, CPoint point) return NULL; } - WEAK_ASSERT(rc.PtInRect(point)); + ASSERT(rc.PtInRect(point)); Item *ret = NULL; @@ -432,28 +433,28 @@ CTreemap::Item *CTreemap::FindItemByPoint(Item *item, CPoint point) } else { - WEAK_ASSERT(item->TmiGetSize() > 0); - WEAK_ASSERT(item->TmiGetChildrenCount() > 0); + ASSERT(item->TmiGetSize() > 0); + ASSERT(item->TmiGetChildrenCount() > 0); for(int i = 0; i < item->TmiGetChildrenCount(); i++) { Item *child = item->TmiGetChild(i); - WEAK_ASSERT(child->TmiGetSize() > 0); + ASSERT(child->TmiGetSize() > 0); #ifdef _DEBUG CRect rcChild(child->TmiGetRectangle()); - WEAK_ASSERT(rcChild.right >= rcChild.left); - WEAK_ASSERT(rcChild.bottom >= rcChild.top); - WEAK_ASSERT(rcChild.left >= rc.left); - WEAK_ASSERT(rcChild.right <= rc.right); - WEAK_ASSERT(rcChild.top >= rc.top); - WEAK_ASSERT(rcChild.bottom <= rc.bottom); + ASSERT(rcChild.right >= rcChild.left); + ASSERT(rcChild.bottom >= rcChild.top); + ASSERT(rcChild.left >= rc.left); + ASSERT(rcChild.right <= rc.right); + ASSERT(rcChild.top >= rc.top); + ASSERT(rcChild.bottom <= rc.bottom); #endif if(child->TmiGetRectangle().PtInRect(point)) { ret = FindItemByPoint(child, point); - WEAK_ASSERT(ret != NULL); + ASSERT(ret != NULL); #ifdef STRONGDEBUG #ifdef _DEBUG for(i++; i < item->TmiGetChildrenCount(); i++) @@ -468,18 +469,18 @@ CTreemap::Item *CTreemap::FindItemByPoint(Item *item, CPoint point) rcChild = child->TmiGetRectangle(); if(rcChild.left == -1) { - WEAK_ASSERT(rcChild.top == -1); - WEAK_ASSERT(rcChild.right == -1); - WEAK_ASSERT(rcChild.bottom == -1); + ASSERT(rcChild.top == -1); + ASSERT(rcChild.right == -1); + ASSERT(rcChild.bottom == -1); break; } - WEAK_ASSERT(rcChild.right >= rcChild.left); - WEAK_ASSERT(rcChild.bottom >= rcChild.top); - WEAK_ASSERT(rcChild.left >= rc.left); - WEAK_ASSERT(rcChild.right <= rc.right); - WEAK_ASSERT(rcChild.top >= rc.top); - WEAK_ASSERT(rcChild.bottom <= rc.bottom); + ASSERT(rcChild.right >= rcChild.left); + ASSERT(rcChild.bottom >= rcChild.top); + ASSERT(rcChild.left >= rc.left); + ASSERT(rcChild.right <= rc.right); + ASSERT(rcChild.top >= rc.top); + ASSERT(rcChild.bottom <= rc.bottom); } #endif #endif @@ -489,7 +490,7 @@ CTreemap::Item *CTreemap::FindItemByPoint(Item *item, CPoint point) } } - WEAK_ASSERT(ret != NULL); + ASSERT(ret != NULL); if(ret == NULL) { @@ -562,10 +563,10 @@ void CTreemap::RecurseDrawGraph( DWORD flags ) { - WEAK_ASSERT(rc.Width() >= 0); - WEAK_ASSERT(rc.Height() >= 0); + ASSERT(rc.Width() >= 0); + ASSERT(rc.Height() >= 0); - WEAK_ASSERT(item->TmiGetSize() > 0); + ASSERT(item->TmiGetSize() > 0); if(m_callback != NULL) { @@ -602,8 +603,8 @@ void CTreemap::RecurseDrawGraph( } else { - WEAK_ASSERT(item->TmiGetChildrenCount() > 0); - WEAK_ASSERT(item->TmiGetSize() > 0); + ASSERT(item->TmiGetChildrenCount() > 0); + ASSERT(item->TmiGetSize() > 0); DrawChildren(bitmap, item, surface, h, flags); } @@ -650,7 +651,7 @@ void CTreemap::DrawChildren( // void CTreemap::KDirStat_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD /*flags*/) { - WEAK_ASSERT(parent->TmiGetChildrenCount() > 0); + ASSERT(parent->TmiGetChildrenCount() > 0); const CRect& rc = parent->TmiGetRectangle(); @@ -664,8 +665,8 @@ void CTreemap::KDirStat_DrawChildren(CColorRefArray &bitmap, Item *parent, const const int width = horizontalRows ? rc.Width() : rc.Height(); const int height = horizontalRows ? rc.Height() : rc.Width(); - WEAK_ASSERT(width >= 0); - WEAK_ASSERT(height >= 0); + ASSERT(width >= 0); + ASSERT(height >= 0); int c = 0; double top = horizontalRows ? rc.top : rc.left; @@ -681,7 +682,7 @@ void CTreemap::KDirStat_DrawChildren(CColorRefArray &bitmap, Item *parent, const for(int i = 0; i < childrenPerRow[row]; i++, c++) { Item *child = parent->TmiGetChild(c); - WEAK_ASSERT(childWidth[c] >= 0); + ASSERT(childWidth[c] >= 0); double fRight = left + childWidth[c] * width; int right = (int)fRight; @@ -713,7 +714,7 @@ void CTreemap::KDirStat_DrawChildren(CColorRefArray &bitmap, Item *parent, const { CRect test; test.IntersectRect(parent->TmiGetRectangle(), rcChild); - WEAK_ASSERT(test == rcChild); + ASSERT(test == rcChild); } #endif @@ -734,10 +735,10 @@ void CTreemap::KDirStat_DrawChildren(CColorRefArray &bitmap, Item *parent, const left = fRight; } - // This asserts due to rounding error: WEAK_ASSERT(left == (horizontalRows ? rc.right : rc.bottom)); + // This asserts due to rounding error: ASSERT(left == (horizontalRows ? rc.right : rc.bottom)); top = fBottom; } - // This asserts due to rounding error: WEAK_ASSERT(top == (horizontalRows ? rc.bottom : rc.right)); + // This asserts due to rounding error: ASSERT(top == (horizontalRows ? rc.bottom : rc.right)); } @@ -750,8 +751,8 @@ bool CTreemap::KDirStat_ArrangeChildren( CArray<int, int>& childrenPerRow ) { - WEAK_ASSERT(!parent->TmiIsLeaf()); - WEAK_ASSERT(parent->TmiGetChildrenCount() > 0); + ASSERT(!parent->TmiIsLeaf()); + ASSERT(parent->TmiGetChildrenCount() > 0); if(parent->TmiGetSize() == 0) { @@ -798,13 +799,13 @@ double CTreemap::KDirStat_CalcutateNextRow(Item *parent, const int nextChild, do { int i = 0; static const double _minProportion = 0.4; - WEAK_ASSERT(_minProportion < 1); + ASSERT(_minProportion < 1); - WEAK_ASSERT(nextChild < parent->TmiGetChildrenCount()); - WEAK_ASSERT(width >= 1.0); + ASSERT(nextChild < parent->TmiGetChildrenCount()); + ASSERT(width >= 1.0); const double mySize = (double)parent->TmiGetSize(); - WEAK_ASSERT(mySize > 0); + ASSERT(mySize > 0); ULONGLONG sizeUsed = 0; double rowHeight = 0; @@ -813,14 +814,14 @@ double CTreemap::KDirStat_CalcutateNextRow(Item *parent, const int nextChild, do ULONGLONG childSize = parent->TmiGetChild(i)->TmiGetSize(); if(childSize == 0) { - WEAK_ASSERT(i > nextChild); // first child has size > 0 + ASSERT(i > nextChild); // first child has size > 0 break; } sizeUsed += childSize; double virtualRowHeight = sizeUsed / mySize; - WEAK_ASSERT(virtualRowHeight > 0); - WEAK_ASSERT(virtualRowHeight <= 1); + ASSERT(virtualRowHeight > 0); + ASSERT(virtualRowHeight <= 1); // Rectangle(mySize) = width * 1.0 // Rectangle(childSize) = childWidth * virtualRowHeight @@ -830,7 +831,7 @@ double CTreemap::KDirStat_CalcutateNextRow(Item *parent, const int nextChild, do if(childWidth_ / virtualRowHeight < _minProportion) { - WEAK_ASSERT(i > nextChild); // because width >= 1 and _minProportion < 1. + ASSERT(i > nextChild); // because width >= 1 and _minProportion < 1. // For the first child we have: // childWidth / rowHeight // = childSize / mySize * width / rowHeight / rowHeight @@ -842,7 +843,7 @@ double CTreemap::KDirStat_CalcutateNextRow(Item *parent, const int nextChild, do } rowHeight = virtualRowHeight; } - WEAK_ASSERT(i > nextChild); + ASSERT(i > nextChild); // Now i-1 is the last child used // and rowHeight is the height of the row. @@ -862,7 +863,7 @@ double CTreemap::KDirStat_CalcutateNextRow(Item *parent, const int nextChild, do double rowSize = mySize * rowHeight; double childSize = (double)parent->TmiGetChild(nextChild + i)->TmiGetSize(); double cw = childSize / rowSize; - WEAK_ASSERT(cw >= 0); + ASSERT(cw >= 0); childWidth[nextChild + i]= cw; } @@ -877,12 +878,12 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co // Rest rectangle to fill CRect remaining(parent->TmiGetRectangle()); - WEAK_ASSERT(remaining.Width() > 0); - WEAK_ASSERT(remaining.Height() > 0); + ASSERT(remaining.Width() > 0); + ASSERT(remaining.Height() > 0); // Size of rest rectangle ULONGLONG remainingSize = parent->TmiGetSize(); - WEAK_ASSERT(remainingSize > 0); + ASSERT(remainingSize > 0); // Scale factor const double sizePerSquarePixel = (double)parent->TmiGetSize() / remaining.Width() / remaining.Height(); @@ -893,8 +894,8 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co // At least one child left while(head < parent->TmiGetChildrenCount()) { - WEAK_ASSERT(remaining.Width() > 0); - WEAK_ASSERT(remaining.Height() > 0); + ASSERT(remaining.Width() > 0); + ASSERT(remaining.Height() > 0); // How we divide the remaining rectangle bool horizontal = (remaining.Width() >= remaining.Height()); @@ -904,7 +905,7 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co // Square of height in size scale for ratio formula const double hh = (height * height) * sizePerSquarePixel; - WEAK_ASSERT(hh > 0); + ASSERT(hh > 0); // Row will be made up of child(rowBegin)...child(rowEnd - 1) int rowBegin = head; @@ -965,11 +966,11 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co // As the size of parent is greater than zero, the size of // the first child must have been greater than zero, too. - WEAK_ASSERT(sum > 0); + ASSERT(sum > 0); // Width of row int width = (horizontal ? remaining.Width() : remaining.Height()); - WEAK_ASSERT(width > 0); + ASSERT(width > 0); if(sum < remainingSize) width = (int)((double)sum / remainingSize * width); @@ -1019,13 +1020,13 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co rc.right = end; } - WEAK_ASSERT(rc.left <= rc.right); - WEAK_ASSERT(rc.top <= rc.bottom); + ASSERT(rc.left <= rc.right); + ASSERT(rc.top <= rc.bottom); - WEAK_ASSERT(rc.left >= remaining.left); - WEAK_ASSERT(rc.right <= remaining.right); - WEAK_ASSERT(rc.top >= remaining.top); - WEAK_ASSERT(rc.bottom <= remaining.bottom); + ASSERT(rc.left >= remaining.left); + ASSERT(rc.right <= remaining.right); + ASSERT(rc.top >= remaining.top); + ASSERT(rc.bottom <= remaining.bottom); RecurseDrawGraph(bitmap, parent->TmiGetChild(i), rc, false, surface, h * m_options.scaleFactor, 0); @@ -1047,10 +1048,10 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co remainingSize -= sum; - WEAK_ASSERT(remaining.left <= remaining.right); - WEAK_ASSERT(remaining.top <= remaining.bottom); + ASSERT(remaining.left <= remaining.right); + ASSERT(remaining.top <= remaining.bottom); - WEAK_ASSERT(remainingSize >= 0); + ASSERT(remainingSize >= 0); head += (rowEnd - rowBegin); @@ -1064,8 +1065,8 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co break; } } - WEAK_ASSERT(remainingSize == 0); - WEAK_ASSERT(remaining.left == remaining.right || remaining.top == remaining.bottom); + ASSERT(remainingSize == 0); + ASSERT(remaining.left == remaining.right || remaining.top == remaining.bottom); } @@ -1074,20 +1075,20 @@ void CTreemap::SequoiaView_DrawChildren(CColorRefArray &bitmap, Item *parent, co void CTreemap::Simple_DrawChildren(CColorRefArray &bitmap, Item *parent, const double *surface, double h, DWORD flags) { #if 1 - WEAK_ASSERT(0); // Not used in WinDirStat. + ASSERT(0); // Not used in WinDirStat. bitmap; parent; surface; h; flags; #else - WEAK_ASSERT(parent->TmiGetChildrenCount() > 0); - WEAK_ASSERT(parent->TmiGetSize() > 0); + ASSERT(parent->TmiGetChildrenCount() > 0); + ASSERT(parent->TmiGetSize() > 0); const CRect& rc = parent->TmiGetRectangle(); bool horizontal = (flags == 0); int width = horizontal ? rc.Width() : rc.Height(); - WEAK_ASSERT(width >= 0); + ASSERT(width >= 0); double fBegin = horizontal ? rc.left : rc.top; int veryEnd = horizontal ? rc.right : rc.bottom; @@ -1108,8 +1109,8 @@ void CTreemap::Simple_DrawChildren(CColorRefArray &bitmap, Item *parent, const d int begin = (int)fBegin; int end = (int)fEnd; - WEAK_ASSERT(begin <= end); - WEAK_ASSERT(end <= veryEnd); + ASSERT(begin <= end); + ASSERT(end <= veryEnd); CRect rcChild; if(horizontal) @@ -1262,7 +1263,7 @@ void CTreemap::DrawCushion(CColorRefArray &bitmap, const CRect& rc, const double } pixel += Ia; - WEAK_ASSERT(pixel <= 1.0); + ASSERT(pixel <= 1.0); // Now, pixel is the brightness of the pixel, 0...1.0. @@ -1310,7 +1311,7 @@ void CTreemap::AddRidge(const CRect& rc, double *surface, double h) int width = rc.Width(); int height = rc.Height(); - WEAK_ASSERT(width > 0 && height > 0); + ASSERT(width > 0 && height > 0); double h4 = 4 * h; diff --git a/windirstat/globalhelpers.cpp b/windirstat/globalhelpers.cpp index 1404c53..d02880c 100644 --- a/windirstat/globalhelpers.cpp +++ b/windirstat/globalhelpers.cpp @@ -553,6 +553,10 @@ bool DriveExists(const CString& path) return true; } +#ifndef UNLEN +# define UNLEN MAX_PATH +#endif + CString GetUserName() { CString s; diff --git a/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj b/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj index b3bafa3..595fc52 100644 --- a/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj +++ b/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0405\</IntDir>
<TargetName>wdsr0405</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj b/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj index c868579..f990953 100644 --- a/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj +++ b/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0407\</IntDir>
<TargetName>wdsr0407</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj b/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj index 5d5c6fb..a1c2956 100644 --- a/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj +++ b/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng040a\</IntDir>
<TargetName>wdsr040a</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj b/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj index 2656d0a..ac611ff 100644 --- a/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj +++ b/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng040b\</IntDir>
<TargetName>wdsr040b</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj b/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj index 04ef51c..d588ac5 100644 --- a/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj +++ b/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng040c\</IntDir>
<TargetName>wdsr040c</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj b/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj index 8987ebb..3aa6a5f 100644 --- a/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj +++ b/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng040e\</IntDir>
<TargetName>wdsr040e</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj b/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj index 651af97..c6bb432 100644 --- a/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj +++ b/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0410\</IntDir>
<TargetName>wdsr0410</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj b/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj index 0181fcd..24da412 100644 --- a/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj +++ b/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0413\</IntDir>
<TargetName>wdsr0413</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj b/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj index 94cd4fc..fa4ed53 100644 --- a/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj +++ b/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0415\</IntDir>
<TargetName>wdsr0415</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj b/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj index 83a39a6..50888b5 100644 --- a/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj +++ b/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0416\</IntDir>
<TargetName>wdsr0416</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj b/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj index 5d09a13..18188ab 100644 --- a/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj +++ b/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0419\</IntDir>
<TargetName>wdsr0419</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj b/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj index f0b6e07..405b871 100644 --- a/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj +++ b/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj @@ -26,7 +26,7 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\..\build\</OutDir>
+ <OutDir>..\..\..\build.vs2017\</OutDir>
<IntDir>..\..\..\intermediate\vs2017_$(ProjectName)_wdslng0425\</IntDir>
<TargetName>wdsr0425</TargetName>
<TargetExt>.wdslng</TargetExt>
diff --git a/windirstat/stdafx.cpp b/windirstat/stdafx.cpp index d469c3e..d3bf4dd 100644 --- a/windirstat/stdafx.cpp +++ b/windirstat/stdafx.cpp @@ -23,7 +23,11 @@ #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.")
+# if !defined(_ANSISTRING) || !defined(ANSISTRING)
+# define _ANSISTRING(text) #text
+# define ANSISTRING(text) _ANSISTRING(text)
+# endif
+# pragma message (ANSISTRING(__FILE__) "(" ANSISTRING(__LINE__) ") : 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
diff --git a/windirstat/stdafx.h b/windirstat/stdafx.h index ee2164d..b920edc 100644 --- a/windirstat/stdafx.h +++ b/windirstat/stdafx.h @@ -1,77 +1,74 @@ -// stdafx.h - include file for standard system include files, -// or project specific include files that are used frequently, -// but are changed infrequently -// -// 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 __STDAFX_H_VER__ -#define __STDAFX_H_VER__ 2017112218 -#if (defined(_MSC_VER) && (_MSC_VER >= 1020)) || defined(__MCPP) -#pragma once -#endif /* Check for "#pragma once" support */ - -#if (defined(HAVE_WIN7_SDK) && HAVE_WIN7_SDK) || (_MSC_VER >= 1600) -# define SUPPORT_W7_TASKBAR 1 -# define SUPPORT_ELEVATION 1 -#endif // HAVE_WIN7_SDK - -#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 - -// turns off MFC's hiding of some common and often safely ignored warning messages -#define _AFX_ALL_WARNINGS - -#include <afxwin.h> // MFC Core -#include <afxext.h> // MFC Extensions - -#include <afxdtctl.h> // MFC IE 4 -#include <afxcmn.h> // MFC Common Controls -#include <afxtempl.h> // MFC Container classes -#include <afxmt.h> // MFC Multi-threading -#include <afxinet.h> // For CInternet* classes - -#include <io.h> // _access() -#include <cmath> // floor(), fmod(), sqrt() etc. -#include <cfloat> // DBL_MAX -#include <psapi.h> // PROCESS_MEMORY_INFO - -#include <atlbase.h> // ComPtr<> - -// Aliasing the macros from wingdi.h -#define RGB_GET_RVALUE(rgb) GetRValue(rgb) -#define RGB_GET_GVALUE(rgb) GetGValue(rgb) -#define RGB_GET_BVALUE(rgb) GetBValue(rgb) - -template<typename T> int signum(T x) { return (x) < 0 ? -1 : (x) == 0 ? 0 : 1; } - -/// signum function for unsigned numbers. -template<typename T> int usignum(T x, T y) { return (x) < (y) ? -1 : (x) == (y) ? 0 : 1; } - -#define WEAK_ASSERT /##/ ASSERT - -#endif /* __STDAFX_H_VER__ */ +// stdafx.h - include file for standard system include files,
+// or project specific include files that are used frequently,
+// but are changed infrequently
+//
+// 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 __STDAFX_H_VER__
+#define __STDAFX_H_VER__ 2017112319
+#if (defined(_MSC_VER) && (_MSC_VER >= 1020)) || defined(__MCPP)
+#pragma once
+#endif /* Check for "#pragma once" support */
+
+#if (defined(HAVE_WIN7_SDK) && HAVE_WIN7_SDK) || (_MSC_VER >= 1600)
+# define SUPPORT_W7_TASKBAR 1
+# define SUPPORT_ELEVATION 1
+#endif // HAVE_WIN7_SDK
+
+#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
+
+// turns off MFC's hiding of some common and often safely ignored warning messages
+#define _AFX_ALL_WARNINGS
+
+#include <afxwin.h> // MFC Core
+#include <afxext.h> // MFC Extensions
+
+#include <afxdtctl.h> // MFC IE 4
+#include <afxcmn.h> // MFC Common Controls
+#include <afxtempl.h> // MFC Container classes
+#include <afxmt.h> // MFC Multi-threading
+#include <afxinet.h> // For CInternet* classes
+
+#include <io.h> // _access()
+#include <cmath> // floor(), fmod(), sqrt() etc.
+#include <cfloat> // DBL_MAX
+#include <psapi.h> // PROCESS_MEMORY_INFO
+
+#include <atlbase.h> // ComPtr<>
+
+#define RGB_GET_RVALUE(rgb) (rgb & 0xFF)
+#define RGB_GET_GVALUE(rgb) ((rgb & 0xFF00) >> 8)
+#define RGB_GET_BVALUE(rgb) ((rgb & 0xFF0000) >> 16)
+
+template<typename T> int signum(T x) { return (x) < 0 ? -1 : (x) == 0 ? 0 : 1; }
+
+/// signum function for unsigned numbers.
+template<typename T> int usignum(T x, T y) { return (x) < (y) ? -1 : (x) == (y) ? 0 : 1; }
+
+#endif /* __STDAFX_H_VER__ */
diff --git a/windirstat/windirstat.cpp b/windirstat/windirstat.cpp index 29ad50c..d481c06 100644 --- a/windirstat/windirstat.cpp +++ b/windirstat/windirstat.cpp @@ -374,11 +374,6 @@ CString CDirstatApp::FindAuxiliaryFileByLangid(LPCTSTR prefix, LPCTSTR suffix, L return wds::strEmpty; } -CString CDirstatApp::ConstructHelpFileName() -{ - return FindHelpfilePathByLangid(CLanguageOptions::GetLanguage()); -} - bool CDirstatApp::IsCorrectResourceDll(LPCTSTR path) { HMODULE module = ::LoadLibraryEx(path, NULL, LOAD_LIBRARY_AS_DATAFILE); @@ -557,9 +552,6 @@ BOOL CDirstatApp::InitInstance() GetOptions()->LoadFromRegistry(); - free((void*)m_pszHelpFilePath); - m_pszHelpFilePath = _tcsdup(ConstructHelpFileName()); // ~CWinApp() will free this memory. - m_pDocTemplate = new CSingleDocTemplate( IDR_MAINFRAME, RUNTIME_CLASS(CDirstatDoc), diff --git a/windirstat/windirstat.h b/windirstat/windirstat.h index 0066378..bc6f916 100644 --- a/windirstat/windirstat.h +++ b/windirstat/windirstat.h @@ -101,8 +101,6 @@ protected: # endif bool IsCorrectResourceDll(LPCTSTR path); - CString ConstructHelpFileName(); - bool UpdateMemoryInfo(); // Get the alternative color from Explorer configuration diff --git a/windirstat/windirstat.vs15.vcxproj b/windirstat/windirstat.vs15.vcxproj index 11f6ceb..3bb0042 100644 --- a/windirstat/windirstat.vs15.vcxproj +++ b/windirstat/windirstat.vs15.vcxproj @@ -69,28 +69,28 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\build\</OutDir>
+ <OutDir>..\build.vs2017\</OutDir>
<IntDir>..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>wds32D</TargetName>
<TargetExt>.exe</TargetExt>
- <LinkIncremental>false</LinkIncremental>
+ <LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\build\</OutDir>
+ <OutDir>..\build.vs2017\</OutDir>
<IntDir>..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>wds64D</TargetName>
<TargetExt>.exe</TargetExt>
- <LinkIncremental>false</LinkIncremental>
+ <LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\build\</OutDir>
+ <OutDir>..\build.vs2017\</OutDir>
<IntDir>..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>wds32</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>..\build\</OutDir>
+ <OutDir>..\build.vs2017\</OutDir>
<IntDir>..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>wds64</TargetName>
<TargetExt>.exe</TargetExt>
@@ -101,7 +101,7 @@ <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
+ <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -110,7 +110,7 @@ <WarningLevel>Level4</WarningLevel>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ProgramDataBaseFileName>$(OutDir)wds32D.pdb</ProgramDataBaseFileName>
</ClCompile>
<ResourceCompile>
@@ -135,7 +135,7 @@ <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
+ <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
diff --git a/windirstat/windirstat.vs8.vcproj b/windirstat/windirstat.vs8.vcproj index 6b76050..56e6799 100644 --- a/windirstat/windirstat.vs8.vcproj +++ b/windirstat/windirstat.vs8.vcproj @@ -46,7 +46,8 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"
- PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"
+ PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;HAVE_WIN7_SDK=1"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
EnableFunctionLevelLinking="true"
@@ -56,7 +57,7 @@ WarningLevel="4"
Detect64BitPortabilityProblems="true"
ProgramDataBaseFileName="$(OutDir)\wds32D.pdb"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -64,7 +65,7 @@ <Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/nologo /l409"
- PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;MODNAME=wds32D"
+ PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;HAVE_WIN7_SDK=1;MODNAME=wds32D"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"
/>
<Tool
@@ -75,7 +76,7 @@ AdditionalOptions="/delayload:psapi.dll /pdbaltpath:%_PDB% /nodefaultlib:libcmt"
AdditionalDependencies="psapi.lib delayimp.lib ..\..\..\build\luajit2_$(PlatformName).lib"
OutputFile="$(OutDir)\wds32D.exe"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
ProgramDataBaseFileName="$(OutDir)\wds32D.pdb"
@@ -138,7 +139,8 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"
- PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"
+ PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;HAVE_WIN7_SDK=1"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
EnableFunctionLevelLinking="true"
@@ -156,7 +158,7 @@ <Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/nologo /l409"
- PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;MODNAME=wds64D"
+ PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;HAVE_WIN7_SDK=1;MODNAME=wds64D"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"
/>
<Tool
@@ -167,7 +169,7 @@ AdditionalOptions="/delayload:psapi.dll /pdbaltpath:%_PDB% /nodefaultlib:libcmt"
AdditionalDependencies="psapi.lib delayimp.lib ..\..\..\build\luajit2_$(PlatformName).lib"
OutputFile="$(OutDir)\wds64D.exe"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
ProgramDataBaseFileName="$(OutDir)\wds64D.pdb"
@@ -230,7 +232,7 @@ AdditionalOptions="/Oi /Ot"
Optimization="3"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"
- PreprocessorDefinitions="NDEBUG;WINVER=0x0501"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501;HAVE_WIN7_SDK=1"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -248,7 +250,7 @@ <Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/nologo /l409"
- PreprocessorDefinitions="NDEBUG;WINVER=0x0501;MODNAME=wds32"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501;HAVE_WIN7_SDK=1;MODNAME=wds32"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"
/>
<Tool
@@ -325,7 +327,7 @@ AdditionalOptions="/Oi /Ot"
Optimization="3"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"
- PreprocessorDefinitions="NDEBUG;WINVER=0x0501"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501;HAVE_WIN7_SDK=1"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -343,7 +345,7 @@ <Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/nologo /l409"
- PreprocessorDefinitions="NDEBUG;WINVER=0x0501;MODNAME=wds64"
+ PreprocessorDefinitions="NDEBUG;WINVER=0x0501;HAVE_WIN7_SDK=1;MODNAME=wds64"
AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"
/>
<Tool
|