• R/O
  • HTTP
  • SSH
  • HTTPS

winmerge-jp: Commit


Commit MetaInfo

Revision169412dd1b34d0ccae2bdc8a355bfcbf1b9de447 (tree)
Time2021-09-12 23:43:24
AuthorTakashi Sawanaka <sdottaka@user...>
CommiterTakashi Sawanaka

Log Message

Fix the problem that registration/unregistration of ShellExtension from the Options dialog does not work on ARM64 version.

Change Summary

Incremental Difference

--- a/Src/PropShell.cpp
+++ b/Src/PropShell.cpp
@@ -60,6 +60,13 @@ static bool RegisterShellExtension(bool unregister, bool peruser)
6060 sei.lpVerb = _T("runas");
6161 if (szSysWow64[0])
6262 {
63+#if defined _M_ARM64
64+ args = options + _T(" \"") + paths::ConcatPath(progpath, _T("ShellExtensionARM64.dll")) + _T("\"");
65+
66+ sei.lpFile = regsvr32.c_str();
67+ sei.lpParameters = args.c_str();
68+ return !!ShellExecuteEx(&sei);
69+#else
6370 args = options + _T(" \"") + paths::ConcatPath(progpath, _T("ShellExtensionX64.dll")) + _T("\"");
6471
6572 sei.lpFile = regsvr32.c_str();
@@ -71,6 +78,7 @@ static bool RegisterShellExtension(bool unregister, bool peruser)
7178 sei.lpFile = regsvr32.c_str();
7279 sei.lpParameters = args.c_str();
7380 return !!ShellExecuteEx(&sei);
81+#endif
7482 }
7583 else
7684 {
Show on old repository browser