commit 592b53d0a48ee41558df78bcd128dbdc4ed4802c
author Dmitry Timoshkov <dmitry@codeweavers.com> Thu Mar 22 19:09:43 2007 +0800
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 22 15:47:25 2007 +0100
tree 55342c1b7a5dd9e9d3681d9dc0941a4ccac9dc51
parent b9eb76dea0fe37cc0f0a4ca7f236b47d7fc98700

riched20: Split unicode and ansi window procs, handle messages depending on the unicode flag.

Add a hack for WM_GETTEXT in RichEdit20W class when running in win9x emulation mode.

dlls/riched20/string.c

diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c
index fd65252..4c44911 100644
--- a/dlls/riched20/string.c
+++ b/dlls/riched20/string.c
@@ -345,9 +345,9 @@
     return editor->pfnWordBreak(str->szData, start, str->nLen, code);
 }
 
-LPWSTR ME_ToUnicode(HWND hWnd, LPVOID psz)
+LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz)
 {
-  if (IsWindowUnicode(hWnd))
+  if (unicode)
     return (LPWSTR)psz;
   else {
     WCHAR *tmp;
@@ -358,27 +358,8 @@
   }
 }
 
-void ME_EndToUnicode(HWND hWnd, LPVOID psz)
+void ME_EndToUnicode(BOOL unicode, LPVOID psz)
 {
-  if (!IsWindowUnicode(hWnd))
-    FREE_OBJ(psz);
-}
-
-LPSTR ME_ToAnsi(HWND hWnd, LPVOID psz)
-{
-  if (!IsWindowUnicode(hWnd))
-    return (LPSTR)psz;
-  else {
-    char *tmp;
-    int nChars = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)psz, -1, NULL, 0, NULL, NULL);
-    if((tmp = ALLOC_N_OBJ(char, nChars)) != NULL)
-      WideCharToMultiByte(CP_ACP, 0, (WCHAR *)psz, -1, tmp, nChars, NULL, NULL);
-    return tmp;
-  }
-}
-
-void ME_EndToAnsi(HWND hWnd, LPVOID psz)
-{
-  if (!IsWindowUnicode(hWnd))
+  if (!unicode)
     FREE_OBJ(psz);
 }