diff --git a/‎CefSharp.Wpf/Internals/IMEHandler.cs‎
Lines changed: 21 additions & 3 deletions b/‎CefSharp.Wpf/Internals/IMEHandler.cs‎
Lines changed: 21 additions & 3 deletions
diff --git a/‎CefSharp.Wpf/Internals/ImeNative.cs‎
Lines changed: 1 addition & 0 deletions b/‎CefSharp.Wpf/Internals/ImeNative.cs‎
Lines changed: 1 addition & 0 deletions
@@ -75,11 +75,12 @@ private static void GetCompositionInfo(IntPtr hwnd, uint lParam, string text, Li
 
             underlines.Clear();
 
+            byte[] attributes = null;
             int targetStart = text.Length;
             int targetEnd = text.Length;
             if (IsParam(lParam, ImeNative.GCS_COMPATTR))
             {
-                GetCompositionSelectionRange(hIMC, ref targetStart, ref targetEnd);
+                attributes = GetCompositionSelectionRange(hIMC, ref targetStart, ref targetEnd);
             }
 
             // Retrieve the selection range information. If CS_NOMOVECARET is specified
@@ -98,6 +99,22 @@ private static void GetCompositionInfo(IntPtr hwnd, uint lParam, string text, Li
                 compositionStart = 0;
             }
 
+            if (attributes != null &&
+                // character before
+                ((compositionStart > 0 && (compositionStart - 1) < attributes.Length && attributes[compositionStart - 1] == ImeNative.ATTR_INPUT)
+                ||
+                // character after
+                (compositionStart >= 0 && compositionStart < attributes.Length && attributes[compositionStart] == ImeNative.ATTR_INPUT)))
+            {
+                // as MS does with their ime implementation we should only use the GCS_CURSORPOS if the character
+                // before or after is new input.
+                // https://referencesource.microsoft.com/#PresentationFramework/src/Framework/System/windows/Documents/ImmComposition.cs,1079
+            }
+            else
+            {
+                compositionStart = text.Length;
+            }
+
             if (IsParam(lParam, ImeNative.GCS_COMPCLAUSE))
             {
                 GetCompositionUnderlines(hIMC, targetStart, targetEnd, underlines);
@@ -158,12 +175,12 @@ private static void GetCompositionUnderlines(IntPtr hIMC, int targetStart, int t
             }
         }
 
-        private static void GetCompositionSelectionRange(IntPtr hIMC, ref int targetStart, ref int targetEnd)
+        private static byte[] GetCompositionSelectionRange(IntPtr hIMC, ref int targetStart, ref int targetEnd)
         {
             var attributeSize = ImeNative.ImmGetCompositionString(hIMC, ImeNative.GCS_COMPATTR, null, 0);
             if (attributeSize <= 0)
             {
-                return;
+                return null;
             }
 
             int start = 0;
@@ -191,6 +208,7 @@ private static void GetCompositionSelectionRange(IntPtr hIMC, ref int targetStar
 
             targetStart = start;
             targetEnd = end;
+            return attributeData;
         }
 
         private static bool IsSelectionAttribute(byte attribute)
 
@@ -19,6 +19,7 @@ public static class ImeNative
         internal const uint CS_NOMOVECARET = 0x4000;
         internal const uint NI_COMPOSITIONSTR = 0x0015;
 
+        internal const uint ATTR_INPUT = 0x00;
         internal const uint ATTR_TARGET_CONVERTED = 0x01;
         internal const uint ATTR_TARGET_NOTCONVERTED = 0x03;
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,12 @@ private static void GetCompositionInfo(IntPtr hwnd, uint lParam, string text, Li`
`75`	`75`
`76`	`76`	`underlines.Clear();`
`77`	`77`
	`78`	`+ byte[] attributes = null;`
`78`	`79`	`int targetStart = text.Length;`
`79`	`80`	`int targetEnd = text.Length;`
`80`	`81`	`if (IsParam(lParam, ImeNative.GCS_COMPATTR))`
`81`	`82`	`{`
`82`		`- GetCompositionSelectionRange(hIMC, ref targetStart, ref targetEnd);`
	`83`	`+ attributes = GetCompositionSelectionRange(hIMC, ref targetStart, ref targetEnd);`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`// Retrieve the selection range information. If CS_NOMOVECARET is specified`
`@@ -98,6 +99,22 @@ private static void GetCompositionInfo(IntPtr hwnd, uint lParam, string text, Li`
`98`	`99`	`compositionStart = 0;`
`99`	`100`	`}`
`100`	`101`
	`102`	`+ if (attributes != null &&`
	`103`	`+ // character before`
	`104`	`+ ((compositionStart > 0 && (compositionStart - 1) < attributes.Length && attributes[compositionStart - 1] == ImeNative.ATTR_INPUT)`
	`105`	`+ \|\|`
	`106`	`+ // character after`
	`107`	`+ (compositionStart >= 0 && compositionStart < attributes.Length && attributes[compositionStart] == ImeNative.ATTR_INPUT)))`
	`108`	`+ {`
	`109`	`+ // as MS does with their ime implementation we should only use the GCS_CURSORPOS if the character`
	`110`	`+ // before or after is new input.`
	`111`	`+ // https://referencesource.microsoft.com/#PresentationFramework/src/Framework/System/windows/Documents/ImmComposition.cs,1079`
	`112`	`+ }`
	`113`	`+ else`
	`114`	`+ {`
	`115`	`+ compositionStart = text.Length;`
	`116`	`+ }`
	`117`	`+`
`101`	`118`	`if (IsParam(lParam, ImeNative.GCS_COMPCLAUSE))`
`102`	`119`	`{`
`103`	`120`	`GetCompositionUnderlines(hIMC, targetStart, targetEnd, underlines);`
`@@ -158,12 +175,12 @@ private static void GetCompositionUnderlines(IntPtr hIMC, int targetStart, int t`
`158`	`175`	`}`
`159`	`176`	`}`
`160`	`177`
`161`		`- private static void GetCompositionSelectionRange(IntPtr hIMC, ref int targetStart, ref int targetEnd)`
	`178`	`+ private static byte[] GetCompositionSelectionRange(IntPtr hIMC, ref int targetStart, ref int targetEnd)`
`162`	`179`	`{`
`163`	`180`	`var attributeSize = ImeNative.ImmGetCompositionString(hIMC, ImeNative.GCS_COMPATTR, null, 0);`
`164`	`181`	`if (attributeSize <= 0)`
`165`	`182`	`{`
`166`		`- return;`
	`183`	`+ return null;`
`167`	`184`	`}`
`168`	`185`
`169`	`186`	`int start = 0;`
`@@ -191,6 +208,7 @@ private static void GetCompositionSelectionRange(IntPtr hIMC, ref int targetStar`
`191`	`208`
`192`	`209`	`targetStart = start;`
`193`	`210`	`targetEnd = end;`
	`211`	`+ return attributeData;`
`194`	`212`	`}`
`195`	`213`
`196`	`214`	`private static bool IsSelectionAttribute(byte attribute)`