Fix TortoiseMerge x64 crash

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/ext/svnbin/x64/TortoiseMerge.exe b/ext/svnbin/x64/TortoiseMerge.exe
new file mode 100644 (file)
index 0000000..b4379f4
Binary files /dev/null and b/ext/svnbin/x64/TortoiseMerge.exe differ

diff --git a/ext/svnbin/x64/intl3_tsvn.dll b/ext/svnbin/x64/intl3_tsvn.dll
new file mode 100644 (file)
index 0000000..7376c6e
Binary files /dev/null and b/ext/svnbin/x64/intl3_tsvn.dll differ

diff --git a/ext/svnbin/x64/libapr_tsvn.dll b/ext/svnbin/x64/libapr_tsvn.dll
new file mode 100644 (file)
index 0000000..a6b100f
Binary files /dev/null and b/ext/svnbin/x64/libapr_tsvn.dll differ

diff --git a/ext/svnbin/x64/libaprutil_tsvn.dll b/ext/svnbin/x64/libaprutil_tsvn.dll
new file mode 100644 (file)
index 0000000..ca41862
Binary files /dev/null and b/ext/svnbin/x64/libaprutil_tsvn.dll differ

diff --git a/src/Changelog.txt b/src/Changelog.txt
index 838913c..82b414d 100644 (file)
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,3 +1,7 @@
+Version 0.5.1.0 version(internal)\r
+Fix:\r
+       Issue 52:  TortoiseMerge crashes on x64  \r
+\r
 Version 0.5.0.0 version(internal)\r
 Features:\r
        *Submodule Support.\r

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index d1e5661..81071e0 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -36,6 +36,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetu
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475} = {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}\r
                {A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC} = {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638} = {E8C01071-3B47-4A3F-9168-AA58A4635638}\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D} = {72EFB681-1397-4193-BBF9-CA05AC52B75D}\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20} = {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}\r

diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi
index 58a5b98..2c308dc 100644 (file)
--- a/src/TortoiseGitSetup/Includes.wxi
+++ b/src/TortoiseGitSetup/Includes.wxi
@@ -100,7 +100,9 @@
        <?define GuidIconsXPStyle="96412A1D-3EE2-4874-8CFC-8EF4D0E36467"?>\r
        <?define GuidIconsMarkPhippard="9151E386-6DD8-45a8-8C04-EBEBD9D8E179"?>\r
        <?define GuidIconsStraight="669EE534-B358-489e-AD81-544A32172FE7"?>\r
-\r
+  <?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>\r
+  <?define RegSSHOpen="0E21B3B2-FA54-411b-9AF3-BB275F169A27"?>\r
+  \r
        <?else?>\r
 \r
        <?define GuidInfoFiles="424219CC-2F91-49ad-B0EF-DB6A61575C99"?>\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 797fa9e..a53a02a 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -211,8 +211,13 @@ out everything for now, leaving these enabled as they are would make the install
           <Directory Id="D__Bin" ShortName="BIN" Name="bin" >\r
 \r
           <Component Id="C__apr" Guid="$(var.GuidAPR)" Win64="$(var.Win64YesNo)">\r
+            <?if $(var.Platform) = "x64" ?>\r
+             <File Id="F__libapr" ShortName="LIBAPR.DLL" Name="libapr_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\x64\libapr_tsvn.dll" KeyPath="yes" />\r
+             <File Id="F__libaprutil" ShortName="LIBAPRUT.DLL" Name="libaprutil_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\x64\libaprutil_tsvn.dll" />\r
+            <?else?>\r
              <File Id="F__libapr" ShortName="LIBAPR.DLL" Name="libapr_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\libapr_tsvn.dll" KeyPath="yes" />\r
              <File Id="F__libaprutil" ShortName="LIBAPRUT.DLL" Name="libaprutil_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\libaprutil_tsvn.dll" />\r
+            <?endif?>\r
           </Component>\r
 \r
 <!--             <Component Id="C__sasl" Guid="$(var.GuidSASL)" Win64="$(var.Win64YesNo)">\r
@@ -226,7 +231,11 @@ out everything for now, leaving these enabled as they are would make the install
            </Component>\r
 --> \r
             <Component Id="C__gettext" Guid="$(var.GuidGettext)" Win64="$(var.Win64YesNo)">\r
-              <File Id="F__intl" ShortName="INTL3_TS.DLL" Name="intl3_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\intl3_tsvn.dll" KeyPath="yes" />\r
+              <?if $(var.Platform) = "x64" ?>\r
+                <File Id="F__intl" ShortName="INTL3_TS.DLL" Name="intl3_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\x64\intl3_tsvn.dll" KeyPath="yes" />\r
+              <?else?>\r
+                <File Id="F__intl" ShortName="INTL3_TS.DLL" Name="intl3_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\intl3_tsvn.dll" KeyPath="yes" />\r
+              <?endif?>\r
             </Component>\r
             \r
             <?if $(var.IncludeCrashReportDll) = 1 ?>\r
@@ -318,7 +327,11 @@ out everything for now, leaving these enabled as they are would make the install
                        </Component>\r
                        \r
             <Component Id="C__TortoiseMerge" Guid="$(var.GuidTortoiseMerge)" Win64="$(var.Win64YesNo)">\r
-              <File Id="F__TortoiseMerge" ShortName="TMERGE.EXE" Name="TortoiseMerge.exe" DiskId="1" Source="..\..\ext\svnbin\TortoiseMerge.exe" KeyPath="yes" />\r
+              <?if $(var.Platform) = "x64" ?>\r
+                <File Id="F__TortoiseMerge" ShortName="TMERGE.EXE" Name="TortoiseMerge.exe" DiskId="1" Source="..\..\ext\svnbin\x64\TortoiseMerge.exe" KeyPath="yes" />\r
+              <?else?>\r
+                <File Id="F__TortoiseMerge" ShortName="TMERGE.EXE" Name="TortoiseMerge.exe" DiskId="1" Source="..\..\ext\svnbin\TortoiseMerge.exe" KeyPath="yes" />\r
+              <?endif?>\r
             </Component>\r
 \r
             <Component Id="C__TortoiseMergeShortcuts" Guid="$(var.GuidTortoiseMergeShortcuts)" Win64="$(var.Win64YesNo)">\r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 5f56913..d3be647 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -2,6 +2,6 @@
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
        <?define MinorVersion="5" ?>\r
-       <?define MicroVersion="0" ?>\r
+       <?define MicroVersion="1" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r