Skip to content

Commit 00add4d

Browse files
sdottakasdottaka
authored
Merge pull request #2 from WinMerge/show-diff
Highlight differences on WebView2 windows
2 parents 55d5f46 + ad3081f commit 00add4d

24 files changed

+5645
-523
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ Dist/
88
*.aps
99
*.*~
1010
winwebdiff-cppcheck-build-dir/
11+
src/gen-versioninfo.h

‎LICENSE_LibXDiff.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* LibXDiff by Davide Libenzi ( File Differential Library )
3+
* Copyright (C) 2003 Davide Libenzi
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 2.1 of the License, or (at your option) any later version.
9+
*
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library; if not, see
17+
* <http://www.gnu.org/licenses/>.
18+
*
19+
* Davide Libenzi <davidel@xmailserver.org>
20+
*/

‎WinWebDiff.vs2019.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinWebDiff", "src\WinWebDif
1010
EndProject
1111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinWebDiffLib", "src\WinWebDiffLib\WinWebDiffLib.vcxproj", "{551AB4A6-2721-48F0-96A4-231BD11032B8}"
1212
EndProject
13+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinWebDiffTest", "src\WinWebDiffTest\WinWebDiffTest.vcxproj", "{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}"
14+
EndProject
1315
Global
1416
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1517
Debug|ARM64 = Debug|ARM64
@@ -44,6 +46,18 @@ Global
4446
{551AB4A6-2721-48F0-96A4-231BD11032B8}.Release|x64.Build.0 = Release|x64
4547
{551AB4A6-2721-48F0-96A4-231BD11032B8}.Release|x86.ActiveCfg = Release|Win32
4648
{551AB4A6-2721-48F0-96A4-231BD11032B8}.Release|x86.Build.0 = Release|Win32
49+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|ARM64.ActiveCfg = Debug|ARM64
50+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|ARM64.Build.0 = Debug|ARM64
51+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x64.ActiveCfg = Debug|x64
52+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x64.Build.0 = Debug|x64
53+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x86.ActiveCfg = Debug|Win32
54+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x86.Build.0 = Debug|Win32
55+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|ARM64.ActiveCfg = Release|ARM64
56+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|ARM64.Build.0 = Release|ARM64
57+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x64.ActiveCfg = Release|x64
58+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x64.Build.0 = Release|x64
59+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x86.ActiveCfg = Release|Win32
60+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x86.Build.0 = Release|Win32
4761
EndGlobalSection
4862
GlobalSection(SolutionProperties) = preSolution
4963
HideSolutionNode = FALSE

‎WinWebDiff.vs2022.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinWebDiff", "src\WinWebDif
1010
EndProject
1111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinWebDiffLib", "src\WinWebDiffLib\WinWebDiffLib.vcxproj", "{551AB4A6-2721-48F0-96A4-231BD11032B8}"
1212
EndProject
13+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinWebDiffTest", "src\WinWebDiffTest\WinWebDiffTest.vcxproj", "{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}"
14+
EndProject
1315
Global
1416
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1517
Debug|ARM64 = Debug|ARM64
@@ -44,6 +46,18 @@ Global
4446
{551AB4A6-2721-48F0-96A4-231BD11032B8}.Release|x64.Build.0 = Release|x64
4547
{551AB4A6-2721-48F0-96A4-231BD11032B8}.Release|x86.ActiveCfg = Release|Win32
4648
{551AB4A6-2721-48F0-96A4-231BD11032B8}.Release|x86.Build.0 = Release|Win32
49+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|ARM64.ActiveCfg = Debug|ARM64
50+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|ARM64.Build.0 = Debug|ARM64
51+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x64.ActiveCfg = Debug|x64
52+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x64.Build.0 = Debug|x64
53+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x86.ActiveCfg = Debug|Win32
54+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Debug|x86.Build.0 = Debug|Win32
55+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|ARM64.ActiveCfg = Release|ARM64
56+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|ARM64.Build.0 = Release|ARM64
57+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x64.ActiveCfg = Release|x64
58+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x64.Build.0 = Release|x64
59+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x86.ActiveCfg = Release|Win32
60+
{4021F55B-AF8F-4A9F-B8F2-A5C3009C5DE6}.Release|x86.Build.0 = Release|Win32
4761
EndGlobalSection
4862
GlobalSection(SolutionProperties) = preSolution
4963
HideSolutionNode = FALSE

‎src/WinWebDiff/Resource.h

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,31 @@
1818
#define IDM_VIEW_SIZE_1280x800 124
1919
#define IDM_VIEW_SIZE_1440x900 125
2020
#define IDM_VIEW_SPLITHORIZONTALLY 126
21-
#define IDM_COMPARE_SCREENSHOTS 130
22-
#define IDM_COMPARE_FULLSIZE_SCREENSHOTS 131
23-
#define IDM_COMPARE_HTML 132
24-
#define IDM_COMPARE_TEXT 133
25-
#define IDM_COMPARE_RESOURCE_TREE 134
26-
#define IDM_CLEAR_DISK_CACHE 135
27-
#define IDM_CLEAR_COOKIES 136
28-
#define IDM_CLEAR_BROWSING_HISTORY 137
29-
#define IDM_CLEAR_ALL_PROFILE 138
30-
#define IDI_WINWEBDIFF 140
31-
#define IDI_SMALL 141
32-
#define IDC_WINWEBDIFF 142
21+
#define IDM_VIEW_VIEWDIFFERENCES 127
22+
#define IDM_VIEW_DIFF_ALGORITHM_MYERS 128
23+
#define IDM_VIEW_DIFF_ALGORITHM_MINIMAL 129
24+
#define IDM_VIEW_DIFF_ALGORITHM_PATIENCE 130
25+
#define IDM_VIEW_DIFF_ALGORITHM_HISTOGRAM 131
26+
#define IDM_VIEW_DIFF_ALGORITHM_NONE 132
27+
#define IDM_COMPARE_RECOMPARE 140
28+
#define IDM_COMPARE_SCREENSHOTS 141
29+
#define IDM_COMPARE_FULLSIZE_SCREENSHOTS 142
30+
#define IDM_COMPARE_HTML 143
31+
#define IDM_COMPARE_TEXT 144
32+
#define IDM_COMPARE_RESOURCE_TREE 145
33+
#define IDM_COMPARE_NEXTDIFFERENCE 146
34+
#define IDM_COMPARE_PREVIOUSDIFFERENCE 147
35+
#define IDM_COMPARE_FIRSTDIFFERENCE 148
36+
#define IDM_COMPARE_LASTDIFFERENCE 149
37+
#define IDM_COMPARE_NEXTCONFLICT 150
38+
#define IDM_COMPARE_PREVIOUSCONFLICT 151
39+
#define IDM_CLEAR_DISK_CACHE 161
40+
#define IDM_CLEAR_COOKIES 162
41+
#define IDM_CLEAR_BROWSING_HISTORY 163
42+
#define IDM_CLEAR_ALL_PROFILE 164
43+
#define IDI_WINWEBDIFF 170
44+
#define IDI_SMALL 171
45+
#define IDC_WINWEBDIFF 172
3346
#define IDC_MYICON 2
3447
#ifndef IDC_STATIC
3548
#define IDC_STATIC -1
@@ -40,7 +53,7 @@
4053
#ifndef APSTUDIO_READONLY_SYMBOLS
4154

4255
#define _APS_NO_MFC 130
43-
#define _APS_NEXT_RESOURCE_VALUE 129
56+
#define _APS_NEXT_RESOURCE_VALUE 180
4457
#define _APS_NEXT_COMMAND_VALUE 32771
4558
#define _APS_NEXT_CONTROL_VALUE 1000
4659
#define _APS_NEXT_SYMED_VALUE 111

0 commit comments

Comments
 (0)