Update winimerge to 1.0.33. fixes #1176: Folder compare with jpg images crashes

diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index 079b3e1..81f40e8 100644 (file)
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -93,7 +93,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMerge32BitPluginProxyPS"
                {AF985E3F-14EE-420E-90FE-AAA844797D36} = {AF985E3F-14EE-420E-90FE-AAA844797D36}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\WinIMerge\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}
@@ -140,7 +140,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImagePlus", "Externals\
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
@@ -148,7 +148,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\w
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FreeImage", "FreeImage", "{AD6E6E47-0363-409F-8B7A-48341147E632}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}

diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
index b1287d6..8887611 100644 (file)
--- a/ALL.vs2019.sln
+++ b/ALL.vs2019.sln
@@ -93,7 +93,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMerge32BitPluginProxyPS"
                {AF985E3F-14EE-420E-90FE-AAA844797D36} = {AF985E3F-14EE-420E-90FE-AAA844797D36}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\WinIMerge\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}
@@ -140,7 +140,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImagePlus", "Externals\
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
@@ -148,7 +148,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\w
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FreeImage", "FreeImage", "{AD6E6E47-0363-409F-8B7A-48341147E632}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}

diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln
index 4e5c15c..3f07df1 100644 (file)
--- a/ALL.vs2022.sln
+++ b/ALL.vs2022.sln
@@ -93,7 +93,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMerge32BitPluginProxyPS"
                {AF985E3F-14EE-420E-90FE-AAA844797D36} = {AF985E3F-14EE-420E-90FE-AAA844797D36}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\WinIMerge\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}
@@ -140,7 +140,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImagePlus", "Externals\
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
@@ -148,7 +148,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\w
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FreeImage", "FreeImage", "{AD6E6E47-0363-409F-8B7A-48341147E632}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index be8051a..907f032 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -20,10 +20,10 @@ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.8-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.8-ARM.zip!Build\ARM\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.8-ARM64.zip!Build\ARM64\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.32/winimerge-1.0.32.0-x86.zip!Build\x86\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.32/winimerge-1.0.32.0-x64.zip!Build\x64\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.32/winimerge-1.0.32.0-ARM.zip!Build\ARM\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.32/winimerge-1.0.32.0-ARM64.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.33/winimerge-1.0.33.0-x86.zip!Build\x86\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.33/winimerge-1.0.33.0-x64.zip!Build\x64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.33/winimerge-1.0.33.0-ARM.zip!Build\ARM\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.33/winimerge-1.0.33.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 ^
 https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^
 https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^

diff --git a/Externals/freeimage b/Externals/freeimage
index 5c23fd3..53cc1a4 160000 (submodule)
--- a/Externals/freeimage
+++ b/Externals/freeimage
@@ -1 +1 @@
-Subproject commit 5c23fd3fc057c2156bb016d2696f57cbd00c49c7
+Subproject commit 53cc1a4efa6989552922c69c22a6e9f94f084736

diff --git a/Externals/versions.txt b/Externals/versions.txt
index 0b7a887..ff6d75d 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -7,7 +7,7 @@ POCO: 1.10.1
 boost: 1.72.0
 frhed: 0.10904.2017.6
 freeimage: 3.18.0
-WinIMerge: 1.0.31.0
+WinIMerge: 1.0.33.0
 Google C++ Testing Framework: 1.11.0
 GnuWin32 Patch for Windows: 2.5.9-7
 7-zip: 21.07

diff --git a/Externals/winimerge b/Externals/winimerge
index 2fb1f01..faf3d2f 160000 (submodule)
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
-Subproject commit 2fb1f01ca7e1385586428cd5df77d37fb375e90a
+Subproject commit faf3d2f8337c36107d33a3ca9d337aca3ff71046