Vitaly Lipatov : mlang: Partially implemented ConvertStringEx.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: c0901b899bd0c574916191626ba8736e58a35e7f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=c0901b899bd0c57491619162...

Author: Vitaly Lipatov <lav(a)etersoft.ru>
Date:   Fri Apr 28 14:35:36 2006 +0400

mlang: Partially implemented ConvertStringEx.

---

 dlls/mlang/mlang.c |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 21076f4..61b2890 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -2113,6 +2113,9 @@ static HRESULT WINAPI fnIMultiLanguage2_
     return E_NOTIMPL;
 }
 
+/*
+ * TODO: handle dwFlag and lpFallBack
+*/
 static HRESULT WINAPI fnIMultiLanguage2_ConvertStringToUnicodeEx(
     IMultiLanguage2* iface,
     DWORD* pdwMode,
@@ -2125,9 +2128,28 @@ static HRESULT WINAPI fnIMultiLanguage2_
     WCHAR* lpFallBack)
 {
     FIXME("\n");
-    return E_NOTIMPL;
+    return ConvertINetMultiByteToUnicode(pdwMode, dwEncoding,
+        pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize);
 }
 
+/*****************************************************************************
+ * MultiLanguage2::ConvertStringToUnicodeEx
+ *
+ * Translates the multibyte string from the specified code page to Unicode.
+ *
+ * PARAMS
+ *   see ConvertStringToUnicode
+ *   dwFlag 
+ *   lpFallBack if dwFlag contains MLCONVCHARF_USEDEFCHAR, lpFallBack string used
+ *              instead unconvertible characters.
+ *
+ * RETURNS
+ *   S_OK     Success.
+ *   S_FALSE  The conversion is not supported.
+ *   E_FAIL   Some error has occurred.
+ *
+ * TODO: handle dwFlag and lpFallBack
+*/
 static HRESULT WINAPI fnIMultiLanguage2_ConvertStringFromUnicodeEx(
     IMultiLanguage2* This,
     DWORD* pdwMode,
@@ -2140,7 +2162,8 @@ static HRESULT WINAPI fnIMultiLanguage2_
     WCHAR* lpFallBack)
 {
     FIXME("\n");
-    return E_NOTIMPL;
+    return ConvertINetUnicodeToMultiByte(pdwMode, dwEncoding,
+        pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize);
 }
 
 static HRESULT WINAPI fnIMultiLanguage2_DetectCodepageInIStream(