[ros-diffs] [akhaldi] 62908: [MLANG] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 23 14:10:33 2014
New Revision: 62908

URL: http://svn.reactos.org/svn/reactos?rev=62908&view=rev
Log:
[MLANG]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/reactos/dll/win32/mlang/mlang.c
    trunk/reactos/dll/win32/mlang/mlang_classes.idl
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/mlang/mlang.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mlang/mlang.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mlang/mlang.c	[iso-8859-1] Wed Apr 23 14:10:33 2014
@@ -39,6 +39,7 @@
 //#include "objbase.h"
 #include <rpcproxy.h>
 #include <mlang.h>
+#include <mimeole.h>
 
 #include <wine/unicode.h>
 #include <wine/debug.h>
@@ -46,8 +47,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mlang);
 
 //#include "initguid.h"
-
-#define CP_UNICODE 1200
 
 static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj);
 static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj);
@@ -577,8 +576,8 @@
 
 static int han2zen(unsigned char *p1, unsigned char *p2)
 {
-    int maru = FALSE;
-    int nigori = FALSE;
+    BOOL maru = FALSE;
+    BOOL nigori = FALSE;
     static const unsigned char char1[] = {129,129,129,129,129,131,131,131,131,
         131,131,131,131,131,131,129,131,131,131,131,131,131,131,131,131,131,
         131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,
@@ -625,7 +624,7 @@
     DWORD i = 0;
     int j = 0;
     unsigned char p2,p;
-    int shifted = FALSE;
+    BOOL shifted = FALSE;
 
     while (i < count)
     {
@@ -693,7 +692,7 @@
     DWORD i = 0;
     int j = 0;
     unsigned char p2,p;
-    int shifted = FALSE;
+    BOOL shifted = FALSE;
 
     while (i < count)
     {
@@ -3487,10 +3486,28 @@
     LONG* pcchLine,
     LONG* pcchSkip)
 {
+    LONG i, line = cchSrc, skip = 0;
+
     FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage,
debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip);
 
-    *pcchLine = cchSrc;
-    *pcchSkip = 0;
+    if (uCodePage == CP_USASCII && cchSrc > cMaxColumns)
+    {
+        for (line = cMaxColumns, i = cMaxColumns - 1; i >= 0; i--)
+        {
+            if (pszSrc[i] == ' ')
+            {
+                while (i >= 0 && pszSrc[i] == ' ')
+                {
+                    i--;
+                    line--;
+                    skip++;
+                }
+                break;
+            }
+        }
+    }
+    *pcchLine = line;
+    *pcchSkip = skip;
     return S_OK;
 }
 

Modified: trunk/reactos/dll/win32/mlang/mlang_classes.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang_clas…
==============================================================================
--- trunk/reactos/dll/win32/mlang/mlang_classes.idl	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mlang/mlang_classes.idl	[iso-8859-1] Wed Apr 23 14:10:33 2014
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#pragma makedep register
 
 [
     helpstring("Multi Language Support"),

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Apr 23 14:10:33 2014
@@ -103,7 +103,7 @@
 reactos/dll/win32/mciqtz32         # Synced to Wine-1.7.17
 reactos/dll/win32/mciseq           # Synced to Wine-1.7.1
 reactos/dll/win32/mciwave          # Synced to Wine-1.7.1
-reactos/dll/win32/mlang            # Synced to Wine-1.7.1
+reactos/dll/win32/mlang            # Synced to Wine-1.7.17
 reactos/dll/win32/mmdevapi         # Synced to Wine-1.7.1
 reactos/dll/win32/mpr              # Synced to Wine-1.7.1
 reactos/dll/win32/mprapi           # Synced to Wine-1.7.1