[PATCH v4 2/6] imm32: Use DrawTextW to wrap IME composition string.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/imm32/ime.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index 8774e714365..8866f8f28f6 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -163,11 +163,10 @@ static void ime_ui_paint( HIMC himc, HWND hwnd )

if (ctx->cfCompForm.dwStyle == CFS_RECT)
         {
-            RECT client;
-            client = ctx->cfCompForm.rcArea;
+            RECT client = ctx->cfCompForm.rcArea;
             MapWindowPoints( ctx->hWnd, 0, (POINT *)&client, 2 );
             IntersectRect( &rect, &rect, &client );
-            /* TODO:  Wrap the input if needed */
+            DrawTextW( hdc, str, len, &rect, DT_WORDBREAK | DT_CALCRECT );
         }

if (ctx->cfCompForm.dwStyle == CFS_DEFAULT)
@@ -196,7 +195,8 @@ static void ime_ui_paint( HIMC himc, HWND hwnd )
         }

new_rect = rect;
-        TextOutW( hdc, offset.x, offset.y, str, len );
+        OffsetRect( &rect, offset.x - rect.left, offset.y - rect.top );
+        DrawTextW( hdc, str, len, &rect, DT_WORDBREAK );

if (font) SelectObject( hdc, font );
         free( str );