Gal Hammer has uploaded a new change for review. Change subject: agent: fixed "modified" files after clone. ......................................................................
agent: fixed "modified" files after clone. Due to CR/LF issue some files were reported as "modified" even after new clone or hard reset. Recommited the files with the right line- ending. Change-Id: I147b60f91335e18d786f79e3ab5d3799c1b18ab8 Signed-off-by: Gal Hammer <gham...@redhat.com> --- M GinaSSO/GinaSSO.sln M GinaSSO/GinaSSO.vcproj M ovirt-guest-agent/ovirt-guest-agent.ini M ovirt-guest-agent/win-guest-agent-build-exe.bat M windows-credprov/OVirtCredProv.sln M windows-credprov/OVirtCredProv.vcproj 6 files changed, 824 insertions(+), 824 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent refs/changes/20/10420/1 diff --git a/GinaSSO/GinaSSO.sln b/GinaSSO/GinaSSO.sln index 5c3ce5b..80343a5 100644 --- a/GinaSSO/GinaSSO.sln +++ b/GinaSSO/GinaSSO.sln @@ -1,29 +1,29 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GinaSSO", "GinaSSO.vcproj", "{87EADA77-9319-446D-9BC3-419B9020B41D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSOInstallLogic", "..\SSOInstallLogic\SSOInstallLogic.vcproj", "{E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}" - ProjectSection(ProjectDependencies) = postProject - {87EADA77-9319-446D-9BC3-419B9020B41D} = {87EADA77-9319-446D-9BC3-419B9020B41D} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {87EADA77-9319-446D-9BC3-419B9020B41D}.Debug|Win32.ActiveCfg = Debug|Win32 - {87EADA77-9319-446D-9BC3-419B9020B41D}.Debug|Win32.Build.0 = Debug|Win32 - {87EADA77-9319-446D-9BC3-419B9020B41D}.Release|Win32.ActiveCfg = Release|Win32 - {87EADA77-9319-446D-9BC3-419B9020B41D}.Release|Win32.Build.0 = Release|Win32 - {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Debug|Win32.Build.0 = Debug|Win32 - {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Release|Win32.ActiveCfg = Release|Win32 - {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GinaSSO", "GinaSSO.vcproj", "{87EADA77-9319-446D-9BC3-419B9020B41D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSOInstallLogic", "..\SSOInstallLogic\SSOInstallLogic.vcproj", "{E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}" + ProjectSection(ProjectDependencies) = postProject + {87EADA77-9319-446D-9BC3-419B9020B41D} = {87EADA77-9319-446D-9BC3-419B9020B41D} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {87EADA77-9319-446D-9BC3-419B9020B41D}.Debug|Win32.ActiveCfg = Debug|Win32 + {87EADA77-9319-446D-9BC3-419B9020B41D}.Debug|Win32.Build.0 = Debug|Win32 + {87EADA77-9319-446D-9BC3-419B9020B41D}.Release|Win32.ActiveCfg = Release|Win32 + {87EADA77-9319-446D-9BC3-419B9020B41D}.Release|Win32.Build.0 = Release|Win32 + {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Debug|Win32.ActiveCfg = Debug|Win32 + {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Debug|Win32.Build.0 = Debug|Win32 + {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Release|Win32.ActiveCfg = Release|Win32 + {E2C275FC-6B2C-4072-8DD6-3EC1DF20839F}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/GinaSSO/GinaSSO.vcproj b/GinaSSO/GinaSSO.vcproj index 4d505e9..4a768c5 100644 --- a/GinaSSO/GinaSSO.vcproj +++ b/GinaSSO/GinaSSO.vcproj @@ -1,254 +1,254 @@ -<?xml version="1.0" encoding="windows-1255"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="GinaSSO" - ProjectGUID="{87EADA77-9319-446D-9BC3-419B9020B41D}" - RootNamespace="GinaSSO" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GINASSO_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" - LinkIncremental="2" - ModuleDefinitionFile="GinaSSO.Def" - GenerateDebugInformation="true" - SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GINASSO_EXPORTS" - RuntimeLibrary="0" - UsePrecompiledHeader="2" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" - LinkIncremental="1" - ModuleDefinitionFile="GinaSSO.Def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath=".\GinaDlg.cpp" - > - </File> - <File - RelativePath=".\GinaSSO.cpp" - > - </File> - <File - RelativePath=".\stdafx.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath=".\GinaDlg.h" - > - </File> - <File - RelativePath=".\GinaSSO.h" - > - </File> - <File - RelativePath=".\resource.h" - > - </File> - <File - RelativePath=".\stdafx.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - <File - RelativePath=".\GinaSSO.Def" - > - </File> - <File - RelativePath=".\GinaSSO.rc" - > - </File> - </Filter> - <File - RelativePath=".\ReadMe.txt" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="windows-1255"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="GinaSSO" + ProjectGUID="{87EADA77-9319-446D-9BC3-419B9020B41D}" + RootNamespace="GinaSSO" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GINASSO_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Ws2_32.lib" + LinkIncremental="2" + ModuleDefinitionFile="GinaSSO.Def" + GenerateDebugInformation="true" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GINASSO_EXPORTS" + RuntimeLibrary="0" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Ws2_32.lib" + LinkIncremental="1" + ModuleDefinitionFile="GinaSSO.Def" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\GinaDlg.cpp" + > + </File> + <File + RelativePath=".\GinaSSO.cpp" + > + </File> + <File + RelativePath=".\stdafx.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\GinaDlg.h" + > + </File> + <File + RelativePath=".\GinaSSO.h" + > + </File> + <File + RelativePath=".\resource.h" + > + </File> + <File + RelativePath=".\stdafx.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + <File + RelativePath=".\GinaSSO.Def" + > + </File> + <File + RelativePath=".\GinaSSO.rc" + > + </File> + </Filter> + <File + RelativePath=".\ReadMe.txt" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/ovirt-guest-agent/ovirt-guest-agent.ini b/ovirt-guest-agent/ovirt-guest-agent.ini index abddac7..64d9ed5 100644 --- a/ovirt-guest-agent/ovirt-guest-agent.ini +++ b/ovirt-guest-agent/ovirt-guest-agent.ini @@ -1,51 +1,51 @@ -# -# rhev-agent.ini - RHEV-agent/Windows configuration file -# - -[general] - -heart_beat_rate = 5 -report_user_rate = 10 -report_application_rate = 120 -report_disk_usage = 300 - -[virtio] - -device = \\.\Global\com.redhat.rhevm.vdsm - -[loggers] -keys=root - -[handlers] -keys=console,logfile - -[formatters] -keys=long,simple,none,sysform - -[logger_root] -level=INFO -handlers=logfile -propagate=0 - -[handler_logfile] -class=handlers.RotatingFileHandler -args=('rhev-agent.log', 'a', 100*1024, 5) -formatter=long - -[handler_console] -class: StreamHandler -args: [] -formatter: none - -[formatter_simple] -format: %(name)s:%(levelname)s: %(message)s - -[formatter_none] -format: %(message)s - -[formatter_long] -format: %(threadName)s::%(levelname)s::%(asctime)s::%(module)s::%(lineno)d::%(name)s::%(message)s - -[formatter_sysform] -format= %(asctime)s %(levelname)s %(message)s -datefmt= +# +# rhev-agent.ini - RHEV-agent/Windows configuration file +# + +[general] + +heart_beat_rate = 5 +report_user_rate = 10 +report_application_rate = 120 +report_disk_usage = 300 + +[virtio] + +device = \\.\Global\com.redhat.rhevm.vdsm + +[loggers] +keys=root + +[handlers] +keys=console,logfile + +[formatters] +keys=long,simple,none,sysform + +[logger_root] +level=INFO +handlers=logfile +propagate=0 + +[handler_logfile] +class=handlers.RotatingFileHandler +args=('rhev-agent.log', 'a', 100*1024, 5) +formatter=long + +[handler_console] +class: StreamHandler +args: [] +formatter: none + +[formatter_simple] +format: %(name)s:%(levelname)s: %(message)s + +[formatter_none] +format: %(message)s + +[formatter_long] +format: %(threadName)s::%(levelname)s::%(asctime)s::%(module)s::%(lineno)d::%(name)s::%(message)s + +[formatter_sysform] +format= %(asctime)s %(levelname)s %(message)s +datefmt= diff --git a/ovirt-guest-agent/win-guest-agent-build-exe.bat b/ovirt-guest-agent/win-guest-agent-build-exe.bat index 5ff7f36..7305151 100644 --- a/ovirt-guest-agent/win-guest-agent-build-exe.bat +++ b/ovirt-guest-agent/win-guest-agent-build-exe.bat @@ -1,3 +1,3 @@ -@echo off -echo "Building the executable" -python setup.py py2exe -b 1 +@echo off +echo "Building the executable" +python setup.py py2exe -b 1 diff --git a/windows-credprov/OVirtCredProv.sln b/windows-credprov/OVirtCredProv.sln index e1d2dab..41eff95 100644 --- a/windows-credprov/OVirtCredProv.sln +++ b/windows-credprov/OVirtCredProv.sln @@ -1,26 +1,26 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OVirtCredProv", "OVirtCredProv.vcproj", "{3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|Win32.Build.0 = Debug|Win32 - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|x64.ActiveCfg = Debug|x64 - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|x64.Build.0 = Debug|x64 - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|Win32.ActiveCfg = Release|Win32 - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|Win32.Build.0 = Release|Win32 - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|x64.ActiveCfg = Release|x64 - {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OVirtCredProv", "OVirtCredProv.vcproj", "{3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|Win32.ActiveCfg = Debug|Win32 + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|Win32.Build.0 = Debug|Win32 + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|x64.ActiveCfg = Debug|x64 + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Debug|x64.Build.0 = Debug|x64 + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|Win32.ActiveCfg = Release|Win32 + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|Win32.Build.0 = Release|Win32 + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|x64.ActiveCfg = Release|x64 + {3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/windows-credprov/OVirtCredProv.vcproj b/windows-credprov/OVirtCredProv.vcproj index b02bfe9..8795076 100644 --- a/windows-credprov/OVirtCredProv.vcproj +++ b/windows-credprov/OVirtCredProv.vcproj @@ -1,461 +1,461 @@ -<?xml version="1.0" encoding="windows-1255"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="OVirtCredProv" - ProjectGUID="{3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}" - RootNamespace="OVirtCredProv" - Keyword="Win32Proj" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="Pch.h" - WarningLevel="4" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="secur32.lib shlwapi.lib" - LinkIncremental="2" - ModuleDefinitionFile="OVirtCredProv.def" - GenerateDebugInformation="true" - SubSystem="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="Pch.h" - WarningLevel="4" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="secur32.lib shlwapi.lib" - LinkIncremental="1" - ModuleDefinitionFile="OVirtCredProv.def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="Pch.h" - WarningLevel="4" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="secur32.lib shlwapi.lib" - LinkIncremental="2" - ModuleDefinitionFile="OVirtCredProv.def" - GenerateDebugInformation="true" - SubSystem="2" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="Pch.h" - WarningLevel="4" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="secur32.lib shlwapi.lib" - LinkIncremental="1" - ModuleDefinitionFile="OVirtCredProv.def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath=".\CredentialsChannel.cpp" - > - </File> - <File - RelativePath=".\Helpers.cpp" - > - </File> - <File - RelativePath=".\Pch.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - PrecompiledHeaderThrough="Pch.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - PrecompiledHeaderThrough="Pch.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - PrecompiledHeaderThrough="Pch.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1" - PrecompiledHeaderThrough="Pch.h" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\OVirtCredentials.cpp" - > - </File> - <File - RelativePath=".\OVirtCredProv.cpp" - > - </File> - <File - RelativePath=".\OVirtCredProv.def" - > - </File> - <File - RelativePath=".\OVirtProvider.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath=".\CredentialsChannel.h" - > - </File> - <File - RelativePath=".\Helpers.h" - > - </File> - <File - RelativePath=".\Pch.h" - > - </File> - <File - RelativePath=".\resource.h" - > - </File> - <File - RelativePath=".\OVirtCredentials.h" - > - </File> - <File - RelativePath=".\OVirtCredProv.h" - > - </File> - <File - RelativePath=".\OVirtProvider.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - <File - RelativePath=".\OVirtCredProv.rc" - > - </File> - </Filter> - <Filter - Name="Utilities" - > - <File - RelativePath=".\Register.reg" - > - </File> - <File - RelativePath=".\Unregister.reg" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="windows-1255"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="OVirtCredProv" + ProjectGUID="{3FA043C2-E5CF-4652-86FB-C3D985C9F1AA}" + RootNamespace="OVirtCredProv" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="Pch.h" + WarningLevel="4" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="secur32.lib shlwapi.lib" + LinkIncremental="2" + ModuleDefinitionFile="OVirtCredProv.def" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="Pch.h" + WarningLevel="4" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="secur32.lib shlwapi.lib" + LinkIncremental="1" + ModuleDefinitionFile="OVirtCredProv.def" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="Pch.h" + WarningLevel="4" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="secur32.lib shlwapi.lib" + LinkIncremental="2" + ModuleDefinitionFile="OVirtCredProv.def" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVIRTCREDPROV_EXPORTS" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="Pch.h" + WarningLevel="4" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="secur32.lib shlwapi.lib" + LinkIncremental="1" + ModuleDefinitionFile="OVirtCredProv.def" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\CredentialsChannel.cpp" + > + </File> + <File + RelativePath=".\Helpers.cpp" + > + </File> + <File + RelativePath=".\Pch.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="Pch.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="Pch.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="Pch.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="Pch.h" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\OVirtCredentials.cpp" + > + </File> + <File + RelativePath=".\OVirtCredProv.cpp" + > + </File> + <File + RelativePath=".\OVirtCredProv.def" + > + </File> + <File + RelativePath=".\OVirtProvider.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\CredentialsChannel.h" + > + </File> + <File + RelativePath=".\Helpers.h" + > + </File> + <File + RelativePath=".\Pch.h" + > + </File> + <File + RelativePath=".\resource.h" + > + </File> + <File + RelativePath=".\OVirtCredentials.h" + > + </File> + <File + RelativePath=".\OVirtCredProv.h" + > + </File> + <File + RelativePath=".\OVirtProvider.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + <File + RelativePath=".\OVirtCredProv.rc" + > + </File> + </Filter> + <Filter + Name="Utilities" + > + <File + RelativePath=".\Register.reg" + > + </File> + <File + RelativePath=".\Unregister.reg" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> -- To view, visit http://gerrit.ovirt.org/10420 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I147b60f91335e18d786f79e3ab5d3799c1b18ab8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Gal Hammer <gham...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches