Author: akhaldi Date: Wed Oct 22 18:05:36 2014 New Revision: 64898
URL: http://svn.reactos.org/svn/reactos?rev=64898&view=rev Log: [KERNEL32] * Zap szCountryListName. * Comment out unused charset_names and strcpynAtoW. CORE-8540
Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c
Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/s... ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Wed Oct 22 18:05:36 2014 @@ -54,6 +54,7 @@ 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s',0 };
+#ifndef __REACTOS__ /* Charset to codepage map, sorted by name. */ static const struct charset_entry { @@ -114,7 +115,7 @@ { "KOI8U", 21866 }, { "UTF8", CP_UTF8 } }; - +#endif
struct locale_name { @@ -139,6 +140,7 @@ static LCID lcid_LC_MEASUREMENT; static LCID lcid_LC_TELEPHONE;
+#ifndef __REACTOS__ /* Copy Ascii string to Unicode without using codepages */ static inline void strcpynAtoW( WCHAR *dst, const char *src, size_t n ) { @@ -149,7 +151,7 @@ } if (n) *dst = 0; } - +#endif
/*********************************************************************** * get_lcid_codepage @@ -1976,18 +1978,6 @@ } return bRet; } - -/* Registry keys for NLS related information */ - -static const WCHAR szCountryListName[] = { - '\','R','e','g','i','s','t','r','y','\', - 'M','a','c','h','i','n','e','\','S','o','f','t','w','a','r','e','\', - 'M','i','c','r','o','s','o','f','t','\','W','i','n','d','o','w','s','\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\', - 'T','e','l','e','p','h','o','n','y','\', - 'C','o','u','n','t','r','y',' ','L','i','s','t','\0' -}; -
/* Callback function ptrs for EnumSystemLanguageGroupsA/W */ typedef struct