Merge pull request #414 from kekekeks/fixes/no-com-support

christophwille · web-flow · commit 59283241495a · 2023-10-28T09:49:40.000+02:00
Add support for runtimes without built-in COM interop
diff --git a/ICSharpCode.AvalonEdit/Editing/ImeNativeWrapper.cs b/ICSharpCode.AvalonEdit/Editing/ImeNativeWrapper.cs
@@ -116,7 +116,14 @@ public static ITfThreadMgr GetTextFrameworkThreadManager()
 		{
 			if (!textFrameworkThreadMgrInitialized) {
 				textFrameworkThreadMgrInitialized = true;
-				TF_CreateThreadMgr(out textFrameworkThreadMgr);
+				try
+				{
+					TF_CreateThreadMgr(out textFrameworkThreadMgr);
+				}
+				catch
+				{
+					// The call will fail if the current runtime doesn't have COM interop
+				}
 			}
 			return textFrameworkThreadMgr;
 		}

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,14 @@ public static ITfThreadMgr GetTextFrameworkThreadManager()`
`116`	`116`	`{`
`117`	`117`	`if (!textFrameworkThreadMgrInitialized) {`
`118`	`118`	`textFrameworkThreadMgrInitialized = true;`
`119`		`- TF_CreateThreadMgr(out textFrameworkThreadMgr);`
	`119`	`+ try`
	`120`	`+ {`
	`121`	`+ TF_CreateThreadMgr(out textFrameworkThreadMgr);`
	`122`	`+ }`
	`123`	`+ catch`
	`124`	`+ {`
	`125`	`+ // The call will fail if the current runtime doesn't have COM interop`
	`126`	`+ }`
`120`	`127`	`}`
`121`	`128`	`return textFrameworkThreadMgr;`
`122`	`129`	`}`