diff --git a/app/app.sln b/app/app.sln new file mode 100644 index 0000000..2384757 --- /dev/null +++ b/app/app.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2050 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app", "app\app.vcxproj", "{A12CF66A-C994-476E-8364-4036E86DCC23}" +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 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Debug|x64.ActiveCfg = Debug|x64 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Debug|x64.Build.0 = Debug|x64 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Debug|x86.ActiveCfg = Debug|Win32 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Debug|x86.Build.0 = Debug|Win32 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Release|x64.ActiveCfg = Release|x64 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Release|x64.Build.0 = Release|x64 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Release|x86.ActiveCfg = Release|Win32 + {A12CF66A-C994-476E-8364-4036E86DCC23}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7C17A628-426F-4991-951A-F2B720868600} + EndGlobalSection +EndGlobal diff --git a/app/app/app.cpp b/app/app/app.cpp new file mode 100644 index 0000000..2a9bf48 Binary files /dev/null and b/app/app/app.cpp differ diff --git a/app/app/app.vcxproj b/app/app/app.vcxproj new file mode 100644 index 0000000..7e06f94 --- /dev/null +++ b/app/app/app.vcxproj @@ -0,0 +1,175 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {A12CF66A-C994-476E-8364-4036E86DCC23} + Win32Proj + app + 8.1 + + + + Application + true + Unicode + v141 + + + Application + false + true + Unicode + v141 + + + Application + true + Unicode + v141 + + + Application + false + true + Unicode + v141 + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)\$(PlatformName)\$(ConfigurationName) + + + true + $(SolutionDir)\$(PlatformName)\$(ConfigurationName) + + + false + $(SolutionDir)\$(PlatformName)\$(ConfigurationName) + + + false + $(SolutionDir)\$(PlatformName)\$(ConfigurationName) + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\exercise\01\dll1\$(Platform)\$(Configuration); + + + Console + true + ..\..\exercise\01\lib\$(PlatformName)\$(ConfigurationName)\static_library.lib;..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName)\dynamic_library_with_implib.lib;%(AdditionalDependencies) + ..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories) + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\exercise\01\dll1\$(Platform)\$(Configuration);c:\program files (x86)\windows kits\8.1\include\um\winnt.h + + + Console + true + ..\..\exercise\01\lib\$(PlatformName)\$(ConfigurationName)\static_library.lib;..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName)\dynamic_library_with_implib.lib;%(AdditionalDependencies) + ..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories) + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\exercise\01\dll1\$(Platform)\$(Configuration);c:\program files (x86)\windows kits\8.1\include\um\winnt.h + + + Console + true + true + true + ..\..\exercise\01\lib\$(PlatformName)\$(ConfigurationName)\static_library.lib;..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName)\dynamic_library_with_implib.lib;%(AdditionalDependencies) + ..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories) + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\exercise\01\dll1\$(Platform)\$(Configuration);c:\program files (x86)\windows kits\8.1\include\um\winnt.h + + + Console + true + true + true + ..\..\exercise\01\lib\$(PlatformName)\$(ConfigurationName)\static_library.lib;..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName)\dynamic_library_with_implib.lib;%(AdditionalDependencies) + ..\..\exercise\01\dll2\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories) + + + + + + + + + \ No newline at end of file diff --git a/app/app/app.vcxproj.filters b/app/app/app.vcxproj.filters new file mode 100644 index 0000000..5551dd9 --- /dev/null +++ b/app/app/app.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/app/app/pch.cpp b/app/app/pch.cpp new file mode 100644 index 0000000..a38f8a3 Binary files /dev/null and b/app/app/pch.cpp differ diff --git a/app/app/pch.h b/app/app/pch.h new file mode 100644 index 0000000..d87432d Binary files /dev/null and b/app/app/pch.h differ diff --git a/exercise/01/.vs/e01/v15/Solution.VC.db-shm b/exercise/01/.vs/e01/v15/Solution.VC.db-shm new file mode 100644 index 0000000..bfd589c Binary files /dev/null and b/exercise/01/.vs/e01/v15/Solution.VC.db-shm differ diff --git a/exercise/01/.vs/e01/v15/Solution.VC.db-wal b/exercise/01/.vs/e01/v15/Solution.VC.db-wal new file mode 100644 index 0000000..d28cbd9 Binary files /dev/null and b/exercise/01/.vs/e01/v15/Solution.VC.db-wal differ diff --git a/exercise/01/dll2/dynamic_library_with_implib.vcxproj b/exercise/01/dll2/dynamic_library_with_implib.vcxproj index 9ad2802..5ee47a4 100644 --- a/exercise/01/dll2/dynamic_library_with_implib.vcxproj +++ b/exercise/01/dll2/dynamic_library_with_implib.vcxproj @@ -72,21 +72,21 @@ true - $(Platform)\$(Configuration)\ + ..\..\..\app\$(Platform) $(Platform)\$(Configuration)\ true - $(Platform)\$(Configuration)\ + ..\..\..\app\$(Platform) false - $(Platform)\$(Configuration)\ + ..\..\..\app\$(Platform) $(Platform)\$(Configuration)\ false - $(Platform)\$(Configuration)\ + ..\..\..\app\$(Platform) diff --git a/exercise/02/code.cpp b/exercise/02/code.cpp index 85e778c..2df5494 100644 --- a/exercise/02/code.cpp +++ b/exercise/02/code.cpp @@ -1,2 +1,17 @@ #include "stdafx.h" #include "code.h" + +void f1(int& a, int& b) +{ + int temp = b; + b = a; + a = temp; +} + +void f2(int* start, int* end) +{ + for (int* i = start; i != end; i++) + { + (* i) ++; + } +} diff --git a/exercise/02/code.h b/exercise/02/code.h index e69de29..eff7ea9 100644 --- a/exercise/02/code.h +++ b/exercise/02/code.h @@ -0,0 +1,4 @@ +#pragma once + +void f1 (int& a, int& b); +void f2(int* start, int* end); \ No newline at end of file diff --git a/exercise/02/test1.cpp b/exercise/02/test1.cpp index 33dfab7..afaa5d4 100644 --- a/exercise/02/test1.cpp +++ b/exercise/02/test1.cpp @@ -14,14 +14,22 @@ namespace simple_test TEST_METHOD(f1_changes_values) { int a=1, b=2; - //f1(a, b); + f1(a, b); Assert::AreEqual(2, a); Assert::AreEqual(1, b); } + + TEST_METHOD(f1_change_values_second_time) + { + int a = 5, b = 15; + f1(a, b); + Assert::AreEqual(15, a); + Assert::AreEqual(5, b); + } TEST_METHOD(f2_increases_all_values_by_one) { int arr[] = { 1, 2, 3 }; - //f2(arr, arr+3); + f2(arr, arr+3); Assert::AreEqual(2, arr[0]); Assert::AreEqual(3, arr[1]); Assert::AreEqual(4, arr[2]); @@ -29,7 +37,7 @@ namespace simple_test TEST_METHOD(f2_works_for_different_number_of_values) { int arr[] = { 2, 4, 6, 8, 10 }; - //f2(arr, arr+5); + f2(arr, arr+5); Assert::AreEqual(3, arr[0]); Assert::AreEqual(5, arr[1]); Assert::AreEqual(7, arr[2]);