Author: cwittich
Date: Sat Sep 10 11:40:54 2016
New Revision: 72643
URL: http://svn.reactos.org/svn/reactos?rev=72643&view=rev
Log:
[CRT] sync ischira.c to wine 1.9.16
Modified:
trunk/reactos/media/doc/README.WINE
trunk/reactos/sdk/lib/crt/mbstring/ischira.c
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72643&r1=72642&r2=72643&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 10 11:40:54 2016
@@ -299,8 +299,9 @@
reactos/sdk/lib/crt/string/strtoul.c # Synced to WineStaging-1.9.9
reactos/sdk/lib/crt/string/strxfrm.c # Synced to Wine-1.9.16
reactos/sdk/lib/crt/string/wcs.c # Synced at 20080611
- reactos/sdk/lib/crt/string/wctype.c # Synced at WineStaging-1.9.16
- reactos/sdk/lib/crt/string/wtoi64.c # Synced at Wine-1.9.16
+ reactos/sdk/lib/crt/string/wctype.c # Synced to WineStaging-1.9.16
+ reactos/sdk/lib/crt/string/wtoi64.c # Synced to Wine-1.9.16
+ reactos/sdk/lib/crt/mbstring/ischira.c # Synced to Wine-1.9.16
reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529
reactos/sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.9.16
reactos/sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55
Modified: trunk/reactos/sdk/lib/crt/mbstring/ischira.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/mbstring/ischira.c?rev=72643&r1=72642&r2=72643&view=diff
==============================================================================
--- trunk/reactos/sdk/lib/crt/mbstring/ischira.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/crt/mbstring/ischira.c [iso-8859-1] Sat Sep 10
11:40:54 2016
@@ -1,58 +1,54 @@
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS system libraries
- * FILE: lib/sdk/crt/mbstring/ischira.c
- * PURPOSE:
- * PROGRAMER:
- * UPDATE HISTORY:
- * 12/04/99: Ariadne Created
- * 05/30/08: Samuel Serapion adapted from PROJECT C Library
- *
- */
-
+#include <precomp.h>
#include <mbctype.h>
-
-/*
- * @implemented
+/*********************************************************************
+ * _ismbchira(MSVCRT.@)
*/
-int _ismbchira( unsigned int c )
+int CDECL _ismbchira(unsigned int c)
{
- return ((c>=0x829F) && (c<=0x82F1));
+ if(get_mbcinfo()->mbcodepage == 932)
+ {
+ /* Japanese/Hiragana, CP 932 */
+ return (c >= 0x829f && c <= 0x82f1);
+ }
+ return 0;
}
-/*
- * @implemented
+/*********************************************************************
+ * _ismbckata(MSVCRT.@)
*/
-int _ismbckata( unsigned int c )
+int CDECL _ismbckata(unsigned int c)
{
- return ((c>=0x8340) && (c<=0x8396));
+ if(get_mbcinfo()->mbcodepage == 932)
+ {
+ /* Japanese/Katakana, CP 932 */
+ return (c >= 0x8340 && c <= 0x8396 && c != 0x837f);
+ }
+ return 0;
}
-/*
- * @implemented
+/*********************************************************************
+ * _mbctohira (MSVCRT.@)
+ *
+ * Converts a sjis katakana character to hiragana.
*/
-unsigned int _mbctohira( unsigned int c )
+unsigned int CDECL _mbctohira(unsigned int c)
{
- if (c >= 0x8340 && c <= 0x837e)
- return c - 0xa1;
- else if (c >= 0x8380 && c <= 0x8396)
- return c - 0xa2;
- else
- return c;
+ if(_ismbckata(c) && c <= 0x8393)
+ return (c - 0x8340 - (c >= 0x837f ? 1 : 0)) + 0x829f;
+ return c;
}
-/*
- * @implemented
+/*********************************************************************
+ * _mbctokata (MSVCRT.@)
+ *
+ * Converts a sjis hiragana character to katakana.
*/
-unsigned int _mbctokata( unsigned int c )
+unsigned int CDECL _mbctokata(unsigned int c)
{
- if (c >= 0x829f && c <= 0x82dd)
- return c + 0xa1;
- else if (c >= 0x82de && c <= 0x82f1)
- return c + 0xa2;
- else
- return c;
+ if(_ismbchira(c))
+ return (c - 0x829f) + 0x8340 + (c >= 0x82de ? 1 : 0);
+ return c;
}
