diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-11-28 15:29:50 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-12-04 13:07:59 +0100 |
| commit | 4f26a5a1fd925b1d6aa19dfc6f0268890993cf2b (patch) | |
| tree | 180c30600215b90dce037737d55007cf73750726 /windows/winutil/src | |
| parent | cbe95366a672a6cad17c4f6bab77044d3c701a43 (diff) | |
| download | mullvadvpn-4f26a5a1fd925b1d6aa19dfc6f0268890993cf2b.tar.xz mullvadvpn-4f26a5a1fd925b1d6aa19dfc6f0268890993cf2b.zip | |
Update winutil testing project
Diffstat (limited to 'windows/winutil/src')
| -rw-r--r-- | windows/winutil/src/extras/migration/migration.cpp | 19 | ||||
| -rw-r--r-- | windows/winutil/src/extras/migration/migration.vcxproj | 12 |
2 files changed, 15 insertions, 16 deletions
diff --git a/windows/winutil/src/extras/migration/migration.cpp b/windows/winutil/src/extras/migration/migration.cpp index 0ee4d458fe..e5fdf3f5ef 100644 --- a/windows/winutil/src/extras/migration/migration.cpp +++ b/windows/winutil/src/extras/migration/migration.cpp @@ -1,34 +1,30 @@ #include "stdafx.h" #include <iostream> -#include "../../winutil/winutil.h" - -void WINUTIL_API ErrorSink(const char *errorMessage, void *) -{ - std::cout << "Error: " << errorMessage << std::endl; -} +#include <libshared/logging/stdoutlogger.h> +#include <winutil/winutil.h> int main() { - const auto status = WinUtil_MigrateAfterWindowsUpdate(ErrorSink, nullptr); + const auto status = WinUtil_MigrateAfterWindowsUpdate(shared::logging::StdoutLogger, nullptr); switch (status) { - case WINUTIL_MIGRATION_STATUS::SUCCESS: + case WINUTIL_MIGRATION_STATUS_SUCCESS: { std::wcout << L"Success" << std::endl; break; } - case WINUTIL_MIGRATION_STATUS::ABORTED: + case WINUTIL_MIGRATION_STATUS_ABORTED: { std::wcout << L"Aborted" << std::endl; break; } - case WINUTIL_MIGRATION_STATUS::NOTHING_TO_MIGRATE: + case WINUTIL_MIGRATION_STATUS_NOTHING_TO_MIGRATE: { std::wcout << L"Nothing to migrate" << std::endl; break; } - case WINUTIL_MIGRATION_STATUS::FAILED: + case WINUTIL_MIGRATION_STATUS_FAILED: { std::wcout << L"Failed" << std::endl; break; @@ -37,4 +33,3 @@ int main() return 0; } - diff --git a/windows/winutil/src/extras/migration/migration.vcxproj b/windows/winutil/src/extras/migration/migration.vcxproj index 0283a21c60..a030827149 100644 --- a/windows/winutil/src/extras/migration/migration.vcxproj +++ b/windows/winutil/src/extras/migration/migration.vcxproj @@ -100,11 +100,12 @@ <ConformanceMode>true</ConformanceMode> <LanguageStandard>stdcpplatest</LanguageStandard> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <AdditionalIncludeDirectories>$(ProjectDir)../../../../winutil/src/;$(ProjectDir)../../../../libshared/src</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libshared.lib;winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> @@ -118,11 +119,12 @@ <ConformanceMode>true</ConformanceMode> <LanguageStandard>stdcpplatest</LanguageStandard> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <AdditionalIncludeDirectories>$(ProjectDir)../../../../winutil/src/;$(ProjectDir)../../../../libshared/src</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libshared.lib;winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> @@ -138,13 +140,14 @@ <ConformanceMode>true</ConformanceMode> <LanguageStandard>stdcpplatest</LanguageStandard> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <AdditionalIncludeDirectories>$(ProjectDir)../../../../winutil/src/;$(ProjectDir)../../../../libshared/src</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libshared.lib;winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> @@ -160,13 +163,14 @@ <ConformanceMode>true</ConformanceMode> <LanguageStandard>stdcpplatest</LanguageStandard> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <AdditionalIncludeDirectories>$(ProjectDir)../../../../winutil/src/;$(ProjectDir)../../../../libshared/src</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libshared.lib;winutil.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> |