diff --git a/AffinityPluginLoader.sln b/AffinityPluginLoader.sln index fc6aa76..903b041 100644 --- a/AffinityPluginLoader.sln +++ b/AffinityPluginLoader.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AffinityPluginLoader", "Aff EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WineFix", "WineFix\WineFix.csproj", "{A9134DEC-BC99-468E-ADE6-8DAC9883F11E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoginFix", "LoginFix\LoginFix.csproj", "{BC45F218-FDC1-49F5-8B6E-E3151E1BE134}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -27,6 +29,10 @@ Global {A9134DEC-BC99-468E-ADE6-8DAC9883F11E}.Debug|x64.Build.0 = Debug|x64 {A9134DEC-BC99-468E-ADE6-8DAC9883F11E}.Release|x64.ActiveCfg = Release|x64 {A9134DEC-BC99-468E-ADE6-8DAC9883F11E}.Release|x64.Build.0 = Release|x64 + {BC45F218-FDC1-49F5-8B6E-E3151E1BE134}.Debug|x64.ActiveCfg = Debug|x64 + {BC45F218-FDC1-49F5-8B6E-E3151E1BE134}.Debug|x64.Build.0 = Debug|x64 + {BC45F218-FDC1-49F5-8B6E-E3151E1BE134}.Release|x64.ActiveCfg = Release|x64 + {BC45F218-FDC1-49F5-8B6E-E3151E1BE134}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LoginFix/LICENSE b/LoginFix/LICENSE new file mode 100644 index 0000000..9efa6fb --- /dev/null +++ b/LoginFix/LICENSE @@ -0,0 +1,338 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Moe Ghoul, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/LoginFix/LoginFix.csproj b/LoginFix/LoginFix.csproj new file mode 100644 index 0000000..a997ba9 --- /dev/null +++ b/LoginFix/LoginFix.csproj @@ -0,0 +1,33 @@ + + + + net48 + latest + win-x64 + x64 + x64 + + + LoginFix + Plugin to fix the Canva sign-in crash under Wine + 0.1.0 + + false + + + + + + + + + + + + {0B4B2B01-D160-40EE-A9AC-9594470DDBC3} + AffinityPluginLoader + False + + + + diff --git a/LoginFix/LoginFixPlugin.cs b/LoginFix/LoginFixPlugin.cs new file mode 100644 index 0000000..3c06448 --- /dev/null +++ b/LoginFix/LoginFixPlugin.cs @@ -0,0 +1,25 @@ +using HarmonyLib; +using AffinityPluginLoader; +using AffinityPluginLoader.Settings; + +namespace LoginFix +{ + /// + /// Works around a Wine WinRT gap that crashes the Canva sign-in callback. + /// + public class LoginFixPlugin : AffinityPlugin + { + public const string PluginId = "loginfix"; + + public override PluginSettingsDefinition DefineSettings() + { + return new PluginSettingsDefinition(PluginId); + } + + public override void OnPatch(Harmony harmony, IPluginContext context) + { + context.Patch("ProcessCommandLineArguments fix", + h => Patches.ProcessCommandLineArgumentsPatch.ApplyPatches(h)); + } + } +} diff --git a/LoginFix/Patches/ProcessCommandLineArgumentsPatch.cs b/LoginFix/Patches/ProcessCommandLineArgumentsPatch.cs new file mode 100644 index 0000000..b2a8b1a --- /dev/null +++ b/LoginFix/Patches/ProcessCommandLineArgumentsPatch.cs @@ -0,0 +1,254 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.IO.Pipes; +using System.Linq; +using System.Reflection; +using System.Threading; +using HarmonyLib; +using AffinityPluginLoader.Core; + +namespace LoginFix.Patches +{ + /// + /// Serif.Affinity.Application.ProcessCommandLineArguments references + /// Windows.ApplicationModel.DataTransfer.SharedStorageAccessManager (only reached for + /// "affinity-open-file:" arguments). Wine has no WinRT implementation for that type, and the + /// CLR resolves every type referenced in a method body when it JITs the method - so any call + /// into ProcessCommandLineArguments throws System.TypeLoadException, including the unrelated + /// "affinity://" OAuth callback path the sign-in flow depends on. + /// + /// Harmony itself can't patch ProcessCommandLineArguments directly either: patching requires + /// decompiling the target method's IL (even for a plain prefix, to build the merged + /// dispatcher), which means resolving every operand in its body - including the poisoned + /// SharedStorageAccessManager call - and that resolution throws the same way the JIT does. + /// + /// Both of ProcessCommandLineArguments' callers only reference it by signature (safe to + /// resolve), not by body, so patching *them* instead works: ProcessArguments() handles the + /// app's own startup command line, and SingleInstanceThread() receives arguments forwarded + /// over a named pipe by a second launched instance (this is the path the Canva sign-in + /// callback actually takes). Both patches fully replace their target with a safe + /// reimplementation that never touches the real ProcessCommandLineArguments. + /// + public static class ProcessCommandLineArgumentsPatch + { + static readonly HashSet KnownFlags = new HashSet + { + "--gpu-telemetry", "--no-dwm-warning", "--hw-ui", "--no-hw-ui", "--no-ocl", + "--click-through", "--no-click-through", "--input-logging", "--printmode1", + "--disable-cltest", "--disable-font-preview-cache", + "--disable-parallel-font-enumeration", "--font-cache-logging", + "--full-crash-dumps", "--disable-wintab", "--legacy-wintab", + }; + + static Type _applicationType; + + public static void ApplyPatches(Harmony harmony) + { + Logger.Info("Applying command-line argument patches (Wine SharedStorageAccessManager fix)..."); + + var serifAssembly = AppDomain.CurrentDomain.GetAssemblies() + .FirstOrDefault(a => a.GetName().Name == "Serif.Affinity"); + if (serifAssembly == null) + { + Logger.Error("Serif.Affinity assembly not found"); + return; + } + + _applicationType = serifAssembly.GetType("Serif.Affinity.Application"); + if (_applicationType == null) + { + Logger.Error("Serif.Affinity.Application type not found"); + return; + } + + var processArguments = AccessTools.Method(_applicationType, "ProcessArguments", Type.EmptyTypes); + if (processArguments == null) + { + Logger.Error("ProcessArguments() not found"); + } + else + { + harmony.Patch(processArguments, + prefix: new HarmonyMethod(AccessTools.Method(typeof(ProcessCommandLineArgumentsPatch), nameof(ProcessArgumentsPrefix)))); + Logger.Info("Patched ProcessArguments (startup command line)"); + } + + var singleInstanceThread = AccessTools.Method(_applicationType, "SingleInstanceThread", Type.EmptyTypes); + if (singleInstanceThread == null) + { + Logger.Error("SingleInstanceThread() not found"); + } + else + { + harmony.Patch(singleInstanceThread, + prefix: new HarmonyMethod(AccessTools.Method(typeof(ProcessCommandLineArgumentsPatch), nameof(SingleInstanceThreadPrefix)))); + Logger.Info("Patched SingleInstanceThread (activation via named pipe - the sign-in callback path)"); + } + } + + // Replaces Application.ProcessArguments(). Mirrors the original's fallback chain + // (live command line, then per-user arguments.cfg, then per-machine arguments.cfg) + // but routes everything through SafeProcessCommandLineArguments instead of the + // real (poisoned) ProcessCommandLineArguments. + static bool ProcessArgumentsPrefix(object __instance) + { + try + { + var setCommandLineArguments = AccessTools.Method(_applicationType, "SetCommandLineArguments", new[] { typeof(string[]) }); + setCommandLineArguments?.Invoke(__instance, new object[] { Environment.GetCommandLineArgs() }); + + SafeProcessCommandLineArguments(__instance, Environment.GetCommandLineArgs().Skip(1)); + + bool handledFromFile = false; + var appDataPathForCurrentUser = (string)AccessTools.Property(_applicationType.BaseType, "AppDataPathForCurrentUser")?.GetValue(__instance); + if (appDataPathForCurrentUser != null) + { + try + { + var lines = File.ReadAllText(Path.Combine(appDataPathForCurrentUser, "arguments.cfg")) + .Split(new[] { "\r\n", "\n", "\t", " " }, StringSplitOptions.RemoveEmptyEntries); + if (lines.Length != 0) + { + SafeProcessCommandLineArguments(__instance, lines); + handledFromFile = true; + } + } + catch { } + } + + if (!handledFromFile) + { + var appDataPathForAllUsers = (string)AccessTools.Property(_applicationType.BaseType, "AppDataPathForAllUsers")?.GetValue(__instance); + if (appDataPathForAllUsers != null) + { + try + { + var lines = File.ReadAllText(Path.Combine(appDataPathForAllUsers, "arguments.cfg")) + .Split(new[] { "\r\n", "\n", "\t", " " }, StringSplitOptions.RemoveEmptyEntries); + if (lines.Length != 0) + { + SafeProcessCommandLineArguments(__instance, lines); + } + } + catch { } + } + } + } + catch (Exception ex) + { + Logger.Error("ProcessArguments replacement failed: " + ex); + } + + return false; + } + + // Replaces the static Application.SingleInstanceThread(). Mirrors the original's named + // pipe server loop exactly, except the received arguments are handed to + // SafeProcessCommandLineArguments on the dispatcher instead of the real + // ProcessCommandLineArguments. + static bool SingleInstanceThreadPrefix() + { + try + { + var application = System.Windows.Application.Current; + var isClosingProp = AccessTools.Property(_applicationType.BaseType, "IsClosing") + ?? AccessTools.Property(_applicationType, "IsClosing"); + var singleInstanceIdProp = AccessTools.Property(_applicationType, "SingleInstanceId"); + var delayDocumentOpenField = AccessTools.Field(_applicationType, "m_delayDocumentOpen"); + + Func isClosing = () => (bool)isClosingProp.GetValue(application); + string singleInstanceId = (string)singleInstanceIdProp.GetValue(application); + + while (!isClosing()) + { + try + { + using (var server = new NamedPipeServerStream(singleInstanceId)) + { + server.WaitForConnection(); + while ((bool)delayDocumentOpenField.GetValue(application)) + { + Thread.Sleep(500); + } + if (isClosing()) continue; + + try + { + using (var reader = new BinaryReader(server)) + { + string text = reader.ReadString(); + var arguments = text.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); + var argsToProcess = arguments.Skip(1).ToArray(); + application.Dispatcher.BeginInvoke((Action)(() => + { + SafeProcessCommandLineArguments(application, argsToProcess); + })); + } + } + catch { } + } + } + catch { } + } + } + catch (Exception ex) + { + Logger.Error("SingleInstanceThread replacement failed: " + ex); + } + + return false; + } + + // Safe stand-in for Application.ProcessCommandLineArguments(IEnumerable). + // Drops "affinity-open-file:" support (needs SharedStorageAccessManager, unsupported + // under Wine either way); everything else matches the original's behavior. + static void SafeProcessCommandLineArguments(object instance, IEnumerable arguments) + { + string callbackUrl = null; + var paths = new List(); + + foreach (var argument in arguments) + { + var lower = argument.ToLowerInvariant(); + if (KnownFlags.Contains(lower)) continue; + if (lower.StartsWith("affinity-open-file:")) + { + Logger.Warning("Ignoring affinity-open-file: argument (needs SharedStorageAccessManager, unsupported under Wine)"); + continue; + } + if (lower.StartsWith("affinity://")) + { + callbackUrl = argument; + continue; + } + paths.Add(argument); + } + + bool mainWindowLoaded = (bool)AccessTools.Field(_applicationType, "m_mainWindowLoaded").GetValue(instance); + var activateMainWindow = AccessTools.Method(_applicationType, "ActivateMainWindow"); + var loadFiles = AccessTools.Method(_applicationType, "LoadFiles", new[] { typeof(List) }); + + if (mainWindowLoaded) + { + activateMainWindow.Invoke(instance, null); + loadFiles.Invoke(instance, new object[] { paths }); + } + else + { + var pathsToLoad = (List)AccessTools.Field(_applicationType, "m_pathsToLoad").GetValue(instance); + foreach (var p in paths) + { + if (!pathsToLoad.Contains(p)) pathsToLoad.Add(p); + } + activateMainWindow.Invoke(instance, null); + } + + if (!string.IsNullOrEmpty(callbackUrl)) + { + var openUrl = AccessTools.Method(_applicationType, "OpenUrl", new[] { typeof(string) }); + openUrl.Invoke(instance, new object[] { callbackUrl }); + } + } + } +} diff --git a/LoginFix/README.md b/LoginFix/README.md new file mode 100644 index 0000000..6a9112e --- /dev/null +++ b/LoginFix/README.md @@ -0,0 +1,43 @@ +# LoginFix + +LoginFix is an APL plugin which fixes the Canva sign-in flow crashing under Wine. + +WineFix's own "Canva sign-in dialog patched out" fix is a temporary workaround, pending a protocol handler fix. LoginFix is that fix: it lets sign-in complete instead of disabling it. + +## Install + +1. [Install APL](https://apl.ncuroe.dev/guide/installation/) first. +2. Download `loginfix-vX.X.X.zip` from the [latest release](https://github.com/noahc3/AffinityPluginLoader/releases) and extract into your Affinity install directory. + +## What It Fixes + +`Serif.Affinity.Application.ProcessCommandLineArguments` has one branch, only reached for an unrelated `affinity-open-file:` argument, that calls the WinRT type `Windows.ApplicationModel.DataTransfer.SharedStorageAccessManager`. Wine has no implementation of that type. + +The .NET CLR resolves every type referenced anywhere in a method's body when it JITs that method, not just the branch actually taken. So any call into `ProcessCommandLineArguments` throws `System.TypeLoadException`, regardless of which arguments were passed. + +This matters because the Canva sign-in callback goes through this exact method. The second `Affinity.exe` instance the OS launches for the callback URL forwards its arguments to the already-running instance over a named pipe, and that named-pipe handler lands in `ProcessCommandLineArguments`. So login always crashed. + +Harmony itself cannot patch `ProcessCommandLineArguments` directly either. Patching a method, even with a plain prefix, requires Harmony to decompile its IL, which means resolving every operand in the method body, including the poisoned `SharedStorageAccessManager` call. A patch on that method throws the same `TypeLoadException`. + +LoginFix instead patches `ProcessCommandLineArguments`'s two callers: + +- `ProcessArguments()`, used for the app's own startup command line +- `SingleInstanceThread()`, the named-pipe listener that receives the sign-in callback from the second launched instance + +Neither caller references the poisoned type directly, only by method signature, which Harmony can resolve without a problem. Both are fully replaced with a safe reimplementation that never calls the real `ProcessCommandLineArguments`. The only thing dropped is the unrelated `affinity-open-file:` handling, which needs `SharedStorageAccessManager` and cannot work under Wine regardless. + +## Compatibility with WineFix + +LoginFix and WineFix patch different methods and can run together. If you install both, WineFix's sign-in dialog suppression and LoginFix's working sign-in flow may conflict, since one hides the dialog and the other completes it. If you install LoginFix, you likely want to disable WineFix's sign-in dialog patch, if that becomes a separate toggle in a future WineFix release. + +## Licensing + +LoginFix is licensed under **GPLv2**. See the [LICENSE](LICENSE) file. + +### License Exemption + +[Canva](https://github.com/canva) and its subsidiaries are exempt from GPLv2 licensing and may (at its option) instead license any source code authored for the LoginFix project under the Zero-Clause BSD license. + +# Credits + +Built and verified on a manual Wine install and on Lutris, tested on stock distro Wine 11.15. See [AffinityOnLinux](https://github.com/seapear/AffinityOnLinux) for the project this fix was developed alongside. diff --git a/README.md b/README.md index b81c2a9..a686048 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,16 @@ Plugins extend `AffinityPlugin` and use [Harmony](https://github.com/pardeike/Ha WineFix is an APL plugin that fixes Wine-specific Affinity bugs. See [WineFix/](WineFix/) for an overview, or the [WineFix docs](https://apl.ncuroe.dev/winefix/) for full details. +## LoginFix + +LoginFix is an APL plugin that fixes the Canva sign-in flow crashing under Wine. See [LoginFix/](LoginFix/) for the root cause and fix details. + ## Licensing APL (AffinityHook, AffinityBootstrap, AffinityPluginLoader) is licensed under the **MIT License**. See the LICENSE file under each project directory. > [!WARNING] -> WineFix is offered under a different license. See [WineFix#Licensing](WineFix#licensing) for information. +> WineFix and LoginFix are offered under a different license. See [WineFix#Licensing](WineFix#licensing) and [LoginFix#Licensing](LoginFix#licensing) for information. ### License Exemption diff --git a/docs/index.md b/docs/index.md index 9c3875e..4cd6c90 100644 --- a/docs/index.md +++ b/docs/index.md @@ -12,3 +12,4 @@ Supports Windows and Linux (Wine). - [Configuration](guide/configuration.md) — APL settings and how to configure them - [Creating a Plugin](dev/creating-a-plugin.md) — Developer guide for building APL plugins - [WineFix](winefix/index.md) — Plugin that fixes Wine-specific Affinity bugs +- [LoginFix](loginfix/index.md) — Plugin that fixes the Canva sign-in crash under Wine diff --git a/docs/loginfix/index.md b/docs/loginfix/index.md new file mode 100644 index 0000000..73dddde --- /dev/null +++ b/docs/loginfix/index.md @@ -0,0 +1,32 @@ +# LoginFix + +LoginFix is an APL plugin which fixes the Canva sign-in flow crashing under Wine. + +WineFix's own "Canva sign-in dialog patched out" fix is a temporary workaround, pending a protocol handler fix. LoginFix is that fix — it lets sign-in complete instead of disabling it. + +## Install + +1. [Install APL](../guide/installation.md) first. +2. Download `loginfix-vX.X.X.zip` from the [latest release](https://github.com/noahc3/AffinityPluginLoader/releases) and extract into your Affinity install directory. + +LoginFix has no configurable settings, once installed, it just works. + +## What It Fixes + +`Serif.Affinity.Application.ProcessCommandLineArguments` has one branch, only reached for an unrelated `affinity-open-file:` argument, that calls the WinRT type `Windows.ApplicationModel.DataTransfer.SharedStorageAccessManager`. Wine has no implementation of that type. + +The .NET CLR resolves every type referenced anywhere in a method's body when it JITs that method, not just the branch actually taken. So any call into `ProcessCommandLineArguments` throws `System.TypeLoadException`, regardless of which arguments were passed. + +This matters because the Canva sign-in callback goes through this exact method. The second `Affinity.exe` instance the OS launches for the callback URL forwards its arguments to the already-running instance over a named pipe, and that named-pipe handler lands in `ProcessCommandLineArguments`. So login always crashed. + +Harmony itself cannot patch `ProcessCommandLineArguments` directly either, patching a method requires Harmony to decompile its IL, which means resolving every operand in the method body, including the poisoned `SharedStorageAccessManager` call. + +LoginFix instead patches `ProcessCommandLineArguments`'s two callers, `ProcessArguments()` (the app's own startup command line) and `SingleInstanceThread()` (the named-pipe listener that receives the sign-in callback). Neither references the poisoned type directly, only by method signature, which Harmony can resolve without a problem. Both are fully replaced with a safe reimplementation that never calls the real `ProcessCommandLineArguments`. + +## Compatibility with WineFix + +LoginFix and WineFix patch different methods and can run together. If both are installed, WineFix's sign-in dialog suppression and LoginFix's working sign-in flow may conflict, since one hides the dialog and the other completes it. + +## Licensing + +LoginFix is licensed under GPLv2, with a Zero-Clause BSD exemption for Canva and its subsidiaries. See the [LICENSE](https://github.com/noahc3/AffinityPluginLoader/blob/main/LoginFix/LICENSE) file. diff --git a/mkdocs.yml b/mkdocs.yml index 2b36742..f3b5df6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -41,3 +41,5 @@ nav: - Overview: winefix/index.md - Installation: winefix/installation.md - Configuration: winefix/configuration.md + - LoginFix: + - Overview: loginfix/index.md