ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
May 2021
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
21 participants
183 discussions
Start a n
N
ew thread
[reactos] 14/17: [PSEH] Use dummy PSEH for clang(-cl) amd64 build
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07dcec0325a056ed3f148…
commit 07dcec0325a056ed3f1480e2856456634c2d80cc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon May 3 15:29:50 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [PSEH] Use dummy PSEH for clang(-cl) amd64 build --- sdk/lib/pseh/include/pseh/pseh2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/pseh/include/pseh/pseh2.h b/sdk/lib/pseh/include/pseh/pseh2.h index fd985dd8702..ecaaa72ee87 100644 --- a/sdk/lib/pseh/include/pseh/pseh2.h +++ b/sdk/lib/pseh/include/pseh/pseh2.h @@ -23,7 +23,7 @@ #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ -#if defined(_USE_NATIVE_SEH) || defined(_MSC_VER) +#if defined(_USE_NATIVE_SEH) || (defined(_MSC_VER) && !(defined(__clang__) && defined(_M_AMD64))) #include <excpt.h> #define _SEH2_TRY __try
3 years, 7 months
1
0
0
0
[reactos] 13/17: [NOTEPAD] Fix resource file
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0bb7757747cb6d2c500e…
commit d0bb7757747cb6d2c500e687df78eb8afea8edc8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 30 17:36:49 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [NOTEPAD] Fix resource file VIRTKEY can't be preceded with ^ and is useless anyway --- base/applications/notepad/lang/es-ES.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index c614cc08880..999a4ae433a 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -8,7 +8,7 @@ BEGIN "^C", CMD_COPY "^B", CMD_SEARCH "^T", CMD_GOTO - "^R", CMD_REPLACE, VIRTKEY, CONTROL + "^R", CMD_REPLACE "^N", CMD_NEW "N", CMD_NEW_WINDOW, VIRTKEY,CONTROL , SHIFT "^A", CMD_OPEN
3 years, 7 months
1
0
0
0
[reactos] 12/17: [CMAKE] Do not use a flag which clang doesn't know
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa51bcfbcb0f9ff308b43…
commit aa51bcfbcb0f9ff308b43d5252d15ed5deca8774 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 30 14:15:39 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [CMAKE] Do not use a flag which clang doesn't know --- sdk/cmake/msvc.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index aad75ebcc4d..b647f839d85 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -67,7 +67,9 @@ add_compile_options(/Zc:threadSafeInit-) # HACK: Disable use of __CxxFrameHandler4 on VS 16.3+ (x64 only) # See
https://developercommunity.visualstudio.com/content/problem/746534/visual-c…
if(ARCH STREQUAL "amd64" AND MSVC_VERSION GREATER 1922) - add_compile_options(/d2FH4-) + if (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_options(/d2FH4-) + endif() add_link_options(/d2:-FH4-) endif()
3 years, 7 months
1
0
0
0
[reactos] 11/17: [KERNEL32] Sync NLS RC files with wine 6.7
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=523912536e6db3320b6f3…
commit 523912536e6db3320b6f3be6a94bf893072d7fa0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 30 13:55:17 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [KERNEL32] Sync NLS RC files with wine 6.7 Mostly for having them UTF-8 encoded --- dll/win32/kernel32/winnls/locale_rc.rc | 181 +++------------------ dll/win32/kernel32/winnls/nls/afk.nls | 29 +++- dll/win32/kernel32/winnls/nls/ara.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/arb.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/are.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/arg.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/arh.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/ari.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/arj.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/ark.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/arl.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/arm.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/aro.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/arq.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/ars.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/art.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/aru.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/ary.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/{cat.nls => ast.nls} | 133 ++++++++------- dll/win32/kernel32/winnls/nls/aze.nls | 101 +++++++----- dll/win32/kernel32/winnls/nls/azl.nls | 47 ++++-- dll/win32/kernel32/winnls/nls/bel.nls | 113 +++++++------ dll/win32/kernel32/winnls/nls/ben.nls | 171 +++++++++++++++++++ dll/win32/kernel32/winnls/nls/bgr.nls | 157 ++++++++++-------- dll/win32/kernel32/winnls/nls/brf.nls | 35 +++- dll/win32/kernel32/winnls/nls/cat.nls | 37 +++-- dll/win32/kernel32/winnls/nls/chs.nls | 123 ++++++++------ dll/win32/kernel32/winnls/nls/cht.nls | 119 ++++++++------ dll/win32/kernel32/winnls/nls/{eng.nls => cor.nls} | 134 ++++++++------- dll/win32/kernel32/winnls/nls/csy.nls | 115 +++++++------ dll/win32/kernel32/winnls/nls/cym.nls | 31 +++- dll/win32/kernel32/winnls/nls/dan.nls | 37 +++-- dll/win32/kernel32/winnls/nls/dea.nls | 43 +++-- dll/win32/kernel32/winnls/nls/dec.nls | 33 +++- dll/win32/kernel32/winnls/nls/del.nls | 35 +++- dll/win32/kernel32/winnls/nls/des.nls | 33 +++- dll/win32/kernel32/winnls/nls/deu.nls | 37 +++-- dll/win32/kernel32/winnls/nls/div.nls | 25 ++- dll/win32/kernel32/winnls/nls/ell.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/ena.nls | 29 +++- dll/win32/kernel32/winnls/nls/enb.nls | 33 +++- dll/win32/kernel32/winnls/nls/enc.nls | 29 +++- dll/win32/kernel32/winnls/nls/eng.nls | 31 +++- dll/win32/kernel32/winnls/nls/eni.nls | 31 +++- dll/win32/kernel32/winnls/nls/enj.nls | 29 +++- dll/win32/kernel32/winnls/nls/enl.nls | 29 +++- dll/win32/kernel32/winnls/nls/enp.nls | 29 +++- dll/win32/kernel32/winnls/nls/ens.nls | 29 +++- dll/win32/kernel32/winnls/nls/ent.nls | 31 +++- dll/win32/kernel32/winnls/nls/enu.nls | 29 +++- dll/win32/kernel32/winnls/nls/enw.nls | 29 +++- dll/win32/kernel32/winnls/nls/enz.nls | 29 +++- dll/win32/kernel32/winnls/nls/{srl.nls => eox.nls} | 159 +++++++++++------- dll/win32/kernel32/winnls/nls/esa.nls | 41 +++-- dll/win32/kernel32/winnls/nls/esb.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esc.nls | 41 +++-- dll/win32/kernel32/winnls/nls/esd.nls | 41 +++-- dll/win32/kernel32/winnls/nls/ese.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esf.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esg.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esh.nls | 37 +++-- dll/win32/kernel32/winnls/nls/esi.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esl.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esm.nls | 43 +++-- dll/win32/kernel32/winnls/nls/esn.nls | 45 +++-- dll/win32/kernel32/winnls/nls/eso.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esp.nls | 43 +++-- dll/win32/kernel32/winnls/nls/esr.nls | 41 +++-- dll/win32/kernel32/winnls/nls/ess.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esu.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esv.nls | 43 +++-- dll/win32/kernel32/winnls/nls/esy.nls | 39 +++-- dll/win32/kernel32/winnls/nls/esz.nls | 41 +++-- dll/win32/kernel32/winnls/nls/eti.nls | 55 ++++--- dll/win32/kernel32/winnls/nls/euq.nls | 31 +++- dll/win32/kernel32/winnls/nls/far.nls | 143 +++++++++------- dll/win32/kernel32/winnls/nls/fin.nls | 43 +++-- dll/win32/kernel32/winnls/nls/fos.nls | 51 ++++-- dll/win32/kernel32/winnls/nls/fra.nls | 63 ++++--- dll/win32/kernel32/winnls/nls/frb.nls | 59 ++++--- dll/win32/kernel32/winnls/nls/frc.nls | 61 ++++--- dll/win32/kernel32/winnls/nls/frl.nls | 63 ++++--- dll/win32/kernel32/winnls/nls/frm.nls | 65 +++++--- dll/win32/kernel32/winnls/nls/frs.nls | 57 ++++--- dll/win32/kernel32/winnls/nls/gae.nls | 178 ++++++++++++++++++++ dll/win32/kernel32/winnls/nls/{eng.nls => gdh.nls} | 138 +++++++++------- dll/win32/kernel32/winnls/nls/{eng.nls => gdv.nls} | 144 +++++++++------- dll/win32/kernel32/winnls/nls/glc.nls | 43 +++-- dll/win32/kernel32/winnls/nls/guj.nls | 25 ++- dll/win32/kernel32/winnls/nls/heb.nls | 147 +++++++++-------- dll/win32/kernel32/winnls/nls/hin.nls | 25 ++- dll/win32/kernel32/winnls/nls/hrv.nls | 59 ++++--- dll/win32/kernel32/winnls/nls/hun.nls | 69 +++++--- dll/win32/kernel32/winnls/nls/hye.nls | 49 ++++-- dll/win32/kernel32/winnls/nls/ind.nls | 29 +++- dll/win32/kernel32/winnls/nls/isl.nls | 79 +++++---- dll/win32/kernel32/winnls/nls/ita.nls | 39 +++-- dll/win32/kernel32/winnls/nls/its.nls | 39 +++-- dll/win32/kernel32/winnls/nls/{enu.nls => ivl.nls} | 91 ++++++----- dll/win32/kernel32/winnls/nls/jpn.nls | 95 ++++++----- dll/win32/kernel32/winnls/nls/kan.nls | 25 ++- dll/win32/kernel32/winnls/nls/kat.nls | 25 ++- dll/win32/kernel32/winnls/nls/kkz.nls | 83 ++++++---- dll/win32/kernel32/winnls/nls/knk.nls | 25 ++- dll/win32/kernel32/winnls/nls/kor.nls | 93 ++++++----- dll/win32/kernel32/winnls/nls/kyr.nls | 119 ++++++++------ dll/win32/kernel32/winnls/nls/lth.nls | 31 +++- dll/win32/kernel32/winnls/nls/lvi.nls | 59 ++++--- dll/win32/kernel32/winnls/nls/mar.nls | 25 ++- dll/win32/kernel32/winnls/nls/mki.nls | 113 +++++++------ dll/win32/kernel32/winnls/nls/mon.nls | 83 ++++++---- dll/win32/kernel32/winnls/nls/msb.nls | 29 +++- dll/win32/kernel32/winnls/nls/msl.nls | 29 +++- dll/win32/kernel32/winnls/nls/nep.nls | 171 +++++++++++++++++++ dll/win32/kernel32/winnls/nls/nlb.nls | 31 +++- dll/win32/kernel32/winnls/nls/nld.nls | 31 +++- dll/win32/kernel32/winnls/nls/{nld.nls => nls.nls} | 65 +++++--- dll/win32/kernel32/winnls/nls/non.nls | 37 +++-- dll/win32/kernel32/winnls/nls/nor.nls | 49 ++++-- dll/win32/kernel32/winnls/nls/pan.nls | 25 ++- dll/win32/kernel32/winnls/nls/plk.nls | 83 ++++++---- dll/win32/kernel32/winnls/nls/ptb.nls | 53 ++++-- dll/win32/kernel32/winnls/nls/ptg.nls | 55 ++++--- dll/win32/kernel32/winnls/nls/rmc.nls | 29 +++- dll/win32/kernel32/winnls/nls/rom.nls | 59 ++++--- dll/win32/kernel32/winnls/nls/rus.nls | 27 ++- dll/win32/kernel32/winnls/nls/san.nls | 25 ++- dll/win32/kernel32/winnls/nls/sin.nls | 177 ++++++++++++++++++++ dll/win32/kernel32/winnls/nls/sky.nls | 91 ++++++----- dll/win32/kernel32/winnls/nls/slv.nls | 33 +++- dll/win32/kernel32/winnls/nls/sqi.nls | 49 ++++-- dll/win32/kernel32/winnls/nls/srb.nls | 115 +++++++------ dll/win32/kernel32/winnls/nls/srl.nls | 47 ++++-- dll/win32/kernel32/winnls/nls/{srl.nls => srm.nls} | 58 ++++--- dll/win32/kernel32/winnls/nls/sve.nls | 43 +++-- dll/win32/kernel32/winnls/nls/svf.nls | 47 ++++-- dll/win32/kernel32/winnls/nls/swk.nls | 29 +++- dll/win32/kernel32/winnls/nls/syr.nls | 25 ++- dll/win32/kernel32/winnls/nls/tam.nls | 25 ++- dll/win32/kernel32/winnls/nls/tel.nls | 25 ++- dll/win32/kernel32/winnls/nls/tha.nls | 115 +++++++------ dll/win32/kernel32/winnls/nls/trk.nls | 103 +++++++----- dll/win32/kernel32/winnls/nls/ttt.nls | 99 ++++++----- dll/win32/kernel32/winnls/nls/ukr.nls | 155 ++++++++++-------- dll/win32/kernel32/winnls/nls/urd.nls | 107 +++++++----- dll/win32/kernel32/winnls/nls/uzb.nls | 119 ++++++++------ dll/win32/kernel32/winnls/nls/uzl.nls | 33 +++- dll/win32/kernel32/winnls/nls/vit.nls | 81 +++++---- dll/win32/kernel32/winnls/nls/{esn.nls => wal.nls} | 151 +++++++++-------- dll/win32/kernel32/winnls/nls/zhh.nls | 39 +++-- dll/win32/kernel32/winnls/nls/zhi.nls | 117 +++++++------ dll/win32/kernel32/winnls/nls/zhm.nls | 111 +++++++------ sdk/include/psdk/winnls.h | 63 +++---- sdk/include/xdk/ntbasedef.h | 27 +++ 154 files changed, 6866 insertions(+), 3747 deletions(-) diff --git a/dll/win32/kernel32/winnls/locale_rc.rc b/dll/win32/kernel32/winnls/locale_rc.rc index 96a33848688..86ababd0900 100644 --- a/dll/win32/kernel32/winnls/locale_rc.rc +++ b/dll/win32/kernel32/winnls/locale_rc.rc @@ -15,377 +15,248 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -//#include "winbase.h" -#include <winnls.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" #define LGRPID_RES_BASE 0x2000 /* add languages in numerical order of main language (last two digits) * it is much easier to find the missing holes that way */ -#pragma code_page(1256) #include "nls/ara.nls" /* 0x0401 LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA */ -#pragma code_page(1256) #include "nls/ari.nls" /* 0x0801 LANG_ARABIC, SUBLANG_ARABIC_IRAQ */ -#pragma code_page(1256) #include "nls/are.nls" /* 0x0c01 LANG_ARABIC, SUBLANG_ARABIC_EGYPT */ -#pragma code_page(1256) #include "nls/arl.nls" /* 0x1001 LANG_ARABIC, SUBLANG_ARABIC_LIBYA */ -#pragma code_page(1256) #include "nls/arg.nls" /* 0x1401 LANG_ARABIC, SUBLANG_ARABIC_ALGERIA */ -#pragma code_page(1256) #include "nls/arm.nls" /* 0x1801 LANG_ARABIC, SUBLANG_ARABIC_MOROCCO */ -#pragma code_page(1256) #include "nls/art.nls" /* 0x1c01 LANG_ARABIC, SUBLANG_ARABIC_TUNISIA */ -#pragma code_page(1256) #include "nls/aro.nls" /* 0x2001 LANG_ARABIC, SUBLANG_ARABIC_OMAN */ -#pragma code_page(1256) #include "nls/ary.nls" /* 0x2401 LANG_ARABIC, SUBLANG_ARABIC_YEMEN */ -#pragma code_page(1256) #include "nls/ars.nls" /* 0x2801 LANG_ARABIC, SUBLANG_ARABIC_SYRIA */ -#pragma code_page(1256) #include "nls/arj.nls" /* 0x2c01 LANG_ARABIC, SUBLANG_ARABIC_JORDAN */ -#pragma code_page(1256) #include "nls/arb.nls" /* 0x3001 LANG_ARABIC, SUBLANG_ARABIC_LEBANON */ -#pragma code_page(1256) #include "nls/ark.nls" /* 0x3401 LANG_ARABIC, SUBLANG_ARABIC_KUWAIT */ -#pragma code_page(1256) #include "nls/aru.nls" /* 0x3801 LANG_ARABIC, SUBLANG_ARABIC_UAE */ -#pragma code_page(1256) #include "nls/arh.nls" /* 0x3c01 LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN */ -#pragma code_page(1256) #include "nls/arq.nls" /* 0x4001 LANG_ARABIC, SUBLANG_ARABIC_QATAR */ -#pragma code_page(1251) #include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */ -#pragma code_page(950) #include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ -#pragma code_page(936) #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ -#pragma code_page(950) #include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */ -#pragma code_page(936) #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ -#pragma code_page(950) #include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ -#pragma code_page(1250) #include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/deu.nls" /* 0x0407 LANG_GERMAN, SUBLANG_GERMAN */ -#pragma code_page(1252) #include "nls/des.nls" /* 0x0807 LANG_GERMAN, SUBLANG_GERMAN_SWISS */ -#pragma code_page(1252) #include "nls/dea.nls" /* 0x0c07 LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN */ -#pragma code_page(1252) #include "nls/del.nls" /* 0x1007 LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG */ -#pragma code_page(1252) #include "nls/dec.nls" /* 0x1407 LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN */ -#pragma code_page(1253) #include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/enu.nls" /* 0x0409 LANG_ENGLISH, SUBLANG_ENGLISH_US */ -#pragma code_page(1252) #include "nls/eng.nls" /* 0x0809 LANG_ENGLISH, SUBLANG_ENGLISH_UK */ -#pragma code_page(1252) #include "nls/ena.nls" /* 0x0c09 LANG_ENGLISH, SUBLANG_ENGLISH_AUS */ -#pragma code_page(1252) #include "nls/enc.nls" /* 0x1009 LANG_ENGLISH, SUBLANG_ENGLISH_CAN */ -#pragma code_page(1252) #include "nls/enz.nls" /* 0x1409 LANG_ENGLISH, SUBLANG_ENGLISH_NZ */ -#pragma code_page(1252) #include "nls/eni.nls" /* 0x1809 LANG_ENGLISH, SUBLANG_ENGLISH_EIRE */ -#pragma code_page(1252) #include "nls/ens.nls" /* 0x1c09 LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA */ -#pragma code_page(1252) #include "nls/enj.nls" /* 0x2009 LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA */ -#pragma code_page(1252) #include "nls/enb.nls" /* 0x2409 LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN */ -#pragma code_page(1252) #include "nls/enl.nls" /* 0x2809 LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE */ -#pragma code_page(1252) #include "nls/ent.nls" /* 0x2c09 LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD */ -#pragma code_page(1252) #include "nls/enw.nls" /* 0x3009 LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE */ -#pragma code_page(1252) #include "nls/enp.nls" /* 0x3409 LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES */ -#pragma code_page(1252) -#include "nls/eoa.nls" /* 0x048F LANG_ESPERANTO, SUBLANG_ESPERANTO */ - -#pragma code_page(1252) #include "nls/esp.nls" /* 0x040a LANG_SPANISH, SUBLANG_SPANISH */ -#pragma code_page(1252) #include "nls/esm.nls" /* 0x080a LANG_SPANISH, SUBLANG_SPANISH_MEXICAN */ -#pragma code_page(1252) #include "nls/esn.nls" /* 0x0c0a LANG_SPANISH, SUBLANG_SPANISH_MODERN */ -#pragma code_page(1252) #include "nls/esg.nls" /* 0x100a LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA */ -#pragma code_page(1252) #include "nls/esc.nls" /* 0x140a LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA */ -#pragma code_page(1252) #include "nls/esa.nls" /* 0x180a LANG_SPANISH, SUBLANG_SPANISH_PANAMA */ -#pragma code_page(1252) #include "nls/esd.nls" /* 0x1c0a LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC */ -#pragma code_page(1252) #include "nls/esv.nls" /* 0x200a LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA */ -#pragma code_page(1252) #include "nls/eso.nls" /* 0x240a LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA */ -#pragma code_page(1252) #include "nls/esr.nls" /* 0x280a LANG_SPANISH, SUBLANG_SPANISH_PERU */ -#pragma code_page(1252) #include "nls/ess.nls" /* 0x2c0a LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA */ -#pragma code_page(1252) #include "nls/esf.nls" /* 0x300a LANG_SPANISH, SUBLANG_SPANISH_ECUADOR */ -#pragma code_page(1252) #include "nls/esl.nls" /* 0x340a LANG_SPANISH, SUBLANG_SPANISH_CHILE */ -#pragma code_page(1252) #include "nls/esy.nls" /* 0x380a LANG_SPANISH, SUBLANG_SPANISH_URUGUAY */ -#pragma code_page(1252) #include "nls/esz.nls" /* 0x3c0a LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY */ -#pragma code_page(1252) #include "nls/esb.nls" /* 0x400a LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA */ -#pragma code_page(1252) #include "nls/ese.nls" /* 0x440a LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR */ -#pragma code_page(1252) #include "nls/esh.nls" /* 0x480a LANG_SPANISH, SUBLANG_SPANISH_HONDURAS */ -#pragma code_page(1252) #include "nls/esi.nls" /* 0x4c0a LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA */ -#pragma code_page(1252) #include "nls/esu.nls" /* 0x500a LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO */ -#pragma code_page(1252) #include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/fra.nls" /* 0x040c LANG_FRENCH, SUBLANG_FRENCH */ -#pragma code_page(1252) #include "nls/frb.nls" /* 0x080c LANG_FRENCH, SUBLANG_FRENCH_BELGIAN */ -#pragma code_page(1252) #include "nls/frc.nls" /* 0x0c0c LANG_FRENCH, SUBLANG_FRENCH_CANADIAN */ -#pragma code_page(1252) #include "nls/frs.nls" /* 0x100c LANG_FRENCH, SUBLANG_FRENCH_SWISS */ -#pragma code_page(1252) #include "nls/frl.nls" /* 0x140c LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG */ -#pragma code_page(1252) #include "nls/frm.nls" /* 0x180c LANG_FRENCH, SUBLANG_FRENCH_MONACO */ -#pragma code_page(1255) #include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_DEFAULT */ -#pragma code_page(1250) #include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ -#pragma code_page(1252) #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -#pragma code_page(932) #include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ -#pragma code_page(949) #include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ -#pragma code_page(1252) #include "nls/nld.nls" /* 0x0413 LANG_DUTCH, SUBLANG_DUTCH */ -#pragma code_page(1252) #include "nls/nlb.nls" /* 0x0813 LANG_DUTCH, SUBLANG_DUTCH_BELGIAN */ -#pragma code_page(1252) #include "nls/nor.nls" /* 0x0414 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */ -#pragma code_page(1252) #include "nls/non.nls" /* 0x0814 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */ -#pragma code_page(1250) #include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/ptb.nls" /* 0x0416 LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */ -#pragma code_page(1252) #include "nls/ptg.nls" /* 0x0816 LANG_PORTUGUESE, SUBLANG_PORTUGUESE */ -//#pragma code_page(1252) -//#include "nls/rmc.nls" /* 0x0417 LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */ +#include "nls/rmc.nls" /* 0x0417 LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */ -#pragma code_page(65001) #include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_DEFAULT */ -#pragma code_page(1250) #include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ -#pragma code_page(1250) #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ -#pragma code_page(1251) #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ +#include "nls/srm.nls" /* 0x241a LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN */ -#pragma code_page(1250) #include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ -#pragma code_page(1250) #include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_SWEDISH */ -#pragma code_page(1252) #include "nls/svf.nls" /* 0x081d LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */ -#pragma code_page(874) #include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_DEFAULT */ -#pragma code_page(1254) #include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_DEFAULT */ -#pragma code_page(1256) #include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ -#pragma code_page(1252) #include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_DEFAULT */ -#pragma code_page(1251) #include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_DEFAULT */ -#pragma code_page(1251) #include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_DEFAULT */ -#pragma code_page(1250) #include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_DEFAULT */ -#pragma code_page(1257) #include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_DEFAULT */ -#pragma code_page(1257) #include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ -#pragma code_page(1256) #include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ -#pragma code_page(1258) #include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ -#pragma code_page(1254) #include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ -#pragma code_page(1251) #include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ -#pragma code_page(1252) #include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_DEFAULT */ -#pragma code_page(1251) #include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ -#pragma code_page(1252) +#include "nls/gae.nls" /* 0x083c LANG_IRISH, SUBLANG_IRISH_IRELAND */ + #include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */ -#pragma code_page(1252) #include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */ -#pragma code_page(1251) #include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ -#pragma code_page(1251) #include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_DEFAULT */ -#pragma code_page(1254) #include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ -#pragma code_page(1251) #include "nls/uzb.nls" /* 0x0843 LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */ -#pragma code_page(1251) #include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ -#pragma code_page(65001) +#include "nls/ben.nls" /* 0x0445 LANG_BANGLA, SUBLANG_BANGLA_INDIA */ + #include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ -#pragma code_page(1251) #include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ -//#pragma code_page(28604) -//#include "nls/cym.nls" /* 0x0452 LANG_WELSH, SUBLANG_DEFAULT */ +#include "nls/cym.nls" /* 0x0452 LANG_WELSH, SUBLANG_DEFAULT */ -#pragma code_page(1252) #include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_DEFAULT */ -#pragma code_page(65001) #include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ -#pragma code_page(65001) +#include "nls/sin.nls" /* 0x045b LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA */ + +#include "nls/nep.nls" /* 0x0461 LANG_NEPALI, SUBLANG_NEPALI_NEPAL */ + #include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ -//#pragma code_page(1252) -//#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_DEFAULT */ +#include "nls/brf.nls" /* 0x047e LANG_BRETON, SUBLANG_DEFAULT */ +#include "nls/gdh.nls" /* 0x0491 LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC */ /* Wine extensions */ -//#include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ +#include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ + +#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ + +#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */ -//#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ +#include "nls/cor.nls" /* 0x0492 LANG_CORNISH, SUBLANG_DEFAULT */ -//#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */ +#include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */ -//#include "nls/cor.nls" /* 0x0492 LANG_CORNISH, SUBLANG_DEFAULT */ +#include "nls/ast.nls" /* 0x04a5 LANG_ASTURIAN, SUBLANG_DEFAULT */ -//#include "nls/gae.nls" /* 0x0494 LANG_GAELIC, SUBLANG_GAELIC */ -//#include "nls/gdh.nls" /* 0x0894 LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */ -//#include "nls/gdv.nls" /* 0x0c94 LANG_GAELIC, SUBLANG_GAELIC_MANX */ +#include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */ diff --git a/dll/win32/kernel32/winnls/nls/afk.nls b/dll/win32/kernel32/winnls/nls/afk.nls index 0869cf20887..aa33aa06d53 100644 --- a/dll/win32/kernel32/winnls/nls/afk.nls +++ b/dll/win32/kernel32/winnls/nls/afk.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1252) - -LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT -LOCALE_FONTSIGNATURE RCDATA { L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x00ff\x003f\x0000\xffff" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT { + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "27" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0436" LOCALE_IDEFAULTMACCODEPAGE "10000" - LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "6" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "209" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0436" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "2" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "4" LOCALE_IPOSSYMPRECEDES "1" @@ -111,6 +111,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januarie" LOCALE_SMONTHNAME2 "Februarie" LOCALE_SMONTHNAME3 "Maart" @@ -126,14 +127,30 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "af-ZA" + LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Suid Afrika" LOCALE_SNATIVECURRNAME "Rand" LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Afrikaans (Suid Afrika)" LOCALE_SNATIVELANGNAME "Afrikaans" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "AFK " LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "af" + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SSHORTDATE "yyyy/MM/dd" + LOCALE_SSHORTESTDAYNAME1 "Ma" + LOCALE_SSHORTESTDAYNAME2 "Di" + LOCALE_SSHORTESTDAYNAME3 "Wo" + LOCALE_SSHORTESTDAYNAME4 "Do" + LOCALE_SSHORTESTDAYNAME5 "Vr" + LOCALE_SSHORTESTDAYNAME6 "Sa" + LOCALE_SSHORTESTDAYNAME7 "So" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/ara.nls b/dll/win32/kernel32/winnls/nls/ara.nls index d1cee066408..ff63164d472 100644 --- a/dll/win32/kernel32/winnls/nls/ara.nls +++ b/dll/win32/kernel32/winnls/nls/ara.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "6" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "966" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "0401" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "205" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0401" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "0" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "0" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "SAU" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARA" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Saudi Arabia" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "ر.س." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Saudi Arabia" LOCALE_SENGCURRNAME "Saudi Riyal" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-SA" - LOCALE_SNATIVECTRYNAME "������� ������� ��������" - LOCALE_SNATIVECURRNAME "���������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "المملكة العربية السعودية" + LOCALE_SNATIVECURRNAME "ريال سعودي" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (المملكة العربية السعودية)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/arb.nls b/dll/win32/kernel32/winnls/nls/arb.nls index b898bd228d3..fb854ac44cd 100644 --- a/dll/win32/kernel32/winnls/nls/arb.nls +++ b/dll/win32/kernel32/winnls/nls/arb.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "961" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "3001" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "139" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "3001" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "LBN" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARB" - LOCALE_SABBREVMONTHNAME1 "�����������" - LOCALE_SABBREVMONTHNAME2 "����" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "������" - LOCALE_SABBREVMONTHNAME7 "����" - LOCALE_SABBREVMONTHNAME8 "��" - LOCALE_SABBREVMONTHNAME9 "�����" - LOCALE_SABBREVMONTHNAME10 "����������" - LOCALE_SABBREVMONTHNAME11 "�����������" - LOCALE_SABBREVMONTHNAME12 "����������" + LOCALE_SABBREVMONTHNAME1 "كانون الثاني" + LOCALE_SABBREVMONTHNAME2 "شباط" + LOCALE_SABBREVMONTHNAME3 "آذار" + LOCALE_SABBREVMONTHNAME4 "نيسان" + LOCALE_SABBREVMONTHNAME5 "أيار" + LOCALE_SABBREVMONTHNAME6 "حزيران" + LOCALE_SABBREVMONTHNAME7 "تموز" + LOCALE_SABBREVMONTHNAME8 "آب" + LOCALE_SABBREVMONTHNAME9 "أيلول" + LOCALE_SABBREVMONTHNAME10 "تشرين الأول" + LOCALE_SABBREVMONTHNAME11 "تشرين الثاني" + LOCALE_SABBREVMONTHNAME12 "كانون الأول" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Lebanon" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "ل.ل." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Lebanon" LOCALE_SENGCURRNAME "Lebanese Pound" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����������" - LOCALE_SMONTHNAME2 "����" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "������" - LOCALE_SMONTHNAME7 "����" - LOCALE_SMONTHNAME8 "��" - LOCALE_SMONTHNAME9 "�����" - LOCALE_SMONTHNAME10 "����������" - LOCALE_SMONTHNAME11 "�����������" - LOCALE_SMONTHNAME12 "����������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "كانون الثاني" + LOCALE_SMONTHNAME2 "شباط" + LOCALE_SMONTHNAME3 "آذار" + LOCALE_SMONTHNAME4 "نيسان" + LOCALE_SMONTHNAME5 "أيار" + LOCALE_SMONTHNAME6 "حزيران" + LOCALE_SMONTHNAME7 "تموز" + LOCALE_SMONTHNAME8 "آب" + LOCALE_SMONTHNAME9 "أيلول" + LOCALE_SMONTHNAME10 "تشرين الأول" + LOCALE_SMONTHNAME11 "تشرين الثاني" + LOCALE_SMONTHNAME12 "كانون الأول" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-LB" - LOCALE_SNATIVECTRYNAME "�����" - LOCALE_SNATIVECURRNAME "����������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "لبنان" + LOCALE_SNATIVECURRNAME "جنيه لبناني" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (لبنان)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/are.nls b/dll/win32/kernel32/winnls/nls/are.nls index 560b2fc87b0..b044d3299b4 100644 --- a/dll/win32/kernel32/winnls/nls/are.nls +++ b/dll/win32/kernel32/winnls/nls/are.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "20" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "0c01" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "67" LOCALE_IINTLCURRDIGITS "3" LOCALE_ILANGUAGE "0c01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "EGY" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARE" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Egypt" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "ج.م." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Egypt" LOCALE_SENGCURRNAME "Egyptian Pound" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-EG" - LOCALE_SNATIVECTRYNAME "���" - LOCALE_SNATIVECURRNAME "��������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "مصر" + LOCALE_SNATIVECURRNAME "جنيه مصري" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (مصر)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/arg.nls b/dll/win32/kernel32/winnls/nls/arg.nls index c28425cfebe..6c10551f012 100644 --- a/dll/win32/kernel32/winnls/nls/arg.nls +++ b/dll/win32/kernel32/winnls/nls/arg.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "213" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "1401" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "4" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "1401" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA LOCALE_ITIME "1" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "0" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "DZA" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARG" - LOCALE_SABBREVMONTHNAME1 "�������" - LOCALE_SABBREVMONTHNAME2 "�������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "��" - LOCALE_SABBREVMONTHNAME6 "����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "���" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "جانفييه" + LOCALE_SABBREVMONTHNAME2 "فيفرييه" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "أفريل" + LOCALE_SABBREVMONTHNAME5 "مي" + LOCALE_SABBREVMONTHNAME6 "جوان" + LOCALE_SABBREVMONTHNAME7 "جوييه" + LOCALE_SABBREVMONTHNAME8 "أوت" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Algeria" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.ج." LOCALE_SDATE "-" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Algeria" LOCALE_SENGCURRNAME "Algerian Dinar" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�������" - LOCALE_SMONTHNAME2 "�������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "��" - LOCALE_SMONTHNAME6 "����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "���" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "جانفييه" + LOCALE_SMONTHNAME2 "فيفرييه" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "أفريل" + LOCALE_SMONTHNAME5 "مي" + LOCALE_SMONTHNAME6 "جوان" + LOCALE_SMONTHNAME7 "جوييه" + LOCALE_SMONTHNAME8 "أوت" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-DZ" - LOCALE_SNATIVECTRYNAME "�������" - LOCALE_SNATIVECURRNAME "����Ѡ������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "الجزائر" + LOCALE_SNATIVECURRNAME "دينار جزائري" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (الجزائر)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/arh.nls b/dll/win32/kernel32/winnls/nls/arh.nls index 6ccb9937087..ce2fe000d43 100644 --- a/dll/win32/kernel32/winnls/nls/arh.nls +++ b/dll/win32/kernel32/winnls/nls/arh.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "973" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "3c01" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "17" LOCALE_IINTLCURRDIGITS "3" LOCALE_ILANGUAGE "3c01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "BHR" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARH" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Bahrain" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.ب." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Bahrain" LOCALE_SENGCURRNAME "Bahraini Dinar" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-BH" - LOCALE_SNATIVECTRYNAME "�������" - LOCALE_SNATIVECURRNAME "����Ѡ������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "البحرين" + LOCALE_SNATIVECURRNAME "دينار بحريني" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (البحرين)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/ari.nls b/dll/win32/kernel32/winnls/nls/ari.nls index 95340062e1a..466fa2540b4 100644 --- a/dll/win32/kernel32/winnls/nls/ari.nls +++ b/dll/win32/kernel32/winnls/nls/ari.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "964" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "0801" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "121" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0801" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "IRQ" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARI" - LOCALE_SABBREVMONTHNAME1 "�����������" - LOCALE_SABBREVMONTHNAME2 "����" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "������" - LOCALE_SABBREVMONTHNAME7 "����" - LOCALE_SABBREVMONTHNAME8 "��" - LOCALE_SABBREVMONTHNAME9 "�����" - LOCALE_SABBREVMONTHNAME10 "����������" - LOCALE_SABBREVMONTHNAME11 "�����������" - LOCALE_SABBREVMONTHNAME12 "����������" + LOCALE_SABBREVMONTHNAME1 "كانون الثاني" + LOCALE_SABBREVMONTHNAME2 "شباط" + LOCALE_SABBREVMONTHNAME3 "آذار" + LOCALE_SABBREVMONTHNAME4 "نيسان" + LOCALE_SABBREVMONTHNAME5 "أيار" + LOCALE_SABBREVMONTHNAME6 "حزيران" + LOCALE_SABBREVMONTHNAME7 "تموز" + LOCALE_SABBREVMONTHNAME8 "آب" + LOCALE_SABBREVMONTHNAME9 "أيلول" + LOCALE_SABBREVMONTHNAME10 "تشرين الأول" + LOCALE_SABBREVMONTHNAME11 "تشرين الثاني" + LOCALE_SABBREVMONTHNAME12 "كانون الأول" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Iraq" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.ع." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iraq" LOCALE_SENGCURRNAME "Iraqi Dinar" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����������" - LOCALE_SMONTHNAME2 "����" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "������" - LOCALE_SMONTHNAME7 "����" - LOCALE_SMONTHNAME8 "��" - LOCALE_SMONTHNAME9 "�����" - LOCALE_SMONTHNAME10 "����������" - LOCALE_SMONTHNAME11 "�����������" - LOCALE_SMONTHNAME12 "����������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "كانون الثاني" + LOCALE_SMONTHNAME2 "شباط" + LOCALE_SMONTHNAME3 "آذار" + LOCALE_SMONTHNAME4 "نيسان" + LOCALE_SMONTHNAME5 "أيار" + LOCALE_SMONTHNAME6 "حزيران" + LOCALE_SMONTHNAME7 "تموز" + LOCALE_SMONTHNAME8 "آب" + LOCALE_SMONTHNAME9 "أيلول" + LOCALE_SMONTHNAME10 "تشرين الأول" + LOCALE_SMONTHNAME11 "تشرين الثاني" + LOCALE_SMONTHNAME12 "كانون الأول" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-IQ" - LOCALE_SNATIVECTRYNAME "������" - LOCALE_SNATIVECURRNAME "����Ѡ�����" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "العراق" + LOCALE_SNATIVECURRNAME "دينار عراقي" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (العراق)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/arj.nls b/dll/win32/kernel32/winnls/nls/arj.nls index be7d4fae41c..fc4f15c509f 100644 --- a/dll/win32/kernel32/winnls/nls/arj.nls +++ b/dll/win32/kernel32/winnls/nls/arj.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "962" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "2c01" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "126" LOCALE_IINTLCURRDIGITS "3" LOCALE_ILANGUAGE "2c01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "JOR" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARJ" - LOCALE_SABBREVMONTHNAME1 "�����������" - LOCALE_SABBREVMONTHNAME2 "����" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "������" - LOCALE_SABBREVMONTHNAME7 "����" - LOCALE_SABBREVMONTHNAME8 "��" - LOCALE_SABBREVMONTHNAME9 "�����" - LOCALE_SABBREVMONTHNAME10 "����������" - LOCALE_SABBREVMONTHNAME11 "�����������" - LOCALE_SABBREVMONTHNAME12 "����������" + LOCALE_SABBREVMONTHNAME1 "كانون الثاني" + LOCALE_SABBREVMONTHNAME2 "شباط" + LOCALE_SABBREVMONTHNAME3 "آذار" + LOCALE_SABBREVMONTHNAME4 "نيسان" + LOCALE_SABBREVMONTHNAME5 "أيار" + LOCALE_SABBREVMONTHNAME6 "حزيران" + LOCALE_SABBREVMONTHNAME7 "تموز" + LOCALE_SABBREVMONTHNAME8 "آب" + LOCALE_SABBREVMONTHNAME9 "أيلول" + LOCALE_SABBREVMONTHNAME10 "تشرين الأول" + LOCALE_SABBREVMONTHNAME11 "تشرين الثاني" + LOCALE_SABBREVMONTHNAME12 "كانون الأول" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Jordan" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.ا." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Jordan" LOCALE_SENGCURRNAME "Jordanian Dinar" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����������" - LOCALE_SMONTHNAME2 "����" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "������" - LOCALE_SMONTHNAME7 "����" - LOCALE_SMONTHNAME8 "��" - LOCALE_SMONTHNAME9 "�����" - LOCALE_SMONTHNAME10 "����������" - LOCALE_SMONTHNAME11 "�����������" - LOCALE_SMONTHNAME12 "����������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "كانون الثاني" + LOCALE_SMONTHNAME2 "شباط" + LOCALE_SMONTHNAME3 "آذار" + LOCALE_SMONTHNAME4 "نيسان" + LOCALE_SMONTHNAME5 "أيار" + LOCALE_SMONTHNAME6 "حزيران" + LOCALE_SMONTHNAME7 "تموز" + LOCALE_SMONTHNAME8 "آب" + LOCALE_SMONTHNAME9 "أيلول" + LOCALE_SMONTHNAME10 "تشرين الأول" + LOCALE_SMONTHNAME11 "تشرين الثاني" + LOCALE_SMONTHNAME12 "كانون الأول" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-JO" - LOCALE_SNATIVECTRYNAME "������" - LOCALE_SNATIVECURRNAME "����Ѡ�����" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "الأردن" + LOCALE_SNATIVECURRNAME "دينار اردني" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (الأردن)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/ark.nls b/dll/win32/kernel32/winnls/nls/ark.nls index c2c864da2b8..9086b622262 100644 --- a/dll/win32/kernel32/winnls/nls/ark.nls +++ b/dll/win32/kernel32/winnls/nls/ark.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "965" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "3401" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "136" LOCALE_IINTLCURRDIGITS "3" LOCALE_ILANGUAGE "3401" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "KWT" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARK" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Kuwait" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.ك." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Kuwait" LOCALE_SENGCURRNAME "Kuwaiti Dinar" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-KW" - LOCALE_SNATIVECTRYNAME "������" - LOCALE_SNATIVECURRNAME "����Ѡ�����" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "الكويت" + LOCALE_SNATIVECURRNAME "دينار كويتي" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (الكويت)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/arl.nls b/dll/win32/kernel32/winnls/nls/arl.nls index 111611b9e17..22bde6893fa 100644 --- a/dll/win32/kernel32/winnls/nls/arl.nls +++ b/dll/win32/kernel32/winnls/nls/arl.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "218" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "1001" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "148" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "1001" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "LBY" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARL" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Libya" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.ل." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Libya" LOCALE_SENGCURRNAME "Libyan Dinar" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-LY" - LOCALE_SNATIVECTRYNAME "�����" - LOCALE_SNATIVECURRNAME "����Ѡ����" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "ليبيا" + LOCALE_SNATIVECURRNAME "دينار ليبي" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (ليبيا)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/arm.nls b/dll/win32/kernel32/winnls/nls/arm.nls index 15aa3fb617f..8ac926550a2 100644 --- a/dll/win32/kernel32/winnls/nls/arm.nls +++ b/dll/win32/kernel32/winnls/nls/arm.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "212" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "1801" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "159" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "1801" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO LOCALE_ITIME "1" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "0" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "MAR" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARM" - LOCALE_SABBREVMONTHNAME1 "�������" - LOCALE_SABBREVMONTHNAME2 "�������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "���" - LOCALE_SABBREVMONTHNAME6 "����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "����" - LOCALE_SABBREVMONTHNAME9 "�������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "جانفييه" + LOCALE_SABBREVMONTHNAME2 "فيفرييه" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "أفريل" + LOCALE_SABBREVMONTHNAME5 "ماي" + LOCALE_SABBREVMONTHNAME6 "جوان" + LOCALE_SABBREVMONTHNAME7 "جوييه" + LOCALE_SABBREVMONTHNAME8 "أووت" + LOCALE_SABBREVMONTHNAME9 "سبتامبر" + LOCALE_SABBREVMONTHNAME10 "أكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Morocco" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.م." LOCALE_SDATE "-" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Morocco" LOCALE_SENGCURRNAME "Moroccan Dirham" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�������" - LOCALE_SMONTHNAME2 "�������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "���" - LOCALE_SMONTHNAME6 "����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "����" - LOCALE_SMONTHNAME9 "�������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "جانفييه" + LOCALE_SMONTHNAME2 "فيفرييه" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "أفريل" + LOCALE_SMONTHNAME5 "ماي" + LOCALE_SMONTHNAME6 "جوان" + LOCALE_SMONTHNAME7 "جوييه" + LOCALE_SMONTHNAME8 "أووت" + LOCALE_SMONTHNAME9 "سبتامبر" + LOCALE_SMONTHNAME10 "أكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-MA" - LOCALE_SNATIVECTRYNAME "������� ��������" - LOCALE_SNATIVECURRNAME "���������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "المملكة المغربية" + LOCALE_SNATIVECURRNAME "درهم مغربي" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (المملكة المغربية)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/aro.nls b/dll/win32/kernel32/winnls/nls/aro.nls index 4a950cd7683..953b761de72 100644 --- a/dll/win32/kernel32/winnls/nls/aro.nls +++ b/dll/win32/kernel32/winnls/nls/aro.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "968" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "2001" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "164" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "2001" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "OMN" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARO" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Oman" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "ر.ع." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Oman" LOCALE_SENGCURRNAME "Rial Omani" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-OM" - LOCALE_SNATIVECTRYNAME "����" - LOCALE_SNATIVECURRNAME "���������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "عمان" + LOCALE_SNATIVECURRNAME "ريال عماني" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (عمان)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/arq.nls b/dll/win32/kernel32/winnls/nls/arq.nls index da63340cb60..25ac8b91323 100644 --- a/dll/win32/kernel32/winnls/nls/arq.nls +++ b/dll/win32/kernel32/winnls/nls/arq.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "974" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "4001" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "197" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "4001" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "QAT" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARQ" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Qatar" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "ر.ق." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Qatar" LOCALE_SENGCURRNAME "Qatari Rial" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-QA" - LOCALE_SNATIVECTRYNAME "���" - LOCALE_SNATIVECURRNAME "��������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "قطر" + LOCALE_SNATIVECURRNAME "ريال قطري" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (قطر)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/ars.nls b/dll/win32/kernel32/winnls/nls/ars.nls index 0124cf301a4..803ca071182 100644 --- a/dll/win32/kernel32/winnls/nls/ars.nls +++ b/dll/win32/kernel32/winnls/nls/ars.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "963" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "2801" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "222" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "2801" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "SYR" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARS" - LOCALE_SABBREVMONTHNAME1 "�����������" - LOCALE_SABBREVMONTHNAME2 "����" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "������" - LOCALE_SABBREVMONTHNAME7 "����" - LOCALE_SABBREVMONTHNAME8 "��" - LOCALE_SABBREVMONTHNAME9 "�����" - LOCALE_SABBREVMONTHNAME10 "����������" - LOCALE_SABBREVMONTHNAME11 "�����������" - LOCALE_SABBREVMONTHNAME12 "����������" + LOCALE_SABBREVMONTHNAME1 "كانون الثاني" + LOCALE_SABBREVMONTHNAME2 "شباط" + LOCALE_SABBREVMONTHNAME3 "آذار" + LOCALE_SABBREVMONTHNAME4 "نيسان" + LOCALE_SABBREVMONTHNAME5 "أيار" + LOCALE_SABBREVMONTHNAME6 "حزيران" + LOCALE_SABBREVMONTHNAME7 "تموز" + LOCALE_SABBREVMONTHNAME8 "آب" + LOCALE_SABBREVMONTHNAME9 "أيلول" + LOCALE_SABBREVMONTHNAME10 "تشرين الأول" + LOCALE_SABBREVMONTHNAME11 "تشرين الثاني" + LOCALE_SABBREVMONTHNAME12 "كانون الأول" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Syria" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "ل.س." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Syria" LOCALE_SENGCURRNAME "Syrian Pound" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����������" - LOCALE_SMONTHNAME2 "����" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "������" - LOCALE_SMONTHNAME7 "����" - LOCALE_SMONTHNAME8 "��" - LOCALE_SMONTHNAME9 "�����" - LOCALE_SMONTHNAME10 "����������" - LOCALE_SMONTHNAME11 "�����������" - LOCALE_SMONTHNAME12 "����������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "كانون الثاني" + LOCALE_SMONTHNAME2 "شباط" + LOCALE_SMONTHNAME3 "آذار" + LOCALE_SMONTHNAME4 "نيسان" + LOCALE_SMONTHNAME5 "أيار" + LOCALE_SMONTHNAME6 "حزيران" + LOCALE_SMONTHNAME7 "تموز" + LOCALE_SMONTHNAME8 "آب" + LOCALE_SMONTHNAME9 "أيلول" + LOCALE_SMONTHNAME10 "تشرين الأول" + LOCALE_SMONTHNAME11 "تشرين الثاني" + LOCALE_SMONTHNAME12 "كانون الأول" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-SY" - LOCALE_SNATIVECTRYNAME "�����" - LOCALE_SNATIVECURRNAME "��������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "سوريا" + LOCALE_SNATIVECURRNAME "جنيه سوري" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (سوريا)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/art.nls b/dll/win32/kernel32/winnls/nls/art.nls index 52c0d50537f..55e34ac77f1 100644 --- a/dll/win32/kernel32/winnls/nls/art.nls +++ b/dll/win32/kernel32/winnls/nls/art.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "216" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "1c01" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "234" LOCALE_IINTLCURRDIGITS "3" LOCALE_ILANGUAGE "1c01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_ITIME "1" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "0" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "TUN" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ART" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "�����" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "���" - LOCALE_SABBREVMONTHNAME6 "����" - LOCALE_SABBREVMONTHNAME7 "������" - LOCALE_SABBREVMONTHNAME8 "���" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "جانفي" + LOCALE_SABBREVMONTHNAME2 "فيفري" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "افريل" + LOCALE_SABBREVMONTHNAME5 "ماي" + LOCALE_SABBREVMONTHNAME6 "جوان" + LOCALE_SABBREVMONTHNAME7 "جويلية" + LOCALE_SABBREVMONTHNAME8 "ابت" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Tunisia" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.ت." LOCALE_SDATE "-" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Tunisia" LOCALE_SENGCURRNAME "Tunisian Dollar" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "�����" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "���" - LOCALE_SMONTHNAME6 "����" - LOCALE_SMONTHNAME7 "������" - LOCALE_SMONTHNAME8 "���" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "جانفي" + LOCALE_SMONTHNAME2 "فيفري" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "افريل" + LOCALE_SMONTHNAME5 "ماي" + LOCALE_SMONTHNAME6 "جوان" + LOCALE_SMONTHNAME7 "جويلية" + LOCALE_SMONTHNAME8 "ابت" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-TN" - LOCALE_SNATIVECTRYNAME "����" - LOCALE_SNATIVECURRNAME "����Ѡ�����" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "تونس" + LOCALE_SNATIVECURRNAME "دولار تونسي" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (تونس)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/aru.nls b/dll/win32/kernel32/winnls/nls/aru.nls index f8422ef6929..d519b38bdd5 100644 --- a/dll/win32/kernel32/winnls/nls/aru.nls +++ b/dll/win32/kernel32/winnls/nls/aru.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "971" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "3801" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "224" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "3801" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "ARE" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARU" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "U.A.E." - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "د.إ." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "U.A.E." LOCALE_SENGCURRNAME "UAE Dirham" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-AE" - LOCALE_SNATIVECTRYNAME "�������� ������� �������" - LOCALE_SNATIVECURRNAME "�����������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "الإمارات العربية المتحدة" + LOCALE_SNATIVECURRNAME "درهم اماراتي" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (الإمارات العربية المتحدة)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/ary.nls b/dll/win32/kernel32/winnls/nls/ary.nls index a91d166265e..0cb1bb88b64 100644 --- a/dll/win32/kernel32/winnls/nls/ary.nls +++ b/dll/win32/kernel32/winnls/nls/ary.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1256) - -LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN -LOCALE_FONTSIGNATURE RCDATA { L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN { + LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "967" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "2401" LOCALE_IDEFAULTMACCODEPAGE "10004" - LOCALE_IDEFAULTUNIXCODEPAGE "28596" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "261" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "2401" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "3" LOCALE_INEGNUMBER "3" LOCALE_INEGSEPBYSPACE "0" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "6" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" @@ -64,40 +64,40 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "�" - LOCALE_S2359 "�" + LOCALE_S1159 "ص" + LOCALE_S2359 "م" LOCALE_SABBREVCTRYNAME "YEM" - LOCALE_SABBREVDAYNAME1 "�������" - LOCALE_SABBREVDAYNAME2 "��������" - LOCALE_SABBREVDAYNAME3 "��������" - LOCALE_SABBREVDAYNAME4 "������" - LOCALE_SABBREVDAYNAME5 "������" - LOCALE_SABBREVDAYNAME6 "�����" - LOCALE_SABBREVDAYNAME7 "�����" + LOCALE_SABBREVDAYNAME1 "الاثنين" + LOCALE_SABBREVDAYNAME2 "الثلاثاء" + LOCALE_SABBREVDAYNAME3 "الاربعاء" + LOCALE_SABBREVDAYNAME4 "الخميس" + LOCALE_SABBREVDAYNAME5 "الجمعة" + LOCALE_SABBREVDAYNAME6 "السبت" + LOCALE_SABBREVDAYNAME7 "الاحد" LOCALE_SABBREVLANGNAME "ARY" - LOCALE_SABBREVMONTHNAME1 "�����" - LOCALE_SABBREVMONTHNAME2 "������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "����" - LOCALE_SABBREVMONTHNAME6 "�����" - LOCALE_SABBREVMONTHNAME7 "�����" - LOCALE_SABBREVMONTHNAME8 "�����" - LOCALE_SABBREVMONTHNAME9 "������" - LOCALE_SABBREVMONTHNAME10 "������" - LOCALE_SABBREVMONTHNAME11 "������" - LOCALE_SABBREVMONTHNAME12 "������" + LOCALE_SABBREVMONTHNAME1 "يناير" + LOCALE_SABBREVMONTHNAME2 "فبراير" + LOCALE_SABBREVMONTHNAME3 "مارس" + LOCALE_SABBREVMONTHNAME4 "ابريل" + LOCALE_SABBREVMONTHNAME5 "مايو" + LOCALE_SABBREVMONTHNAME6 "يونيو" + LOCALE_SABBREVMONTHNAME7 "يوليو" + LOCALE_SABBREVMONTHNAME8 "اغسطس" + LOCALE_SABBREVMONTHNAME9 "سبتمبر" + LOCALE_SABBREVMONTHNAME10 "اكتوبر" + LOCALE_SABBREVMONTHNAME11 "نوفمبر" + LOCALE_SABBREVMONTHNAME12 "ديسمبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Yemen" - LOCALE_SCURRENCY "�.�.�" + LOCALE_SCURRENCY "ر.ي." LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�������" - LOCALE_SDAYNAME2 "��������" - LOCALE_SDAYNAME3 "��������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "�����" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME1 "الاثنين" + LOCALE_SDAYNAME2 "الثلاثاء" + LOCALE_SDAYNAME3 "الاربعاء" + LOCALE_SDAYNAME4 "الخميس" + LOCALE_SDAYNAME5 "الجمعة" + LOCALE_SDAYNAME6 "السبت" + LOCALE_SDAYNAME7 "الاحد" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Yemen" LOCALE_SENGCURRNAME "Yemeni Rial" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "�����" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "����" - LOCALE_SMONTHNAME6 "�����" - LOCALE_SMONTHNAME7 "�����" - LOCALE_SMONTHNAME8 "�����" - LOCALE_SMONTHNAME9 "������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "������" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "يناير" + LOCALE_SMONTHNAME2 "فبراير" + LOCALE_SMONTHNAME3 "مارس" + LOCALE_SMONTHNAME4 "ابريل" + LOCALE_SMONTHNAME5 "مايو" + LOCALE_SMONTHNAME6 "يونيو" + LOCALE_SMONTHNAME7 "يوليو" + LOCALE_SMONTHNAME8 "اغسطس" + LOCALE_SMONTHNAME9 "سبتمبر" + LOCALE_SMONTHNAME10 "اكتوبر" + LOCALE_SMONTHNAME11 "نوفمبر" + LOCALE_SMONTHNAME12 "ديسمبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "ar-YE" - LOCALE_SNATIVECTRYNAME "�����" - LOCALE_SNATIVECURRNAME "��������" + LOCALE_SNAN "ليس رقمًا" + LOCALE_SNATIVECTRYNAME "اليمن" + LOCALE_SNATIVECURRNAME "ريال يمني" LOCALE_SNATIVEDIGITS L"\x0660\x0661\x0662\x0663\x0664\x0665\x0666\x0667\x0668\x0669" - LOCALE_SNATIVELANGNAME "�������" + LOCALE_SNATIVEDISPLAYNAME "العربية (اليمن)" + LOCALE_SNATIVELANGNAME "العربية" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "ARA " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "ar" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "ن" + LOCALE_SSHORTESTDAYNAME2 "ث" + LOCALE_SSHORTESTDAYNAME3 "ر" + LOCALE_SSHORTESTDAYNAME4 "خ" + LOCALE_SSHORTESTDAYNAME5 "ج" + LOCALE_SSHORTESTDAYNAME6 "س" + LOCALE_SSHORTESTDAYNAME7 "ح" + LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/cat.nls b/dll/win32/kernel32/winnls/nls/ast.nls similarity index 57% copy from dll/win32/kernel32/winnls/nls/cat.nls copy to dll/win32/kernel32/winnls/nls/ast.nls index 65c0985f975..4a6a77aa721 100644 --- a/dll/win32/kernel32/winnls/nls/cat.nls +++ b/dll/win32/kernel32/winnls/nls/ast.nls @@ -1,7 +1,7 @@ /* - * Locale definitions for Catalan + * Locale definitions for Asturian * - * Copyright 2002 Alexandre Julliard for CodeWeavers + * Copyright 2019 Enol Puente for Softastur * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1252) +#pragma code_page(65001) /* UTF-8 */ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT -LOCALE_FONTSIGNATURE RCDATA { L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" } - -STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT { + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "34" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "040a" LOCALE_IDEFAULTMACCODEPAGE "10000" - LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0403" + LOCALE_ILANGUAGE "04a5" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "8" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" @@ -57,83 +56,101 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "1" LOCALE_IPOSSYMPRECEDES "0" LOCALE_IREADINGLAYOUT "0" LOCALE_ITIME "1" LOCALE_ITIMEMARKPOSN "0" - LOCALE_ITLZERO "1" + LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "ESP" - LOCALE_SABBREVDAYNAME1 "dl." - LOCALE_SABBREVDAYNAME2 "dt." - LOCALE_SABBREVDAYNAME3 "dc." - LOCALE_SABBREVDAYNAME4 "dj." - LOCALE_SABBREVDAYNAME5 "dv." - LOCALE_SABBREVDAYNAME6 "ds." - LOCALE_SABBREVDAYNAME7 "dg." - LOCALE_SABBREVLANGNAME "CAT" - LOCALE_SABBREVMONTHNAME1 "gen" - LOCALE_SABBREVMONTHNAME2 "feb" - LOCALE_SABBREVMONTHNAME3 "mar�" - LOCALE_SABBREVMONTHNAME4 "abr" - LOCALE_SABBREVMONTHNAME5 "maig" - LOCALE_SABBREVMONTHNAME6 "juny" - LOCALE_SABBREVMONTHNAME7 "jul" - LOCALE_SABBREVMONTHNAME8 "ag" - LOCALE_SABBREVMONTHNAME9 "set" - LOCALE_SABBREVMONTHNAME10 "oct" - LOCALE_SABBREVMONTHNAME11 "nov" - LOCALE_SABBREVMONTHNAME12 "des" + LOCALE_SABBREVDAYNAME1 "Llu" + LOCALE_SABBREVDAYNAME2 "Mar" + LOCALE_SABBREVDAYNAME3 "Mie" + LOCALE_SABBREVDAYNAME4 "Xue" + LOCALE_SABBREVDAYNAME5 "Vie" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" + LOCALE_SABBREVLANGNAME "AST" + LOCALE_SABBREVMONTHNAME1 "Xin" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Abr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Xun" + LOCALE_SABBREVMONTHNAME7 "Xnt" + LOCALE_SABBREVMONTHNAME8 "Ago" + LOCALE_SABBREVMONTHNAME9 "Set" + LOCALE_SABBREVMONTHNAME10 "Och" + LOCALE_SABBREVMONTHNAME11 "Pay" + LOCALE_SABBREVMONTHNAME12 "Avi" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Spain" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "€" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "dilluns" - LOCALE_SDAYNAME2 "dimarts" - LOCALE_SDAYNAME3 "dimecres" - LOCALE_SDAYNAME4 "dijous" - LOCALE_SDAYNAME5 "divendres" - LOCALE_SDAYNAME6 "dissabte" - LOCALE_SDAYNAME7 "diumenge" + LOCALE_SDAYNAME1 "Llunes" + LOCALE_SDAYNAME2 "Martes" + LOCALE_SDAYNAME3 "Miércoles" + LOCALE_SDAYNAME4 "Xueves" + LOCALE_SDAYNAME5 "Vienres" + LOCALE_SDAYNAME6 "Sábadu" + LOCALE_SDAYNAME7 "Domingu" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Spain" LOCALE_SENGCURRNAME "Euro" - LOCALE_SENGLANGUAGE "Catalan" + LOCALE_SENGLANGUAGE "Asturian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "EUR" LOCALE_SISO3166CTRYNAME "ES" - LOCALE_SISO639LANGNAME "ca" - LOCALE_SLANGUAGE "Catalan" + LOCALE_SISO639LANGNAME "ast" + LOCALE_SLANGUAGE "Asturian" LOCALE_SLIST ";" LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "gener" - LOCALE_SMONTHNAME2 "febrer" - LOCALE_SMONTHNAME3 "mar�" - LOCALE_SMONTHNAME4 "abril" - LOCALE_SMONTHNAME5 "maig" - LOCALE_SMONTHNAME6 "juny" - LOCALE_SMONTHNAME7 "juliol" - LOCALE_SMONTHNAME8 "agost" - LOCALE_SMONTHNAME9 "setembre" - LOCALE_SMONTHNAME10 "octubre" - LOCALE_SMONTHNAME11 "novembre" - LOCALE_SMONTHNAME12 "desembre" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "Xineru" + LOCALE_SMONTHNAME2 "Febreru" + LOCALE_SMONTHNAME3 "Marzu" + LOCALE_SMONTHNAME4 "Abril" + LOCALE_SMONTHNAME5 "Mayu" + LOCALE_SMONTHNAME6 "Xunu" + LOCALE_SMONTHNAME7 "Xunetu" + LOCALE_SMONTHNAME8 "Agostu" + LOCALE_SMONTHNAME9 "Setiembre" + LOCALE_SMONTHNAME10 "Ochobre" + LOCALE_SMONTHNAME11 "Payares" + LOCALE_SMONTHNAME12 "Avientu" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "ca-ES" - LOCALE_SNATIVECTRYNAME "Espanya" - LOCALE_SNATIVECURRNAME "euro" + LOCALE_SNAME "ast-ES" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "España" + LOCALE_SNATIVECURRNAME "Euru" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "catal�" + LOCALE_SNATIVEDISPLAYNAME "Asturianu" + LOCALE_SNATIVELANGNAME "Asturianu" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "AST " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "ast" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "Ll" + LOCALE_SSHORTESTDAYNAME2 "Ma" + LOCALE_SSHORTESTDAYNAME3 "Mi" + LOCALE_SSHORTESTDAYNAME4 "Xu" + LOCALE_SSHORTESTDAYNAME5 "Vi" + LOCALE_SSHORTESTDAYNAME6 "Sá" + LOCALE_SSHORTESTDAYNAME7 "Do" + LOCALE_SSHORTTIME "HH:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "." LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/aze.nls b/dll/win32/kernel32/winnls/nls/aze.nls index 4d1700fcad2..e2860d088f0 100644 --- a/dll/win32/kernel32/winnls/nls/aze.nls +++ b/dll/win32/kernel32/winnls/nls/aze.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1251) - -LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC -LOCALE_FONTSIGNATURE RCDATA { L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x0002\x0004\x0000\x0000\x0202" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC { + LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x0002\x0004\x0000\x0000\x0202" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "994" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_IDEFAULTEBCDICCODEPAGE "20880" LOCALE_IDEFAULTLANGUAGE "082c" LOCALE_IDEFAULTMACCODEPAGE "10007" - LOCALE_IDEFAULTUNIXCODEPAGE "28595" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "5" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "082c" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "8" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "1" LOCALE_IPOSSYMPRECEDES "0" @@ -67,29 +67,29 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_S1159 "" LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "AZE" - LOCALE_SABBREVDAYNAME1 "��" - LOCALE_SABBREVDAYNAME2 "��" - LOCALE_SABBREVDAYNAME3 "�" + LOCALE_SABBREVDAYNAME1 "Бе" + LOCALE_SABBREVDAYNAME2 "Ча" + LOCALE_SABBREVDAYNAME3 "Ч" LOCALE_SABBREVDAYNAME4 L"\x04b8\x0430" LOCALE_SABBREVDAYNAME5 L"\x04b8" - LOCALE_SABBREVDAYNAME6 "�" - LOCALE_SABBREVDAYNAME7 "�" + LOCALE_SABBREVDAYNAME6 "Ш" + LOCALE_SABBREVDAYNAME7 "Б" LOCALE_SABBREVLANGNAME "AZE" - LOCALE_SABBREVMONTHNAME1 "���" - LOCALE_SABBREVMONTHNAME2 "���" - LOCALE_SABBREVMONTHNAME3 "���" - LOCALE_SABBREVMONTHNAME4 "���" - LOCALE_SABBREVMONTHNAME5 "��" - LOCALE_SABBREVMONTHNAME6 "ȼ��" - LOCALE_SABBREVMONTHNAME7 "ȼ��" - LOCALE_SABBREVMONTHNAME8 "���" - LOCALE_SABBREVMONTHNAME9 "���" - LOCALE_SABBREVMONTHNAME10 "���" - LOCALE_SABBREVMONTHNAME11 "���" - LOCALE_SABBREVMONTHNAME12 "���" + LOCALE_SABBREVMONTHNAME1 "Јан" + LOCALE_SABBREVMONTHNAME2 "Фев" + LOCALE_SABBREVMONTHNAME3 "Мар" + LOCALE_SABBREVMONTHNAME4 "Апр" + LOCALE_SABBREVMONTHNAME5 "Мај" + LOCALE_SABBREVMONTHNAME6 "Ијун" + LOCALE_SABBREVMONTHNAME7 "Ијул" + LOCALE_SABBREVMONTHNAME8 "Авг" + LOCALE_SABBREVMONTHNAME9 "Сен" + LOCALE_SABBREVMONTHNAME10 "Окт" + LOCALE_SABBREVMONTHNAME11 "Ноя" + LOCALE_SABBREVMONTHNAME12 "Дек" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Azerbaijan" - LOCALE_SCURRENCY "���." + LOCALE_SCURRENCY "ман." LOCALE_SDATE "." LOCALE_SDAYNAME1 L"\x0411\x0430\x0437\x0430\x0440\x00a0\x0435\x0440\x0442\x04d9\x0441\x0438" LOCALE_SDAYNAME2 L"\x0427\x04d9\x0440\x0448\x04d9\x043d\x0431\x04d9\x00a0\x0430\x0445\x0448\x0430\x043c\x044b" @@ -97,7 +97,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SDAYNAME4 L"\x04b8\x04af\x043c\x04d9\x00a0\x0430\x0445\x0448\x0430\x043c\x044b" LOCALE_SDAYNAME5 L"\x04b8\x04af\x043c\x04d9" LOCALE_SDAYNAME6 L"\x0428\x04d9\x043d\x0431\x04d9" - LOCALE_SDAYNAME7 "�����" + LOCALE_SDAYNAME7 "Базар" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Azerbaijan" LOCALE_SENGCURRNAME "Azerbaijanian Manat" @@ -111,31 +111,48 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "������" - LOCALE_SMONTHNAME2 "������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "��" - LOCALE_SMONTHNAME6 "ȼ��" - LOCALE_SMONTHNAME7 "ȼ��" - LOCALE_SMONTHNAME8 "������" - LOCALE_SMONTHNAME9 "�������" - LOCALE_SMONTHNAME10 "������" - LOCALE_SMONTHNAME11 "�����" - LOCALE_SMONTHNAME12 "������" + LOCALE_SMONTHDAY "d MMMM" + LOCALE_SMONTHNAME1 "Јанвар" + LOCALE_SMONTHNAME2 "Феврал" + LOCALE_SMONTHNAME3 "Март" + LOCALE_SMONTHNAME4 "Апрел" + LOCALE_SMONTHNAME5 "Мај" + LOCALE_SMONTHNAME6 "Ијун" + LOCALE_SMONTHNAME7 "Ијул" + LOCALE_SMONTHNAME8 "Август" + LOCALE_SMONTHNAME9 "Сентјабр" + LOCALE_SMONTHNAME10 "Октјабр" + LOCALE_SMONTHNAME11 "Нојабр" + LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "�" - LOCALE_SNAME "az-AZ" + LOCALE_SMONTHOUSANDSEP " " + LOCALE_SNAME "az-Cyrl-AZ" + LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME L"\x0410\x0437\x04d9\x0440\x0431\x0430\x0458\x04b9\x0430\x043d" - LOCALE_SNATIVECURRNAME "�����" + LOCALE_SNATIVECURRNAME "рубль" LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "" LOCALE_SNATIVELANGNAME L"\x0410\x0437\x04d9\x0440\x0431\x0430\x0458\x04b9\x0430\x043d" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "AZE " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Arab;" + LOCALE_SPARENT "az-Cyrl" LOCALE_SSHORTDATE "dd.MM.yyyy" + LOCALE_SSHORTESTDAYNAME1 "Бе" + LOCALE_SSHORTESTDAYNAME2 "Ча" + LOCALE_SSHORTESTDAYNAME3 "Ч" + LOCALE_SSHORTESTDAYNAME4 "Ҹа" + LOCALE_SSHORTESTDAYNAME5 "Ҹ" + LOCALE_SSHORTESTDAYNAME6 "Ш" + LOCALE_SSHORTESTDAYNAME7 "Б" + LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "�" + LOCALE_STHOUSAND " " LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" @@ -152,9 +169,9 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/dll/win32/kernel32/winnls/nls/azl.nls b/dll/win32/kernel32/winnls/nls/azl.nls index 82315904cd5..86d49a6b5fc 100644 --- a/dll/win32/kernel32/winnls/nls/azl.nls +++ b/dll/win32/kernel32/winnls/nls/azl.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1254) - -LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN -LOCALE_FONTSIGNATURE RCDATA { L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0400\x0013\x0000\x0000\xc5d4" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN { + LOCALE_FONTSIGNATURE L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0400\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "994" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_IDEFAULTEBCDICCODEPAGE "20905" LOCALE_IDEFAULTLANGUAGE "042c" LOCALE_IDEFAULTMACCODEPAGE "10081" - LOCALE_IDEFAULTUNIXCODEPAGE "28599" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "5" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "042c" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "8" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "1" LOCALE_IPOSSYMPRECEDES "0" @@ -68,11 +68,11 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "AZE" LOCALE_SABBREVDAYNAME1 "Be" - LOCALE_SABBREVDAYNAME2 L"\x00c7a" - LOCALE_SABBREVDAYNAME3 L"\x00c7" + LOCALE_SABBREVDAYNAME2 "Ça" + LOCALE_SABBREVDAYNAME3 "Ç" LOCALE_SABBREVDAYNAME4 "Ca" LOCALE_SABBREVDAYNAME5 "C" - LOCALE_SABBREVDAYNAME6 L"\x015E" + LOCALE_SABBREVDAYNAME6 "Ş" LOCALE_SABBREVDAYNAME7 "B" LOCALE_SABBREVLANGNAME "AZE" LOCALE_SABBREVMONTHNAME1 "Yan" @@ -80,8 +80,8 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_SABBREVMONTHNAME3 "Mar" LOCALE_SABBREVMONTHNAME4 "Apr" LOCALE_SABBREVMONTHNAME5 "May" - LOCALE_SABBREVMONTHNAME6 L"\x0130yun" - LOCALE_SABBREVMONTHNAME7 L"\x0130yul" + LOCALE_SABBREVMONTHNAME6 "İyun" + LOCALE_SABBREVMONTHNAME7 "İyul" LOCALE_SABBREVMONTHNAME8 "Avg" LOCALE_SABBREVMONTHNAME9 "Sen" LOCALE_SABBREVMONTHNAME10 "Okt" @@ -111,31 +111,48 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Yanvar" LOCALE_SMONTHNAME2 "Fevral" LOCALE_SMONTHNAME3 "Mart" LOCALE_SMONTHNAME4 "Aprel" LOCALE_SMONTHNAME5 "May" - LOCALE_SMONTHNAME6 L"\x0130yun" - LOCALE_SMONTHNAME7 L"\x0130yul" + LOCALE_SMONTHNAME6 "İyun" + LOCALE_SMONTHNAME7 "İyul" LOCALE_SMONTHNAME8 "Avgust" LOCALE_SMONTHNAME9 "Sentyabr" LOCALE_SMONTHNAME10 "Oktyabr" LOCALE_SMONTHNAME11 "Noyabr" LOCALE_SMONTHNAME12 "Dekabr" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "�" + LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "az-Latn-AZ" + LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME L"Az\x0259rbaycanca" LOCALE_SNATIVECURRNAME "manat" LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "" LOCALE_SNATIVELANGNAME L"Az\x0259rbaycan\x00ad\x0131l\x0131" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "AZE " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "az-Latn" LOCALE_SSHORTDATE "dd.MM.yyyy" + LOCALE_SSHORTESTDAYNAME1 "Be" + LOCALE_SSHORTESTDAYNAME2 "Ça" + LOCALE_SSHORTESTDAYNAME3 "Ç" + LOCALE_SSHORTESTDAYNAME4 "Ca" + LOCALE_SSHORTESTDAYNAME5 "C" + LOCALE_SSHORTESTDAYNAME6 "Ş" + LOCALE_SSHORTESTDAYNAME7 "B" + LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "�" + LOCALE_STHOUSAND " " LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/bel.nls b/dll/win32/kernel32/winnls/nls/bel.nls index 86e5c2c3315..e6cc7a58df8 100644 --- a/dll/win32/kernel32/winnls/nls/bel.nls +++ b/dll/win32/kernel32/winnls/nls/bel.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1251) - -LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT -LOCALE_FONTSIGNATURE RCDATA { L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x0002\x0004\x0000\x0000\x0202" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT { + LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x0002\x0004\x0000\x0000\x0202" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "375" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0423" LOCALE_IDEFAULTMACCODEPAGE "10007" - LOCALE_IDEFAULTUNIXCODEPAGE "1251" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "29" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0423" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "0" LOCALE_INEGCURR "8" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "0" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "1" LOCALE_IPOSSYMPRECEDES "0" @@ -67,37 +67,37 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_S1159 "" LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "BLR" - LOCALE_SABBREVDAYNAME1 "��" - LOCALE_SABBREVDAYNAME2 "�" - LOCALE_SABBREVDAYNAME3 "��" - LOCALE_SABBREVDAYNAME4 "��" - LOCALE_SABBREVDAYNAME5 "��" - LOCALE_SABBREVDAYNAME6 "��" - LOCALE_SABBREVDAYNAME7 "��" + LOCALE_SABBREVDAYNAME1 "пн" + LOCALE_SABBREVDAYNAME2 "аў" + LOCALE_SABBREVDAYNAME3 "ср" + LOCALE_SABBREVDAYNAME4 "чц" + LOCALE_SABBREVDAYNAME5 "пт" + LOCALE_SABBREVDAYNAME6 "сб" + LOCALE_SABBREVDAYNAME7 "нд" LOCALE_SABBREVLANGNAME "BEL" - LOCALE_SABBREVMONTHNAME1 "���" - LOCALE_SABBREVMONTHNAME2 "���" - LOCALE_SABBREVMONTHNAME3 "���" - LOCALE_SABBREVMONTHNAME4 "���" - LOCALE_SABBREVMONTHNAME5 "���" - LOCALE_SABBREVMONTHNAME6 "���" - LOCALE_SABBREVMONTHNAME7 "˳�" - LOCALE_SABBREVMONTHNAME8 "��" - LOCALE_SABBREVMONTHNAME9 "���" - LOCALE_SABBREVMONTHNAME10 "���" - LOCALE_SABBREVMONTHNAME11 "˳�" - LOCALE_SABBREVMONTHNAME12 "���" + LOCALE_SABBREVMONTHNAME1 "Сту" + LOCALE_SABBREVMONTHNAME2 "Лют" + LOCALE_SABBREVMONTHNAME3 "Сак" + LOCALE_SABBREVMONTHNAME4 "Кра" + LOCALE_SABBREVMONTHNAME5 "Май" + LOCALE_SABBREVMONTHNAME6 "Чэр" + LOCALE_SABBREVMONTHNAME7 "Ліп" + LOCALE_SABBREVMONTHNAME8 "Жні" + LOCALE_SABBREVMONTHNAME9 "Вер" + LOCALE_SABBREVMONTHNAME10 "Кас" + LOCALE_SABBREVMONTHNAME11 "Ліс" + LOCALE_SABBREVMONTHNAME12 "Сне" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Belarus" - LOCALE_SCURRENCY "���." + LOCALE_SCURRENCY "руб." LOCALE_SDATE "." - LOCALE_SDAYNAME1 "����������" - LOCALE_SDAYNAME2 "������" - LOCALE_SDAYNAME3 "������" - LOCALE_SDAYNAME4 "������" - LOCALE_SDAYNAME5 "������" - LOCALE_SDAYNAME6 "������" - LOCALE_SDAYNAME7 "�������" + LOCALE_SDAYNAME1 "панядзелак" + LOCALE_SDAYNAME2 "аўторак" + LOCALE_SDAYNAME3 "серада" + LOCALE_SDAYNAME4 "чацвер" + LOCALE_SDAYNAME5 "пятніца" + LOCALE_SDAYNAME6 "субота" + LOCALE_SDAYNAME7 "нядзеля" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Belarus" LOCALE_SENGCURRNAME "Belarusian Ruble" @@ -111,29 +111,46 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;3" - LOCALE_SMONTHNAME1 "��������" - LOCALE_SMONTHNAME2 "����" - LOCALE_SMONTHNAME3 "������" - LOCALE_SMONTHNAME4 "�������" - LOCALE_SMONTHNAME5 "���" - LOCALE_SMONTHNAME6 "�������" - LOCALE_SMONTHNAME7 "˳����" - LOCALE_SMONTHNAME8 "������" - LOCALE_SMONTHNAME9 "��������" - LOCALE_SMONTHNAME10 "���������" - LOCALE_SMONTHNAME11 "˳������" - LOCALE_SMONTHNAME12 "�������" + LOCALE_SMONTHDAY "d MMMM" + LOCALE_SMONTHNAME1 "Студзень\0студзеня" + LOCALE_SMONTHNAME2 "Люты\0лютага" + LOCALE_SMONTHNAME3 "Сакавік\0сакавіка" + LOCALE_SMONTHNAME4 "Красавік\0красавіка" + LOCALE_SMONTHNAME5 "Май\0мая" + LOCALE_SMONTHNAME6 "Чэрвень\0чэрвеня" + LOCALE_SMONTHNAME7 "Ліпень\0ліпеня" + LOCALE_SMONTHNAME8 "Жнівень\0жніўня" + LOCALE_SMONTHNAME9 "Верасень\0верасня" + LOCALE_SMONTHNAME10 "Кастрычнік\0кастрычніка" + LOCALE_SMONTHNAME11 "Лістапад\0лістапада" + LOCALE_SMONTHNAME12 "Снежань\0снежня" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "be-BY" - LOCALE_SNATIVECTRYNAME "��������" - LOCALE_SNATIVECURRNAME "������" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "Беларусь" + LOCALE_SNATIVECURRNAME "рубель" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "����������" + LOCALE_SNATIVEDISPLAYNAME "Беларуская (Беларусь)" + LOCALE_SNATIVELANGNAME "Беларуская" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "BEL " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Cyrl;" + LOCALE_SPARENT "be" LOCALE_SSHORTDATE "dd.MM.yyyy" + LOCALE_SSHORTESTDAYNAME1 "пн" + LOCALE_SSHORTESTDAYNAME2 "аў" + LOCALE_SSHORTESTDAYNAME3 "ср" + LOCALE_SSHORTESTDAYNAME4 "чц" + LOCALE_SSHORTESTDAYNAME5 "пт" + LOCALE_SSHORTESTDAYNAME6 "сб" + LOCALE_SSHORTESTDAYNAME7 "нд" + LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND " " LOCALE_STIME ":" @@ -152,7 +169,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/ben.nls b/dll/win32/kernel32/winnls/nls/ben.nls new file mode 100644 index 00000000000..bead15abaf4 --- /dev/null +++ b/dll/win32/kernel32/winnls/nls/ben.nls @@ -0,0 +1,171 @@ +/* + * Locale definitions for Bangla + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA +{ + LOCALE_FONTSIGNATURE L"\x0000\x0001\x0000\x0000\x0000\x0000\x0000\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0445" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "113" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0445" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_IPOSITIVEPERCENT "1" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "AM" + LOCALE_S2359 "PM" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "সোম." + LOCALE_SABBREVDAYNAME2 "মঙ্গল." + LOCALE_SABBREVDAYNAME3 "বুধ." + LOCALE_SABBREVDAYNAME4 "বৃহস্পতি." + LOCALE_SABBREVDAYNAME5 "শুক্র." + LOCALE_SABBREVDAYNAME6 "শনি." + LOCALE_SABBREVDAYNAME7 "রবি." + LOCALE_SABBREVLANGNAME "BNG" + LOCALE_SABBREVMONTHNAME1 "জানু." + LOCALE_SABBREVMONTHNAME2 "ফেব্রু." + LOCALE_SABBREVMONTHNAME3 "মার্চ" + LOCALE_SABBREVMONTHNAME4 "এপ্রিল" + LOCALE_SABBREVMONTHNAME5 "মে" + LOCALE_SABBREVMONTHNAME6 "জুন" + LOCALE_SABBREVMONTHNAME7 "জুলাই" + LOCALE_SABBREVMONTHNAME8 "আগ." + LOCALE_SABBREVMONTHNAME9 "সেপ্টে." + LOCALE_SABBREVMONTHNAME10 "অক্টো." + LOCALE_SABBREVMONTHNAME11 "নভে." + LOCALE_SABBREVMONTHNAME12 "ডিসে." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "₹" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "সোমবার" + LOCALE_SDAYNAME2 "মঙ্গলবার" + LOCALE_SDAYNAME3 "বুধবার" + LOCALE_SDAYNAME4 "বৃহস্পতিবার" + LOCALE_SDAYNAME5 "শুক্রবার" + LOCALE_SDAYNAME6 "শনিবার" + LOCALE_SDAYNAME7 "রবিবার" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Bangla" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "bn" + LOCALE_SLANGUAGE "Bangla (India)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "জানুয়ারী" + LOCALE_SMONTHNAME2 "ফেব্রুয়ারী" + LOCALE_SMONTHNAME3 "মার্চ" + LOCALE_SMONTHNAME4 "এপ্রিল" + LOCALE_SMONTHNAME5 "মে" + LOCALE_SMONTHNAME6 "জুন" + LOCALE_SMONTHNAME7 "জুলাই" + LOCALE_SMONTHNAME8 "আগস্ট" + LOCALE_SMONTHNAME9 "সেপ্টেম্বর" + LOCALE_SMONTHNAME10 "অক্টোবর" + LOCALE_SMONTHNAME11 "নভেম্বর" + LOCALE_SMONTHNAME12 "ডিসেম্বর" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "bn-IN" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "ভারত" + LOCALE_SNATIVECURRNAME "টাকা" + LOCALE_SNATIVEDIGITS "০১২৩৪৫৬৭৮৯" + LOCALE_SNATIVEDISPLAYNAME "বাংলা (ভারত)" + LOCALE_SNATIVELANGNAME "বাংলা" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "BEN " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Beng;" + LOCALE_SPARENT "bn" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSHORTESTDAYNAME1 "স" + LOCALE_SSHORTESTDAYNAME2 "ম" + LOCALE_SSHORTESTDAYNAME3 "বু" + LOCALE_SSHORTESTDAYNAME4 "বৃ" + LOCALE_SSHORTESTDAYNAME5 "শু" + LOCALE_SSHORTESTDAYNAME6 "শ" + LOCALE_SSHORTESTDAYNAME7 "র" + LOCALE_SSHORTTIME "HH.mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME "." + LOCALE_STIMEFORMAT "HH.mm.ss" + LOCALE_SYEARMONTH "MMMM, yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/dll/win32/kernel32/winnls/nls/bgr.nls b/dll/win32/kernel32/winnls/nls/bgr.nls index 9e50e95630a..5f1f0e66974 100644 --- a/dll/win32/kernel32/winnls/nls/bgr.nls +++ b/dll/win32/kernel32/winnls/nls/bgr.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1251) - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -LOCALE_FONTSIGNATURE RCDATA { L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x0002\x0004\x0000\x0000\x0202" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT { + LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x0002\x0004\x0000\x0000\x0202" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "359" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "0402" LOCALE_IDEFAULTMACCODEPAGE "10007" - LOCALE_IDEFAULTUNIXCODEPAGE "1251" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "35" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0402" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "0" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "8" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "1" LOCALE_IPOSSYMPRECEDES "0" @@ -67,94 +67,111 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT LOCALE_S1159 "" LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "BGR" - LOCALE_SABBREVDAYNAME1 "����������" - LOCALE_SABBREVDAYNAME2 "�������" - LOCALE_SABBREVDAYNAME3 "�����" - LOCALE_SABBREVDAYNAME4 "���������" - LOCALE_SABBREVDAYNAME5 "�����" - LOCALE_SABBREVDAYNAME6 "������" - LOCALE_SABBREVDAYNAME7 "������" + LOCALE_SABBREVDAYNAME1 "понеделник" + LOCALE_SABBREVDAYNAME2 "вторник" + LOCALE_SABBREVDAYNAME3 "сряда" + LOCALE_SABBREVDAYNAME4 "четвъртък" + LOCALE_SABBREVDAYNAME5 "петък" + LOCALE_SABBREVDAYNAME6 "събота" + LOCALE_SABBREVDAYNAME7 "неделя" LOCALE_SABBREVLANGNAME "BGR" - LOCALE_SABBREVMONTHNAME1 "������" - LOCALE_SABBREVMONTHNAME2 "��������" - LOCALE_SABBREVMONTHNAME3 "����" - LOCALE_SABBREVMONTHNAME4 "�����" - LOCALE_SABBREVMONTHNAME5 "���" - LOCALE_SABBREVMONTHNAME6 "���" - LOCALE_SABBREVMONTHNAME7 "���" - LOCALE_SABBREVMONTHNAME8 "������" - LOCALE_SABBREVMONTHNAME9 "���������" - LOCALE_SABBREVMONTHNAME10 "��������" - LOCALE_SABBREVMONTHNAME11 "�������" - LOCALE_SABBREVMONTHNAME12 "��������" + LOCALE_SABBREVMONTHNAME1 "Януари" + LOCALE_SABBREVMONTHNAME2 "Февруари" + LOCALE_SABBREVMONTHNAME3 "Март" + LOCALE_SABBREVMONTHNAME4 "Април" + LOCALE_SABBREVMONTHNAME5 "Май" + LOCALE_SABBREVMONTHNAME6 "Юни" + LOCALE_SABBREVMONTHNAME7 "Юли" + LOCALE_SABBREVMONTHNAME8 "Август" + LOCALE_SABBREVMONTHNAME9 "Септември" + LOCALE_SABBREVMONTHNAME10 "Октомври" + LOCALE_SABBREVMONTHNAME11 "Ноември" + LOCALE_SABBREVMONTHNAME12 "Декември" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Bulgaria" - LOCALE_SCURRENCY "��" + LOCALE_SCURRENCY "лв" LOCALE_SDATE "." - LOCALE_SDAYNAME1 "����������" - LOCALE_SDAYNAME2 "�������" - LOCALE_SDAYNAME3 "�����" - LOCALE_SDAYNAME4 "���������" - LOCALE_SDAYNAME5 "�����" - LOCALE_SDAYNAME6 "������" - LOCALE_SDAYNAME7 "������" + LOCALE_SDAYNAME1 "понеделник" + LOCALE_SDAYNAME2 "вторник" + LOCALE_SDAYNAME3 "сряда" + LOCALE_SDAYNAME4 "четвъртък" + LOCALE_SDAYNAME5 "петък" + LOCALE_SDAYNAME6 "събота" + LOCALE_SDAYNAME7 "неделя" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Bulgaria" LOCALE_SENGCURRNAME "Bulgarian Lev" LOCALE_SENGLANGUAGE "Bulgarian" LOCALE_SGROUPING "3;0" - LOCALE_SINTLSYMBOL "BGN" + LOCALE_SINTLSYMBOL "BGL" LOCALE_SISO3166CTRYNAME "BG" LOCALE_SISO639LANGNAME "bg" LOCALE_SLANGUAGE "Bulgarian" LOCALE_SLIST ";" - LOCALE_SLONGDATE "dd MMMM yyyy '�.'" + LOCALE_SLONGDATE "dd MMMM yyyy 'г.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "������" - LOCALE_SMONTHNAME2 "��������" - LOCALE_SMONTHNAME3 "����" - LOCALE_SMONTHNAME4 "�����" - LOCALE_SMONTHNAME5 "���" - LOCALE_SMONTHNAME6 "���" - LOCALE_SMONTHNAME7 "���" - LOCALE_SMONTHNAME8 "������" - LOCALE_SMONTHNAME9 "���������" - LOCALE_SMONTHNAME10 "��������" - LOCALE_SMONTHNAME11 "�������" - LOCALE_SMONTHNAME12 "��������" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "Януари" + LOCALE_SMONTHNAME2 "Февруари" + LOCALE_SMONTHNAME3 "Март" + LOCALE_SMONTHNAME4 "Април" + LOCALE_SMONTHNAME5 "Май" + LOCALE_SMONTHNAME6 "Юни" + LOCALE_SMONTHNAME7 "Юли" + LOCALE_SMONTHNAME8 "Август" + LOCALE_SMONTHNAME9 "Септември" + LOCALE_SMONTHNAME10 "Октомври" + LOCALE_SMONTHNAME11 "Ноември" + LOCALE_SMONTHNAME12 "Декември" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "�" + LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "bg-BG" - LOCALE_SNATIVECTRYNAME "��������" - LOCALE_SNATIVECURRNAME "��." + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "България" + LOCALE_SNATIVECURRNAME "лв." LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "���������" + LOCALE_SNATIVEDISPLAYNAME "български (България)" + LOCALE_SNATIVELANGNAME "български" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "BGR " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Cyrl;" - LOCALE_SSHORTDATE "dd.M.yyyy '�.'" + LOCALE_SPARENT "bg" + LOCALE_SSHORTDATE "dd.M.yyyy 'г.'" + LOCALE_SSHORTESTDAYNAME1 "пн" + LOCALE_SSHORTESTDAYNAME2 "вт" + LOCALE_SSHORTESTDAYNAME3 "ср" + LOCALE_SSHORTESTDAYNAME4 "чт" + LOCALE_SSHORTESTDAYNAME5 "пт" + LOCALE_SSHORTESTDAYNAME6 "сб" + LOCALE_SSHORTESTDAYNAME7 "нд" + LOCALE_SSHORTTIME "HH:mm" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "�" + LOCALE_STHOUSAND " " LOCALE_STIME ":" LOCALE_STIMEFORMAT "HH:mm:ss" - LOCALE_SYEARMONTH "MMMM yyyy '�.'" + LOCALE_SYEARMONTH "MMMM yyyy 'г.'" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "�����e�" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "�������������������" - LGRPID_BALTIC+LGRPID_RES_BASE "���������" - LGRPID_GREEK+LGRPID_RES_BASE "������" - LGRPID_CYRILLIC+LGRPID_RES_BASE "��������" - LGRPID_TURKISH+LGRPID_RES_BASE "������" - LGRPID_JAPANESE+LGRPID_RES_BASE "�������" - LGRPID_KOREAN+LGRPID_RES_BASE "��������" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "�������� �����������" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "�������� ��������" - LGRPID_THAI+LGRPID_RES_BASE "������" - LGRPID_HEBREW+LGRPID_RES_BASE "�����" - LGRPID_ARABIC+LGRPID_RES_BASE "�������" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "����������" - LGRPID_INDIC+LGRPID_RES_BASE "��������" - LGRPID_GEORGIAN+LGRPID_RES_BASE "���������" - LGRPID_ARMENIAN+LGRPID_RES_BASE "��������" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/dll/win32/kernel32/winnls/nls/brf.nls b/dll/win32/kernel32/winnls/nls/brf.nls index e42199a4ca3..06862e665c6 100644 --- a/dll/win32/kernel32/winnls/nls/brf.nls +++ b/dll/win32/kernel32/winnls/nls/brf.nls @@ -19,13 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1252) - -LANGUAGE LANG_BRETON, SUBLANG_DEFAULT -LOCALE_FONTSIGNATURE RCDATA { L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT { + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "33" @@ -39,17 +37,18 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_IDEFAULTEBCDICCODEPAGE "20297" LOCALE_IDEFAULTLANGUAGE "040c" LOCALE_IDEFAULTMACCODEPAGE "10000" - LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "84" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0493" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "0" LOCALE_INEGCURR "8" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" @@ -58,6 +57,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "0" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "1" LOCALE_IPOSSYMPRECEDES "0" @@ -90,7 +90,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "Ker" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "France" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "€" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "Lun" LOCALE_SDAYNAME2 "Meurzh" @@ -112,6 +112,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Genver" LOCALE_SMONTHNAME2 "C'hwevrer" LOCALE_SMONTHNAME3 "Meurzh" @@ -125,18 +126,34 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_SMONTHNAME11 "Du" LOCALE_SMONTHNAME12 "Kerzu" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "�" + LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "br-FR" + LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Bro-C'haill" LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Brezhoneg (Bro-C'haill)" LOCALE_SNATIVELANGNAME "Brezhoneg" LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "BRE " + LOCALE_SPERCENT "%" + LOCALE_SPERMILLE L"\x2030" + LOCALE_SPOSINFINITY L"\x221e" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "fr" LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "L" + LOCALE_SSHORTESTDAYNAME2 "Mz" + LOCALE_SSHORTESTDAYNAME3 "Mc" + LOCALE_SSHORTESTDAYNAME4 "Y" + LOCALE_SSHORTESTDAYNAME5 "G" + LOCALE_SSHORTESTDAYNAME6 "Sa" + LOCALE_SSHORTESTDAYNAME7 "Su" + LOCALE_SSHORTTIME "HH:mm" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "�" + LOCALE_STHOUSAND " " LOCALE_STIME ":" LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" @@ -153,7 +170,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dll/win32/kernel32/winnls/nls/cat.nls b/dll/win32/kernel32/winnls/nls/cat.nls index 65c0985f975..5f1fa43e025 100644 --- a/dll/win32/kernel32/winnls/nls/cat.nls +++ b/dll/win32/kernel32/winnls/nls/cat.nls @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1252) - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT -LOCALE_FONTSIGNATURE RCDATA { L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" } +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT { + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "34" @@ -38,17 +36,18 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "040a" LOCALE_IDEFAULTMACCODEPAGE "10000" - LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" LOCALE_IFIRSTDAYOFWEEK "0" LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0403" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" + LOCALE_INEGATIVEPERCENT "1" LOCALE_INEGCURR "8" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" @@ -57,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_INEUTRAL "0" LOCALE_IOPTIONALCALENDAR "0" LOCALE_IPAPERSIZE "9" + LOCALE_IPOSITIVEPERCENT "1" LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "1" LOCALE_IPOSSYMPRECEDES "0" @@ -77,7 +77,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_SABBREVLANGNAME "CAT" LOCALE_SABBREVMONTHNAME1 "gen" LOCALE_SABBREVMONTHNAME2 "feb" - LOCALE_SABBREVMONTHNAME3 "mar�" + LOCALE_SABBREVMONTHNAME3 "març" LOCALE_SABBREVMONTHNAME4 "abr" LOCALE_SABBREVMONTHNAME5 "maig" LOCALE_SABBREVMONTHNAME6 "juny" @@ -89,7 +89,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "des" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Spain" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "€" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "dilluns" LOCALE_SDAYNAME2 "dimarts" @@ -111,9 +111,10 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "gener" LOCALE_SMONTHNAME2 "febrer" - LOCALE_SMONTHNAME3 "mar�" + LOCALE_SMONTHNAME3 "març" LOCALE_SMONTHNAME4 "abril" LOCALE_SMONTHNAME5 "maig" ... 17307 lines suppressed ...
3 years, 7 months
1
0
0
0
[reactos] 10/17: [CRT] Also use alias _rot functions for clang-cl amd64 build
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=802665a4aca261148cecd…
commit 802665a4aca261148cecd50ab2dfb871a893a012 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 29 23:33:05 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [CRT] Also use alias _rot functions for clang-cl amd64 build --- sdk/lib/crt/crt.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index 6a1111789d7..848d9a90dbc 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -483,6 +483,10 @@ elseif(ARCH STREQUAL "amd64") if(MSVC) list(APPEND CRT_ASM_SOURCE except/amd64/cpp.s) + if (CMAKE_C_COMPILER_ID STREQUAL "Clang") + list(APPEND CRT_ASM_SOURCE + stdlib/clang-alias.s) + endif() endif() elseif(ARCH STREQUAL "arm") list(APPEND CRT_SOURCE
3 years, 7 months
1
0
0
0
[reactos] 09/17: [CMAKE] Do not define _M_AMD64 when using amd64 clang-cl
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ae4590b6648f020e4ca9…
commit 4ae4590b6648f020e4ca9666fcd4b0abef66741f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 29 22:28:33 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [CMAKE] Do not define _M_AMD64 when using amd64 clang-cl --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac31959a410..d1e1e82eac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,7 +215,11 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to add_definitions(-DSARCH_PC98) endif() elseif(ARCH STREQUAL "amd64") - add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64) + # clang-cl defines this one for itself + if (NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")) + add_compile_definitions(_M_AMD64) + endif() + add_definitions(-D_AMD64_ -D__x86_64__ -D_WIN64) elseif(ARCH STREQUAL "arm") # _M_ARM is already defined by toolchain add_definitions(-D_ARM_ -D__arm__ -DWIN32)
3 years, 7 months
1
0
0
0
[reactos] 08/17: [CRT] Do not define builtin functions if not needed
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8aea84dab78c0fa82540f…
commit 8aea84dab78c0fa82540fe7a3b291af831549e5a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 29 22:25:54 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [CRT] Do not define builtin functions if not needed --- sdk/include/crt/mingw32/intrin_x86.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index 5cf6c2884b3..888bf795313 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -663,16 +663,20 @@ __INTRIN_INLINE short _InterlockedIncrement16(volatile short * lpAddend) #endif #if defined(__x86_64__) +#if !HAS_BUILTIN(_InterlockedDecrement64) __INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * lpAddend) { return _InterlockedExchangeAdd64(lpAddend, -1) - 1; } +#endif +#if !HAS_BUILTIN(_InterlockedIncrement64) __INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * lpAddend) { return _InterlockedExchangeAdd64(lpAddend, 1) + 1; } #endif +#endif #endif /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 */
3 years, 7 months
1
0
0
0
[reactos] 07/17: [CMAKE] Always use cl to build host tools
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7197620b894a52100fc56…
commit 7197620b894a52100fc568a1b8f15e38b17587c5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 29 22:14:41 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [CMAKE] Always use cl to build host tools --- sdk/cmake/host-tools.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 5d426e1b863..fe9b449fa84 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -11,6 +11,7 @@ function(setup_host_tools) COMMAND ${CMAKE_C_COMPILER} --print-file-name=plugin OUTPUT_VARIABLE GCC_PLUGIN_DIR) string(STRIP ${GCC_PLUGIN_DIR} GCC_PLUGIN_DIR) + list(APPEND CMAKE_HOST_TOOLS_EXTRA_ARGS -DGCC_PLUGIN_DIR=${GCC_PLUGIN_DIR}) list(APPEND HOST_MODULES gcc_plugin_seh) endif() list(TRANSFORM HOST_TOOLS PREPEND "${REACTOS_BINARY_DIR}/host-tools/bin/" OUTPUT_VARIABLE HOST_TOOLS_OUTPUT) @@ -25,6 +26,13 @@ function(setup_host_tools) set(HOST_MODULE_SUFFIX ".so") endif() + # CMake might choose clang if it finds it in the PATH. Always prefer cl for host tools + if (MSVC) + list(APPEND CMAKE_HOST_TOOLS_EXTRA_ARGS + -DCMAKE_C_COMPILER=cl + -DCMAKE_CXX_COMPILER=cl) + endif() + ExternalProject_Add(host-tools SOURCE_DIR ${REACTOS_SOURCE_DIR} PREFIX ${REACTOS_BINARY_DIR}/host-tools @@ -34,8 +42,8 @@ function(setup_host_tools) -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin - -DGCC_PLUGIN_DIR=${GCC_PLUGIN_DIR} -DTARGET_COMPILER_ID=${CMAKE_C_COMPILER_ID} + ${CMAKE_HOST_TOOLS_EXTRA_ARGS} BUILD_ALWAYS TRUE INSTALL_COMMAND ${CMAKE_COMMAND} -E true BUILD_BYPRODUCTS ${HOST_TOOLS_OUTPUT}
3 years, 7 months
1
0
0
0
[reactos] 06/17: [GITHUB] Enable GCC+clang amd64 build
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a66214c0205420ad9ef56…
commit a66214c0205420ad9ef56e1ead738cdb3e5beefd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 28 14:13:31 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [GITHUB] Enable GCC+clang amd64 build Use github cache to build & retrieve RosBE on linux, for now using a custom build script until Next RosBE is out Use a matrix to manage linux gcc + clang build --- .github/workflows/build.yml | 113 +++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 70 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22cf1db250d..31af335b11a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,107 +2,80 @@ name: Build on: [push, pull_request] jobs: - build-gcc-i386: - name: GCC (i386) + build-linux: + strategy: + matrix: + compiler: [gcc, clang] + arch: [i386, amd64] + fail-fast: false runs-on: ubuntu-latest steps: - - name: Install RosBE + - name: Get Runner arch + id: get_native_arch run: | - wget
https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst
- mkdir ${{github.workspace}}/rosbe - tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe - - name: Install other packages + gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}' + echo ::set-output name=march::$(gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}') + - name: Get RosBE + uses: actions/cache@v2 + with: + path: RosBE-CI + key: RosBE-CI-${{runner.os}}-${{steps.get_native_arch.outputs.march}} + - name: Compile RosBE + run: | + wget
https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899…
+ chmod +x build_rosbe_ci.sh + ./build_rosbe_ci.sh ${{github.workspace}}/RosBE-CI + - name: Install ccache run: sudo apt install ccache - - uses: actions/checkout@v2 + - name: Install LLVM + if: ${{ matrix.compiler == 'clang' }} + run: | + echo "LLVM_VERSION=12" >> $GITHUB_ENV + wget
https://apt.llvm.org/llvm.sh
+ chmod +x llvm.sh + sudo ./llvm.sh $LLVM_VERSION + - name: Source checkout + uses: actions/checkout@v2 with: path: src - name: Set up cache for ccache uses: actions/cache@v2 with: path: ccache - key: ccache-gcc-i386-${{github.sha}} + key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} restore-keys: | - ccache-gcc-i386- + ccache-${{matrix.compiler}}-${{matrix.arch}}- - name: Set ccache settings run: | echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV + echo "CCACHE_COMPILERCHECK=string:${{hashfiles('./build_rosbe_ci.sh', './RosBE-CI/git-commit')}}" >> $GITHUB_ENV + - name: Create Build directory + run: mkdir build - name: Configure - run: | - mkdir build - echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands + working-directory: ${{github.workspace}}/build + run: echo 'cmake ${{github.workspace}}/src -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Build - run: | - echo 'cd ${{github.workspace}}/build && cmake --build .' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands + working-directory: ${{github.workspace}}/build + run: echo 'cmake --build .' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Generate ISOs - run: | - echo 'cd ${{github.workspace}}/build && cmake --build . --target bootcd && cmake --build . --target livecd' > commands - ${{github.workspace}}/rosbe/RosBE.sh < 'commands' + working-directory: ${{github.workspace}}/build + run: echo 'cmake --build . --target bootcd --target livecd' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Print ccache statistics run: ccache -s - name: Upload bootcd uses: actions/upload-artifact@v2 with: - name: reactos-gcc-i386-${{github.sha}} + name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} path: build/bootcd.iso - name: Upload livecd uses: actions/upload-artifact@v2 with: - name: reactos-gcc-i386-${{github.sha}} + name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} path: build/livecd.iso - build-clang-i386: - name: Clang (i386) - runs-on: ubuntu-latest - steps: - - name: Install RosBE - run: | - wget
https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst
- mkdir ${{github.workspace}}/rosbe - tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe - - name: Set LLVM version - run: | - echo "LLVM_VERSION=12" >> $GITHUB_ENV - - name: Install LLVM - run: | - wget
https://apt.llvm.org/llvm.sh
- chmod +x llvm.sh - sudo ./llvm.sh $LLVM_VERSION - - name: Install other packages - run: | - sudo apt install ccache - - uses: actions/checkout@v2 - with: - path: src - - name: Set up cache for ccache - uses: actions/cache@v2 - with: - path: ccache - key: ccache-clang-i386-${{github.sha}} - restore-keys: | - ccache-clang-i386- - - name: Set ccache settings - run: | - echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV - echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV - echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV - echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV - - name: Configure - run: | - mkdir build - echo 'cd ${{github.workspace}}/build && cmake ${{github.workspace}}/src -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=i386 -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands - - name: Build - run: | - echo 'cd ${{github.workspace}}/build && cmake --build .' > commands - ${{github.workspace}}/rosbe/RosBE.sh < commands - - name: Print ccache statistics - run: ccache -s - build-clang-cl-i386: name: Clang-CL (i386) runs-on: windows-latest
3 years, 7 months
1
0
0
0
[reactos] 05/17: [FRAMEDYN] Fix the whole situation with regards to wchar_t
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=061c7ecb1ae9a752bf84e…
commit 061c7ecb1ae9a752bf84ed039765a43f5c1b3abe Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 29 10:53:08 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [FRAMEDYN] Fix the whole situation with regards to wchar_t Alias CHSTRING_WCHAR to unsigned short and use inline wrappers to be able to use the thing with modern compilers Put the GCC aliases into the public header. Enable build with clang-cl --- dll/win32/CMakeLists.txt | 4 +- dll/win32/framedyn/CMakeLists.txt | 8 - dll/win32/framedyn/alias_gcc.s | 98 ------- dll/win32/framedyn/chstring.cpp | 171 ++++++------ dll/win32/framedyn/framedyn.spec | 120 ++++----- modules/rostests/tests/dllexport/CMakeLists.txt | 12 +- sdk/include/psdk/chstring.h | 337 ++++++++++++++++++++---- 7 files changed, 448 insertions(+), 302 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 9e7c13363ab..2f46ab09f56 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -44,9 +44,7 @@ add_subdirectory(faultrep) add_subdirectory(fltlib) add_subdirectory(fmifs) add_subdirectory(fontsub) -if(NOT USE_CLANG_CL) - add_subdirectory(framedyn) -endif() +add_subdirectory(framedyn) add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) diff --git a/dll/win32/framedyn/CMakeLists.txt b/dll/win32/framedyn/CMakeLists.txt index 837fea881fa..16e1b7e43e9 100644 --- a/dll/win32/framedyn/CMakeLists.txt +++ b/dll/win32/framedyn/CMakeLists.txt @@ -13,11 +13,3 @@ set_target_cpp_properties(framedyn WITH_EXCEPTIONS) set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) - -if(NOT MSVC) - add_asm_files(framedynex_asm alias_gcc.s) - add_library(framedynex ${framedynex_asm}) - set_target_properties(framedynex PROPERTIES LINKER_LANGUAGE ASM) -else() - target_compile_options(framedyn PRIVATE /Zc:wchar_t-) -endif() diff --git a/dll/win32/framedyn/alias_gcc.s b/dll/win32/framedyn/alias_gcc.s deleted file mode 100644 index 6390c4c1387..00000000000 --- a/dll/win32/framedyn/alias_gcc.s +++ /dev/null @@ -1,98 +0,0 @@ -#include <asm.inc> - -.code -.align 4 - -MACRO(DEFINE_ALIAS, alias, alias2, origstring) -PUBLIC alias -.weakref alias2, origstring -alias: - jmp alias2 -ENDM - -#define DEFINE_ALIAS(alias, orig) DEFINE_ALIAS alias, __wrap_ ## alias, #orig - -DEFINE_ALIAS(__ZN8CHString16AllocBeforeWriteEi, ?AllocBeforeWrite@CHString@@IAEXH@Z) -DEFINE_ALIAS(__ZN8CHString11AllocBufferEi, ?AllocBuffer@CHString@@IAEXH@Z) -DEFINE_ALIAS(__ZNK8CHString9AllocCopyERS_iii, ?AllocCopy@CHString@@IBEXAAV1@HHH@Z) -DEFINE_ALIAS(__ZNK8CHString14AllocSysStringEv, ?AllocSysString@CHString@@QBEPAGXZ) -DEFINE_ALIAS(__ZN8CHString10AssignCopyEiPKw, ?AssignCopy@CHString@@IAEXHPBG@Z) -DEFINE_ALIAS(__ZN8CHStringC1ERKS_, ??0CHString@@QAE@ABV0@@Z) -DEFINE_ALIAS(__ZN8CHStringC1EPKc, ??0CHString@@QAE@PBD@Z) -DEFINE_ALIAS(__ZN8CHStringC1EPKh, ??0CHString@@QAE@PBE@Z) -DEFINE_ALIAS(__ZN8CHStringC1EPKw, ??0CHString@@QAE@PBG@Z) -DEFINE_ALIAS(__ZN8CHStringC1EPKwi, ??0CHString@@QAE@PBGH@Z) -DEFINE_ALIAS(__ZN8CHStringC1Ewi, ??0CHString@@QAE@GH@Z) -DEFINE_ALIAS(__ZN8CHStringC1Ev, ??0CHString@@QAE@XZ) -DEFINE_ALIAS(__ZN8CHStringC2Ev, ??0CHString@@QAE@XZ) // CHString::CHString(void) -DEFINE_ALIAS(__ZNK8CHString7CollateEPKw, ?Collate@CHString@@QBEHPBG@Z) -DEFINE_ALIAS(__ZNK8CHString7CompareEPKw, ?Compare@CHString@@QBEHPBG@Z) -DEFINE_ALIAS(__ZNK8CHString13CompareNoCaseEPKw, ?CompareNoCase@CHString@@QBEHPBG@Z) -DEFINE_ALIAS(__ZN8CHString10ConcatCopyEiPKwiS1_, ?ConcatCopy@CHString@@IAEXHPBGH0@Z) -DEFINE_ALIAS(__ZN8CHString13ConcatInPlaceEiPKw, ?ConcatInPlace@CHString@@IAEXHPBG@Z) -DEFINE_ALIAS(__ZN8CHString15CopyBeforeWriteEv, ?CopyBeforeWrite@CHString@@IAEXXZ) -DEFINE_ALIAS(__ZN8CHString5EmptyEv, ?Empty@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZNK8CHString4FindEPKw, ?Find@CHString@@QBEHPBG@Z) -DEFINE_ALIAS(__ZNK8CHString4FindEw, ?Find@CHString@@QBEHG@Z) -DEFINE_ALIAS(__ZNK8CHString9FindOneOfEPKw, ?FindOneOf@CHString@@QBEHPBG@Z) -DEFINE_ALIAS(__ZN8CHString6FormatEjz, ?Format@CHString@@QAAXIZZ) -DEFINE_ALIAS(__ZN8CHString6FormatEPKwz, ?Format@CHString@@QAAXPBGZZ) -DEFINE_ALIAS(__ZN8CHString14FormatMessageWEjz, ?FormatMessageW@CHString@@QAAXIZZ) -DEFINE_ALIAS(__ZN8CHString14FormatMessageWEPKwz, ?FormatMessageW@CHString@@QAAXPBGZZ) -DEFINE_ALIAS(__ZN8CHString7FormatVEPKwPc, ?FormatV@CHString@@QAEXPBGPAD@Z) -DEFINE_ALIAS(__ZN8CHString9FreeExtraEv, ?FreeExtra@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZNK8CHString14GetAllocLengthEv, ?GetAllocLength@CHString@@QBEHXZ) -DEFINE_ALIAS(__ZNK8CHString5GetAtEi, ?GetAt@CHString@@QBEGH@Z) -DEFINE_ALIAS(__ZN8CHString9GetBufferEi, ?GetBuffer@CHString@@QAEPAGH@Z) -DEFINE_ALIAS(__ZN8CHString18GetBufferSetLengthEi, ?GetBufferSetLength@CHString@@QAEPAGH@Z) -DEFINE_ALIAS(__ZNK8CHString7GetDataEv, ?GetData@CHString@@IBEPAUCHStringData@@XZ) -DEFINE_ALIAS(__ZNK8CHString9GetLengthEv, ?GetLength@CHString@@QBEHXZ) -DEFINE_ALIAS(__ZN8CHString4InitEv, ?Init@CHString@@IAEXXZ) -DEFINE_ALIAS(__ZNK8CHString7IsEmptyEv, ?IsEmpty@CHString@@QBEHXZ) -DEFINE_ALIAS(__ZNK8CHString4LeftEi, ?Left@CHString@@QBE?AV1@H@Z) -DEFINE_ALIAS(__ZN8CHString11LoadStringWEj, ?LoadStringW@CHString@@QAEHI@Z) -DEFINE_ALIAS(__ZN8CHString11LoadStringWEjPwj, ?LoadStringW@CHString@@IAEHIPAGI@Z) -DEFINE_ALIAS(__ZN8CHString10LockBufferEv, ?LockBuffer@CHString@@QAEPAGXZ) -DEFINE_ALIAS(__ZN8CHString9MakeLowerEv, ?MakeLower@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZN8CHString11MakeReverseEv, ?MakeReverse@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZN8CHString9MakeUpperEv, ?MakeUpper@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZNK8CHString3MidEi, ?Mid@CHString@@QBE?AV1@H@Z) -DEFINE_ALIAS(__ZNK8CHString3MidEii, ?Mid@CHString@@QBE?AV1@HH@Z) -DEFINE_ALIAS(__ZN8CHString7ReleaseEP12CHStringData@4, ?Release@CHString@@KGXPAUCHStringData@@@Z) -DEFINE_ALIAS(__ZN8CHString7ReleaseEv, ?Release@CHString@@IAEXXZ) -DEFINE_ALIAS(__ZN8CHString13ReleaseBufferEi, ?ReleaseBuffer@CHString@@QAEXH@Z) -DEFINE_ALIAS(__ZNK8CHString11ReverseFindEw, ?ReverseFind@CHString@@QBEHG@Z) -DEFINE_ALIAS(__ZNK8CHString5RightEi, ?Right@CHString@@QBE?AV1@H@Z) -DEFINE_ALIAS(__ZN8CHString10SafeStrlenEPKw@4, ?SafeStrlen@CHString@@KGHPBG@Z) -DEFINE_ALIAS(__ZN8CHString5SetAtEiw, ?SetAt@CHString@@QAEXHG@Z) -DEFINE_ALIAS(__ZNK8CHString13SpanExcludingEPKw, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z) -DEFINE_ALIAS(__ZNK8CHString13SpanIncludingEPKw, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z) -DEFINE_ALIAS(__ZN8CHString8TrimLeftEv, ?TrimLeft@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZN8CHString9TrimRightEv, ?TrimRight@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZN8CHString12UnlockBufferEv, ?UnlockBuffer@CHString@@QAEXXZ) -DEFINE_ALIAS(__ZNK8CHStringcvPKwEv, ??BCHString@@QBEPBGXZ) -DEFINE_ALIAS(__ZN8CHStringpLERKS_, ??YCHString@@QAEABV0@ABV0@@Z) -DEFINE_ALIAS(__ZN8CHStringpLEc, ??YCHString@@QAEABV0@D@Z) -DEFINE_ALIAS(__ZN8CHStringpLEPKw, ??YCHString@@QAEABV0@PBG@Z) -DEFINE_ALIAS(__ZN8CHStringpLEw, ??YCHString@@QAEABV0@G@Z) -DEFINE_ALIAS(__ZN8CHStringaSEPS_, ??4CHString@@QAEABV0@PAV0@@Z) -DEFINE_ALIAS(__ZN8CHStringaSERKS_, ??4CHString@@QAEABV0@ABV0@@Z) -DEFINE_ALIAS(__ZN8CHStringaSEPKc, ??4CHString@@QAEABV0@PBD@Z) -DEFINE_ALIAS(__ZN8CHStringaSEc, ??4CHString@@QAEABV0@D@Z) -DEFINE_ALIAS(__ZN8CHStringaSEPKh, ??4CHString@@QAEABV0@PBE@Z) -DEFINE_ALIAS(__ZN8CHStringaSEPKw, ??4CHString@@QAEABV0@PBG@Z) -DEFINE_ALIAS(__ZN8CHStringaSEw, ??4CHString@@QAEABV0@G@Z) -DEFINE_ALIAS(__ZNK8CHStringixEi, ??ACHString@@QBEGH@Z) -DEFINE_ALIAS(__ZN8CHStringD1Ev, ??1CHString@@QAE@XZ) // CHString::~CHString() complete object destructor -DEFINE_ALIAS(__ZN8CHStringD2Ev, ??1CHString@@QAE@XZ) // CHString::~CHString() base object destructor -DEFINE_ALIAS(__ZplwRK8CHString, ??H@YG?AVCHString@@GABV0@@Z) -DEFINE_ALIAS(__ZplRK8CHStringw, ??H@YG?AVCHString@@ABV0@G@Z) -DEFINE_ALIAS(__ZplRK8CHStringPKw, ??H@YG?AVCHString@@ABV0@PBG@Z) -DEFINE_ALIAS(__ZplPKwRK8CHString, ??H@YG?AVCHString@@PBGABV0@@Z) -DEFINE_ALIAS(__ZplRK8CHStringS1_, ??H@YG?AVCHString@@ABV0@0@Z) -DEFINE_ALIAS(__ZN8Provider5FlushEv, ?Flush@Provider@@MAEXXZ) -DEFINE_ALIAS(__ZN8Provider21ValidateDeletionFlagsEl, ?ValidateDeletionFlags@Provider@@MAEJJ@Z) -DEFINE_ALIAS(__ZN8Provider19ValidateMethodFlagsEl, ?ValidateMethodFlags@Provider@@MAEJJ@Z) -DEFINE_ALIAS(__ZN8Provider18ValidateQueryFlagsEl, ?ValidateQueryFlags@Provider@@MAEJJ@Z) - -END diff --git a/dll/win32/framedyn/chstring.cpp b/dll/win32/framedyn/chstring.cpp index 59bbec6cfa8..9f24a90ec2b 100644 --- a/dll/win32/framedyn/chstring.cpp +++ b/dll/win32/framedyn/chstring.cpp @@ -34,7 +34,7 @@ // This is unsafe. This string show be LPCWSTR // However we have to assign it to LPWSTR var. So, let's ignore about const, // as MS does. Normally we check in our code that we don't overwrite this string. -LPWSTR afxPchNil = (LPWSTR)L"\0"; +CHSTRING_WCHAR afxPchNil[1] = {0}; // This is the data that are matching the null string upper CHStringData afxNullData = {0, 0, 0}; // Exception we may throw in case of allocation failure @@ -107,7 +107,7 @@ CHString::CHString() /* * @implemented */ -CHString::CHString(WCHAR ch, int nRepeat) +CHString::CHString(CHSTRING_WCHAR ch, int nRepeat) { // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -131,7 +131,7 @@ CHString::CHString(WCHAR ch, int nRepeat) /* * @implemented */ -CHString::CHString(LPCWSTR lpsz) +CHString::CHString(CHSTRING_LPCWSTR lpsz) { // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -146,7 +146,9 @@ CHString::CHString(LPCWSTR lpsz) if (Len) { AllocBuffer(Len); - wcsncpy(m_pchData, lpsz, Len); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData), + reinterpret_cast<LPCWSTR>(lpsz), + Len); } } } @@ -154,7 +156,7 @@ CHString::CHString(LPCWSTR lpsz) /* * @implemented */ -CHString::CHString(LPCWSTR lpch, int nLength) +CHString::CHString(CHSTRING_LPCWSTR lpch, int nLength) { // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -164,7 +166,9 @@ CHString::CHString(LPCWSTR lpch, int nLength) { // Just copy the string AllocBuffer(nLength); - wcsncpy(m_pchData, lpch, nLength); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData), + reinterpret_cast<LPCWSTR>(lpch), + nLength); } } @@ -185,7 +189,7 @@ CHString::CHString(LPCSTR lpsz) { // Allocate and convert the string AllocBuffer(Len); - mbstowcsz(m_pchData, lpsz, Len + 1); + mbstowcsz(reinterpret_cast<LPWSTR>(m_pchData), lpsz, Len + 1); // Releasing buffer here is to allow to // update the buffer size. We notify we're // done with changing the string: recompute its @@ -348,30 +352,32 @@ void CHString::AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtr // copying data from another. This is needed by Left/Mid/Right dest.AllocBuffer(nCopyLen + nExtraLen); // And copy our stuff in - wcsncpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen); + wcsncpy(reinterpret_cast<LPWSTR>(dest.m_pchData), + reinterpret_cast<LPWSTR>(m_pchData + nCopyIndex), + nCopyLen); } /* * @implemented */ -BSTR CHString::AllocSysString() const +CHSTRING_LPWSTR CHString::AllocSysString() const { BSTR SysString; // Just allocate the string - SysString = SysAllocStringLen(m_pchData, GetData()->nDataLength); + SysString = SysAllocStringLen(reinterpret_cast<LPWSTR>(m_pchData), GetData()->nDataLength); if (!SysString) { throw HeapException; } - return SysString; + return reinterpret_cast<CHSTRING_LPWSTR>(SysString); } /* * @implemented */ -void CHString::AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) +void CHString::AssignCopy(int nSrcLen, CHSTRING_LPCWSTR lpszSrcData) { // Don't allow negative len if (nSrcLen < 0) @@ -389,7 +395,8 @@ void CHString::AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) } // Just copy, write down new size, and ensure it's null terminated - wcsncpy(m_pchData, lpszSrcData, nSrcLen); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData), + reinterpret_cast<LPCWSTR>(lpszSrcData), nSrcLen); GetData()->nDataLength = nSrcLen; m_pchData[nSrcLen] = 0; } @@ -397,37 +404,37 @@ void CHString::AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) /* * @implemented */ -int CHString::Collate(LPCWSTR lpsz) const +int CHString::Collate(CHSTRING_LPCWSTR lpsz) const { // Just call the deprecated function here - no matter we are null terminated // Did you read my statement about how safe is this implementation? - return wcscoll(m_pchData, lpsz); + return wcscoll(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpsz)); } /* * @implemented */ -int CHString::Compare(LPCWSTR lpsz) const +int CHString::Compare(CHSTRING_LPCWSTR lpsz) const { // Just call the deprecated function here - no matter we are null terminated // Did you read my statement about how safe is this implementation? - return wcscmp(m_pchData, lpsz); + return wcscmp(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpsz)); } /* * @implemented */ -int CHString::CompareNoCase(LPCWSTR lpsz) const +int CHString::CompareNoCase(CHSTRING_LPCWSTR lpsz) const { // Just call the deprecated function here - no matter we are null terminated // Did you read my statement about how safe is this implementation? - return wcsicmp(m_pchData, lpsz); + return wcsicmp(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpsz)); } /* * @implemented */ -void CHString::ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData) +void CHString::ConcatInPlace(int nSrcLen, CHSTRING_LPCWSTR lpszSrcData) { // With null length, there's not that much to concat... if (nSrcLen == 0) @@ -467,7 +474,9 @@ void CHString::ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData) } // Then, just copy and null terminate - wcsncpy(m_pchData + GetData()->nDataLength, lpszSrcData, nSrcLen); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData + GetData()->nDataLength), + reinterpret_cast<LPCWSTR>(lpszSrcData), + nSrcLen); GetData()->nDataLength += nSrcLen; m_pchData[GetData()->nDataLength] = 0; } @@ -476,7 +485,9 @@ void CHString::ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData) /* * @implemented */ -void CHString::ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data) +void CHString::ConcatCopy( + int nSrc1Len, CHSTRING_LPCWSTR lpszSrc1Data, + int nSrc2Len, CHSTRING_LPCWSTR lpszSrc2Data) { int TotalLen; @@ -495,8 +506,12 @@ void CHString::ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCW // Otherwise, allocate a new buffer to hold everything (caller will release previous buffer) AllocBuffer(TotalLen); // And concat stuff - wcsncpy(m_pchData, lpszSrc1Data, nSrc1Len); - wcsncpy(m_pchData + nSrc1Len, lpszSrc2Data, nSrc2Len); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData), + reinterpret_cast<LPCWSTR>(lpszSrc1Data), + nSrc1Len); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData + nSrc1Len), + reinterpret_cast<LPCWSTR>(lpszSrc2Data), + nSrc2Len); } /* @@ -521,7 +536,9 @@ void CHString::CopyBeforeWrite() Release(); // Alloc new buffer and copy old data in it AllocBuffer(Data->nDataLength); - wcsncpy(m_pchData, Data->data(), Data->nDataLength); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData), + reinterpret_cast<LPCWSTR>(Data->data()), + Data->nDataLength); } /* @@ -552,12 +569,12 @@ void CHString::Empty() /* * @implemented */ -int CHString::Find(WCHAR ch) const +int CHString::Find(CHSTRING_WCHAR ch) const { - WCHAR *Found; + CHSTRING_LPCWSTR Found; // Let's use appropriate helper - Found = wcschr(m_pchData, ch); + Found = reinterpret_cast<CHSTRING_LPCWSTR>(wcschr(reinterpret_cast<LPCWSTR>(m_pchData), ch)); // We have to return a position, so compute it if (Found) { @@ -571,12 +588,12 @@ int CHString::Find(WCHAR ch) const /* * @implemented */ -int CHString::Find(LPCWSTR lpszSub) const +int CHString::Find(CHSTRING_LPCWSTR lpszSub) const { - WCHAR *Found; + CHSTRING_LPCWSTR Found; // Let's use appropriate helper - Found = wcsstr(m_pchData, lpszSub); + Found = reinterpret_cast<CHSTRING_LPCWSTR>(wcsstr(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpszSub))); // We have to return a position, so compute it if (Found) { @@ -590,12 +607,12 @@ int CHString::Find(LPCWSTR lpszSub) const /* * @implemented */ -int CHString::FindOneOf(LPCWSTR lpszCharSet) const +int CHString::FindOneOf(CHSTRING_LPCWSTR lpszCharSet) const { - WCHAR *Found; + CHSTRING_LPCWSTR Found; // Let's use appropriate helper - Found = wcspbrk(m_pchData, lpszCharSet); + Found = reinterpret_cast<CHSTRING_LPCWSTR>(wcspbrk(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpszCharSet))); // We have to return a position, so compute it if (Found) { @@ -618,7 +635,7 @@ void CHString::Format(UINT nFormatID, ...) /* * @implemented */ -void CHString::Format(LPCWSTR lpszFormat, ...) +void CHString::Format(CHSTRING_LPCWSTR lpszFormat, ...) { // Forward to FormatV va_list ArgsList; @@ -640,7 +657,7 @@ void CHString::FormatMessageW(UINT nFormatID, ...) /* * @unimplemented */ -void CHString::FormatMessageW(LPCWSTR lpszFormat, ...) +void CHString::FormatMessageW(CHSTRING_LPCWSTR lpszFormat, ...) { UNIMPLEMENTED; } @@ -648,7 +665,7 @@ void CHString::FormatMessageW(LPCWSTR lpszFormat, ...) /* * @unimplemented */ -void CHString::FormatV(LPCWSTR lpszFormat, va_list argList) +void CHString::FormatV(CHSTRING_LPCWSTR lpszFormat, va_list argList) { UNIMPLEMENTED; } @@ -671,7 +688,7 @@ void CHString::FreeExtra() // Allocate a new one, at the right size (with no place for \0 :-)) AllocBuffer(GetData()->nDataLength); // Copy old and release it - wcsncpy(m_pchData, OldData->data(), OldData->nDataLength); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(OldData->data()), OldData->nDataLength); Release(OldData); } @@ -686,7 +703,7 @@ int CHString::GetAllocLength() const /* * @implemented */ -WCHAR CHString::GetAt(int nIndex) const +CHSTRING_WCHAR CHString::GetAt(int nIndex) const { // It's up to you to check the index! return m_pchData[nIndex]; @@ -695,9 +712,9 @@ WCHAR CHString::GetAt(int nIndex) const /* * @implemented */ -LPWSTR CHString::GetBuffer(int nMinBufLength) +CHSTRING_LPWSTR CHString::GetBuffer(int nMinBufLength) { - LPWSTR OldBuffer = m_pchData; + CHSTRING_LPWSTR OldBuffer = m_pchData; // We'll have to allocate a new buffer if it's not big enough // or if it's shared by several strings @@ -715,7 +732,7 @@ LPWSTR CHString::GetBuffer(int nMinBufLength) // Allocate new buffer AllocBuffer(nMinBufLength); // Copy contents - wcsncpy(m_pchData, OldBuffer, OldLen); + wcsncpy(reinterpret_cast<LPWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(OldBuffer), OldLen); GetData()->nDataLength = OldLen; // Release old @@ -730,7 +747,7 @@ LPWSTR CHString::GetBuffer(int nMinBufLength) /* * @implemented */ -LPWSTR CHString::GetBufferSetLength(int nNewLength) +CHSTRING_LPWSTR CHString::GetBufferSetLength(int nNewLength) { // Get a buffer big enough // We don't care about the return, it will be set in the string @@ -813,7 +830,7 @@ int CHString::LoadStringW(UINT nID) /* * @implemented */ -int CHString::LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) +int CHString::LoadStringW(UINT nID, CHSTRING_LPWSTR lpszBuf, UINT nMaxBuf) { // Deprecated and not implemented any longer - well, this is its implementation return 0; @@ -822,9 +839,9 @@ int CHString::LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) /* * @implemented */ -LPWSTR CHString::LockBuffer() +CHSTRING_LPWSTR CHString::LockBuffer() { - LPWSTR LockedBuffer; + CHSTRING_LPWSTR LockedBuffer; // The purpose here is basically to set the nRefs to max int LockedBuffer = GetBuffer(0); @@ -842,7 +859,7 @@ void CHString::MakeLower() CopyBeforeWrite(); // Let's use appropriate helper - _wcslwr(m_pchData); + _wcslwr(reinterpret_cast<LPWSTR>(m_pchData)); } /* @@ -854,7 +871,7 @@ void CHString::MakeReverse() CopyBeforeWrite(); // Let's use appropriate helper - _wcsrev(m_pchData); + _wcsrev(reinterpret_cast<LPWSTR>(m_pchData)); } /* @@ -866,7 +883,7 @@ void CHString::MakeUpper() CopyBeforeWrite(); // Let's use appropriate helper - _wcsupr(m_pchData); + _wcsupr(reinterpret_cast<LPWSTR>(m_pchData)); } /* @@ -968,7 +985,7 @@ void CHString::ReleaseBuffer(int nNewLength) // If no len provided, get one if (nNewLength == -1) { - nNewLength = (int)wcslen(m_pchData); + nNewLength = (int)wcslen(reinterpret_cast<LPCWSTR>(m_pchData)); } // Set appropriate size and null-terminate @@ -980,12 +997,12 @@ void CHString::ReleaseBuffer(int nNewLength) /* * @implemented */ -int CHString::ReverseFind(WCHAR ch) const +int CHString::ReverseFind(CHSTRING_WCHAR ch) const { - WCHAR *Last; + CHSTRING_WCHAR *Last; // Let's use appropriate helper - Last = wcsrchr(m_pchData, ch); + Last = reinterpret_cast<CHSTRING_WCHAR*>(wcsrchr(reinterpret_cast<LPCWSTR>(m_pchData), ch)); // We have to return a position, so compute it if (Last) { @@ -1020,7 +1037,7 @@ CHString CHString::Right(int nCount) const /* * @implemented */ -int CHString::SafeStrlen(LPCWSTR lpsz) +int CHString::SafeStrlen(CHSTRING_LPCWSTR lpsz) { // Check we have a string and then get its length if (lpsz == 0) @@ -1031,13 +1048,13 @@ int CHString::SafeStrlen(LPCWSTR lpsz) // Of course, it's not safe at all in case string is not null-terminated. // Things that may happen given strings are not to be null-terminated // in this class... - return (int)wcslen(lpsz); + return (int)wcslen(reinterpret_cast<LPCWSTR>(lpsz)); } /* * @implemented */ -void CHString::SetAt(int nIndex, WCHAR ch) +void CHString::SetAt(int nIndex, CHSTRING_WCHAR ch) { CopyBeforeWrite(); @@ -1047,24 +1064,24 @@ void CHString::SetAt(int nIndex, WCHAR ch) /* * @implemented */ -CHString CHString::SpanExcluding(LPCWSTR lpszCharSet) const +CHString CHString::SpanExcluding(CHSTRING_LPCWSTR lpszCharSet) const { int Count; // Get position and then, extract - Count = (int)wcscspn(m_pchData, lpszCharSet); + Count = (int)wcscspn(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpszCharSet)); return Left(Count); } /* * @implemented */ -CHString CHString::SpanIncluding(LPCWSTR lpszCharSet) const +CHString CHString::SpanIncluding(CHSTRING_LPCWSTR lpszCharSet) const { int Count; // Get position and then, extract - Count = (int)wcsspn(m_pchData, lpszCharSet); + Count = (int)wcsspn(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpszCharSet)); return Left(Count); } @@ -1075,7 +1092,7 @@ void CHString::TrimLeft() { int NewBegin; int NewLength; - WCHAR *CurrentChar; + CHSTRING_WCHAR *CurrentChar; // We'll modify, so copy first CopyBeforeWrite(); @@ -1097,7 +1114,7 @@ void CHString::TrimLeft() // And move memory NewBegin = (CurrentChar - m_pchData); NewLength = GetData()->nDataLength - NewBegin; - memmove(m_pchData, CurrentChar, NewLength * sizeof(WCHAR)); + memmove(m_pchData, CurrentChar, NewLength * sizeof(CHSTRING_WCHAR)); GetData()->nDataLength = NewLength; } @@ -1106,8 +1123,8 @@ void CHString::TrimLeft() */ void CHString::TrimRight() { - WCHAR *CurrentChar; - WCHAR *CanBeEaten; + CHSTRING_WCHAR *CurrentChar; + CHSTRING_WCHAR *CanBeEaten; // We'll modify, so copy first CopyBeforeWrite(); @@ -1167,14 +1184,14 @@ void CHString::UnlockBuffer() */ const CHString& CHString::operator=(char ch) { - *this = (WCHAR)ch; + *this = (CHSTRING_WCHAR)ch; return *this; } /* * @implemented */ -const CHString& CHString::operator=(WCHAR ch) +const CHString& CHString::operator=(CHSTRING_WCHAR ch) { AssignCopy(1, &ch); return *this; @@ -1215,7 +1232,7 @@ const CHString& CHString::operator=(LPCSTR lpsz) } // Convert and copy - mbstowcsz(m_pchData, lpsz, Len + 1); + mbstowcsz(reinterpret_cast<LPWSTR>(m_pchData), lpsz, Len + 1); // Get new size and so on ReleaseBuffer(); @@ -1225,7 +1242,7 @@ const CHString& CHString::operator=(LPCSTR lpsz) /* * @implemented */ -const CHString& CHString::operator=(LPCWSTR lpsz) +const CHString& CHString::operator=(CHSTRING_LPCWSTR lpsz) { int Len; @@ -1279,14 +1296,14 @@ const CHString& CHString::operator=(const unsigned char* lpsz) */ const CHString& CHString::operator+=(char ch) { - *this += (WCHAR)ch; + *this += (CHSTRING_WCHAR)ch; return *this; } /* * @implemented */ -const CHString& CHString::operator+=(WCHAR ch) +const CHString& CHString::operator+=(CHSTRING_WCHAR ch) { ConcatInPlace(1, &ch); return *this; @@ -1295,7 +1312,7 @@ const CHString& CHString::operator+=(WCHAR ch) /* * @implemented */ -const CHString& CHString::operator+=(LPCWSTR lpsz) +const CHString& CHString::operator+=(CHSTRING_LPCWSTR lpsz) { int Len; @@ -1318,7 +1335,7 @@ const CHString& CHString::operator+=(const CHString& string) /* * @implemented */ -WCHAR CHString::operator[](int nIndex) const +CHSTRING_WCHAR CHString::operator[](int nIndex) const { return m_pchData[nIndex]; } @@ -1326,7 +1343,7 @@ WCHAR CHString::operator[](int nIndex) const /* * @implemented */ -CHString::operator LPCWSTR() const +CHString::operator CHSTRING_LPCWSTR() const { return m_pchData; } @@ -1334,7 +1351,7 @@ CHString::operator LPCWSTR() const /* * @implemented */ -CHString WINAPI operator+(WCHAR ch, const CHString& string) +CHString WINAPI operator+(CHSTRING_WCHAR ch, const CHString& string) { CHString NewString; @@ -1347,7 +1364,7 @@ CHString WINAPI operator+(WCHAR ch, const CHString& string) /* * @implemented */ -CHString WINAPI operator+(const CHString& string, WCHAR ch) +CHString WINAPI operator+(const CHString& string, CHSTRING_WCHAR ch) { CHString NewString; @@ -1360,7 +1377,7 @@ CHString WINAPI operator+(const CHString& string, WCHAR ch) /* * @implemented */ -CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) +CHString WINAPI operator+(const CHString& string, CHSTRING_LPCWSTR lpsz) { int Len; CHString NewString; @@ -1376,7 +1393,7 @@ CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) /* * @implemented */ -CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string) +CHString WINAPI operator+(CHSTRING_LPCWSTR lpsz, const CHString& string) { int Len; CHString NewString; diff --git a/dll/win32/framedyn/framedyn.spec b/dll/win32/framedyn/framedyn.spec index 99bc8ca5074..99a22f33598 100644 --- a/dll/win32/framedyn/framedyn.spec +++ b/dll/win32/framedyn/framedyn.spec @@ -4,29 +4,29 @@ @ thiscall -arch=i386 ?AllocBuffer@CHString@@IAEXH@Z(long) _ZN8CHString11AllocBufferEi # protected: void __thiscall CHString::AllocBuffer(int) @ thiscall -arch=i386 ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii # protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const @ thiscall -arch=i386 ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv -@ thiscall -arch=i386 ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw +@ thiscall -arch=i386 ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKt @ thiscall -arch=i386 ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC1ERKS_ @ thiscall -arch=i386 ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC1EPKc @ thiscall -arch=i386 ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC1EPKh -@ thiscall -arch=i386 ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKw -@ thiscall -arch=i386 ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKwi -@ thiscall -arch=i386 ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Ewi +@ thiscall -arch=i386 ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKt +@ thiscall -arch=i386 ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKti +@ thiscall -arch=i386 ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Eti @ thiscall -arch=i386 ??0CHString@@QAE@XZ() _ZN8CHStringC1Ev # public: __thiscall CHString::CHString(void) -@ thiscall -arch=i386 ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw # public: int __thiscall CHString::Collate(unsigned short const *)const -@ thiscall -arch=i386 ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw # public: int __thiscall CHString::Compare(unsigned short const *)const -@ thiscall -arch=i386 ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const -@ thiscall -arch=i386 ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) -@ thiscall -arch=i386 ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) +@ thiscall -arch=i386 ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKt # public: int __thiscall CHString::Collate(unsigned short const *)const +@ thiscall -arch=i386 ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKt # public: int __thiscall CHString::Compare(unsigned short const *)const +@ thiscall -arch=i386 ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKt # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const +@ thiscall -arch=i386 ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKtiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) +@ thiscall -arch=i386 ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKt # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) @ thiscall -arch=i386 ?CopyBeforeWrite@CHString@@IAEXXZ() _ZN8CHString15CopyBeforeWriteEv # protected: void __thiscall CHString::CopyBeforeWrite(void) @ thiscall -arch=i386 ?Empty@CHString@@QAEXXZ() _ZN8CHString5EmptyEv # public: void __thiscall CHString::Empty(void) -@ thiscall -arch=i386 ?Find@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short const *)const -@ thiscall -arch=i386 ?Find@CHString@@QBEHG@Z(long) _ZNK8CHString4FindEw # public: int __thiscall CHString::Find(unsigned short)const -@ thiscall -arch=i386 ?FindOneOf@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw # public: int __thiscall CHString::FindOneOf(unsigned short const *)const +@ thiscall -arch=i386 ?Find@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString4FindEPKt # public: int __thiscall CHString::Find(unsigned short const *)const +@ thiscall -arch=i386 ?Find@CHString@@QBEHG@Z(long) _ZNK8CHString4FindEt # public: int __thiscall CHString::Find(unsigned short)const +@ thiscall -arch=i386 ?FindOneOf@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString9FindOneOfEPKt # public: int __thiscall CHString::FindOneOf(unsigned short const *)const @ thiscall -arch=i386 ?Format@CHString@@QAAXIZZ(long long long) _ZN8CHString6FormatEjz # public: void __cdecl CHString::Format(unsigned int,...) -@ thiscall -arch=i386 ?Format@CHString@@QAAXPBGZZ(long wstr long) _ZN8CHString6FormatEPKwz # public: void __cdecl CHString::Format(unsigned short const *,...) +@ thiscall -arch=i386 ?Format@CHString@@QAAXPBGZZ(long wstr long) _ZN8CHString6FormatEPKtz # public: void __cdecl CHString::Format(unsigned short const *,...) @ thiscall -arch=i386 ?FormatMessageW@CHString@@QAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz # public: void __cdecl CHString::FormatMessageW(unsigned int,...) -@ thiscall -arch=i386 ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) -@ thiscall -arch=i386 ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) +@ thiscall -arch=i386 ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKtz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) +@ thiscall -arch=i386 ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) _ZN8CHString7FormatVEPKtPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) @ thiscall -arch=i386 ?FreeExtra@CHString@@QAEXXZ() _ZN8CHString9FreeExtraEv # public: void __thiscall CHString::FreeExtra(void) @ thiscall -arch=i386 ?GetAllocLength@CHString@@QBEHXZ() _ZNK8CHString14GetAllocLengthEv # public: int __thiscall CHString::GetAllocLength(void)const @ thiscall -arch=i386 ?GetAt@CHString@@QBEGH@Z(long) _ZNK8CHString5GetAtEi # public: unsigned short __thiscall CHString::GetAt(int)const @@ -38,7 +38,7 @@ @ thiscall -arch=i386 ?IsEmpty@CHString@@QBEHXZ() _ZNK8CHString7IsEmptyEv # public: int __thiscall CHString::IsEmpty(void)const @ thiscall -arch=i386 ?Left@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString4LeftEi # public: class CHString __thiscall CHString::Left(int)const @ thiscall -arch=i386 ?LoadStringW@CHString@@QAEHI@Z(long) _ZN8CHString11LoadStringWEj # public: int __thiscall CHString::LoadStringW(unsigned int) -@ thiscall -arch=i386 ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) +@ thiscall -arch=i386 ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPtj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) @ thiscall -arch=i386 ?LockBuffer@CHString@@QAEPAGXZ() _ZN8CHString10LockBufferEv # public: unsigned short * __thiscall CHString::LockBuffer(void) @ thiscall -arch=i386 ?MakeLower@CHString@@QAEXXZ() _ZN8CHString9MakeLowerEv # public: void __thiscall CHString::MakeLower(void) @ thiscall -arch=i386 ?MakeReverse@CHString@@QAEXXZ() _ZN8CHString11MakeReverseEv # public: void __thiscall CHString::MakeReverse(void) @@ -48,33 +48,33 @@ @ thiscall -arch=i386 ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 # protected: static void __stdcall CHString::Release(struct CHStringData *) @ thiscall -arch=i386 ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) @ thiscall -arch=i386 ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) -@ thiscall -arch=i386 ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const +@ thiscall -arch=i386 ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEt # public: int __thiscall CHString::ReverseFind(unsigned short)const @ thiscall -arch=i386 ?Right@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString5RightEi # public: class CHString __thiscall CHString::Right(int)const -@ stdcall -arch=i386 ?SafeStrlen@CHString@@KGHPBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) -@ thiscall -arch=i386 ?SetAt@CHString@@QAEXHG@Z(long long) _ZN8CHString5SetAtEiw # public: void __thiscall CHString::SetAt(int,unsigned short) -@ thiscall -arch=i386 ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const -@ thiscall -arch=i386 ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const +@ stdcall -arch=i386 ?SafeStrlen@CHString@@KGHPBG@Z(wstr) _ZN8CHString10SafeStrlenEPKt # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) +@ thiscall -arch=i386 ?SetAt@CHString@@QAEXHG@Z(long long) _ZN8CHString5SetAtEit # public: void __thiscall CHString::SetAt(int,unsigned short) +@ thiscall -arch=i386 ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKt # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const +@ thiscall -arch=i386 ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKt # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const @ thiscall -arch=i386 ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv # public: void __thiscall CHString::TrimLeft(void) @ thiscall -arch=i386 ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv # public: void __thiscall CHString::TrimRight(void) @ thiscall -arch=i386 ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv # public: void __thiscall CHString::UnlockBuffer(void) -@ thiscall -arch=i386 ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKwEv # public: __thiscall CHString::operator unsigned short const *(void)const +@ thiscall -arch=i386 ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKtEv # public: __thiscall CHString::operator unsigned short const *(void)const @ thiscall -arch=i386 ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ # public: class CHString const & __thiscall CHString::operator+=(class CHString const &) @ thiscall -arch=i386 ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc # public: class CHString const & __thiscall CHString::operator+=(char) -@ thiscall -arch=i386 ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) -@ thiscall -arch=i386 ??YCHString@@QAEABV0@G@Z(long) _ZN8CHStringpLEw # public: class CHString const & __thiscall CHString::operator+=(unsigned short) +@ thiscall -arch=i386 ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKt # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) +@ thiscall -arch=i386 ??YCHString@@QAEABV0@G@Z(long) _ZN8CHStringpLEt # public: class CHString const & __thiscall CHString::operator+=(unsigned short) @ thiscall -arch=i386 ??4CHString@@QAEABV0@PAV0@@Z(ptr) _ZN8CHStringaSEPS_ # public: class CHString const & __thiscall CHString::operator=(class CHString *) @ thiscall -arch=i386 ??4CHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringaSERKS_ # public: class CHString const & __thiscall CHString::operator=(class CHString const &) @ thiscall -arch=i386 ??4CHString@@QAEABV0@PBD@Z(str) _ZN8CHStringaSEPKc # public: class CHString const & __thiscall CHString::operator=(char const *) @ thiscall -arch=i386 ??4CHString@@QAEABV0@D@Z(long) _ZN8CHStringaSEc # public: class CHString const & __thiscall CHString::operator=(char) @ thiscall -arch=i386 ??4CHString@@QAEABV0@PBE@Z(str) _ZN8CHStringaSEPKh # public: class CHString const & __thiscall CHString::operator=(unsigned char const *) -@ thiscall -arch=i386 ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) -@ thiscall -arch=i386 ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw # public: class CHString const & __thiscall CHString::operator=(unsigned short) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKt # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEt # public: class CHString const & __thiscall CHString::operator=(unsigned short) @ thiscall -arch=i386 ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi # public: unsigned short __thiscall CHString::operator[](int)const @ thiscall -arch=i386 ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev # public: __thiscall CHString::~CHString(void), complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor -@ stdcall -arch=i386 ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) -@ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw # class CHString __stdcall operator+(class CHString const &,unsigned short) -@ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw # class CHString __stdcall operator+(class CHString const &,unsigned short const *) -@ stdcall -arch=i386 ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) +@ stdcall -arch=i386 ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZpltRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) +@ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringt # class CHString __stdcall operator+(class CHString const &,unsigned short) +@ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKt # class CHString __stdcall operator+(class CHString const &,unsigned short const *) +@ stdcall -arch=i386 ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKtRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) @ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ # class CHString __stdcall operator+(class CHString const &,class CHString const &) @ thiscall -arch=i386 ?Flush@Provider@@MAEXXZ() _ZN8Provider5FlushEv # protected: virtual void __thiscall Provider::Flush(void) @ thiscall -arch=i386 ?ValidateDeletionFlags@Provider@@MAEJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl # protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) @@ -86,29 +86,29 @@ @ thiscall -arch=win64 ?AllocBuffer@CHString@@IEAAXH@Z(long) _ZN8CHString11AllocBufferEi # protected: void __thiscall CHString::AllocBuffer(int) @ thiscall -arch=win64 ?AllocCopy@CHString@@IEBAXAEAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii # protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const @ thiscall -arch=win64 ?AllocSysString@CHString@@QEBAPEAGXZ() _ZNK8CHString14AllocSysStringEv -@ thiscall -arch=win64 ?AssignCopy@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw +@ thiscall -arch=win64 ?AssignCopy@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKt @ thiscall -arch=win64 ??0CHString@@QEAA@AEBV0@@Z(ptr) _ZN8CHStringC1ERKS_ @ thiscall -arch=win64 ??0CHString@@QEAA@PEBD@Z(str) _ZN8CHStringC1EPKc @ thiscall -arch=win64 ??0CHString@@QEAA@PEBE@Z(str) _ZN8CHStringC1EPKh -@ thiscall -arch=win64 ??0CHString@@QEAA@PEBG@Z(wstr) _ZN8CHStringC1EPKw -@ thiscall -arch=win64 ??0CHString@@QEAA@PEBGH@Z(wstr long) _ZN8CHStringC1EPKwi -@ thiscall -arch=win64 ??0CHString@@QEAA@GH@Z(long long) _ZN8CHStringC1Ewi +@ thiscall -arch=win64 ??0CHString@@QEAA@PEBG@Z(wstr) _ZN8CHStringC1EPKt +@ thiscall -arch=win64 ??0CHString@@QEAA@PEBGH@Z(wstr long) _ZN8CHStringC1EPKti +@ thiscall -arch=win64 ??0CHString@@QEAA@GH@Z(long long) _ZN8CHStringC1Eti @ thiscall -arch=win64 ??0CHString@@QEAA@XZ() _ZN8CHStringC1Ev # public: __thiscall CHString::CHString(void) -@ thiscall -arch=win64 ?Collate@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CollateEPKw # public: int __thiscall CHString::Collate(unsigned short const *)const -@ thiscall -arch=win64 ?Compare@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CompareEPKw # public: int __thiscall CHString::Compare(unsigned short const *)const -@ thiscall -arch=win64 ?CompareNoCase@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const -@ thiscall -arch=win64 ?ConcatCopy@CHString@@IEAAXHPEBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) -@ thiscall -arch=win64 ?ConcatInPlace@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) +@ thiscall -arch=win64 ?Collate@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CollateEPKt # public: int __thiscall CHString::Collate(unsigned short const *)const +@ thiscall -arch=win64 ?Compare@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CompareEPKt # public: int __thiscall CHString::Compare(unsigned short const *)const +@ thiscall -arch=win64 ?CompareNoCase@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKt # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const +@ thiscall -arch=win64 ?ConcatCopy@CHString@@IEAAXHPEBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKtiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) +@ thiscall -arch=win64 ?ConcatInPlace@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKt # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) @ thiscall -arch=win64 ?CopyBeforeWrite@CHString@@IEAAXXZ() _ZN8CHString15CopyBeforeWriteEv # protected: void __thiscall CHString::CopyBeforeWrite(void) @ thiscall -arch=win64 ?Empty@CHString@@QEAAXXZ() _ZN8CHString5EmptyEv # public: void __thiscall CHString::Empty(void) -@ thiscall -arch=win64 ?Find@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short const *)const -@ thiscall -arch=win64 ?Find@CHString@@QEBAHG@Z(long) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short)const -@ thiscall -arch=win64 ?FindOneOf@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw # public: int __thiscall CHString::FindOneOf(unsigned short const *)const +@ thiscall -arch=win64 ?Find@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString4FindEPKt # public: int __thiscall CHString::Find(unsigned short const *)const +@ thiscall -arch=win64 ?Find@CHString@@QEBAHG@Z(long) _ZNK8CHString4FindEt # public: int __thiscall CHString::Find(unsigned short)const +@ thiscall -arch=win64 ?FindOneOf@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString9FindOneOfEPKt # public: int __thiscall CHString::FindOneOf(unsigned short const *)const @ thiscall -arch=win64 ?Format@CHString@@QEAAXIZZ(long long long) _ZN8CHString6FormatEjz # public: void __cdecl CHString::Format(unsigned int,...) -@ thiscall -arch=win64 ?Format@CHString@@QEAAXPEBGZZ(long wstr long) _ZN8CHString6FormatEPKwz # public: void __cdecl CHString::Format(unsigned short const *,...) +@ thiscall -arch=win64 ?Format@CHString@@QEAAXPEBGZZ(long wstr long) _ZN8CHString6FormatEPKtz # public: void __cdecl CHString::Format(unsigned short const *,...) @ thiscall -arch=win64 ?FormatMessageW@CHString@@QEAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz # public: void __cdecl CHString::FormatMessageW(unsigned int,...) -@ thiscall -arch=win64 ?FormatMessageW@CHString@@QEAAXPEBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) -@ thiscall -arch=win64 ?FormatV@CHString@@QEAAXPEBGPEAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) +@ thiscall -arch=win64 ?FormatMessageW@CHString@@QEAAXPEBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKtz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) +@ thiscall -arch=win64 ?FormatV@CHString@@QEAAXPEBGPEAD@Z(wstr long) _ZN8CHString7FormatVEPKtPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) @ thiscall -arch=win64 ?FreeExtra@CHString@@QEAAXXZ() _ZN8CHString9FreeExtraEv # public: void __thiscall CHString::FreeExtra(void) @ thiscall -arch=win64 ?GetAllocLength@CHString@@QEBAHXZ() _ZNK8CHString14GetAllocLengthEv # public: int __thiscall CHString::GetAllocLength(void)const @ thiscall -arch=win64 ?GetAt@CHString@@QEBAGH@Z(long) _ZNK8CHString5GetAtEi # public: unsigned short __thiscall CHString::GetAt(int)const @@ -120,7 +120,7 @@ @ thiscall -arch=win64 ?IsEmpty@CHString@@QEBAHXZ() _ZNK8CHString7IsEmptyEv # public: int __thiscall CHString::IsEmpty(void)const @ thiscall -arch=win64 ?Left@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString4LeftEi # public: class CHString __thiscall CHString::Left(int)const @ thiscall -arch=win64 ?LoadStringW@CHString@@QEAAHI@Z(long) _ZN8CHString11LoadStringWEj # public: int __thiscall CHString::LoadStringW(unsigned int) -@ thiscall -arch=win64 ?LoadStringW@CHString@@IEAAHIPEAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) +@ thiscall -arch=win64 ?LoadStringW@CHString@@IEAAHIPEAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPtj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) @ thiscall -arch=win64 ?LockBuffer@CHString@@QEAAPEAGXZ() _ZN8CHString10LockBufferEv # public: unsigned short * __thiscall CHString::LockBuffer(void) @ thiscall -arch=win64 ?MakeLower@CHString@@QEAAXXZ() _ZN8CHString9MakeLowerEv # public: void __thiscall CHString::MakeLower(void) @ thiscall -arch=win64 ?MakeReverse@CHString@@QEAAXXZ() _ZN8CHString11MakeReverseEv # public: void __thiscall CHString::MakeReverse(void) @@ -130,33 +130,33 @@ @ thiscall -arch=win64 ?Release@CHString@@KAXPEAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData # protected: static void __stdcall CHString::Release(struct CHStringData *) @ thiscall -arch=win64 ?Release@CHString@@IEAAXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) @ thiscall -arch=win64 ?ReleaseBuffer@CHString@@QEAAXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) -@ thiscall -arch=win64 ?ReverseFind@CHString@@QEBAHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const +@ thiscall -arch=win64 ?ReverseFind@CHString@@QEBAHG@Z(long) _ZNK8CHString11ReverseFindEt # public: int __thiscall CHString::ReverseFind(unsigned short)const @ thiscall -arch=win64 ?Right@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString5RightEi # public: class CHString __thiscall CHString::Right(int)const -@ stdcall -arch=win64 ?SafeStrlen@CHString@@KAHPEBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) -@ thiscall -arch=win64 ?SetAt@CHString@@QEAAXHG@Z(long long) _ZN8CHString5SetAtEiw # public: void __thiscall CHString::SetAt(int,unsigned short) -@ thiscall -arch=win64 ?SpanExcluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const -@ thiscall -arch=win64 ?SpanIncluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const +@ stdcall -arch=win64 ?SafeStrlen@CHString@@KAHPEBG@Z(wstr) _ZN8CHString10SafeStrlenEPKt # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) +@ thiscall -arch=win64 ?SetAt@CHString@@QEAAXHG@Z(long long) _ZN8CHString5SetAtEit # public: void __thiscall CHString::SetAt(int,unsigned short) +@ thiscall -arch=win64 ?SpanExcluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKt # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const +@ thiscall -arch=win64 ?SpanIncluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKt # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const @ thiscall -arch=win64 ?TrimLeft@CHString@@QEAAXXZ() _ZN8CHString8TrimLeftEv # public: void __thiscall CHString::TrimLeft(void) @ thiscall -arch=win64 ?TrimRight@CHString@@QEAAXXZ() _ZN8CHString9TrimRightEv # public: void __thiscall CHString::TrimRight(void) @ thiscall -arch=win64 ?UnlockBuffer@CHString@@QEAAXXZ() _ZN8CHString12UnlockBufferEv # public: void __thiscall CHString::UnlockBuffer(void) -@ thiscall -arch=win64 ??BCHString@@QEBAPEBGXZ(ptr) _ZNK8CHStringcvPKwEv # public: __thiscall CHString::operator unsigned short const *(void)const +@ thiscall -arch=win64 ??BCHString@@QEBAPEBGXZ(ptr) _ZNK8CHStringcvPKtEv # public: __thiscall CHString::operator unsigned short const *(void)const @ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@AEBV0@@Z(ptr) _ZN8CHStringpLERKS_ # public: class CHString const & __thiscall CHString::operator+=(class CHString const &) @ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@D@Z(long) _ZN8CHStringpLEc # public: class CHString const & __thiscall CHString::operator+=(char) -@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringpLEPKw # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) -@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringpLEw # public: class CHString const & __thiscall CHString::operator+=(unsigned short) +@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringpLEPKt # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) +@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringpLEt # public: class CHString const & __thiscall CHString::operator+=(unsigned short) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEAV0@@Z(ptr) _ZN8CHStringaSEPS_ # public: class CHString const & __thiscall CHString::operator=(class CHString *) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@AEBV0@@Z(ptr) _ZN8CHStringaSERKS_ # public: class CHString const & __thiscall CHString::operator=(class CHString const &) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBD@Z(str) _ZN8CHStringaSEPKc # public: class CHString const & __thiscall CHString::operator=(char const *) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@D@Z(long) _ZN8CHStringaSEc # public: class CHString const & __thiscall CHString::operator=(char) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBE@Z(str) _ZN8CHStringaSEPKh # public: class CHString const & __thiscall CHString::operator=(unsigned char const *) -@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringaSEPKw # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) -@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringaSEw # public: class CHString const & __thiscall CHString::operator=(unsigned short) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringaSEPKt # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringaSEt # public: class CHString const & __thiscall CHString::operator=(unsigned short) @ thiscall -arch=win64 ??ACHString@@QEBAGH@Z(long) _ZNK8CHStringixEi # public: unsigned short __thiscall CHString::operator[](int)const @ thiscall -arch=win64 ??1CHString@@QEAA@XZ() _ZN8CHStringD1Ev # public: __thiscall CHString::~CHString(void), complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor -@ stdcall -arch=win64 ??H@YA?AVCHString@@GAEBV0@@Z(long ptr) _ZplwRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) -@ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@G@Z(ptr long) _ZplRK8CHStringw # class CHString __stdcall operator+(class CHString const &,unsigned short) -@ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@PEBG@Z(ptr wstr) _ZplRK8CHStringPKw # class CHString __stdcall operator+(class CHString const &,unsigned short const *) -@ stdcall -arch=win64 ??H@YA?AVCHString@@PEBGAEBV0@@Z(wstr ptr) _ZplPKwRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) +@ stdcall -arch=win64 ??H@YA?AVCHString@@GAEBV0@@Z(long ptr) _ZpltRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) +@ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@G@Z(ptr long) _ZplRK8CHStringt # class CHString __stdcall operator+(class CHString const &,unsigned short) +@ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@PEBG@Z(ptr wstr) _ZplRK8CHStringPKt # class CHString __stdcall operator+(class CHString const &,unsigned short const *) +@ stdcall -arch=win64 ??H@YA?AVCHString@@PEBGAEBV0@@Z(wstr ptr) _ZplPKtRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) @ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ # class CHString __stdcall operator+(class CHString const &,class CHString const &) @ thiscall -arch=win64 ?Flush@Provider@@MEAAXXZ() _ZN8Provider5FlushEv # protected: virtual void __thiscall Provider::Flush(void) @ thiscall -arch=win64 ?ValidateDeletionFlags@Provider@@MEAAJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl # protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) diff --git a/modules/rostests/tests/dllexport/CMakeLists.txt b/modules/rostests/tests/dllexport/CMakeLists.txt index 65e87cec3bb..111921cf7f0 100644 --- a/modules/rostests/tests/dllexport/CMakeLists.txt +++ b/modules/rostests/tests/dllexport/CMakeLists.txt @@ -23,17 +23,7 @@ add_executable(dllexport_test dllexport_test.c) set_module_type(dllexport_test win32cui) add_importlibs(dllexport_test dllexport_test_dll1 msvcrt kernel32 ntdll) -# framedyn is skipped in the clang-cl build -if(NOT USE_CLANG_CL) - add_library(dllimport_test MODULE dllimport_framedyn.cpp) set_module_type(dllimport_test module) add_importlibs(dllimport_test framedyn) - -if (MSVC) - target_compile_options(dllimport_test PRIVATE /Zc:wchar_t-) -else() - target_link_libraries(dllimport_test framedynex) -endif() - -endif() +add_dependencies(dllimport_test psdk) diff --git a/sdk/include/psdk/chstring.h b/sdk/include/psdk/chstring.h index 2db344a2262..a2994bc064b 100644 --- a/sdk/include/psdk/chstring.h +++ b/sdk/include/psdk/chstring.h @@ -6,15 +6,25 @@ #include <windows.h> #include <provexce.h> +/* + * Framedyn dates from ancient times when wchar_t was a typedef to unsigned short. + * In order be able to use newer compilers, we define inline overloaded wrappers. + */ +using CHSTRING_WCHAR=unsigned short ; +using CHSTRING_LPCWSTR=const CHSTRING_WCHAR*; +using CHSTRING_LPWSTR=CHSTRING_WCHAR*; +static_assert(sizeof(CHSTRING_WCHAR) == sizeof(wchar_t), "CHSTRING_WCHAR must be of same size than wchar_t"); + + struct CHStringData { long nRefs; int nDataLength; int nAllocLength; - WCHAR* data() + CHSTRING_WCHAR* data() { - return (WCHAR*)(this+1); + return (CHSTRING_WCHAR*)(this+1); } }; @@ -22,109 +32,346 @@ class CHString { public: CHString(); - CHString(WCHAR ch, int nRepeat = 1); - CHString(LPCWSTR lpsz); - CHString(LPCWSTR lpch, int nLength); + CHString(CHSTRING_WCHAR ch, int nRepeat = 1); + CHString(CHSTRING_LPCWSTR lpsz); + CHString(CHSTRING_LPCWSTR lpch, int nLength); CHString(LPCSTR lpsz); CHString(const CHString& stringSrc); CHString(const unsigned char* lpsz); ~CHString(); - BSTR AllocSysString() const; - int Collate(LPCWSTR lpsz) const; - int Compare(LPCWSTR lpsz) const; - int CompareNoCase(LPCWSTR lpsz) const; + CHSTRING_LPWSTR AllocSysString() const; + int Collate(CHSTRING_LPCWSTR lpsz) const; + int Collate(const wchar_t* lpsz) const + { + return Collate(reinterpret_cast<CHSTRING_LPCWSTR>(lpsz)); + } + int Compare(CHSTRING_LPCWSTR lpsz) const; + int Compare(const wchar_t* lpsz) const + { + return Compare(reinterpret_cast<CHSTRING_LPCWSTR>(lpsz)); + } + int CompareNoCase(CHSTRING_LPCWSTR lpsz) const; + int CompareNoCase(const wchar_t* lpsz) const + { + return CompareNoCase(reinterpret_cast<CHSTRING_LPCWSTR>(lpsz)); + } void Empty(); - int Find(WCHAR ch) const; - int Find(LPCWSTR lpszSub) const; - int FindOneOf(LPCWSTR lpszCharSet) const; + int Find(CHSTRING_WCHAR ch) const; + int Find(CHSTRING_LPCWSTR lpszSub) const; + int Find(const wchar_t* lpszSub) const + { + return FindOneOf(reinterpret_cast<CHSTRING_LPCWSTR>(lpszSub)); + } + int FindOneOf(CHSTRING_LPCWSTR lpszCharSet) const; + int FindOneOf(const wchar_t* lpszCharSet) const + { + return FindOneOf(reinterpret_cast<CHSTRING_LPCWSTR>(lpszCharSet)); + } void Format(UINT nFormatID, ...); - void Format(LPCWSTR lpszFormat, ...); + void Format(CHSTRING_LPCWSTR lpszFormat, ...); + template <typename ...Params> + void Format(const wchar_t* lpszFormat, Params&&... params) + { + Format(reinterpret_cast<CHSTRING_LPCWSTR>(lpszFormat), params...); + } void FormatMessageW(UINT nFormatID, ...); - void FormatMessageW(LPCWSTR lpszFormat, ...); - void FormatV(LPCWSTR lpszFormat, va_list argList); + void FormatMessageW(CHSTRING_LPCWSTR lpszFormat, ...); + template <typename ...Params> + void FormatMessageW(const wchar_t* lpszFormat, Params&&... params) + { + FormatMessageW(reinterpret_cast<CHSTRING_LPCWSTR>(lpszFormat), params...); + } + void FormatV(CHSTRING_LPCWSTR lpszFormat, va_list argList); + void FormatV(const wchar_t* lpszFormat, va_list argList) + { + return FormatV(reinterpret_cast<CHSTRING_LPCWSTR>(lpszFormat), argList); + } void FreeExtra(); int GetAllocLength() const; - WCHAR GetAt(int nIndex) const; - LPWSTR GetBuffer(int nMinBufLength); - LPWSTR GetBufferSetLength(int nNewLength); + CHSTRING_WCHAR GetAt(int nIndex) const; + CHSTRING_LPWSTR GetBuffer(int nMinBufLength); + CHSTRING_LPWSTR GetBufferSetLength(int nNewLength); int GetLength() const; BOOL IsEmpty() const; CHString Left(int nCount) const; int LoadStringW(UINT nID); - LPWSTR LockBuffer(); + CHSTRING_LPWSTR LockBuffer(); void MakeLower(); void MakeReverse(); void MakeUpper(); CHString Mid(int nFirst) const; CHString Mid(int nFirst, int nCount) const; void ReleaseBuffer(int nNewLength = -1); - int ReverseFind(WCHAR ch) const; + int ReverseFind(CHSTRING_WCHAR ch) const; CHString Right(int nCount) const; - void SetAt(int nIndex, WCHAR ch); - CHString SpanExcluding(LPCWSTR lpszCharSet) const; - CHString SpanIncluding(LPCWSTR lpszCharSet) const; + void SetAt(int nIndex, CHSTRING_WCHAR ch); + CHString SpanExcluding(CHSTRING_LPCWSTR lpszCharSet) const; + CHString SpanExcluding(const wchar_t* lpszCharSet) const + { + return SpanExcluding(reinterpret_cast<CHSTRING_LPCWSTR>(lpszCharSet)); + } + CHString SpanIncluding(CHSTRING_LPCWSTR lpszCharSet) const; + CHString SpanIncluding(const wchar_t* lpszCharSet) const + { + return SpanIncluding(reinterpret_cast<CHSTRING_LPCWSTR>(lpszCharSet)); + } void TrimLeft(); void TrimRight(); void UnlockBuffer(); const CHString& operator=(char ch); - const CHString& operator=(WCHAR ch); + const CHString& operator=(CHSTRING_WCHAR ch); const CHString& operator=(CHString *p); const CHString& operator=(LPCSTR lpsz); - const CHString& operator=(LPCWSTR lpsz); + const CHString& operator=(CHSTRING_LPCWSTR lpsz); const CHString& operator=(const CHString& stringSrc); const CHString& operator=(const unsigned char* lpsz); const CHString& operator+=(char ch); - const CHString& operator+=(WCHAR ch); - const CHString& operator+=(LPCWSTR lpsz); + const CHString& operator+=(CHSTRING_WCHAR ch); + const CHString& operator+=(CHSTRING_LPCWSTR lpsz); const CHString& operator+=(const CHString& string); - WCHAR operator[](int nIndex) const; + CHSTRING_WCHAR operator[](int nIndex) const; - operator LPCWSTR() const; + operator CHSTRING_LPCWSTR() const; - friend CHString WINAPI operator+(WCHAR ch, const CHString& string); - friend CHString WINAPI operator+(const CHString& string, WCHAR ch); - friend CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz); - friend CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string); + friend CHString WINAPI operator+(CHSTRING_WCHAR ch, const CHString& string); + friend CHString WINAPI operator+(const CHString& string, CHSTRING_WCHAR ch); + friend CHString WINAPI operator+(const CHString& string, CHSTRING_LPCWSTR lpsz); + friend CHString WINAPI operator+(CHSTRING_LPCWSTR lpsz, const CHString& string); friend CHString WINAPI operator+(const CHString& string1, const CHString& string2); protected: - LPWSTR m_pchData; + CHSTRING_LPWSTR m_pchData; void AllocBeforeWrite(int nLen); void AllocBuffer(int nLen); void AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtraLen) const; - void AssignCopy(int nSrcLen, LPCWSTR lpszSrcData); - void ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data); - void ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData); + void AssignCopy(int nSrcLen, CHSTRING_LPCWSTR lpszSrcData); + void AssignCopy(int nSrcLen, const wchar_t* lpszSrcData) + { + AssignCopy(nSrcLen, reinterpret_cast<CHSTRING_LPCWSTR>(lpszSrcData)); + } + void ConcatCopy(int nSrc1Len, CHSTRING_LPCWSTR lpszSrc1Data, int nSrc2Len, CHSTRING_LPCWSTR lpszSrc2Data); + void ConcatCopy(int nSrc1Len, const wchar_t* lpszSrc1Data, int nSrc2Len, const wchar_t* lpszSrc2Data) + { + ConcatCopy(nSrc1Len, reinterpret_cast<CHSTRING_LPCWSTR>(lpszSrc1Data), nSrc2Len, reinterpret_cast<CHSTRING_LPCWSTR>(lpszSrc2Data)); + } + void ConcatInPlace(int nSrcLen, CHSTRING_LPCWSTR lpszSrcData); + void ConcatInPlace(int nSrcLen, const wchar_t* lpszSrcData) + { + ConcatInPlace(nSrcLen, reinterpret_cast<CHSTRING_LPCWSTR>(lpszSrcData)); + } void CopyBeforeWrite(); CHStringData* GetData() const; void Init(); - int LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf); + int LoadStringW(UINT nID, CHSTRING_LPWSTR lpszBuf, UINT nMaxBuf); void Release(); static void WINAPI Release(CHStringData* pData); - static int WINAPI SafeStrlen(LPCWSTR lpsz); + static int WINAPI SafeStrlen(CHSTRING_LPCWSTR lpsz); + static int WINAPI SafeStrlen(const wchar_t* lpsz) + { + return SafeStrlen(reinterpret_cast<CHSTRING_LPCWSTR>(lpsz)); + } }; -inline BOOL operator==(const CHString& s1, LPCWSTR s2) { return s1.Compare(s2) == 0; } +inline BOOL operator==(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Compare(s2) == 0; } inline BOOL operator==(const CHString& s1, const CHString& s2) { return s1.Compare(s2) == 0; } -inline BOOL operator!=(const CHString& s1, LPCWSTR s2) { return s1.Compare(s2) != 0; } +inline BOOL operator!=(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Compare(s2) != 0; } inline BOOL operator!=(const CHString& s1, const CHString& s2) { return s1.Compare(s2) != 0; } -inline BOOL operator<(const CHString& s1, LPCWSTR s2) { return s1.Compare(s2) < 0; } +inline BOOL operator<(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Compare(s2) < 0; } inline BOOL operator<(const CHString& s1, const CHString& s2) { return s1.Compare(s2) < 0; } -inline BOOL operator>(const CHString& s1, LPCWSTR s2) { return s1.Compare(s2) > 0; } +inline BOOL operator>(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Compare(s2) > 0; } inline BOOL operator>(const CHString& s1, const CHString& s2) { return s1.Compare(s2) > 0; } -inline BOOL operator<=(const CHString& s1, LPCWSTR s2) { return s1.Compare(s2) <= 0; } +inline BOOL operator<=(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Compare(s2) <= 0; } inline BOOL operator<=(const CHString& s1, const CHString& s2) { return s1.Compare(s2) <= 0; } -inline BOOL operator>=(const CHString& s1, LPCWSTR s2) { return s1.Compare(s2) >= 0; } +inline BOOL operator>=(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Compare(s2) >= 0; } inline BOOL operator>=(const CHString& s1, const CHString& s2) { return s1.Compare(s2) >= 0; } +/* Have GCC link to the symbols exported by framedyn.dll */ +#ifdef __GNUC__ + +#define DEFINE_FRAMEDYN_ALIAS(alias, orig) __asm__(".set " #alias ", \"" #orig "\""); + +#ifdef _M_IX86 +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString16AllocBeforeWriteEi, ?AllocBeforeWrite@CHString@@IAEXH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString11AllocBufferEi, ?AllocBuffer@CHString@@IAEXH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString9AllocCopyERS_iii, ?AllocCopy@CHString@@IBEXAAV1@HHH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString14AllocSysStringEv, ?AllocSysString@CHString@@QBEPAGXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString10AssignCopyEiPKt, ?AssignCopy@CHString@@IAEXHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC1ERKS_, ??0CHString@@QAE@ABV0@@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC1EPKc, ??0CHString@@QAE@PBD@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC1EPKh, ??0CHString@@QAE@PBE@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC1EPKt, ??0CHString@@QAE@PBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC1EPKti, ??0CHString@@QAE@PBGH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC1Eti, ??0CHString@@QAE@GH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC1Ev, ??0CHString@@QAE@XZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringC2Ev, ??0CHString@@QAE@XZ) // CHString::CHString(void) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString7CollateEPKt, ?Collate@CHString@@QBEHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString7CompareEPKt, ?Compare@CHString@@QBEHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString13CompareNoCaseEPKt, ?CompareNoCase@CHString@@QBEHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString10ConcatCopyEiPKtiS1_, ?ConcatCopy@CHString@@IAEXHPBGH0@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString13ConcatInPlaceEiPKt, ?ConcatInPlace@CHString@@IAEXHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString15CopyBeforeWriteEv, ?CopyBeforeWrite@CHString@@IAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString5EmptyEv, ?Empty@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString4FindEPKt, ?Find@CHString@@QBEHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString4FindEt, ?Find@CHString@@QBEHG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString9FindOneOfEPKt, ?FindOneOf@CHString@@QBEHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString6FormatEjz, ?Format@CHString@@QAAXIZZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString6FormatEPKtz, ?Format@CHString@@QAAXPBGZZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString14FormatMessageWEjz, ?FormatMessageW@CHString@@QAAXIZZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString14FormatMessageWEPKtz, ?FormatMessageW@CHString@@QAAXPBGZZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString7FormatVEPKtPc, ?FormatV@CHString@@QAEXPBGPAD@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString9FreeExtraEv, ?FreeExtra@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString14GetAllocLengthEv, ?GetAllocLength@CHString@@QBEHXZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString5GetAtEi, ?GetAt@CHString@@QBEGH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString9GetBufferEi, ?GetBuffer@CHString@@QAEPAGH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString18GetBufferSetLengthEi, ?GetBufferSetLength@CHString@@QAEPAGH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString7GetDataEv, ?GetData@CHString@@IBEPAUCHStringData@@XZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString9GetLengthEv, ?GetLength@CHString@@QBEHXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString4InitEv, ?Init@CHString@@IAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString7IsEmptyEv, ?IsEmpty@CHString@@QBEHXZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString4LeftEi, ?Left@CHString@@QBE?AV1@H@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString11LoadStringWEj, ?LoadStringW@CHString@@QAEHI@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString11LoadStringWEjPtj, ?LoadStringW@CHString@@IAEHIPAGI@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString10LockBufferEv, ?LockBuffer@CHString@@QAEPAGXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString9MakeLowerEv, ?MakeLower@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString11MakeReverseEv, ?MakeReverse@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString9MakeUpperEv, ?MakeUpper@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString3MidEi, ?Mid@CHString@@QBE?AV1@H@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString3MidEii, ?Mid@CHString@@QBE?AV1@HH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString7ReleaseEP12CHStringData@4, ?Release@CHString@@KGXPAUCHStringData@@@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString7ReleaseEv, ?Release@CHString@@IAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString13ReleaseBufferEi, ?ReleaseBuffer@CHString@@QAEXH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString11ReverseFindEt, ?ReverseFind@CHString@@QBEHG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString5RightEi, ?Right@CHString@@QBE?AV1@H@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString10SafeStrlenEPKt@4, ?SafeStrlen@CHString@@KGHPBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString5SetAtEit, ?SetAt@CHString@@QAEXHG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString13SpanExcludingEPKt, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHString13SpanIncludingEPKt, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString8TrimLeftEv, ?TrimLeft@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString9TrimRightEv, ?TrimRight@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHString12UnlockBufferEv, ?UnlockBuffer@CHString@@QAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHStringcvPKwEv, ??BCHString@@QBEPBGXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringpLERKS_, ??YCHString@@QAEABV0@ABV0@@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringpLEc, ??YCHString@@QAEABV0@D@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringpLEPKw, ??YCHString@@QAEABV0@PBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringpLEw, ??YCHString@@QAEABV0@G@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringaSEPS_, ??4CHString@@QAEABV0@PAV0@@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringaSERKS_, ??4CHString@@QAEABV0@ABV0@@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringaSEPKc, ??4CHString@@QAEABV0@PBD@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringaSEc, ??4CHString@@QAEABV0@D@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringaSEPKh, ??4CHString@@QAEABV0@PBE@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringaSEPKw, ??4CHString@@QAEABV0@PBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringaSEw, ??4CHString@@QAEABV0@G@Z) +DEFINE_FRAMEDYN_ALIAS(__ZNK8CHStringixEi, ??ACHString@@QBEGH@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringD1Ev, ??1CHString@@QAE@XZ) // CHString::~CHString() complete object destructor +DEFINE_FRAMEDYN_ALIAS(__ZN8CHStringD2Ev, ??1CHString@@QAE@XZ) // CHString::~CHString() base object destructor +DEFINE_FRAMEDYN_ALIAS(__ZplwRK8CHString, ??H@YG?AVCHString@@GABV0@@Z) +DEFINE_FRAMEDYN_ALIAS(__ZplRK8CHStringw, ??H@YG?AVCHString@@ABV0@G@Z) +DEFINE_FRAMEDYN_ALIAS(__ZplRK8CHStringPKw, ??H@YG?AVCHString@@ABV0@PBG@Z) +DEFINE_FRAMEDYN_ALIAS(__ZplPKwRK8CHString, ??H@YG?AVCHString@@PBGABV0@@Z) +DEFINE_FRAMEDYN_ALIAS(__ZplRK8CHStringS1_, ??H@YG?AVCHString@@ABV0@0@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8Provider5FlushEv, ?Flush@Provider@@MAEXXZ) +DEFINE_FRAMEDYN_ALIAS(__ZN8Provider21ValidateDeletionFlagsEl, ?ValidateDeletionFlags@Provider@@MAEJJ@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8Provider19ValidateMethodFlagsEl, ?ValidateMethodFlags@Provider@@MAEJJ@Z) +DEFINE_FRAMEDYN_ALIAS(__ZN8Provider18ValidateQueryFlagsEl, ?ValidateQueryFlags@Provider@@MAEJJ@Z) +#elif defined(_M_AMD64) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString16AllocBeforeWriteEi, ?AllocBeforeWrite@CHString@@IEAAXH@Z) // protected: void __thiscall CHString::AllocBeforeWrite(int) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString11AllocBufferEi, ?AllocBuffer@CHString@@IEAAXH@Z) // protected: void __thiscall CHString::AllocBuffer(int) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString9AllocCopyERS_iii, ?AllocCopy@CHString@@IEBAXAEAV1@HHH@Z) // protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString14AllocSysStringEv, ?AllocSysString@CHString@@QEBAPEAGXZ) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString10AssignCopyEiPKt, ?AssignCopy@CHString@@IEAAXHPEBG@Z) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC1ERKS_, ??0CHString@@QEAA@AEBV0@@Z) // CHString::CHString(CHString const&) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC1EPKc, ??0CHString@@QEAA@PEBD@Z) // CHString::CHString(char const*) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC1EPKh, ??0CHString@@QEAA@PEBE@Z) // CHString::CHString(unsigned char const*) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC1EPKt, ??0CHString@@QEAA@PEBG@Z) // CHString::CHString(unsigned short const*) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC1EPKti, ??0CHString@@QEAA@PEBGH@Z) // CHString::CHString(unsigned short const*, int) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC1Eti, ??0CHString@@QEAA@GH@Z) // CHString::CHString(unsigned short, int) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC1Ev, ??0CHString@@QEAA@XZ) // public: __thiscall CHString::CHString(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringC2Ev, ??0CHString@@QEAA@XZ) // public: __thiscall CHString::CHString(void) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString7CollateEPKt, ?Collate@CHString@@QEBAHPEBG@Z) // public: int __thiscall CHString::Collate(unsigned short const *)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString7CompareEPKt, ?Compare@CHString@@QEBAHPEBG@Z) // public: int __thiscall CHString::Compare(unsigned short const *)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString13CompareNoCaseEPKt, ?CompareNoCase@CHString@@QEBAHPEBG@Z) // public: int __thiscall CHString::CompareNoCase(unsigned short const *)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString10ConcatCopyEiPKtiS1_, ?ConcatCopy@CHString@@IEAAXHPEBGH0@Z) // protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString13ConcatInPlaceEiPKt, ?ConcatInPlace@CHString@@IEAAXHPEBG@Z) // protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString15CopyBeforeWriteEv, ?CopyBeforeWrite@CHString@@IEAAXXZ) // protected: void __thiscall CHString::CopyBeforeWrite(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString5EmptyEv, ?Empty@CHString@@QEAAXXZ) // public: void __thiscall CHString::Empty(void) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString4FindEPKt, ?Find@CHString@@QEBAHPEBG@Z) // public: int __thiscall CHString::Find(unsigned short const *)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString4FindEt, ?Find@CHString@@QEBAHG@Z) // public: int __thiscall CHString::Find(unsigned short)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString9FindOneOfEPKt, ?FindOneOf@CHString@@QEBAHPEBG@Z) // public: int __thiscall CHString::FindOneOf(unsigned short const *)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString6FormatEjz, ?Format@CHString@@QEAAXIZZ) // public: void __cdecl CHString::Format(unsigned int,...) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString6FormatEPKtz, ?Format@CHString@@QEAAXPEBGZZ) // public: void __cdecl CHString::Format(unsigned short const *,...) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString14FormatMessageWEjz, ?FormatMessageW@CHString@@QEAAXIZZ) // public: void __cdecl CHString::FormatMessageW(unsigned int,...) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString14FormatMessageWEPKtz, ?FormatMessageW@CHString@@QEAAXPEBGZZ) // public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString7FormatVEPKtPc, ?FormatV@CHString@@QEAAXPEBGPEAD@Z) // public: void __thiscall CHString::FormatV(unsigned short const *,char *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString9FreeExtraEv, ?FreeExtra@CHString@@QEAAXXZ) // public: void __thiscall CHString::FreeExtra(void) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString14GetAllocLengthEv, ?GetAllocLength@CHString@@QEBAHXZ) // public: int __thiscall CHString::GetAllocLength(void)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString5GetAtEi, ?GetAt@CHString@@QEBAGH@Z) // public: unsigned short __thiscall CHString::GetAt(int)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString9GetBufferEi, ?GetBuffer@CHString@@QEAAPEAGH@Z) // public: unsigned short * __thiscall CHString::GetBuffer(int) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString18GetBufferSetLengthEi, ?GetBufferSetLength@CHString@@QEAAPEAGH@Z) // public: unsigned short * __thiscall CHString::GetBufferSetLength(int) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString7GetDataEv, ?GetData@CHString@@IEBAPEAUCHStringData@@XZ) // protected: struct CHStringData * __thiscall CHString::GetData(void)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString9GetLengthEv, ?GetLength@CHString@@QEBAHXZ) // public: int __thiscall CHString::GetLength(void)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString4InitEv, ?Init@CHString@@IEAAXXZ) // protected: void __thiscall CHString::Init(void) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString7IsEmptyEv, ?IsEmpty@CHString@@QEBAHXZ) // public: int __thiscall CHString::IsEmpty(void)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString4LeftEi, ?Left@CHString@@QEBA?AV1@H@Z) // public: class CHString __thiscall CHString::Left(int)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString11LoadStringWEj, ?LoadStringW@CHString@@QEAAHI@Z) // public: int __thiscall CHString::LoadStringW(unsigned int) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString11LoadStringWEjPtj, ?LoadStringW@CHString@@IEAAHIPEAGI@Z) // protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString10LockBufferEv, ?LockBuffer@CHString@@QEAAPEAGXZ) // public: unsigned short * __thiscall CHString::LockBuffer(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString9MakeLowerEv, ?MakeLower@CHString@@QEAAXXZ) // public: void __thiscall CHString::MakeLower(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString11MakeReverseEv, ?MakeReverse@CHString@@QEAAXXZ) // public: void __thiscall CHString::MakeReverse(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString9MakeUpperEv, ?MakeUpper@CHString@@QEAAXXZ) // public: void __thiscall CHString::MakeUpper(void) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString3MidEi, ?Mid@CHString@@QEBA?AV1@H@Z) // public: class CHString __thiscall CHString::Mid(int)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString3MidEii, ?Mid@CHString@@QEBA?AV1@HH@Z) // public: class CHString __thiscall CHString::Mid(int,int)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString7ReleaseEP12CHStringData, ?Release@CHString@@KAXPEAUCHStringData@@@Z) // protected: static void __stdcall CHString::Release(struct CHStringData *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString7ReleaseEv, ?Release@CHString@@IEAAXXZ) // protected: void __thiscall CHString::Release(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString13ReleaseBufferEi, ?ReleaseBuffer@CHString@@QEAAXH@Z) // public: void __thiscall CHString::ReleaseBuffer(int) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString11ReverseFindEt, ?ReverseFind@CHString@@QEBAHG@Z) // public: int __thiscall CHString::ReverseFind(unsigned short)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString5RightEi, ?Right@CHString@@QEBA?AV1@H@Z) // public: class CHString __thiscall CHString::Right(int)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString10SafeStrlenEPKt, ?SafeStrlen@CHString@@KAHPEBG@Z) // protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString5SetAtEit, ?SetAt@CHString@@QEAAXHG@Z) // public: void __thiscall CHString::SetAt(int,unsigned short) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString13SpanExcludingEPKt, ?SpanExcluding@CHString@@QEBA?AV1@PEBG@Z) // public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHString13SpanIncludingEPKt, ?SpanIncluding@CHString@@QEBA?AV1@PEBG@Z) // public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString8TrimLeftEv, ?TrimLeft@CHString@@QEAAXXZ) // public: void __thiscall CHString::TrimLeft(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString9TrimRightEv, ?TrimRight@CHString@@QEAAXXZ) // public: void __thiscall CHString::TrimRight(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHString12UnlockBufferEv, ?UnlockBuffer@CHString@@QEAAXXZ) // public: void __thiscall CHString::UnlockBuffer(void) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHStringcvPKtEv, ??BCHString@@QEBAPEBGXZ) // public: __thiscall CHString::operator unsigned short const *(void)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringpLERKS_, ??YCHString@@QEAAAEBV0@AEBV0@@Z) // public: class CHString const & __thiscall CHString::operator+=(class CHString const &) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringpLEc, ??YCHString@@QEAAAEBV0@D@Z) // public: class CHString const & __thiscall CHString::operator+=(char) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringpLEPKt, ??YCHString@@QEAAAEBV0@PEBG@Z) // public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringpLEt, ??YCHString@@QEAAAEBV0@G@Z) // public: class CHString const & __thiscall CHString::operator+=(unsigned short) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringaSEPS_, ??4CHString@@QEAAAEBV0@PEAV0@@Z) // public: class CHString const & __thiscall CHString::operator=(class CHString *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringaSERKS_, ??4CHString@@QEAAAEBV0@AEBV0@@Z) // public: class CHString const & __thiscall CHString::operator=(class CHString const &) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringaSEPKc, ??4CHString@@QEAAAEBV0@PEBD@Z) // public: class CHString const & __thiscall CHString::operator=(char const *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringaSEc, ??4CHString@@QEAAAEBV0@D@Z) // public: class CHString const & __thiscall CHString::operator=(char) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringaSEPKh, ??4CHString@@QEAAAEBV0@PEBE@Z) // public: class CHString const & __thiscall CHString::operator=(unsigned char const *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringaSEPKt, ??4CHString@@QEAAAEBV0@PEBG@Z) // public: class CHString const & __thiscall CHString::operator=(unsigned short const *) +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringaSEt, ??4CHString@@QEAAAEBV0@G@Z) // public: class CHString const & __thiscall CHString::operator=(unsigned short) +DEFINE_FRAMEDYN_ALIAS(_ZNK8CHStringixEi, ??ACHString@@QEBAGH@Z) // public: unsigned short __thiscall CHString::operator[](int)const +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringD1Ev, ??1CHString@@QEAA@XZ) // public: __thiscall CHString::~CHString(void), complete object destructor +DEFINE_FRAMEDYN_ALIAS(_ZN8CHStringD2Ev, ??1CHString@@QEAA@XZ) // public: __thiscall CHString::~CHString(void), base object destructor +DEFINE_FRAMEDYN_ALIAS(_ZpltRK8CHString, ??H@YA?AVCHString@@GAEBV0@@Z) // class CHString __stdcall operator+(unsigned short,class CHString const &) +DEFINE_FRAMEDYN_ALIAS(_ZplRK8CHStringt, ??H@YA?AVCHString@@AEBV0@G@Z) // class CHString __stdcall operator+(class CHString const &,unsigned short) +DEFINE_FRAMEDYN_ALIAS(_ZplRK8CHStringPKt, ??H@YA?AVCHString@@AEBV0@PEBG@Z) // class CHString __stdcall operator+(class CHString const &,unsigned short const *) +DEFINE_FRAMEDYN_ALIAS(_ZplPKtRK8CHString, ??H@YA?AVCHString@@PEBGAEBV0@@Z) // class CHString __stdcall operator+(unsigned short const *,class CHString const &) +DEFINE_FRAMEDYN_ALIAS(_ZplRK8CHStringS1_, ??H@YA?AVCHString@@AEBV0@0@Z) // class CHString __stdcall operator+(class CHString const &,class CHString const &) +DEFINE_FRAMEDYN_ALIAS(_ZN8Provider5FlushEv, ?Flush@Provider@@MEAAXXZ) // protected: virtual void __thiscall Provider::Flush(void) +DEFINE_FRAMEDYN_ALIAS(_ZN8Provider21ValidateDeletionFlagsEl, ?ValidateDeletionFlags@Provider@@MEAAJJ@Z) // protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) +DEFINE_FRAMEDYN_ALIAS(_ZN8Provider19ValidateMethodFlagsEl, ?ValidateMethodFlags@Provider@@MEAAJJ@Z) // protected: virtual long __thiscall Provider::ValidateMethodFlags(long) +DEFINE_FRAMEDYN_ALIAS(_ZN8Provider18ValidateQueryFlagsEl, ?ValidateQueryFlags@Provider@@MEAAJJ@Z) // protected: virtual long __thiscall Provider::ValidateQueryFlags(long) +#else +#error Unsupported arch +#endif + +#undef DEFINE_FRAMEDYN_ALIAS + +#endif // __GNUC__ + #endif
3 years, 7 months
1
0
0
0
← Newer
1
...
13
14
15
16
17
18
19
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
Results per page:
10
25
50
100
200