[KERNEL32/LIBWINE/USP10]

* Move the wctype table from kernel32 to libwine in preparations for implementing crt locale support. By Samuel Serapion.
See issue #6538 for more details.

svn path=/trunk/; revision=54144

reactos/dll/win32/kernel32/CMakeLists.txt

@@ -69,7 +69,6 @@ list(APPEND SOURCE
     wine/res.c
     wine/timezone.c
     winnls/string/casemap.c
-    winnls/string/chartype.c
     winnls/string/collation.c
     winnls/string/fold.c
     winnls/string/format_msg.c

reactos/dll/win32/kernel32/kernel32.rbuild

@@ -92,7 +92,6 @@
 	</directory>
 	<directory name="winnls">
 		<directory name="string">
-			<file>chartype.c</file>
 			<file>collation.c</file>
 			<file>casemap.c</file>
 			<file>fold.c</file>

reactos/dll/win32/kernel32/winnls/string/lang.c

@@ -49,11 +49,6 @@
 extern int wine_fold_string(int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen);
 extern int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dstlen);
 extern int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2);
-static inline unsigned short get_char_typeW( WCHAR ch )
-{
-    extern const unsigned short wine_wctype_table[];
-    return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)];
-}
 
 #define HeapAlloc RtlAllocateHeap
 #define HeapReAlloc RtlReAllocateHeap

reactos/dll/win32/usp10/bidi.c

@@ -107,14 +107,6 @@ enum directions
 };
 
 /* HELPER FUNCTIONS */
-/* the character type contains the C1_* flags in the low 12 bits */
-/* and the C2_* type in the high 4 bits */
-static __inline unsigned short get_char_typeW( WCHAR ch )
-{
-    WORD CharType;
-    GetStringTypeW(CT_CTYPE1, &ch, 1, &CharType);
-    return CharType;
-}
 
 /* Convert the libwine information to the direction enum */
 static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount, const SCRIPT_CONTROL *c)
@@ -758,7 +750,7 @@ BOOL BIDI_DetermineLevels(
 {
     WORD *chartype;
     unsigned baselevel = 0,j;
-    TRACE("%s, %d", debugstr_wn(lpString, uCount), uCount);
+    TRACE("%s, %d\n", debugstr_wn(lpString, uCount), uCount);
 
     chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD));
     if (!chartype)

reactos/include/reactos/wine/unicode.h

@@ -61,6 +61,12 @@
 #define vsnprintfW _vsnwprintf
 #define isprintW iswprint
 
+static __inline unsigned short get_char_typeW( WCHAR ch )
+{
+    extern const unsigned short wine_wctype_table[];
+    return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)];
+}
+
 static __inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n )
 {
     const WCHAR *end;

reactos/lib/3rdparty/libwine/CMakeLists.txt

@@ -6,6 +6,7 @@ list(APPEND SOURCE
     config.c
     debug_ros.c
     loader.c
+    wctype.c
 #    string.c implements _stricmp, already shipped with crt
 )
 

reactos/lib/3rdparty/libwine/libwine.rbuild

@@ -7,6 +7,7 @@
 	<file>config.c</file>
 	<file>debug_ros.c</file>
 	<file>loader.c</file>
+	<file>wctype.c</file>
 	<!--file>string.c</file-->
 </module>
 <module name="wineldr" type="staticlibrary">