summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2018-05-28 12:14:39 +0200
committerOdd Stranne <odd@mullvad.net>2018-06-18 08:45:13 +0200
commit2c0db1e81e641eda6dd9f55772b23356bed96580 (patch)
tree14de34370787e03c94e7e4386c41ad2b32321734
parent7bd7a1c4b43bab5f52189a64bac02eea8ea5e1f0 (diff)
downloadmullvadvpn-2c0db1e81e641eda6dd9f55772b23356bed96580.tar.xz
mullvadvpn-2c0db1e81e641eda6dd9f55772b23356bed96580.zip
Cleanup 'dnstest' project and rename into 'loader'
Diffstat
-rw-r--r--windows/windns/extras.sln31
-rw-r--r--windows/windns/src/dnstest/dnstest.cppbin8556 -> 0 bytes
-rw-r--r--windows/windns/src/dnstest/dnstest.vcxproj.filters111
-rw-r--r--windows/windns/src/dnstest/dnstest.vcxproj.user4
-rw-r--r--windows/windns/src/extras/loader/loader.cppbin0 -> 1918 bytes
-rw-r--r--windows/windns/src/extras/loader/loader.vcxproj (renamed from windows/windns/src/dnstest/dnstest.vcxproj)37
-rw-r--r--windows/windns/src/extras/loader/loader.vcxproj.filters11
-rw-r--r--windows/windns/src/extras/loader/stdafx.cpp (renamed from windows/windns/src/dnstest/stdafx.cpp)bin590 -> 590 bytes
-rw-r--r--windows/windns/src/extras/loader/stdafx.h (renamed from windows/windns/src/dnstest/stdafx.h)bin642 -> 642 bytes
-rw-r--r--windows/windns/src/extras/loader/targetver.h (renamed from windows/windns/src/dnstest/targetver.h)bin630 -> 630 bytes
-rw-r--r--windows/windns/windns.sln14
11 files changed, 48 insertions, 160 deletions
diff --git a/windows/windns/extras.sln b/windows/windns/extras.sln
new file mode 100644
index 0000000000..ecb11d05a7
--- /dev/null
+++ b/windows/windns/extras.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2027
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader", "src\extras\loader\loader.vcxproj", "{1476A8B9-4A9E-4358-8744-A350CB97E152}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x64.ActiveCfg = Debug|x64
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x64.Build.0 = Debug|x64
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x86.ActiveCfg = Debug|Win32
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x86.Build.0 = Debug|Win32
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x64.ActiveCfg = Release|x64
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x64.Build.0 = Release|x64
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x86.ActiveCfg = Release|Win32
+ {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {16D5A833-BF2F-4049-A7E1-570B792F8148}
+ EndGlobalSection
+EndGlobal
diff --git a/windows/windns/src/dnstest/dnstest.cpp b/windows/windns/src/dnstest/dnstest.cpp
deleted file mode 100644
index 76ae8615a4..0000000000
--- a/windows/windns/src/dnstest/dnstest.cpp
+++ /dev/null
Binary files differ
diff --git a/windows/windns/src/dnstest/dnstest.vcxproj.filters b/windows/windns/src/dnstest/dnstest.vcxproj.filters
deleted file mode 100644
index 07cecae9a7..0000000000
--- a/windows/windns/src/dnstest/dnstest.vcxproj.filters
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- <Filter Include="other files">
- <UniqueIdentifier>{f6f1a55f-c90a-4972-9986-37b42d9ae7a0}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="stdafx.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="targetver.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\wmi\connection.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\wmi\iconnection.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\wmi\resultset.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\wmi\methodcall.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\comhelpers.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\configmanager.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\dnsconfig.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\consoletracesink.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\wmi\eventsink.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\netconfigeventsink.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\netconfighelpers.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\wmi\notification.h">
- <Filter>other files</Filter>
- </ClInclude>
- <ClInclude Include="..\windns\dnsreverter.h">
- <Filter>other files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="stdafx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="dnstest.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\wmi\connection.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\wmi\resultset.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\wmi\methodcall.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\comhelpers.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\configmanager.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\dnsconfig.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\consoletracesink.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\wmi\eventsink.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\netconfigeventsink.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\netconfighelpers.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\wmi\notification.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- <ClCompile Include="..\windns\dnsreverter.cpp">
- <Filter>other files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/windows/windns/src/dnstest/dnstest.vcxproj.user b/windows/windns/src/dnstest/dnstest.vcxproj.user
deleted file mode 100644
index be25078707..0000000000
--- a/windows/windns/src/dnstest/dnstest.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project> \ No newline at end of file
diff --git a/windows/windns/src/extras/loader/loader.cpp b/windows/windns/src/extras/loader/loader.cpp
new file mode 100644
index 0000000000..f4169b66b6
--- /dev/null
+++ b/windows/windns/src/extras/loader/loader.cpp
Binary files differ
diff --git a/windows/windns/src/dnstest/dnstest.vcxproj b/windows/windns/src/extras/loader/loader.vcxproj
index ca60bb0361..7fdfe073c3 100644
--- a/windows/windns/src/dnstest/dnstest.vcxproj
+++ b/windows/windns/src/extras/loader/loader.vcxproj
@@ -22,7 +22,7 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{1476A8B9-4A9E-4358-8744-A350CB97E152}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
- <RootNamespace>dnstest</RootNamespace>
+ <RootNamespace>loader</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -98,7 +98,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)../../;$(ProjectDir)../../../../windows-libraries/src/</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
@@ -117,7 +117,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)../../;$(ProjectDir)../../../../windows-libraries/src/</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
@@ -138,7 +138,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)../../;$(ProjectDir)../../../../windows-libraries/src/</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
@@ -161,7 +161,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)../../;$(ProjectDir)../../../../windows-libraries/src/</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
@@ -175,36 +175,11 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="..\windns\comhelpers.h" />
- <ClInclude Include="..\windns\configmanager.h" />
- <ClInclude Include="..\windns\consoletracesink.h" />
- <ClInclude Include="..\windns\dnsconfig.h" />
- <ClInclude Include="..\windns\dnsreverter.h" />
- <ClInclude Include="..\windns\netconfigeventsink.h" />
- <ClInclude Include="..\windns\netconfighelpers.h" />
- <ClInclude Include="..\windns\wmi\connection.h" />
- <ClInclude Include="..\windns\wmi\eventsink.h" />
- <ClInclude Include="..\windns\wmi\iconnection.h" />
- <ClInclude Include="..\windns\wmi\methodcall.h" />
- <ClInclude Include="..\windns\wmi\notification.h" />
- <ClInclude Include="..\windns\wmi\resultset.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\windns\comhelpers.cpp" />
- <ClCompile Include="..\windns\configmanager.cpp" />
- <ClCompile Include="..\windns\consoletracesink.cpp" />
- <ClCompile Include="..\windns\dnsconfig.cpp" />
- <ClCompile Include="..\windns\dnsreverter.cpp" />
- <ClCompile Include="..\windns\netconfigeventsink.cpp" />
- <ClCompile Include="..\windns\netconfighelpers.cpp" />
- <ClCompile Include="..\windns\wmi\connection.cpp" />
- <ClCompile Include="..\windns\wmi\eventsink.cpp" />
- <ClCompile Include="..\windns\wmi\methodcall.cpp" />
- <ClCompile Include="..\windns\wmi\notification.cpp" />
- <ClCompile Include="..\windns\wmi\resultset.cpp" />
- <ClCompile Include="dnstest.cpp" />
+ <ClCompile Include="loader.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
diff --git a/windows/windns/src/extras/loader/loader.vcxproj.filters b/windows/windns/src/extras/loader/loader.vcxproj.filters
new file mode 100644
index 0000000000..a7599167d6
--- /dev/null
+++ b/windows/windns/src/extras/loader/loader.vcxproj.filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="targetver.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="loader.cpp" />
+ <ClCompile Include="stdafx.cpp" />
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/windows/windns/src/dnstest/stdafx.cpp b/windows/windns/src/extras/loader/stdafx.cpp
index cb6d7f782d..cb6d7f782d 100644
--- a/windows/windns/src/dnstest/stdafx.cpp
+++ b/windows/windns/src/extras/loader/stdafx.cpp
Binary files differ
diff --git a/windows/windns/src/dnstest/stdafx.h b/windows/windns/src/extras/loader/stdafx.h
index 94d4ed877d..94d4ed877d 100644
--- a/windows/windns/src/dnstest/stdafx.h
+++ b/windows/windns/src/extras/loader/stdafx.h
Binary files differ
diff --git a/windows/windns/src/dnstest/targetver.h b/windows/windns/src/extras/loader/targetver.h
index 567cd346ef..567cd346ef 100644
--- a/windows/windns/src/dnstest/targetver.h
+++ b/windows/windns/src/extras/loader/targetver.h
Binary files differ
diff --git a/windows/windns/windns.sln b/windows/windns/windns.sln
index dc992bd0af..1d9eeb1a9c 100644
--- a/windows/windns/windns.sln
+++ b/windows/windns/windns.sln
@@ -10,12 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "windns", "src\windns\windns
{B52E2D10-A94A-4605-914A-2DCEF6A757EF} = {B52E2D10-A94A-4605-914A-2DCEF6A757EF}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnstest", "src\dnstest\dnstest.vcxproj", "{1476A8B9-4A9E-4358-8744-A350CB97E152}"
- ProjectSection(ProjectDependencies) = postProject
- {A5344205-FC37-4572-9C63-8564ECC410AC} = {A5344205-FC37-4572-9C63-8564ECC410AC}
- {B52E2D10-A94A-4605-914A-2DCEF6A757EF} = {B52E2D10-A94A-4605-914A-2DCEF6A757EF}
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -44,14 +38,6 @@ Global
{A5344205-FC37-4572-9C63-8564ECC410AC}.Release|x86.ActiveCfg = Release|Win32
{A5344205-FC37-4572-9C63-8564ECC410AC}.Release|x86.Build.0 = Release|Win32
{A5344205-FC37-4572-9C63-8564ECC410AC}.Release|x86.Deploy.0 = Release|Win32
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x64.ActiveCfg = Debug|x64
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x64.Build.0 = Debug|x64
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x86.ActiveCfg = Debug|Win32
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Debug|x86.Build.0 = Debug|Win32
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x64.ActiveCfg = Release|x64
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x64.Build.0 = Release|x64
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x86.ActiveCfg = Release|Win32
- {1476A8B9-4A9E-4358-8744-A350CB97E152}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.