diff --git a/tools/autotools/tsk_recover.cpp b/tools/autotools/tsk_recover.cpp index a1fb9ddce430d68f68e1a686e10a81a8877dfd3f..648990079aa83dfccd9d5a047e8029ea577e5129 100644 --- a/tools/autotools/tsk_recover.cpp +++ b/tools/autotools/tsk_recover.cpp @@ -295,7 +295,7 @@ TskRecover::filterFs(TSK_FS_INFO * fs_info) { if (m_writeVolumeDir) { #ifdef TSK_WIN32 - _snwprintf(m_vsName, FILENAME_MAX, (LPCWSTR) L"vol_%" PRIuOFF "\\", + _snwprintf(m_vsName, FILENAME_MAX, (LPCWSTR) ("vol_%" PRIuOFF "\\"), fs_info->offset / m_img_info->sector_size); #else snprintf(m_vsName, FILENAME_MAX, "vol_%" PRIuOFF "/", diff --git a/win32/tsk-win.sln b/win32/tsk-win.sln index a78949a20df0527eff647f7c7d39c8180c0e0858..d8dbf3463e01d7c22f017c7c97ee4d86ba91107a 100644 --- a/win32/tsk-win.sln +++ b/win32/tsk-win.sln @@ -187,9 +187,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsk_loaddb", "tsk_loaddb\ts EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsk_comparedir", "tsk_comparedir\tsk_compare.vcproj", "{8EE881F4-78DC-49C7-8845-E842358AC0FA}" - ProjectSection(ProjectDependencies) = postProject - {88B5F49E-6EBE-4FEA-8E5B-BE1F0DF7E8E8} = {88B5F49E-6EBE-4FEA-8E5B-BE1F0DF7E8E8} - EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {F12AA46A-EA91-4AB6-8246-7800DF6128A4} = {F12AA46A-EA91-4AB6-8246-7800DF6128A4} + {47901C6F-77EC-4753-A83A-F6AE975851B9} = {47901C6F-77EC-4753-A83A-F6AE975851B9} + {47E72886-0B51-4098-BAF4-68B4494F0872} = {47E72886-0B51-4098-BAF4-68B4494F0872} + {88B5F49E-6EBE-4FEA-8E5B-BE1F0DF7E8E8} = {88B5F49E-6EBE-4FEA-8E5B-BE1F0DF7E8E8} + {2D0B32C2-B035-4873-8E9A-4D4221D93F68} = {2D0B32C2-B035-4873-8E9A-4D4221D93F68} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -372,12 +376,12 @@ Global {96AFC6D4-A3DC-44D4-8F55-F74E1D21798C}.Debug|Win32.Build.0 = Debug|Win32 {96AFC6D4-A3DC-44D4-8F55-F74E1D21798C}.Release|Win32.ActiveCfg = Release|Win32 {96AFC6D4-A3DC-44D4-8F55-F74E1D21798C}.Release|Win32.Build.0 = Release|Win32 - {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug_NoLibs|Win32.ActiveCfg = Debug_NoLibs|Win32 - {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug_NoLibs|Win32.Build.0 = Debug_NoLibs|Win32 - {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug|Win32.ActiveCfg = Debug|Win32 - {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug|Win32.Build.0 = Debug|Win32 - {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Release|Win32.ActiveCfg = Release|Win32 - {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Release|Win32.Build.0 = Release|Win32 + {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug_NoLibs|Win32.ActiveCfg = Debug_NoLibs|Win32 + {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug_NoLibs|Win32.Build.0 = Debug_NoLibs|Win32 + {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Debug|Win32.Build.0 = Debug|Win32 + {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Release|Win32.ActiveCfg = Release|Win32 + {8EE881F4-78DC-49C7-8845-E842358AC0FA}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/tsk_comparedir/tsk_compare.vcproj b/win32/tsk_comparedir/tsk_compare.vcproj index 8a86a4255c219fd1b66b8bb4a790e31a20993167..7e433b274d2208c141c4e6a9381942090ca70e2a 100644 --- a/win32/tsk_comparedir/tsk_compare.vcproj +++ b/win32/tsk_comparedir/tsk_compare.vcproj @@ -57,6 +57,8 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="libewf.lib" + AdditionalLibraryDirectories="$(ProjectDir)\..\libewf\msvscpp\release\" GenerateDebugInformation="true" TargetMachine="1" /> @@ -109,6 +111,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="$(ProjectDir)\..\..\" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -125,6 +128,8 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="libewf.lib" + AdditionalLibraryDirectories="$(ProjectDir)\..\libewf\msvscpp\release\" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/win32/tsk_loaddb/tsk_loaddb.vcproj b/win32/tsk_loaddb/tsk_loaddb.vcproj index fd4b1a4791247d7ccdb9e93b1b6a03346b82ace9..a3bf6a0c7827bb9168c049de934642c21c487e3c 100644 --- a/win32/tsk_loaddb/tsk_loaddb.vcproj +++ b/win32/tsk_loaddb/tsk_loaddb.vcproj @@ -112,6 +112,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="$(ProjectDir)\..\..\" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3"