Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-21 05:39:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MLANG]

Browse source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62908
This commit is contained in:
Amine Khaldi 2014-04-23 14:10:33 +00:00
parent 93eaaf69ea
commit 28d6b8206a
3 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
reactos/dll/win32/mlang/mlang.c
View file

@ -39,6 +39,7 @@
//#include "objbase.h"
#include <rpcproxy.h>
#include <mlang.h>
#include <mimeole.h>
#include <wine/unicode.h>
#include <wine/debug.h>
@ -47,8 +48,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);
static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum);
@ -577,8 +576,8 @@ static inline void sjis2jis(unsigned char *p1, unsigned char *p2)
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 @@ static UINT ConvertJIS2SJIS(LPCSTR input, DWORD count, LPSTR output)
DWORD i = 0;
int j = 0;
unsigned char p2,p;
int shifted = FALSE;
BOOL shifted = FALSE;
while (i < count)
{
@ -693,7 +692,7 @@ static UINT ConvertSJIS2JIS(LPCSTR input, DWORD count, LPSTR output)
DWORD i = 0;
int j = 0;
unsigned char p2,p;
int shifted = FALSE;
BOOL shifted = FALSE;
while (i < count)
{
@ -3487,10 +3486,28 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA(
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;
}

2
reactos/dll/win32/mlang/mlang_classes.idl
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#pragma makedep register
[
helpstring("Multi Language Support"),
threading(both),

2
reactos/media/doc/README.WINE
View file

@ -103,7 +103,7 @@ reactos/dll/win32/mcicda # Synced to Wine-1.7.1
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