Alexandre Julliard : libwine_unicode: Renamed is_dbcs_leadbyte to wine_is_dbcs_leadbyte.

Alexandre Julliard julliard at wine.codeweavers.com
Wed May 24 07:49:05 CDT 2006


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed May 24 14:14:09 2006 +0200

libwine_unicode: Renamed is_dbcs_leadbyte to wine_is_dbcs_leadbyte.

---

 dlls/kernel/locale.c          |    4 ++--
 dlls/ntdll/rtlstr.c           |    2 +-
 include/wine/unicode.h        |    2 +-
 libs/unicode/string.c         |    2 +-
 libs/unicode/wine_unicode.def |    2 +-
 libs/unicode/wine_unicode.map |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c
index ebeeee2..29064b7 100644
--- a/dlls/kernel/locale.c
+++ b/dlls/kernel/locale.c
@@ -1279,7 +1279,7 @@ BOOL WINAPI IsValidCodePage( UINT codepa
 BOOL WINAPI IsDBCSLeadByteEx( UINT codepage, BYTE testchar )
 {
     const union cptable *table = get_codepage_table( codepage );
-    return table && is_dbcs_leadbyte( table, testchar );
+    return table && wine_is_dbcs_leadbyte( table, testchar );
 }
 
 
@@ -1299,7 +1299,7 @@ BOOL WINAPI IsDBCSLeadByteEx( UINT codep
 BOOL WINAPI IsDBCSLeadByte( BYTE testchar )
 {
     if (!ansi_cptable) return FALSE;
-    return is_dbcs_leadbyte( ansi_cptable, testchar );
+    return wine_is_dbcs_leadbyte( ansi_cptable, testchar );
 }
 
 
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 468ac31..8e997e7 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -638,7 +638,7 @@ WCHAR WINAPI RtlAnsiCharToUnicodeChar(LP
     WCHAR str;
     DWORD charSize = sizeof(CHAR);
 
-    if (is_dbcs_leadbyte(ansi_table, **ansi))
+    if (wine_is_dbcs_leadbyte(ansi_table, **ansi))
         charSize++;
 
     RtlMultiByteToUnicodeN(&str, sizeof(WCHAR), NULL, *ansi, charSize);
diff --git a/include/wine/unicode.h b/include/wine/unicode.h
index 88e93b2..34ae52b 100644
--- a/include/wine/unicode.h
+++ b/include/wine/unicode.h
@@ -95,7 +95,7 @@ extern int snprintfW( WCHAR *str, size_t
 extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist );
 extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist );
 
-extern inline int is_dbcs_leadbyte( const union cptable *table, unsigned char ch )
+extern inline int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch )
 {
     return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]);
 }
diff --git a/libs/unicode/string.c b/libs/unicode/string.c
index 7d88586..860e09d 100644
--- a/libs/unicode/string.c
+++ b/libs/unicode/string.c
@@ -27,7 +27,7 @@ extern const WCHAR wine_casemap_lower[];
 extern const WCHAR wine_casemap_upper[];
 extern const unsigned short wine_wctype_table[];
 
-int is_dbcs_leadbyte( const union cptable *table, unsigned char ch )
+int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch )
 {
     return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]);
 }
diff --git a/libs/unicode/wine_unicode.def b/libs/unicode/wine_unicode.def
index d892629..e582d88 100644
--- a/libs/unicode/wine_unicode.def
+++ b/libs/unicode/wine_unicode.def
@@ -4,7 +4,6 @@ EXPORTS
     atoiW
     atolW
     get_char_typeW
-    is_dbcs_leadbyte
     isalnumW
     isalphaW
     iscntrlW
@@ -53,6 +52,7 @@ EXPORTS
     wine_cpsymbol_wcstombs
     wine_fold_string
     wine_get_sortkey
+    wine_is_dbcs_leadbyte
     wine_utf8_mbstowcs
     wine_utf8_wcstombs
     wine_wctype_table
diff --git a/libs/unicode/wine_unicode.map b/libs/unicode/wine_unicode.map
index 30e3086..7d98e64 100644
--- a/libs/unicode/wine_unicode.map
+++ b/libs/unicode/wine_unicode.map
@@ -4,7 +4,6 @@ WINE_1.0
     atoiW;
     atolW;
     get_char_typeW;
-    is_dbcs_leadbyte;
     isalnumW;
     isalphaW;
     iscntrlW;
@@ -53,6 +52,7 @@ WINE_1.0
     wine_cpsymbol_wcstombs;
     wine_fold_string;
     wine_get_sortkey;
+    wine_is_dbcs_leadbyte;
     wine_utf8_mbstowcs;
     wine_utf8_wcstombs;
     wine_wctype_table;




More information about the wine-cvs mailing list