winmerge-svn — Subscribe to this list if you wish to receive notifications from Subversion

[Winmerge-svn] SF.net SVN: winmerge:[7194] trunk/Src/FileFilterHelper.cpp

[<jt...@us...>]

Revision: 7194
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7194&view=rev
Author:   jtuc
Date:     2010-06-14 21:27:35 +0000 (Mon, 14 Jun 2010)

Log Message:
-----------
Fix regression from MFC to STL string conversion committed as of revision 6865.

Revision Links:
--------------
    http://winmerge.svn.sourceforge.net/winmerge/?rev=6865&view=rev

Modified Paths:
--------------
    trunk/Src/FileFilterHelper.cpp

Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp	2010-06-13 20:02:50 UTC (rev 7193)
+++ trunk/Src/FileFilterHelper.cpp	2010-06-14 21:27:35 UTC (rev 7194)
@@ -335,7 +335,7 @@
 			bFilterAdded = FALSE;
 
 		pos = ext.find_first_of(pszSeps); 
-		if (bFilterAdded && pos >= 0)
+		if (bFilterAdded && pos != String::npos)
 			strPattern += _T("|");
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7193] trunk/ArchiveSupport/Merge7zInstaller/Files.rc2

[<jt...@us...>]

Revision: 7193
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7193&view=rev
Author:   jtuc
Date:     2010-06-13 20:02:50 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Add Merge7z914 to Merge7zInstaller

Modified Paths:
--------------
    trunk/ArchiveSupport/Merge7zInstaller/Files.rc2

Modified: trunk/ArchiveSupport/Merge7zInstaller/Files.rc2
===================================================================
--- trunk/ArchiveSupport/Merge7zInstaller/Files.rc2	2010-06-13 20:01:22 UTC (rev 7192)
+++ trunk/ArchiveSupport/Merge7zInstaller/Files.rc2	2010-06-13 20:02:50 UTC (rev 7193)
@@ -19,6 +19,8 @@
 MERGE7ZU(Merge7z912U.dll)
 MERGE7Z(Merge7z913.dll)
 MERGE7ZU(Merge7z913U.dll)
+MERGE7Z(Merge7z914.dll)
+MERGE7ZU(Merge7z914U.dll)
 
 VIIZIP(7zip_pad.xml)
 VIIZIP(7z.dll)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7192] trunk/ArchiveSupport/Merge7z

[<jt...@us...>]

Revision: 7192
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7192&view=rev
Author:   jtuc
Date:     2010-06-13 20:01:22 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Add Merge7z914.vcxproj

Added Paths:
-----------
    trunk/ArchiveSupport/Merge7z/Merge7z914.vcxproj
    trunk/ArchiveSupport/Merge7z/Merge7z914.vcxproj.filters

Added: trunk/ArchiveSupport/Merge7z/Merge7z914.vcxproj
===================================================================
--- trunk/ArchiveSupport/Merge7z/Merge7z914.vcxproj	                        (rev 0)
+++ trunk/ArchiveSupport/Merge7z/Merge7z914.vcxproj	2010-06-13 20:01:22 UTC (rev 7192)
@@ -0,0 +1,1216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="UnicodeDebug|Win32">
+      <Configuration>UnicodeDebug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="UnicodeRelease|Win32">
+      <Configuration>UnicodeRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B29DC1D6-CB00-4D4A-8199-96A42D669BA2}</ProjectGuid>
+    <SccProjectName />
+    <SccLocalPath />
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\Merge7z914___Win32_Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\Merge7z914___Win32_Release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\Merge7z914___Win32_Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\Merge7z914___Win32_Debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SRC7Z)\7z914;$(SRC7Z)\7z914\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug/Merge7z914.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug/</AssemblerListingLocation>
+      <ObjectFileName>.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>../../Build/MergeUnicodeDebug/Merge7z914U.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>../../Build/MergeUnicodeDebug/Merge7z914U.pdb</ProgramDatabaseFile>
+      <ImportLibrary>.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug/Merge7z914U.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\BuildTmp\Merge7z914___Win32_UnicodeDebug/Merge7z914.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0407</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SRC7Z)\7z914\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease/Merge7z914.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease/</AssemblerListingLocation>
+      <ObjectFileName>.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>../../Build/MergeUnicodeRelease/Merge7z914U.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+      <ImportLibrary>.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease/Merge7z914U.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\BuildTmp\Merge7z914___Win32_UnicodeRelease/Merge7z914.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0407</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SRC7Z)\7z914;$(SRC7Z)\7z914\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7z914_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z914___Win32_Release/Merge7z914.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\..\BuildTmp\Merge7z914___Win32_Release/</AssemblerListingLocation>
+      <ObjectFileName>.\..\BuildTmp\Merge7z914___Win32_Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z914___Win32_Release/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>../../Build/MergeRelease/Merge7z914.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+      <ImportLibrary>.\..\BuildTmp\Merge7z914___Win32_Release/Merge7z914.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\BuildTmp\Merge7z914___Win32_Release/Merge7z914.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0407</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SRC7Z)\7z914;$(SRC7Z)\7z914\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7z914_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z914___Win32_Debug/Merge7z914.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\..\BuildTmp\Merge7z914___Win32_Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\..\BuildTmp\Merge7z914___Win32_Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z914___Win32_Debug/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>../../Build/MergeDebug/Merge7z914.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>../../Build/MergeDebug/Merge7z914.pdb</ProgramDatabaseFile>
+      <ImportLibrary>.\..\BuildTmp\Merge7z914___Win32_Debug/Merge7z914.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\BuildTmp\Merge7z914___Win32_Debug/Merge7z914.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0407</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="Merge7z.def" />
+    <None Include="$(SRC7Z)\7z914\CPP\7zip\Ui\Gui\FM.ico" />
+    <None Include="revision.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\7z914\C\CpuArch.h" />
+    <ClInclude Include="Merge7z.h" />
+    <ClInclude Include="Merge7zCommon.h" />
+    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="tools.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\GUI\resource.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\DLL.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\Error.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\FileIO.h" />
+    <ClInclude Include="..\..\..\..\7z914\Cpp\Windows\Control\ListView.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\PropVariant.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\PropVariantConversions.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\ResourceString.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\Synchronization.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\IntToString.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\Lang.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\MyString.h" />
+    <ClInclude Include="..\..\..\..\7z914\Cpp\7zip\Archive\Common\OutStreamWithCRC.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\StringConvert.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\StringToInt.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\TextConfig.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\UTFConvert.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\Common\ArchiveExtractCallback.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\Common\ArchiveOpenCallback.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\Common\DefaultName.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\Control\Dialog.h" />
+    <ClInclude Include="..\..\..\..\7z914\Cpp\7zip\Ui\Common\EnumDirItems.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\ExtractCallback.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\Common\FileStreams.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\FormatUtils.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\LangUtils.h" />
+    <ClInclude Include="..\..\..\..\7z914\Cpp\7zip\Ui\Common\LoadCodecs.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\MessagesDialog.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\Common\OpenArchive.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\OpenCallback.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\OverwriteDialog.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\PasswordDialog.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\FileManager\ProgramLocation.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\Common\ProgressUtils.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\Common\StreamUtils.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\Common\UpdateCallback.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\GUI\UpdateCallbackGUI.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\Window.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\UI\Common\ExtractingFilePath.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\FileDir.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\FileFind.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Windows\FileName.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\7zip\Common\FilePathAutoRename.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\MyVector.h" />
+    <ClInclude Include="$(SRC7Z)\7z914\CPP\Common\Wildcard.h" />
+    <ClInclude Include="..\..\..\..\7z914\C\7zCrc.h" />
+    <ClInclude Include="..\..\..\..\7z914\C\Threads.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\7z914\C\7zCrcOpt.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\7z914\C\CpuArch.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Merge7z907.cpp" />
+    <ClCompile Include="Merge7zCommon.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="StdAfx.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Create</PrecompiledHeader>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="tools.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Windows\DLL.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Windows\Error.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Windows\FileIO.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\7z914\Cpp\Windows\Control\ListView.cpp" />
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Windows\PropVariant.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Windows\PropVariantConversions.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Windows\ResourceString.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Windows\Synchronization.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Common\IntToString.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Common\Lang.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Common\MyString.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\7z914\Cpp\7zip\Archive\Common\OutStreamWithCRC.cpp" />
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Common\StringConvert.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Common\StringToInt.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z914_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(SRC7Z)\7z914\CPP\Common\TextConfig.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z914_EXPORTS</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z914_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7191] trunk/Src/diffutils/src/DIRENT.C

[<jt...@us...>]

Revision: 7191
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7191&view=rev
Author:   jtuc
Date:     2010-06-13 15:22:21 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
fix a warning

Modified Paths:
--------------
    trunk/Src/diffutils/src/DIRENT.C

Modified: trunk/Src/diffutils/src/DIRENT.C
===================================================================
--- trunk/Src/diffutils/src/DIRENT.C	2010-06-13 15:18:34 UTC (rev 7190)
+++ trunk/Src/diffutils/src/DIRENT.C	2010-06-13 15:22:21 UTC (rev 7191)
@@ -324,7 +324,7 @@
 			if ( ff.ff_name[0] != '.' )
 			{
 				/*  make a copy of the name  */
-				if ( (names[count] = strdup(ff.ff_name))
+				if ( (names[count] = _strdup(ff.ff_name))
 								     == NULL )
 				{
 					/*  free all if error (out of mem)  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7190] trunk/Src

[<jt...@us...>]

Revision: 7190
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7190&view=rev
Author:   jtuc
Date:     2010-06-13 15:18:34 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Fix last commit breaking compilation due to "struct stat" vs. "struct _stat".

Modified Paths:
--------------
    trunk/Src/DiffFileData.cpp
    trunk/Src/diffutils/src/DIFF.H

Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp	2010-06-13 14:58:54 UTC (rev 7189)
+++ trunk/Src/DiffFileData.cpp	2010-06-13 15:18:34 UTC (rev 7190)
@@ -102,7 +102,7 @@
 			return false;
 
 		// Get file stats (diffutils uses these)
-		if (fstat(m_inf[i].desc, &m_inf[i].stat) != 0)
+		if (_fstat(m_inf[i].desc, &m_inf[i].stat) != 0)
 		{
 			return false;
 		}

Modified: trunk/Src/diffutils/src/DIFF.H
===================================================================
--- trunk/Src/diffutils/src/DIFF.H	2010-06-13 14:58:54 UTC (rev 7189)
+++ trunk/Src/diffutils/src/DIFF.H	2010-06-13 15:18:34 UTC (rev 7190)
@@ -227,7 +227,7 @@
 struct file_data {
     int             desc;	/* File descriptor  */
     char const      *name;	/* File name  */
-    struct stat     stat;	/* File status from fstat()  */
+    struct _stat    stat;	/* File status from fstat()  */
     int             dir_p;	/* nonzero if file is a directory  */
 
     /* Buffer in which text of file is read.  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7189] trunk/Src/DiffWrapper.cpp

[<jt...@us...>]

Revision: 7189
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7189&view=rev
Author:   jtuc
Date:     2010-06-13 14:58:54 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
BUG: [ 2982964 ] Wrong time stamp even in latest revision (NOT old bug)

Modified Paths:
--------------
    trunk/Src/DiffWrapper.cpp

Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp	2010-06-13 12:18:30 UTC (rev 7188)
+++ trunk/Src/DiffWrapper.cpp	2010-06-13 14:58:54 UTC (rev 7189)
@@ -1227,18 +1227,19 @@
 	inf_patch[0].name = ansiconvert_SystemCP(path1.c_str());
 	inf_patch[1].name = ansiconvert_SystemCP(path2.c_str());
 
-	// Fix timestamps for generated patch files
-	// If there are translations needed (e.g. when comparing UTF-16 files)
-	// then the stats in 'inf' are read from temp files. If the original
-	// file's and read timestamps differ, use original file's timestamps.
-	// See also sf.net bug item #2791506.
-	struct __stat64 st;
-	_tstat64(path1.c_str(), &st);
-	if (st.st_mtime != inf_patch[0].stat.st_mtime)
-		inf_patch[0].stat.st_mtime = st.st_mtime;
-	_tstat64(path2.c_str(), &st);
-	if (st.st_mtime != inf_patch[1].stat.st_mtime)
-		inf_patch[1].stat.st_mtime = st.st_mtime;
+	// If paths in m_s1File and m_s2File point to original files, then we can use
+	// them to fix potentially meaningless stats from potentially temporary files,
+	// resulting from whatever transforms may have taken place.
+	// If not, then we can't help it, and hence ASSERT that this won't happen.
+	if (!m_bPathsAreTemp)
+	{
+		_tstat(m_s1File.c_str(), &inf_patch[0].stat);
+		_tstat(m_s2File.c_str(), &inf_patch[1].stat);
+	}
+	else
+	{
+		ASSERT(FALSE);
+	}
 
 	outfile = NULL;
 	if (!m_sPatchFile.empty())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7188] trunk/Src/Common/SortHeaderCtrl.cpp

[<jt...@us...>]

Revision: 7188
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7188&view=rev
Author:   jtuc
Date:     2010-06-13 12:18:30 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
CSortHeaderCtrl: Replace GetDllVersion() by SendMessage(CCM_GETVERSION), which works for comctl32.dll 5.80 and better.
As this removes the last reference to GetDllVersion(), we are now ready to drop dllver.cpp/.h.

Modified Paths:
--------------
    trunk/Src/Common/SortHeaderCtrl.cpp

Modified: trunk/Src/Common/SortHeaderCtrl.cpp
===================================================================
--- trunk/Src/Common/SortHeaderCtrl.cpp	2010-06-13 12:10:45 UTC (rev 7187)
+++ trunk/Src/Common/SortHeaderCtrl.cpp	2010-06-13 12:18:30 UTC (rev 7188)
@@ -9,7 +9,6 @@
 
 #include "StdAfx.h"
 #include "SortHeaderCtrl.h"
-#include "dllver.h"
 
 #ifndef HDF_SORTUP
 #define HDF_SORTUP              0x0400
@@ -60,7 +59,7 @@
 	}
 
 	GetItem( nCol, &hditem );
-	if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(6,00))
+	if (SendMessage(CCM_GETVERSION) >= 6)
 	{
 		// We can use HDF_SORTUP and HDF_SORTDOWN flag to draw a sort arrow on the header.
 		hditem.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7187] trunk/Src

[<jt...@us...>]

Revision: 7187
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7187&view=rev
Author:   jtuc
Date:     2010-06-13 12:10:45 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Remove unnecessary #include "dllver.h"

Modified Paths:
--------------
    trunk/Src/ConfigLog.cpp
    trunk/Src/DirViewColHandler.cpp
    trunk/Src/FilepathEdit.cpp
    trunk/Src/MergeDoc.cpp

Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp	2010-06-13 10:20:59 UTC (rev 7186)
+++ trunk/Src/ConfigLog.cpp	2010-06-13 12:10:45 UTC (rev 7187)
@@ -25,7 +25,6 @@
 #include "StdAfx.h"
 #include "Constants.h"
 #include "version.h"
-#include "dllver.h"
 #include "UniFile.h"
 #include "DiffWrapper.h"
 #include "ConfigLog.h"

Modified: trunk/Src/DirViewColHandler.cpp
===================================================================
--- trunk/Src/DirViewColHandler.cpp	2010-06-13 10:20:59 UTC (rev 7186)
+++ trunk/Src/DirViewColHandler.cpp	2010-06-13 12:10:45 UTC (rev 7187)
@@ -15,7 +15,6 @@
 #include "DirDoc.h"
 #include "resource.h"
 #include "coretools.h"
-#include "dllver.h"
 #include "DirViewColItems.h"
 #include "DirColsDlg.h"
 #include "OptionsDef.h"

Modified: trunk/Src/FilepathEdit.cpp
===================================================================
--- trunk/Src/FilepathEdit.cpp	2010-06-13 10:20:59 UTC (rev 7186)
+++ trunk/Src/FilepathEdit.cpp	2010-06-13 12:10:45 UTC (rev 7187)
@@ -31,7 +31,6 @@
 #include "BCMenu.h"
 #include "FilepathEdit.h"
 #include "Shlwapi.h"
-#include "dllVer.h"		
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp	2010-06-13 10:20:59 UTC (rev 7186)
+++ trunk/Src/MergeDoc.cpp	2010-06-13 12:10:45 UTC (rev 7187)
@@ -54,7 +54,6 @@
 #include "DiffFileInfo.h"
 #include "SaveClosingDlg.h"
 #include "DiffList.h"
-#include "dllver.h"
 #include "codepage.h"
 #include "paths.h"
 #include "OptionsMgr.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7186] trunk/Src

[<jt...@us...>]

Revision: 7186
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7186&view=rev
Author:   jtuc
Date:     2010-06-13 10:20:59 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
PATCH: [ 3015416 ] LineFiltersDlg: Employ listview in-place editing capability

Modified Paths:
--------------
    trunk/Src/LineFiltersDlg.cpp
    trunk/Src/LineFiltersDlg.h
    trunk/Src/Merge.rc
    trunk/Src/resource.h

Modified: trunk/Src/LineFiltersDlg.cpp
===================================================================
--- trunk/Src/LineFiltersDlg.cpp	2010-06-13 10:13:37 UTC (rev 7185)
+++ trunk/Src/LineFiltersDlg.cpp	2010-06-13 10:20:59 UTC (rev 7186)
@@ -11,7 +11,6 @@
 #include "LineFiltersList.h"
 #include "MainFrm.h"
 #include "LineFiltersDlg.h"
-#include "dllver.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -33,8 +32,6 @@
 LineFiltersDlg::LineFiltersDlg()
 : CPropertyPage(LineFiltersDlg::IDD)
 , m_pList(NULL)
-, m_bEditing(FALSE)
-, m_editedIndex(-1)
 {
 	//{{AFX_DATA_INIT(LineFiltersDlg)
 	m_bIgnoreRegExp = FALSE;
@@ -53,22 +50,19 @@
 	DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
 	//}}AFX_DATA_MAP
 	DDX_Control(pDX, IDC_LFILTER_LIST, m_filtersList);
-	DDX_Control(pDX, IDC_LFILTER_EDITBOX, m_editRegexp);
-	DDX_Control(pDX, IDC_LFILTER_EDITSAVE, m_saveRegexp);
 }
 
 
 BEGIN_MESSAGE_MAP(LineFiltersDlg, CPropertyPage)
 	//{{AFX_MSG_MAP(LineFiltersDlg)
-	ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
 	ON_COMMAND(ID_HELP, OnHelp)
 	//}}AFX_MSG_MAP
 	ON_BN_CLICKED(IDC_LFILTER_ADDBTN, OnBnClickedLfilterAddBtn)
 	ON_BN_CLICKED(IDC_LFILTER_EDITBTN, OnBnClickedLfilterEditbtn)
 	ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn)
-	ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave)
 	ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
-	ON_EN_KILLFOCUS(IDC_LFILTER_EDITBOX, OnEnKillfocusLfilterEditbox)
+	ON_NOTIFY(LVN_KEYDOWN, IDC_LFILTER_LIST, OnLvnKeyDownLfilterList)
+	ON_NOTIFY(LVN_ENDLABELEDIT, IDC_LFILTER_LIST, OnEndLabelEditLfilterList)
 END_MESSAGE_MAP()
 
 
@@ -96,48 +90,23 @@
 void LineFiltersDlg::InitList()
 {
 	// Show selection across entire row.
-	DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT |
-		LVS_EX_ONECLICKACTIVATE;
-	// Also enable infotips if they have new enough version for our
-	// custom draw code
-	// LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
-	if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
-		newstyle |= LVS_EX_INFOTIP;
+	// Also enable infotips.
+	m_filtersList.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
 
-	m_filtersList.ModifyStyle(0, LVS_EDITLABELS | LVS_SHOWSELALWAYS);
-
-	m_filtersList.SetExtendedStyle(m_filtersList.GetExtendedStyle() | newstyle);
-
 	String title = theApp.LoadString(IDS_FILTERLINE_REGEXP);
 	m_filtersList.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 500);
 
 	int count = m_pList->GetCount();
-	int ind = -1;
 	for (int i = 0; i < count; i++)
 	{
 		const LineFilterItem &item = m_pList->GetAt(i);
-		ind = AddRow(item.filterStr.c_str(), item.enabled);
+		AddRow(item.filterStr.c_str(), item.enabled);
 	}
-	if (count > 0)
-	{
-		m_filtersList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
-		BOOL bPartialOk = FALSE;
-		m_filtersList.EnsureVisible(0, bPartialOk);
-		CString text = m_filtersList.GetItemText(0, 0);
-		m_editRegexp.SetWindowText(text);
-	}
+	m_filtersList.SetItemState(0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
 	UpdateData(FALSE);
 }
 
 /**
- * @brief User clicked filter enable/disable checkbox.
- */
-void LineFiltersDlg::OnIgnoreregexp() 
-{
-	UpdateData();
-}
-
-/**
  * @brief Open help from mainframe when user presses F1.
  */
 void LineFiltersDlg::OnHelp()
@@ -154,7 +123,7 @@
 int LineFiltersDlg::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/)
 {
 	int items = m_filtersList.GetItemCount();
-	int ind = m_filtersList.InsertItem(items + 1, filter);
+	int ind = m_filtersList.InsertItem(items, filter);
 	m_filtersList.SetCheck(ind, enabled);
 	return ind;
 }
@@ -168,14 +137,7 @@
 	int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED);
 	if (sel > -1)
 	{
-		CString text = m_filtersList.GetItemText(sel, 0);
-		m_editRegexp.SetWindowText(text);
-		m_editRegexp.SetReadOnly(FALSE);
-		m_saveRegexp.EnableWindow(TRUE);
-		m_editRegexp.SetFocus();
-		m_editRegexp.SetSel(0, -1);
-		m_bEditing = TRUE;
-		m_editedIndex = sel;
+		m_filtersList.EditLabel(sel);
 	}
 }
 
@@ -188,8 +150,7 @@
 	if (ind >= -1)
 	{
 		m_filtersList.SetItemState(ind, LVIS_SELECTED, LVIS_SELECTED);
-		BOOL bPartialOk = FALSE;
-		m_filtersList.EnsureVisible(ind, bPartialOk);
+		m_filtersList.EnsureVisible(ind, FALSE);
 		EditSelectedFilter();
 	}
 }
@@ -234,8 +195,7 @@
  */
 void LineFiltersDlg::OnBnClickedLfilterRemovebtn()
 {
-	int sel =- 1;
-	sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+	int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED);
 	if (sel != -1)
 	{
 		m_filtersList.DeleteItem(sel);
@@ -251,78 +211,31 @@
 }
 
 /**
- * @brief Called when Save button is clicked.
+ * @brief Called when the user activates an item.
  */
-void LineFiltersDlg::OnBnClickedLfilterEditsave()
-{
-	SaveItem();
-}
-
-/**
- * @brief Cancel editing of filter when ESC is pressed.
- */
-BOOL LineFiltersDlg::PreTranslateMessage(MSG* pMsg)
-{
-	if (m_bEditing)
-	{
-		// Handle Esc key press
-		if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE)
-		{
-			m_saveRegexp.EnableWindow(FALSE);
-			m_editRegexp.SetReadOnly(TRUE);
-			m_bEditing = FALSE;
-			m_filtersList.SetFocus();
-			int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED);
-			if (sel > -1)
-			{
-				CString text = m_filtersList.GetItemText(sel, 0);
-				m_editRegexp.SetWindowText(text);
-			}
-			return TRUE;
-		}
-	}
-	return CPropertyPage::PreTranslateMessage(pMsg);
-}
-
-/**
- * @brief Called when selected item in list changes.
- */
 void LineFiltersDlg::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
 {
-	LPNMITEMACTIVATE pNMIA = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
-	int item = pNMIA->iItem;
-	if (m_bEditing)
-	{
-		m_saveRegexp.EnableWindow(FALSE);
-		m_editRegexp.SetReadOnly(TRUE);
-		m_bEditing = FALSE;
-	}
-	CString text = m_filtersList.GetItemText(item, 0);
-	m_editRegexp.SetWindowText(text);
+	EditSelectedFilter();
 	*pResult = 0;
 }
 
 /**
- * @brief Save the current filter in edit box.
+ * @brief Called when a key has been pressed while the list has the focus.
  */
-void LineFiltersDlg::SaveItem()
+void LineFiltersDlg::OnLvnKeyDownLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
 {
-	if (m_bEditing)
+	LPNMKEY pNMKey = reinterpret_cast<LPNMKEY>(pNMHDR);
+	if (LOWORD(pNMKey->nVKey) == VK_F2)
 	{
-		CString text;
-		m_editRegexp.GetWindowText(text);
-		m_filtersList.SetItemText(m_editedIndex, 0, text);
-		m_bEditing = FALSE;
-		m_editRegexp.SetReadOnly(TRUE);
-		m_saveRegexp.EnableWindow(FALSE);
-		m_editedIndex = -1;
+		EditSelectedFilter();
 	}
+	*pResult = 0;
 }
 
 /**
- * @brief Called when filter edit box loses its focus.
+ * @brief Called when in-place editing has finished.
  */
-void LineFiltersDlg::OnEnKillfocusLfilterEditbox()
+void LineFiltersDlg::OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
 {
-	SaveItem();
+	*pResult = 1;
 }

Modified: trunk/Src/LineFiltersDlg.h
===================================================================
--- trunk/Src/LineFiltersDlg.h	2010-06-13 10:13:37 UTC (rev 7185)
+++ trunk/Src/LineFiltersDlg.h	2010-06-13 10:20:59 UTC (rev 7186)
@@ -46,32 +46,25 @@
 	// Generated message map functions
 	//{{AFX_MSG(LineFiltersDlg)
 	virtual BOOL OnInitDialog();
-	afx_msg void OnIgnoreregexp();
 	afx_msg void OnHelp();
 	virtual void OnOK();
 	afx_msg void OnBnClickedLfilterAddBtn();
 	afx_msg void OnBnClickedLfilterEditbtn();
 	afx_msg void OnBnClickedLfilterRemovebtn();
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
-	afx_msg void OnBnClickedLfilterEditsave();
 	afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
-	afx_msg void OnEnKillfocusLfilterEditbox();
+	afx_msg void OnLvnKeyDownLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
 	void InitList();
 	int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE);
 	void EditSelectedFilter();
-	void SaveItem();
 
 private:
 	CListCtrl m_filtersList; /**< List control having filter strings */
-	CEdit m_editRegexp; /**< Editbox for editing filter */
-	CButton m_saveRegexp; /**< Button for saving edited filter */
 
 	LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
-	BOOL m_bEditing; /**< Are we editing a filter string? */
-	int m_editedIndex; /**< Index of the item being edited. */
 };
 
 //{{AFX_INSERT_LOCATION}}

Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc	2010-06-13 10:13:37 UTC (rev 7185)
+++ trunk/Src/Merge.rc	2010-06-13 10:20:59 UTC (rev 7186)
@@ -896,10 +896,7 @@
                     351,8
     CONTROL         "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT | 
                     LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | 
-                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
-    EDITTEXT        IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    PUSHBUTTON      "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,121
     PUSHBUTTON      "New",IDC_LFILTER_ADDBTN,7,167,50,14
     PUSHBUTTON      "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
     PUSHBUTTON      "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14

Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h	2010-06-13 10:13:37 UTC (rev 7185)
+++ trunk/Src/resource.h	2010-06-13 10:20:59 UTC (rev 7186)
@@ -431,10 +431,8 @@
 #define IDC_LFILTER_LIST                1327
 #define IDC_LFILTER_ADDBTN              1328
 #define IDC_LFILTER_EDITBTN             1329
-#define IDC_LFILTER_EDITBOX             1330
 #define IDC_LFILTER_REMOVEBTN           1331
 #define IDC_BUTTON2                     1332
-#define IDC_LFILTER_EDITSAVE            1333
 #define IDC_ABOUTBOX_ICON               1334
 #define IDC_ASK_MULTIWINDOW_CLOSE       1335
 #define IDC_COLDLG_LIST                 1336


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7185] trunk/Src

[<jt...@us...>]

Revision: 7185
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7185&view=rev
Author:   jtuc
Date:     2010-06-13 10:13:37 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
PATCH: [ 3015396 ] Remove obsolete dll version checks

Modified Paths:
--------------
    trunk/Src/DirColsDlg.cpp
    trunk/Src/DirView.cpp
    trunk/Src/FileFiltersDlg.cpp
    trunk/Src/PluginsListDlg.cpp

Modified: trunk/Src/DirColsDlg.cpp
===================================================================
--- trunk/Src/DirColsDlg.cpp	2010-06-13 09:02:45 UTC (rev 7184)
+++ trunk/Src/DirColsDlg.cpp	2010-06-13 10:13:37 UTC (rev 7185)
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "merge.h"
 #include "DirColsDlg.h"
-#include "dllver.h"
 #include <algorithm>
 
 #ifdef _DEBUG
@@ -63,13 +62,8 @@
 void CDirColsDlg::InitList()
 {
 	// Show selection across entire row.
-	DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT;
-	// Also enable infotips if they have new enough version for our
-	// custom draw code
-	// LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
-	if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
-		newstyle |= LVS_EX_INFOTIP;
-	m_listColumns.SetExtendedStyle(m_listColumns.GetExtendedStyle() | newstyle);
+	// Also enable infotips.
+	m_listColumns.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
 	m_listColumns.InsertColumn(0, _T(""), LVCFMT_LEFT, 150);
 }
 

Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp	2010-06-13 09:02:45 UTC (rev 7184)
+++ trunk/Src/DirView.cpp	2010-06-13 10:13:37 UTC (rev 7185)
@@ -39,7 +39,6 @@
 #include "resource.h"
 #include "coretools.h"
 #include "WaitStatusCursor.h"
-#include "dllver.h"
 #include "locality.h"
 #include "FileTransform.h"
 #include "SelectUnpackerDlg.h"
@@ -332,14 +331,9 @@
 	ReloadColumns();
 
 	// Show selection across entire row.
-	// Also allow user to rearrange columns via drag&drop of headers
-	// if they have a new enough common controls
-	DWORD exstyle = LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP;
-	// Also enable infotips if they have new enough version for our
-	// custom draw code
-	// LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
-	if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4, 71))
-		exstyle |= LVS_EX_INFOTIP;
+	// Also allow user to rearrange columns via drag&drop of headers.
+	// Also enable infotips.
+	DWORD exstyle = LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP | LVS_EX_INFOTIP;
 	m_pList->SetExtendedStyle(exstyle);
 }
 
@@ -2620,10 +2614,6 @@
  */
 void CDirView::FixReordering()
 {
-	// LVCOLUMN.iOrder is present with version 4.70+
-	if (GetDllVersion(_T("shlwapi.dll")) < PACKVERSION(4, 70))
-		return;
-
 	LVCOLUMN lvcol;
 	lvcol.mask = LVCF_ORDER;
 	lvcol.fmt = 0;

Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp	2010-06-13 09:02:45 UTC (rev 7184)
+++ trunk/Src/FileFiltersDlg.cpp	2010-06-13 10:13:37 UTC (rev 7185)
@@ -29,7 +29,6 @@
 #include "MainFrm.h"
 #include "FileFiltersDlg.h"
 #include "coretools.h"
-#include "dllver.h"
 #include "FileFilterMgr.h"
 #include "paths.h"
 #include "SharedFilterDlg.h"
@@ -128,13 +127,8 @@
 void FileFiltersDlg::InitList()
 {
 	// Show selection across entire row.
-	DWORD newstyle = LVS_EX_FULLROWSELECT;
-	// Also enable infotips if they have new enough version for our
-	// custom draw code
-	// LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
-	if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
-		newstyle |= LVS_EX_INFOTIP;
-	m_listFilters.SetExtendedStyle(m_listFilters.GetExtendedStyle() | newstyle);
+	// Also enable infotips.
+	m_listFilters.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
 
 	String title = theApp.LoadString(IDS_FILTERFILE_NAMETITLE);
 	m_listFilters.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150);
@@ -332,12 +326,6 @@
 	NMLVGETINFOTIP * pInfoTip = reinterpret_cast<NMLVGETINFOTIP*>(pNMHDR);
 	ASSERT(pInfoTip);
 
-	if (GetDllVersion(_T("comctl32.dll")) < PACKVERSION(4,71))
-	{
-		// LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
-		return;
-	}
-
 	// Get subitem under mouse cursor
 	lvhti.pt = m_ptLastMousePos;
 	m_listFilters.SubItemHitTest(&lvhti);

Modified: trunk/Src/PluginsListDlg.cpp
===================================================================
--- trunk/Src/PluginsListDlg.cpp	2010-06-13 09:02:45 UTC (rev 7184)
+++ trunk/Src/PluginsListDlg.cpp	2010-06-13 10:13:37 UTC (rev 7185)
@@ -10,7 +10,6 @@
 #include "UnicodeString.h"
 #include "Merge.h"
 #include "Plugins.h"
-#include "dllver.h"
 #include "PluginsListDlg.h"
 #include "OptionsDef.h"
 
@@ -69,13 +68,8 @@
 void PluginsListDlg::InitList()
 {
 	// Show selection across entire row.
-	DWORD newstyle = LVS_EX_FULLROWSELECT;
-	// Also enable infotips if they have new enough version for our
-	// custom draw code
-	// LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
-	if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
-		newstyle |= LVS_EX_INFOTIP;
-	m_list.SetExtendedStyle(m_list.GetExtendedStyle() | newstyle);
+	// Also enable infotips.
+	m_list.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
 
 	String title = LoadResString(IDS_PLUGINSLIST_NAME);
 	m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7184] trunk/Src/MergeDiffDetailView.cpp

[<jt...@us...>]

Revision: 7184
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7184&view=rev
Author:   jtuc
Date:     2010-06-13 09:02:45 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
CMergeDiffDetailView: Fix an inconsistency in m_lineBegin vs. m_lineEnd vs. m_diffLength, which was occurring after rescan.

Modified Paths:
--------------
    trunk/Src/MergeDiffDetailView.cpp

Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp	2010-06-13 08:25:01 UTC (rev 7183)
+++ trunk/Src/MergeDiffDetailView.cpp	2010-06-13 09:02:45 UTC (rev 7184)
@@ -666,7 +666,7 @@
 		{
 		// just check that all positions all valid
 		m_lineEnd = min(m_lineEnd, GetLineCount()-1);
-		m_diffLength = GetLineCount() - m_lineBegin;
+		m_diffLength = m_lineEnd - m_lineBegin + 1;
 		m_ptCursorPos.y = min(m_ptCursorPos.y, GetLineCount()-1);
 		m_ptCursorPos.x = min(m_ptCursorPos.x, GetLineLength(m_ptCursorPos.y));
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7183] trunk/Docs/Users/ReleaseNotes.html

[<ki...@us...>]

Revision: 7183
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7183&view=rev
Author:   kimmov
Date:     2010-06-13 08:25:01 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Update 2.12.4 release notes to trunk.

Modified Paths:
--------------
    trunk/Docs/Users/ReleaseNotes.html

Modified: trunk/Docs/Users/ReleaseNotes.html
===================================================================
--- trunk/Docs/Users/ReleaseNotes.html	2010-06-12 13:00:33 UTC (rev 7182)
+++ trunk/Docs/Users/ReleaseNotes.html	2010-06-13 08:25:01 UTC (rev 7183)
@@ -51,63 +51,168 @@
 </head>
 <body>
 
-<h2>WinMerge 2.9.10 Beta Release Notes</h2>
+<h2>WinMerge 2.12.4 Release Notes</h2>
 <ul>
   <li><a href="#about">About This Release</a></li>
-  <li><a href="#new2910">What Is New in 2.9.10?</a></li>
+  <li><a href="#new2124">What Is New in 2.12.4?</a></li>
+  <li><a href="#new2122">What Is New in 2.12.2?</a></li>
+  <li><a href="#new2120">What Is New in 2.12.0?</a></li>
+  <li><a href="#new2112">What Is New in 2.11.2 beta?</a></li>
   <li><a href="#issues">Known Issues</a></li>
 </ul>
-<p>July 2008</p>
+<p>June 2009</p>
 
 <h3><a name="about">About This Release</a></h3>
 
 <p>
-This is a WinMerge beta release which is meant for preview the current state of
-WinMerge development. This release is not recommended for the production.
+This is a WinMerge 2.12.4 stable release. This release replaces earlier WinMerge
+stable releases as a recommended release.
 </p>
 
 <p>
-Please submit bug reports to our <a href=
-"https://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug-tracker</a>.
+Please submit bug reports to our <a href="http://bugs.winmerge.org">bug-tracker</a>.
+</p>
 
-<h3><a name="new2910">What Is New in 2.9.10?</a></h3>
+<h3><a name="#new2124">What Is New in 2.12.4?</a></h3>
 <p>
-For a complete changelog history, see the <code><a href="ChangeLog.txt">ChangeLog.txt</a></code>
-file located in the <code>Docs</code> folder under the WinMerge program folder.
+WinMerge 2.12.4 is an bug-fix release fixing few important bugs found
+from the 2.12.2 release. For a complete changelog history, see the
+<code><a href="ChangeLog.txt">ChangeLog.txt</a></code> file located in the
+<code>Docs</code> folder under the WinMerge program folder.</p>
+
+<h4>Bugs fixed</h4>
+<ul>
+  <li>When folder compare method changed during the compare it was not reset
+    back to original. This caused some surprising behavior and missing info.</li>
+  <li>Reports had same left/right description</li>
+  <li>When conflict file was saved trailing line-ending was lost</li>
+  <li>Opening mixed-EOL file one side forced both files to be handled as
+    mixed-eol files</li>
+  <li>Generated patch had wrong file time for UTF-16 files</li>
+  <li>"##" in file filter pattern caused an infinite loop</li>
+</ul>
+
+<h3><a name="#new2122">What Is New in 2.12.2?</a></h3>
+<p>
+WinMerge 2.12.2 is an bug-fix release fixing couple of important bugs found
+from the 2.12.0 release. For a complete changelog history, see the
+<code><a href="ChangeLog.txt">ChangeLog.txt</a></code> file located in the
+<code>Docs</code> folder under the WinMerge program folder.</p>
+
+<h4>Bugs fixed</h4>
+<ul>
+  <li>Disable folder compare tree-view by default</li>
+  <li>Filename extension column was empty for files (in folder compare)</li>
+  <li>Crash when selecting backup folder</li>
+  <li>Swapping panes did not update statusbar (in file compare)</li>
+  <li>Says files are identical after making files different in another
+    application and re-loading them</li>
+  <li>Files with missing last EOL (End Of Line) bytes were not merged correctly</li>
+</ul>
+
+<h4>Translation updates</h4>
+<ul>
+  <li>Polish</li>
+</ul>
+
+<h3><a name="#new2120">What Is New in 2.12.0?</a></h3>
+<p>
+WinMerge 2.12 is an important update to WinMerge. There are lots of 
+improvements and bug fixes since 2.10.4 stable release. 
 </p>
 
+<p>2.12.0 stable release has only couple of changes after beta release. See the
+2.12 beta release changes below for more complete change list in this release.
+</p>
+
+<h4>Improvements</h4>
+<ul>
+  <li>Remember last target folder for Copy/Move to in folder compare</li>
+</ul>
+
+<h4>Bugs fixed</h4>
+<ul>
+  <li>Help window opened from WinMerge was modal</li>
+  <li>Files without extension get backed up to name..bak</li>
+</ul>
+
+<h4>Translation updates</h4>
+<ul>
+  <li>Chinese Traditional</li>
+  <li>Croatian</li>
+  <li>Czech</li>
+  <li>Danish</li>
+  <li>Dutch</li>
+  <li>French</li>
+  <li>Galician</li>
+  <li>German</li>
+  <li>Greek</li>
+  <li>Japanese</li>
+  <li>Swedish</li>
+  <li>Ukrainian</li>
+</ul>
+
+
+<h3><a name="new2112">What Is New in 2.11.2 beta?</a></h3>
 <p>
-WinMerge 2.9.x will not have many new features. Instead many existing features
-will be improved and optimized. And some long-standing problems will be fixed.
+WinMerge 2.11.x adds couple of long awaited features. Overall WinMerge 2.11.x
+will be important improvement for some use cases.
 </p>
 
-<h4>Regular expressions</h4>
+<h4>Tree-view for folder compare</h4>
 <p>
-Regular expression library (PCRE, <a href="http://www.pcre.org/">http://www.pcre.org/</a>)
-is updated to the latest version (7.7). That will fix some problems present in
-older version used in WinMerge 2.8.x. PCRE is now used also in WinMerge's
-editor component. So Find- and Replace- features have now a lot improved regular
-expression support.
+WinMerge can now show folder compare results in a tree-style view. This is
+much improved way to show result compared to old flat result view. Subfolders
+in tree-view can be made visible and hidden like in Windows Explorer. The
+tree-style is only available when subfolders are included to the comparison. 
 </p>
 
-<h4>Installing for all users</h4>
+<h4>Include items in unique folders in compare results</h4>
 <p>
-Installer will now install WinMerge to all users. Previously the installer
-always installed just for the current user which causes problems in many
-environments. Now the Shell Integration is correctly enabled for all users
-after installing.
+If subfolders are included to the compare all unique subfolders and files in
+them are now visible in compare results. In earlier versions WinMerge only shows
+the top-level unique folder. This means one can copy subfolders and files
+inside unique folders to another side and proper folder structure is created in
+the target side.
 </p>
 
-<h4>Changes</h4>
+<h4>General compare result statuses</h4>
+<p>
+When WinMerge cannot determine if file is text- or binary-file it now shows the
+compare status with general statuses. Earlier WinMerge versions showed such
+files as text files. This is important since e.g. file size/time -based compare
+methods cannot know if file is binary- or text-file.
+</p>
+
+<h4>More accurate location pane</h4>
+<p>
+Location pane now shows missing lines more accurately. Also the visible area
+indicator positioning matches better reality.
+</p>
+
+<h4>Re-load files changed in disk behind WinMerge</h4>
+<p>
+WinMerge now finally can re-load files that have been changed in the disk after
+WinMerge loaded them. This is remarkable usability improvement since earlier
+versions required user to close current files and open them again.
+</p>
+
+<h4>Other changes</h4>
 <ul>
-  <li>Fix location pane flickering, optimize location pane</li>
-  <li>Open conflict files by drag&amp;dropping file to main window</li>
-  <li>Manual improvements</li>
+  <li>Refresh compare results after changing line filter</li>
+  <li>Add option to show Open-dialog on WinMerge startup</li>
+  <li>PCRE updated to version 7.8</li>
+  <li>Installer can add WinMerge to system path</li>
+  <li>New options page for Shell Integration options</li>
+  <li>Better Unicode file detection for full contents compare</li>
 </ul>
 
-<h4>Translation updates</h4>
+<h4>Important bug fixes</h4>
 <ul>
-  <li>New Slovenian translation</li>
+  <li>Quick compare didn't ignore EOL differences</li>
+  <li>Remove invalid characters from command line</li>
+  <li>Crash when compared file disappeared during file compare</li>
+  <li>Don't show file name extension for folders</li>
 </ul>
 
 <h3><a name="issues">Known Issues</a></h3>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7182] trunk/Tools/Scripts/create_release.py

[<ki...@us...>]

Revision: 7182
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7182&view=rev
Author:   kimmov
Date:     2010-06-12 13:00:33 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
Buildscript: Use Python's optparse module to parse command line.

Modified Paths:
--------------
    trunk/Tools/Scripts/create_release.py

Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py	2010-06-12 12:55:52 UTC (rev 7181)
+++ trunk/Tools/Scripts/create_release.py	2010-06-12 13:00:33 UTC (rev 7182)
@@ -81,7 +81,7 @@
 import os
 import os.path
 import sys
-import getopt
+simport optparse
 import shutil
 import SetVersions
 import ToolSettings
@@ -494,45 +494,37 @@
     else:
         return True
 
-def usage():
-    """Print script usage information."""
-
-    print 'WinMerge release script.'
-    print 'Usage: create_release [-h] [-f file] [-v n] [-c] [-l]'
-    print '  where:'
-    print '    -h, --help print this help'
-    print '    -v n, --version=n set release version'
-    print '    -c, --cleanup clean up build files (temp files, libraries, executables)'
-    print '    -l, --libraries build libraries (expat, scew, pcre) only'
-    print '    -f file, --file=filename set the version number ini file'
-    print '  For example: create_release -f versions.ini'
-    print '  If no version number (-v) or INI file (-f) given, 0.0.0.0 will be'
-    print '    used as version number.'
-
 def main(argv):
     global prog
     ver_file = ''
-    if len(argv) > 0:
-        opts, args = getopt.getopt(argv, "hclv:f:", [ "help", "cleanup", "libraries",
-                                                    "version=", "file="])
-        
-        for opt, arg in opts:
-            if opt in ("-h", "--help"):
-                usage()
-                sys.exit()
-            if opt in ("-v", "--version"):
-                prog_version = arg
-                print "Start building WinMerge release version " + prog_version
-            if opt in ("-c", "--cleanup"):
-                if cleanup_build() == True:
-                    print 'Cleanup done.'
-                sys.exit()
-            if opt in ("-l", "--libraries"):
-                build_libraries()
-                sys.exit()
-            if opt in ("-f", "--file"):
-                ver_file = arg
-        
+    
+    parser = optparse.OptionParser()
+    parser.add_option('--version', '-v', action = 'store',
+            help = 'Set global version number to use.')
+    parser.add_option('--cleanup', '-c', action = 'store_true',
+            help = 'Clean up build files (temp files, libraries, executables).')
+    parser.add_option('--libraries', '-l', action = 'store_true',
+            help = 'Build libraries (hekxedit, rawio32) only.')
+    parser.add_option('--file', '-f', action = 'store',
+            help = 'Set the version number ini file.')
+    options, arguments = parser.parse_args()
+
+    if options.version:
+        prog_version = options.version
+        print 'Start building Frhed release version ' + prog_version
+
+    if options.cleanup:
+        if cleanup_build() == True:
+            print 'Cleanup done.'
+        sys.exit()
+
+    if options.libraries:
+        build_libraries()
+        sys.exit()
+
+    if options.file:
+        ver_file = options.file
+
     if ver_file == '' and prog_version == '':
         print 'WARNING: No version number or INI file given, using default'
         print '    version number of 0.0.0.0 where applicable in this script.'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7181] trunk

[<ki...@us...>]

Revision: 7181
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7181&view=rev
Author:   kimmov
Date:     2010-06-12 12:55:52 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
BUG: #2995925 No refreshing after merging difference

Revert revisions 7086 and 7089 to fix the regression.

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/MergeDoc.cpp
    trunk/Src/MergeDoc.h
    trunk/Src/MergeEditView.cpp

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2010-06-12 09:58:16 UTC (rev 7180)
+++ trunk/Docs/Users/ChangeLog.txt	2010-06-12 12:55:52 UTC (rev 7181)
@@ -7,6 +7,7 @@
   Installer: Embed MS runtime files installer for x64 (r7150)
   Bugfix: Compare by size always checked file times too (#2919510)
   Bugfix: Line filtering wasted huge amounts of memory (#3014162)
+  Bugfix: Difference blocks not cleared after merging (#2995925)
   Translation updates:
   - Japanese (r7153)
 
@@ -36,7 +37,6 @@
   Bugfix: Pane headers not updated after language change (#2923684)
   Bugfix: File panes become unaligned when last line didn't have
     an EOL byte (#2922517)
-  Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
   Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
   Translation updates:
   - Slovenian (#2917796, #2932094)

Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp	2010-06-12 09:58:16 UTC (rev 7180)
+++ trunk/Src/MergeDoc.cpp	2010-06-12 12:55:52 UTC (rev 7181)
@@ -2277,7 +2277,7 @@
 	}
 
 	BOOL bBinary = FALSE;
-	nRescanResult = Rescan(bBinary, bIdentical, TRUE);
+	nRescanResult = Rescan(bBinary, bIdentical);
 
 	// Open filed if rescan succeed and files are not binaries
 	if (nRescanResult == RESCAN_OK)

Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h	2010-06-12 09:58:16 UTC (rev 7180)
+++ trunk/Src/MergeDoc.h	2010-06-12 12:55:52 UTC (rev 7181)
@@ -234,7 +234,6 @@
 	void SetMergingMode(bool bMergingMode);
 	void SetDetectMovedBlocks(bool bDetectMovedBlocks);
 	bool IsMixedEOL(int nBuffer) const;
-	void SetAutomaticRescan(bool bRescan) { m_bEnableRescan = bRescan; }
 
 // implementation methods
 private:

Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp	2010-06-12 09:58:16 UTC (rev 7180)
+++ trunk/Src/MergeEditView.cpp	2010-06-12 12:55:52 UTC (rev 7181)
@@ -1635,7 +1635,6 @@
 {
 	bool bOldValue = m_bAutomaticRescan;
 	m_bAutomaticRescan = bEnable;
-	GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
 	return bOldValue;
 }
 
@@ -2334,7 +2333,6 @@
 void CMergeEditView::RefreshOptions()
 { 
 	m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
-	GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
 
 	if (GetOptionsMgr()->GetInt(OPT_TAB_TYPE) == 0)
 		SetInsertTabs(true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7180] trunk/Docs/Users/ChangeLog.txt

[<ki...@us...>]

Revision: 7180
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7180&view=rev
Author:   kimmov
Date:     2010-06-12 09:58:16 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
Fix the changelog item - use the patch ID when it exists.

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2010-06-12 09:56:48 UTC (rev 7179)
+++ trunk/Docs/Users/ChangeLog.txt	2010-06-12 09:58:16 UTC (rev 7180)
@@ -6,7 +6,7 @@
 WinMerge 2.13.13
   Installer: Embed MS runtime files installer for x64 (r7150)
   Bugfix: Compare by size always checked file times too (#2919510)
-  Bugfix: Line filtering wasted huge amounts of memory (r7178)
+  Bugfix: Line filtering wasted huge amounts of memory (#3014162)
   Translation updates:
   - Japanese (r7153)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7179] trunk/Docs/Users/ChangeLog.txt

[<ki...@us...>]

Revision: 7179
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7179&view=rev
Author:   kimmov
Date:     2010-06-12 09:56:48 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
Changelog: Bugfix: Line filtering wasted huge amounts of memory

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2010-06-11 19:59:11 UTC (rev 7178)
+++ trunk/Docs/Users/ChangeLog.txt	2010-06-12 09:56:48 UTC (rev 7179)
@@ -6,6 +6,7 @@
 WinMerge 2.13.13
   Installer: Embed MS runtime files installer for x64 (r7150)
   Bugfix: Compare by size always checked file times too (#2919510)
+  Bugfix: Line filtering wasted huge amounts of memory (r7178)
   Translation updates:
   - Japanese (r7153)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7178] trunk/Src

[<jt...@us...>]

Revision: 7178
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7178&view=rev
Author:   jtuc
Date:     2010-06-11 19:59:11 +0000 (Fri, 11 Jun 2010)

Log Message:
-----------
PATCH: [ 3014162 ] Fix LineFilters wasting enormous amounts of memory

Modified Paths:
--------------
    trunk/Src/Common/coretools.cpp
    trunk/Src/Common/coretools.h
    trunk/Src/CompareEngines/DiffUtils.cpp
    trunk/Src/DiffWrapper.cpp
    trunk/Src/FileFilterHelper.cpp
    trunk/Src/FilterList.cpp
    trunk/Src/FilterList.h

Modified: trunk/Src/Common/coretools.cpp
===================================================================
--- trunk/Src/Common/coretools.cpp	2010-06-09 06:22:56 UTC (rev 7177)
+++ trunk/Src/Common/coretools.cpp	2010-06-11 19:59:11 UTC (rev 7178)
@@ -91,6 +91,17 @@
 	return cnt;
 }
 
+size_t linelen(const char *string)
+{
+	size_t stringlen = 0;
+	while (char c = string[stringlen])
+	{
+		if (c == '\r' || c == '\n')
+			break;
+		++stringlen;
+	}
+	return stringlen;
+}
 
 void GetLocalDrives(LPTSTR letters)
 {

Modified: trunk/Src/Common/coretools.h
===================================================================
--- trunk/Src/Common/coretools.h	2010-06-09 06:22:56 UTC (rev 7177)
+++ trunk/Src/Common/coretools.h	2010-06-11 19:59:11 UTC (rev 7178)
@@ -105,6 +105,7 @@
 String LegalizeFileName(LPCTSTR szFileName);
 
 int tcssubptr(LPCTSTR start, LPCTSTR end);
+size_t linelen(const char *string);
 
 HANDLE RunIt(LPCTSTR szExeFile, LPCTSTR szArgs, BOOL bMinimized = TRUE, BOOL bNewConsole = FALSE);
 BOOL HasExited(HANDLE hProcess, DWORD *pCode = NULL);

Modified: trunk/Src/CompareEngines/DiffUtils.cpp
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.cpp	2010-06-09 06:22:56 UTC (rev 7177)
+++ trunk/Src/CompareEngines/DiffUtils.cpp	2010-06-11 19:59:11 UTC (rev 7178)
@@ -13,6 +13,7 @@
 #include "DiffContext.h"
 #include "DIFF.H"
 #include "DiffUtils.h"
+#include "coretools.h"
 
 namespace CompareEngines
 {
@@ -240,21 +241,15 @@
 		return false;
 	}
 
-	const char EolIndicators[] = "\r\n"; //List of characters used as EOL
 	bool linesMatch = true; // set to false when non-matching line is found.
 	int line = StartPos;
 
 	while (line <= EndPos && linesMatch == true)
 	{
-		std::string LineData(files[FileNo].linbuf[line]);
-		size_t EolPos = LineData.find_first_of(EolIndicators);
-		if (EolPos != std::string::npos)
+		const char *string = files[FileNo].linbuf[line];
+		size_t stringlen = linelen(string);
+		if (!m_pFilterList->Match(stringlen, string, m_codepage))
 		{
-			LineData.erase(EolPos);
-		}
-
-		if (!m_pFilterList->Match(LineData.c_str(), m_codepage))
-		{
 			linesMatch = false;
 		}
 		++line;

Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp	2010-06-09 06:22:56 UTC (rev 7177)
+++ trunk/Src/DiffWrapper.cpp	2010-06-11 19:59:11 UTC (rev 7178)
@@ -1064,24 +1064,17 @@
 		return false;
 	}
 
-	const char EolIndicators[] = "\r\n"; //List of characters used as EOL
 	bool linesMatch = true; // set to false when non-matching line is found.
 	int line = StartPos;
 
 	while (line <= EndPos && linesMatch == true)
 	{
-		char * linedata = strdup(files[FileNo].linbuf[line]);
-		int eolpos = strcspn(linedata, EolIndicators);
-		if (eolpos != strlen(linedata))
+		const char *string = files[FileNo].linbuf[line];
+		size_t stringlen = linelen(string);
+		if (!m_pFilterList->Match(stringlen, string, m_codepage))
 		{
-			linedata[eolpos] = '\0';
-		}
-
-		if (!m_pFilterList->Match(linedata, m_codepage))
-		{
 			linesMatch = false;
 		}
-		free(linedata);
 		++line;
 	}
 	return linesMatch;

Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp	2010-06-09 06:22:56 UTC (rev 7177)
+++ trunk/Src/FileFilterHelper.cpp	2010-06-11 19:59:11 UTC (rev 7178)
@@ -253,7 +253,7 @@
 			strFileName = strFileName + _T(".");
 
 		char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName.c_str());
-		bool match = m_pMaskFilter->Match(name_utf);
+		bool match = m_pMaskFilter->Match(strlen(name_utf), name_utf);
 		UCS2UTF8_Dealloc(name_utf);
 		return match;
 	}

Modified: trunk/Src/FilterList.cpp
===================================================================
--- trunk/Src/FilterList.cpp	2010-06-09 06:22:56 UTC (rev 7177)
+++ trunk/Src/FilterList.cpp	2010-06-11 19:59:11 UTC (rev 7178)
@@ -107,11 +107,10 @@
  * @param [in] codepage codepage of string.
  * @return true if any of the expressions did match the string.
  */
-bool FilterList::Match(const char *string, int codepage/*=CP_UTF8*/)
+bool FilterList::Match(size_t stringlen, const char *string, int codepage/*=CP_UTF8*/)
 {
 	bool retval = false;
 	const size_t count = m_list.size();
-	size_t stringlen = strlen(string);
 
 	// convert string into UTF-8
 	ucr::buffer buf(stringlen * 2);

Modified: trunk/Src/FilterList.h
===================================================================
--- trunk/Src/FilterList.h	2010-06-09 06:22:56 UTC (rev 7177)
+++ trunk/Src/FilterList.h	2010-06-11 19:59:11 UTC (rev 7178)
@@ -48,7 +48,7 @@
 	void AddRegExp(const char *regularExpression, EncodingType encoding);
 	void RemoveAllFilters();
 	bool HasRegExps();
-	bool Match(const char *string, int codepage = CP_UTF8);
+	bool Match(size_t stringlen, const char *string, int codepage = CP_UTF8);
 	const char * GetLastMatchExpression();
 
 private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7177] trunk/Src/HexMergeDoc.cpp

[<jt...@us...>]

Revision: 7177
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7177&view=rev
Author:   jtuc
Date:     2010-06-09 06:22:56 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
HexMergeView: Differences could fail to show up in left pane unless some action was taken that would cause a repaint (seen on Vista with OPT_SCROLL_TO_FIRST off).

Modified Paths:
--------------
    trunk/Src/HexMergeDoc.cpp

Modified: trunk/Src/HexMergeDoc.cpp
===================================================================
--- trunk/Src/HexMergeDoc.cpp	2010-06-06 13:41:33 UTC (rev 7176)
+++ trunk/Src/HexMergeDoc.cpp	2010-06-09 06:22:56 UTC (rev 7177)
@@ -439,21 +439,21 @@
  */
 HRESULT CHexMergeDoc::OpenDocs(LPCTSTR pathLeft, LPCTSTR pathRight, BOOL bROLeft, BOOL bRORight)
 {
+	CHexMergeFrame *pf = GetParentFrame();
+	ASSERT(pf);
 	HRESULT hr;
 	if (SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_LEFT, pathLeft, bROLeft)) &&
 		SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_RIGHT, pathRight, bRORight)))
 	{
 		UpdateDiffItem(0);
+		pf->Invalidate();
 		if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
 			m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
 	}
 	else
 	{
-		if (CFrameWnd *pFrame = GetParentFrame())
-		{
-			// Use verify macro to trap possible error in debug.
-			VERIFY(pFrame->DestroyWindow());
-		}
+		// Use verify macro to trap possible error in debug.
+		VERIFY(pf->DestroyWindow());
 	}
 	return hr;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7176] trunk/Src/Common/unicoder.cpp

[<jt...@us...>]

Revision: 7176
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7176&view=rev
Author:   jtuc
Date:     2010-06-06 13:41:33 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Fix an apparent bug in to_utf8_advance()

Modified Paths:
--------------
    trunk/Src/Common/unicoder.cpp

Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp	2010-06-02 14:51:43 UTC (rev 7175)
+++ trunk/Src/Common/unicoder.cpp	2010-06-06 13:41:33 UTC (rev 7176)
@@ -281,7 +281,7 @@
 	}
 	else if (u < 0x80000000)
 	{
-		*lpd++ = 0xF8 + (u >> 30);
+		*lpd++ = 0xFC + (u >> 30);
 		*lpd++ = 0x80 + ((u >> 24) & 0x3F);
 		*lpd++ = 0x80 + ((u >> 18) & 0x3F);
 		*lpd++ = 0x80 + ((u >> 12) & 0x3F);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7175] trunk/Src/DirViewColItems.cpp

[<jt...@us...>]

Revision: 7175
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7175&view=rev
Author:   jtuc
Date:     2010-06-02 14:51:43 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
VC2010 does not accept a dot to serve as a class resolution operator

Modified Paths:
--------------
    trunk/Src/DirViewColItems.cpp

Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp	2010-06-02 06:24:43 UTC (rev 7174)
+++ trunk/Src/DirViewColItems.cpp	2010-06-02 14:51:43 UTC (rev 7175)
@@ -228,8 +228,8 @@
 	{
 		int i_ahead = s.find('\\', i);
 		int j_ahead = t.find('\\', j);
-		int length_s = (i_ahead != std::string.npos ? i_ahead : s.length()) - i;
-		int length_t = (j_ahead != std::string.npos ? j_ahead : t.length()) - j;
+		int length_s = (i_ahead != String::npos ? i_ahead : s.length()) - i;
+		int length_t = (j_ahead != String::npos ? j_ahead : t.length()) - j;
 		if (length_s != length_t ||
 			!StrIsIntlEqual(FALSE, s.c_str() + i, t.c_str() + j, length_s))
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7174] trunk/Src/Merge.vcproj

[<ge...@us...>]

Revision: 7174
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7174&view=rev
Author:   gerundt
Date:     2010-06-02 06:24:43 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
Fix some batch files paths in Merge.vcproj

Modified Paths:
--------------
    trunk/Src/Merge.vcproj

Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj	2010-06-02 06:19:33 UTC (rev 7173)
+++ trunk/Src/Merge.vcproj	2010-06-02 06:24:43 UTC (rev 7174)
@@ -12006,15 +12006,15 @@
 			Name="Batch files"
 			>
 			<File
-				RelativePath=".\Languages\BuildMergeLangDll.bat"
+				RelativePath="..\Translations\WinMerge\BuildMergeLangDll.bat"
 				>
 			</File>
 			<File
-				RelativePath=".\Languages\CreateMasterPotFile.vbs"
+				RelativePath="..\Translations\WinMerge\CreateMasterPotFile.vbs"
 				>
 			</File>
 			<File
-				RelativePath=".\Languages\GetTranslationsStatus.vbs"
+				RelativePath="..\Translations\WinMerge\GetTranslationsStatus.vbs"
 				>
 			</File>
 			<File
@@ -12030,7 +12030,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\Languages\UpdatePoFilesFromPotFile.vbs"
+				RelativePath="..\Translations\WinMerge\UpdatePoFilesFromPotFile.vbs"
 				>
 			</File>
 		</Filter>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7173] trunk/Src/MergeLangX64.vcproj

[<ge...@us...>]

Revision: 7173
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7173&view=rev
Author:   gerundt
Date:     2010-06-02 06:19:33 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
Fix CreateMasterPotFile calls in MergeLangX64.vcproj

Modified Paths:
--------------
    trunk/Src/MergeLangX64.vcproj

Modified: trunk/Src/MergeLangX64.vcproj
===================================================================
--- trunk/Src/MergeLangX64.vcproj	2010-05-19 12:57:18 UTC (rev 7172)
+++ trunk/Src/MergeLangX64.vcproj	2010-06-02 06:19:33 UTC (rev 7173)
@@ -29,7 +29,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -110,7 +110,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -192,7 +192,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -271,7 +271,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -351,7 +351,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -432,7 +432,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -514,7 +514,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -593,7 +593,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -673,7 +673,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -754,7 +754,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -836,7 +836,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -915,7 +915,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+				CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -997,7 +997,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1006,7 +1006,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1015,7 +1015,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1024,7 +1024,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1033,7 +1033,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1042,7 +1042,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1051,7 +1051,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1060,7 +1060,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1069,7 +1069,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1078,7 +1078,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1087,7 +1087,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
@@ -1096,7 +1096,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
+					CommandLine="cd ..\Translations\WinMerge&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7172] trunk/Src

[<jt...@us...>]

Revision: 7172
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7172&view=rev
Author:   jtuc
Date:     2010-05-19 12:57:18 +0000 (Wed, 19 May 2010)

Log Message:
-----------
Restart discussion about binary file detection (TODO #1946860)

Modified Paths:
--------------
    trunk/Src/FileTextEncoding.cpp
    trunk/Src/FileTextEncoding.h
    trunk/Src/codepage_detect.cpp

Modified: trunk/Src/FileTextEncoding.cpp
===================================================================
--- trunk/Src/FileTextEncoding.cpp	2010-05-19 12:25:14 UTC (rev 7171)
+++ trunk/Src/FileTextEncoding.cpp	2010-05-19 12:57:18 UTC (rev 7172)
@@ -30,6 +30,7 @@
 	m_unicoding = ucr::NONE;
 	m_bom = false;
 	m_guessed = false;
+	m_binary = false;
 }
 
 /**

Modified: trunk/Src/FileTextEncoding.h
===================================================================
--- trunk/Src/FileTextEncoding.h	2010-05-19 12:25:14 UTC (rev 7171)
+++ trunk/Src/FileTextEncoding.h	2010-05-19 12:57:18 UTC (rev 7172)
@@ -20,6 +20,7 @@
 	ucr::UNICODESET m_unicoding; /**< Unicode encoding. */
 	bool m_bom; /**< Unicode byte marker */
 	bool m_guessed; /**< Whether encoding was guessed from content */
+	bool m_binary;
 
 	FileTextEncoding();
 	void Clear();

Modified: trunk/Src/codepage_detect.cpp
===================================================================
--- trunk/Src/codepage_detect.cpp	2010-05-19 12:25:14 UTC (rev 7171)
+++ trunk/Src/codepage_detect.cpp	2010-05-19 12:57:18 UTC (rev 7172)
@@ -208,6 +208,7 @@
 	encoding->SetCodepage(getDefaultCodepage());
 	encoding->m_bom = false;
 	encoding->m_guessed = false;
+	encoding->m_binary = false;
 	switch (fi.nByteOrder)
 	{
 	case 8 + 2 + 0:
@@ -226,8 +227,9 @@
 		if (fi.pImage && !CheckForInvalidUtf8((LPBYTE)fi.pImage, fi.cbImage))
 			encoding->SetUnicoding(ucr::UTF8);
 		encoding->m_bom = false;
+		if (memchr(fi.pImage, 0, fi.cbImage))
+			encoding->m_binary = true;
 		break;
-
 	}
 	if (fi.nByteOrder == 1 && bGuessEncoding)
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7171] trunk/Src/codepage_detect.cpp

[<jt...@us...>]

Revision: 7171
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7171&view=rev
Author:   jtuc
Date:     2010-05-19 12:25:14 +0000 (Wed, 19 May 2010)

Log Message:
-----------
Fix possible access beyond end of memory mapped file

Modified Paths:
--------------
    trunk/Src/codepage_detect.cpp

Modified: trunk/Src/codepage_detect.cpp
===================================================================
--- trunk/Src/codepage_detect.cpp	2010-05-16 15:19:15 UTC (rev 7170)
+++ trunk/Src/codepage_detect.cpp	2010-05-19 12:25:14 UTC (rev 7171)
@@ -223,7 +223,7 @@
 		encoding->m_bom = true;
 		break;
 	default:
-		if (fi.pImage && !CheckForInvalidUtf8((LPBYTE)fi.pImage, 4096))
+		if (fi.pImage && !CheckForInvalidUtf8((LPBYTE)fi.pImage, fi.cbImage))
 			encoding->SetUnicoding(ucr::UTF8);
 		encoding->m_bom = false;
 		break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7170] trunk/Src/Common/UnicodeString.cpp

[<jt...@us...>]

Revision: 7170
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7170&view=rev
Author:   jtuc
Date:     2010-05-16 15:19:15 +0000 (Sun, 16 May 2010)

Log Message:
-----------
string_replace(): Fix infinite loop if (replace) contains an occurrence of (find) at a position greater than the length of (find).

Modified Paths:
--------------
    trunk/Src/Common/UnicodeString.cpp

Modified: trunk/Src/Common/UnicodeString.cpp
===================================================================
--- trunk/Src/Common/UnicodeString.cpp	2010-05-16 14:44:19 UTC (rev 7169)
+++ trunk/Src/Common/UnicodeString.cpp	2010-05-16 15:19:15 UTC (rev 7170)
@@ -57,11 +57,12 @@
  */
 void string_replace(String &target, const String &find, const String &replace)
 {
-	const std::string::size_type replace_len = find.length();
-	std::string::size_type pos = 0;
+	const String::size_type find_len = find.length();
+	const String::size_type replace_len = replace.length();
+	String::size_type pos = 0;
 	while ((pos = target.find(find, pos)) != String::npos)
 	{
-		target.replace(pos, replace_len, replace);
+		target.replace(pos, find_len, replace);
 		pos += replace_len;
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.