[ros-diffs] [hyperion] 34463: modified dll/win32/kernel32/misc/lang.c modified dll/win32/kernel32/kernel32.def Stubbed out GetLocaleInfoEx modified include/psdk/winnls.h Added some Vista and later NLS defines to the SDK modified dll/nls/idndl/idndl.rbuild Correctly set a NULL entry point for idndl.dll modified dll/nls/idndl_redist/idndl_redist.rbuild modified dll/nls/normaliz_redist/normaliz_redist.rbuild Give unique names to the redistributable versions of idndl.dll and normaliz.dll Everything else Scattered NLS modules in the appropriate locations, as per standard source tree layout
hyperion at svn.reactos.org
hyperion at svn.reactos.org
Sun Jul 13 19:54:53 CEST 2008
Author: hyperion
Date: Sun Jul 13 12:54:53 2008
New Revision: 34463
URL: http://svn.reactos.org/svn/reactos?rev=34463&view=rev
Log:
modified dll/win32/kernel32/misc/lang.c
modified dll/win32/kernel32/kernel32.def
Stubbed out GetLocaleInfoEx
modified include/psdk/winnls.h
Added some Vista and later NLS defines to the SDK
modified dll/nls/idndl/idndl.rbuild
Correctly set a NULL entry point for idndl.dll
modified dll/nls/idndl_redist/idndl_redist.rbuild
modified dll/nls/normaliz_redist/normaliz_redist.rbuild
Give unique names to the redistributable versions of idndl.dll and normaliz.dll
Everything else
Scattered NLS modules in the appropriate locations, as per standard source tree layout
Added:
trunk/reactos/dll/nls/
trunk/reactos/dll/nls/idndl/
- copied from r34425, trunk/reactos/nls/dll/idndl/
trunk/reactos/dll/nls/idndl_redist/
- copied from r34425, trunk/reactos/nls/dll/idndl_redist/
trunk/reactos/dll/nls/nls.rbuild (with props)
trunk/reactos/dll/nls/normaliz/
- copied from r34425, trunk/reactos/nls/dll/normaliz/
trunk/reactos/dll/nls/normaliz_redist/
- copied from r34425, trunk/reactos/nls/dll/normaliz_redist/
trunk/reactos/lib/3rdparty/icu4ros/
- copied from r34425, trunk/reactos/nls/3rdparty/
trunk/reactos/lib/nls/
trunk/reactos/lib/nls/idna/
- copied from r34425, trunk/reactos/nls/lib/idna/
trunk/reactos/lib/nls/nls.rbuild (with props)
trunk/reactos/lib/nls/normalize/
- copied from r34425, trunk/reactos/nls/lib/normalize/
trunk/reactos/lib/nls/scripts/
- copied from r34425, trunk/reactos/nls/lib/scripts/
Removed:
trunk/reactos/nls/
Modified:
trunk/reactos/ReactOS-generic.rbuild
trunk/reactos/dll/dll.rbuild
trunk/reactos/dll/nls/idndl/idndl.rbuild
trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
trunk/reactos/dll/win32/kernel32/kernel32.def
trunk/reactos/dll/win32/kernel32/misc/lang.c
trunk/reactos/include/psdk/winnls.h
trunk/reactos/lib/3rdparty/3rdparty.rbuild
trunk/reactos/lib/lib.rbuild
Modified: trunk/reactos/ReactOS-generic.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev=34463&r1=34462&r2=34463&view=diff
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -58,9 +58,6 @@
<directory name="modules">
<xi:include href="modules/directory.rbuild" />
</directory>
- <!--<directory name="nls">
- <xi:include href="nls/nls.rbuild" />
- </directory>-->
<directory name="ntoskrnl">
<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
<!-- <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> -->
Modified: trunk/reactos/dll/dll.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/dll.rbuild?rev=34463&r1=34462&r2=34463&view=diff
==============================================================================
--- trunk/reactos/dll/dll.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/dll.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -13,6 +13,9 @@
<directory name="keyboard">
<xi:include href="keyboard/keyboard.rbuild" />
</directory>
+<directory name="nls">
+ <xi:include href="nls/nls.rbuild" />
+</directory>
<directory name="ntdll">
<xi:include href="ntdll/ntdll.rbuild" />
</directory>
Modified: trunk/reactos/dll/nls/idndl/idndl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl/idndl.rbuild?rev=34463&r1=34425&r2=34463&view=diff
==============================================================================
--- trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -4,7 +4,7 @@
<library>kernel32</library>
<compilerflag>-fno-exceptions</compilerflag>
<compilerflag>-fno-rtti</compilerflag>
- <linkerflag>-Wl,--entry,0</linkerflag>
+ <entrypoint>0</entrypoint>
<file>idndl.cpp</file>
<importlibrary definition="idndl.def" />
</module>
Modified: trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild?rev=34463&r1=34425&r2=34463&view=diff
==============================================================================
--- trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="idndl_redist" type="win32dll" installname="idndl.dll">
+<module name="idndl_redist" type="win32dll" installname="idndl_redist.dll">
<library>kernel32</library>
<library>scripts</library>
<library>libcntpr</library>
Added: trunk/reactos/dll/nls/nls.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/nls.rbuild?rev=34463&view=auto
==============================================================================
--- trunk/reactos/dll/nls/nls.rbuild (added)
+++ trunk/reactos/dll/nls/nls.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -1,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+ <directory name="idndl">
+ <xi:include href="idndl/idndl.rbuild" />
+ </directory>
+ <directory name="idndl_redist">
+ <xi:include href="idndl_redist/idndl_redist.rbuild" />
+ </directory>
+ <directory name="normaliz">
+ <xi:include href="normaliz/normaliz.rbuild" />
+ </directory>
+ <directory name="normaliz_redist">
+ <xi:include href="normaliz_redist/normaliz_redist.rbuild" />
+ </directory>
+</group>
Propchange: trunk/reactos/dll/nls/nls.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild?rev=34463&r1=34425&r2=34463&view=diff
==============================================================================
--- trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -4,7 +4,7 @@
<include base="icu4ros">icu/source/common</include>
<directory name="data"><file>icudt38.c</file></directory>
</module>
-<module name="normaliz_redist" type="win32dll" installname="normaliz.dll">
+<module name="normaliz_redist" type="win32dll" installname="normaliz_redist.dll">
<library>normalize</library>
<library>idna</library>
<library>icu4ros</library>
Modified: trunk/reactos/dll/win32/kernel32/kernel32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel32.def?rev=34463&r1=34462&r2=34463&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -1,4 +1,4 @@
-;
+;
; kernel32.def
;
; Exports for KERNEL32 DLL
@@ -7,14 +7,14 @@
;
; Author: Scott Christley <scottc at net-community.com>
; Date: 1996
-;
+;
; This file is part of the Windows32 API Library.
;
; This library is free software; you can redistribute it and/or
; modify it under the terms of the GNU Library General Public
; License as published by the Free Software Foundation; either
; version 2 of the License, or (at your option) any later version.
-;
+;
; This library is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -22,10 +22,10 @@
;
; If you are interested in a warranty or support for this source code,
; contact Scott Christley <scottc at net-community.com> for more information.
-;
+;
; You should have received a copy of the GNU Library General Public
; License along with this library; see the file COPYING.LIB.
-; If not, write to the Free Software Foundation,
+; If not, write to the Free Software Foundation,
; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
;
LIBRARY KERNEL32.DLL
@@ -419,6 +419,7 @@
GetLocalTime at 4
GetLocaleInfoA at 16
GetLocaleInfoW at 16
+GetLocaleInfoEx at 16
GetLogicalDriveStringsA at 8
GetLogicalDriveStringsW at 8
GetLogicalDrives at 0
Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lang.c?rev=34463&r1=34462&r2=34463&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -1590,6 +1590,18 @@
return nRet;
}
+int
+WINAPI
+GetLocaleInfoEx (
+ LPCWSTR lpLocaleName,
+ LCTYPE LCType,
+ LPWSTR lpLCData,
+ int cchData
+ )
+{
+ return -1;
+}
+
/*
* @implemented
*/
@@ -1773,8 +1785,8 @@
}
-static int compare_unicode_string(
- PUNICODE_STRING String1,
+static int compare_unicode_string(
+ PUNICODE_STRING String1,
PUNICODE_STRING String2,
DWORD Flags
)
@@ -1782,7 +1794,7 @@
ULONG len1, len2;
PWCHAR s1, s2;
WCHAR c1, c2;
-
+
if (String1 && String2)
{
len1 = String1->Length / sizeof(WCHAR);
@@ -1901,8 +1913,8 @@
else
Result = RtlCompareUnicodeString(
&String1, &String2, (BOOLEAN)(dwCmpFlags & NORM_IGNORECASE));
-
-
+
+
if (Result) /* need to translate result */
return (Result < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;
@@ -2177,9 +2189,9 @@
DWORD dwFlags)
{
static const WCHAR szFormat[] = { '%','x','\0' };
- UNICODE_STRING szNlsKeyName =
+ UNICODE_STRING szNlsKeyName =
RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\System\\CurrentControlSet\\Control\\Nls");
- UNICODE_STRING szLangGroupsKeyName =
+ UNICODE_STRING szLangGroupsKeyName =
RTL_CONSTANT_STRING(L"Language Groups");
const int MAX_VALUE_NAME = 16;
const int MAX_VALUE_SYMB = 128;
Modified: trunk/reactos/include/psdk/winnls.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=34463&r1=34462&r2=34463&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -122,6 +122,9 @@
#define LOCALE_SISO639LANGNAME 89
#define LOCALE_SISO3166CTRYNAME 90
#define LOCALE_SNAME 92
+#endif
+#if (WINVER >= 0x0600)
+#define LOCALE_SSCRIPTS 108
#endif
#define LOCALE_SYSTEM_DEFAULT 0x800
#define LOCALE_USER_DEFAULT 0x400
@@ -430,6 +433,12 @@
#define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER
#define CAL_USE_CP_ACP LOCALE_USE_CP_ACP
#endif /* (WINVER >= 0x0500) */
+#if WINVER >= 0x0600
+#define IDN_ALLOW_UNASSIGNED 0x1
+#define IDN_USE_STD3_ASCII_RULES 0x2
+#define VS_ALLOW_LATIN 0x1
+#define GSS_ALLOW_INHERITED_COMMON 0x1
+#endif
#ifndef _BASETSD_H
typedef long LONG_PTR;
#endif
@@ -638,8 +647,15 @@
BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD);
#endif /* (WINVER >= 0x0500) */
#if (WINVER >= 0x0600)
+WINBASEAPI
+int WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,int);
+int WINAPI IdnToAscii(DWORD,LPCWSTR,int,LPWSTR,int);
+int WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,int,LPWSTR,int);
+int WINAPI IdnToUnicode(DWORD,LPCWSTR,int,LPWSTR,int);
+BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int);
int WINAPI NormalizeString(NORM_FORM,LPCWSTR,int,LPWSTR,int);
-BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int);
+int WINAPI GetStringScripts(DWORD,LPCWSTR,int,LPWSTR,int);
+BOOL WINAPI VerifyScripts(DWORD,LPCWSTR,int,LPCWSTR,int);
#endif /* (WINVER >= 0x0600) */
#ifdef UNICODE
Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbuild?rev=34463&r1=34462&r2=34463&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -9,6 +9,9 @@
</directory>
<directory name="expat">
<xi:include href="expat/expat.rbuild" />
+ </directory>
+ <directory name="icu4ros">
+ <xi:include href="icu4ros/icu4ros.rbuild" />
</directory>
<directory name="libwine">
<xi:include href="libwine/libwine.rbuild" />
Modified: trunk/reactos/lib/lib.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=34463&r1=34462&r2=34463&view=diff
==============================================================================
--- trunk/reactos/lib/lib.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/lib.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -28,6 +28,9 @@
<directory name="inflib">
<xi:include href="inflib/inflib.rbuild" />
</directory>
+ <directory name="nls">
+ <xi:include href="nls/nls.rbuild" />
+ </directory>
<directory name="ntdllsys">
<xi:include href="ntdllsys/ntdllsys.rbuild" />
</directory>
Added: trunk/reactos/lib/nls/nls.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/nls.rbuild?rev=34463&view=auto
==============================================================================
--- trunk/reactos/lib/nls/nls.rbuild (added)
+++ trunk/reactos/lib/nls/nls.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008
@@ -1,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+ <directory name="idna">
+ <xi:include href="idna/idna.rbuild" />
+ </directory>
+ <directory name="normalize">
+ <xi:include href="normalize/normalize.rbuild" />
+ </directory>
+ <directory name="scripts">
+ <xi:include href="scripts/scripts.rbuild" />
+ </directory>
+</group>
Propchange: trunk/reactos/lib/nls/nls.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
More information about the Ros-diffs
mailing list