Using EOL extension now, including a .hgeol file to make certain line ending specifications explicit

Added missing test case for lua-winreg
A number of warnings addressed
Adding some helpers to deal with user privileges
Some improvements regarding the inclusion of a basic set of Lua scripts in the resource section
New version of setvcvars.cmd

6 files changed, 397 insertions, 31 deletions

diff --git a/sandbox/luaconf/hello.lua b/sandbox/luaconf/hello.lua
index 99bb1dc..fcf1408 100644
--- a/sandbox/luaconf/hello.lua
+++ b/sandbox/luaconf/hello.lua
@@ -1,6 +1,6 @@
-module(..., package.seeall)

+module("hello", package.seeall)

 

 -- Declare the functions you want in your module

 function hello()

-print "Hello world"

+    print "Hello world"

 end

diff --git a/sandbox/luaconf/lua_conf.cpp b/sandbox/luaconf/lua_conf.cpp
index 1a14edb..110919a 100644
--- a/sandbox/luaconf/lua_conf.cpp
+++ b/sandbox/luaconf/lua_conf.cpp
@@ -37,7 +37,6 @@ namespace
         fflush(stderr);

     }

 

-

     static int report (lua_State *L, int status)

     {

         if (status && !lua_isnil(L, -1)) {

@@ -77,16 +76,30 @@ namespace
 

 using namespace std;

 

-int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])

+int _tmain(int, TCHAR**)

 {

     lua_State* L = luaWDS_open();

     if(L)

     {

-        //fprintf(stderr, "[STACK TOP] %i (line %i)\n", lua_gettop(L), __LINE__);

-        w32res_enumerateEmbeddedLuaScripts(L);

-        int ret = luaL_dofile(L, "lua_conf.lua");

+        stackDump(L, "Before enumerating Lua resources");

+        int ret = w32res_enumerateEmbeddedLuaScripts(L);

         if(ret)

         {

+            char const* lpszError = lua_tostring(L, -1);

+            fprintf(stderr, "Error occurred: %s\n", lpszError);

+            lua_pop(L, 1); /* pop error message from the stack */

+            lua_close(L);

+            return EXIT_FAILURE;

+        }

+        lua_pop(L, 1); // pop the winres table from the stack

+        stackDump(L, "Before executing external Lua script (after enumerating Lua resources)");

+        ret = luaL_dostring(L, "require \"globals\"");

+        ret = luaL_dostring(L, "require \"autoexec\"");

+        //lua_pop(L, 1); /* pop result from the stack */

+        stackDump(L, "After executing external Lua script");

+        if (ret)

+        {

+            fprintf(stderr, "Error occurred: %s\n", lua_tostring(L, -1));

             lua_pop(L, 1); /* pop error message from the stack */

             lua_close(L);

             return EXIT_FAILURE;

diff --git a/sandbox/luaconf/lua_conf.lua b/sandbox/luaconf/lua_conf.lua
index 648e1f4..6b26364 100644
--- a/sandbox/luaconf/lua_conf.lua
+++ b/sandbox/luaconf/lua_conf.lua
@@ -1,20 +1,61 @@
 if os.isadmin() then

-  print "I'm admin"

+    print "I'm admin"

 else

-  print "I'm NOT admin"

+    print "I'm NOT admin"

 end

 

 if os.iswow64() then

-  print "I'm a WOW64 process"

+    print "I'm a WOW64 process"

 else

-  print "I'm NOT a WOW64 process"

+    print "I'm NOT a WOW64 process"

 end

 

 function dumptable(T,t)

+    local __genOrderedIndex = function( t )

+        local orderedIndex = {}

+        for key in pairs(t) do

+            table.insert( orderedIndex, key )

+        end

+        table.sort( orderedIndex )

+        return orderedIndex

+    end

+    local orderedNext = function (t, state)

+        -- Equivalent of the next function, but returns the keys in the alphabetic

+        -- order. We use a temporary ordered key table that is stored in the

+        -- table being iterated.

+        local key = nil

+        --print("orderedNext: state = "..tostring(state) )

+        if state == nil then

+            -- the first time, generate the index

+            t.__orderedIndex = __genOrderedIndex( t )

+            key = t.__orderedIndex[1]

+        else

+            -- fetch the next value

+            for i = 1,table.getn(t.__orderedIndex) do

+                if t.__orderedIndex[i] == state then

+                    key = t.__orderedIndex[i+1]

+                end

+            end

+        end

+        if key then

+            return key, t[key]

+        end

+        -- no more value to return, cleanup

+        t.__orderedIndex = nil

+        return

+    end

+    local orderedPairs = function(t)

+        -- Equivalent of the pairs() function on tables. Allows to iterate

+        -- in order

+        return orderedNext, t, nil

+    end

     print '--------------------------'

     print(T)

     print '--------------------------'

-    for k,v in pairs(t)do print(k,v) end

+    for k,v in orderedPairs(t) do

+        print(k,v)

+    end

+    print '=========================='

 end

 

 if winres then

@@ -24,13 +65,18 @@ if winres then
     end

 end

 

+--[[

 for k,v in pairs(winres.scripts) do

     package.preload[k:lower()] = function(...)

         return winres.c_loader(k:upper())

     end

-    package.preload[k:upper()] = package.preload[k:lower()]

+    --package.preload[k:upper()] = package.preload[k:lower()]

 end

+--]]

 dumptable('package.preload', package.preload)

 dumptable('winreg', winreg)

-require "helloworld"

+hello = require "hello"

 dumptable('package.loaded', package.loaded)

+dumptable('_G', _G)

+

+hello.hello()
\ No newline at end of file
diff --git a/sandbox/luaconf/lua_conf.rc b/sandbox/luaconf/lua_conf.rc
index af9fbb1..76dd05c 100644
--- a/sandbox/luaconf/lua_conf.rc
+++ b/sandbox/luaconf/lua_conf.rc
@@ -57,7 +57,9 @@ END
 #include "modules/w32resembed.h"

 

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-helloworld LUA "../../sandbox/luaconf/hello.lua"

+autoexec LUA "../../sandbox/luaconf/lua_conf.lua"

+globals LUA "../../embedded-lua/globals.lua"

+hello LUA "../../sandbox/luaconf/hello.lua"

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

diff --git a/sandbox/luaconf/luaconf.vs15.vcxproj b/sandbox/luaconf/luaconf.vs15.vcxproj
index 0d7d22a..f1ec210 100644
--- a/sandbox/luaconf/luaconf.vs15.vcxproj
+++ b/sandbox/luaconf/luaconf.vs15.vcxproj
@@ -1,6 +1,14 @@
 <?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="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

       <Platform>Win32</Platform>

@@ -16,6 +24,20 @@
     <Keyword>Win32Proj</Keyword>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <CharacterSet>Unicode</CharacterSet>

+    <PlatformToolset>v141</PlatformToolset>

+    <UseOfMfc>Static</UseOfMfc>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <CharacterSet>Unicode</CharacterSet>

+    <PlatformToolset>v141</PlatformToolset>

+    <UseOfMfc>Static</UseOfMfc>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

@@ -33,6 +55,12 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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)'=='Debug|x64'" 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|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

@@ -40,6 +68,20 @@
     <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)'=='Debug|Win32'">

+    <OutDir>..\..\build.vs2017\</OutDir>

+    <IntDir>..\..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>

+    <TargetName>luaconf32D</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <OutDir>..\..\build.vs2017\</OutDir>

+    <IntDir>..\..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>

+    <TargetName>luaconf64D</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <OutDir>..\..\build.vs2017\</OutDir>

     <IntDir>..\..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>

@@ -54,12 +96,80 @@
     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <RuntimeTypeInfo>false</RuntimeTypeInfo>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)luaconf32D.pdb</ProgramDataBaseFileName>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <FullProgramDatabaseFile>true</FullProgramDatabaseFile>

+      <OutputFile>$(OutDir)luaconf32D.exe</OutputFile>

+      <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <TargetMachine>MachineX86</TargetMachine>

+      <AdditionalOptions>/pdbaltpath:%_PDB% /nodefaultlib:libcmt %(AdditionalOptions)</AdditionalOptions>

+    </Link>

+    <PostBuildEvent>

+      <Command>xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <RuntimeTypeInfo>false</RuntimeTypeInfo>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)luaconf64D.pdb</ProgramDataBaseFileName>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <FullProgramDatabaseFile>true</FullProgramDatabaseFile>

+      <OutputFile>$(OutDir)luaconf64D.exe</OutputFile>

+      <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <TargetMachine>MachineX64</TargetMachine>

+      <AdditionalOptions>/pdbaltpath:%_PDB% /nodefaultlib:libcmt %(AdditionalOptions)</AdditionalOptions>

+    </Link>

+    <PostBuildEvent>

+      <Command>xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

   <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>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -72,7 +182,7 @@
       <ProgramDataBaseFileName>$(OutDir)luaconf32.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -86,16 +196,16 @@
       <TargetMachine>MachineX86</TargetMachine>

       <AdditionalOptions>/pdbaltpath:%_PDB% /release %(AdditionalOptions)</AdditionalOptions>

     </Link>

-    <PreBuildEvent>

-      <Command>copy &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)\&quot;</Command>

-    </PreBuildEvent>

+    <PostBuildEvent>

+      <Command>xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;</Command>

+    </PostBuildEvent>

   </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>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -108,7 +218,7 @@
       <ProgramDataBaseFileName>$(OutDir)luaconf64.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -122,9 +232,9 @@
       <TargetMachine>MachineX64</TargetMachine>

       <AdditionalOptions>/pdbaltpath:%_PDB% /release %(AdditionalOptions)</AdditionalOptions>

     </Link>

-    <PreBuildEvent>

-      <Command>copy &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)\&quot;</Command>

-    </PreBuildEvent>

+    <PostBuildEvent>

+      <Command>xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;</Command>

+    </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClInclude Include="lua_conf.h" />

diff --git a/sandbox/luaconf/luaconf.vs8.vcproj b/sandbox/luaconf/luaconf.vs8.vcproj
index 7786d7e..38cd27c 100644
--- a/sandbox/luaconf/luaconf.vs8.vcproj
+++ b/sandbox/luaconf/luaconf.vs8.vcproj
@@ -19,6 +19,185 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="..\..\build"

+			IntermediateDirectory="..\..\intermediate\vs2005_$(PlatformName)_$(ConfigurationName)\$(ProjectName)"

+			ConfigurationType="1"

+			UseOfMFC="1"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."

+				PreprocessorDefinitions="_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				EnableFunctionLevelLinking="true"

+				RuntimeTypeInfo="false"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				ProgramDataBaseFileName="$(OutDir)\luaconf32D.pdb"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalOptions="/nologo /l409"

+				PreprocessorDefinitions="_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

+				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir)"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/pdbaltpath:%_PDB% /nodefaultlib:libcmt"

+				AdditionalDependencies="..\..\..\..\build\luajit2_$(PlatformName).lib"

+				OutputFile="$(OutDir)\luaconf32D.exe"

+				LinkIncremental="1"

+				AdditionalLibraryDirectories="$(IntDir);$(IntDir)"

+				GenerateDebugInformation="true"

+				ProgramDataBaseFileName="$(OutDir)\luaconf32D.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\build"

+			IntermediateDirectory="..\..\intermediate\vs2005_$(PlatformName)_$(ConfigurationName)\$(ProjectName)"

+			ConfigurationType="1"

+			UseOfMFC="1"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."

+				PreprocessorDefinitions="_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				EnableFunctionLevelLinking="true"

+				RuntimeTypeInfo="false"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				ProgramDataBaseFileName="$(OutDir)\luaconf64D.pdb"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalOptions="/nologo /l409"

+				PreprocessorDefinitions="_DEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

+				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir)"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/pdbaltpath:%_PDB% /nodefaultlib:libcmt"

+				AdditionalDependencies="..\..\..\..\build\luajit2_$(PlatformName).lib"

+				OutputFile="$(OutDir)\luaconf64D.exe"

+				LinkIncremental="1"

+				AdditionalLibraryDirectories="$(IntDir);$(IntDir)"

+				GenerateDebugInformation="true"

+				ProgramDataBaseFileName="$(OutDir)\luaconf64D.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;"

+			/>

+		</Configuration>

+		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="..\..\build"

 			IntermediateDirectory="..\..\intermediate\vs2005_$(PlatformName)_$(ConfigurationName)\$(ProjectName)"

@@ -28,7 +207,6 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				CommandLine="copy &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)\&quot;"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -47,7 +225,7 @@
 				AdditionalOptions="/Oi /Ot"

 				Optimization="3"

 				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -65,7 +243,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

 				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir)"

 			/>

 			<Tool

@@ -108,6 +286,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;"

 			/>

 		</Configuration>

 		<Configuration

@@ -120,7 +299,6 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				CommandLine="copy &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)\&quot;"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -140,7 +318,7 @@
 				AdditionalOptions="/Oi /Ot"

 				Optimization="3"

 				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -158,7 +336,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501;LUA_REG_NO_WINTRACE;LUA_REG_NO_HIVEOPS;LUA_REG_NO_DLL"

 				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;..\..;$(IntDir)"

 			/>

 			<Tool

@@ -201,6 +379,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="xcopy /f /y &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)&quot;"

 			/>

 		</Configuration>

 	</Configurations>

@@ -241,6 +420,22 @@
 				RelativePath="..\..\windirstat\WDS_Lua_C.c"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						CompileAs="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						CompileAs="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					>

 					<Tool