wine-devel December 2021

wine-devel@winehq.org

85 participants
585 discussions

[PATCH] kernel32: Store the ILANGUAGE values in uppercase.
by Francois Gouget 07 Dec '21

07 Dec '21

Some APIs (e.g. GetSystemPreferredUILanguages()) return them as a string so the case should match the one used by Windows in case developers used case sensitive string comparisons (e.g. as in advapi32:lsa) Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/nls/are.nls | 4 ++-- dlls/kernel32/nls/arh.nls | 4 ++-- dlls/kernel32/nls/arj.nls | 4 ++-- dlls/kernel32/nls/art.nls | 4 ++-- dlls/kernel32/nls/ast.nls | 4 ++-- dlls/kernel32/nls/aze.nls | 4 ++-- dlls/kernel32/nls/azl.nls | 2 +- dlls/kernel32/nls/dea.nls | 4 ++-- dlls/kernel32/nls/ena.nls | 4 ++-- dlls/kernel32/nls/enb.nls | 2 +- dlls/kernel32/nls/ens.nls | 4 ++-- dlls/kernel32/nls/ent.nls | 4 ++-- dlls/kernel32/nls/eox.nls | 4 ++-- dlls/kernel32/nls/esa.nls | 4 ++-- dlls/kernel32/nls/esb.nls | 4 ++-- dlls/kernel32/nls/esc.nls | 4 ++-- dlls/kernel32/nls/esd.nls | 4 ++-- dlls/kernel32/nls/ese.nls | 4 ++-- dlls/kernel32/nls/esf.nls | 4 ++-- dlls/kernel32/nls/esg.nls | 4 ++-- dlls/kernel32/nls/esh.nls | 4 ++-- dlls/kernel32/nls/esi.nls | 4 ++-- dlls/kernel32/nls/esl.nls | 4 ++-- dlls/kernel32/nls/esm.nls | 4 ++-- dlls/kernel32/nls/esn.nls | 4 ++-- dlls/kernel32/nls/eso.nls | 4 ++-- dlls/kernel32/nls/esp.nls | 4 ++-- dlls/kernel32/nls/esr.nls | 4 ++-- dlls/kernel32/nls/ess.nls | 4 ++-- dlls/kernel32/nls/esu.nls | 4 ++-- dlls/kernel32/nls/esv.nls | 4 ++-- dlls/kernel32/nls/esy.nls | 4 ++-- dlls/kernel32/nls/esz.nls | 4 ++-- dlls/kernel32/nls/euq.nls | 4 ++-- dlls/kernel32/nls/fin.nls | 4 ++-- dlls/kernel32/nls/fra.nls | 4 ++-- dlls/kernel32/nls/frb.nls | 4 ++-- dlls/kernel32/nls/frc.nls | 4 ++-- dlls/kernel32/nls/frl.nls | 4 ++-- dlls/kernel32/nls/frm.nls | 4 ++-- dlls/kernel32/nls/frs.nls | 4 ++-- dlls/kernel32/nls/gae.nls | 4 ++-- dlls/kernel32/nls/glc.nls | 2 +- dlls/kernel32/nls/heb.nls | 4 ++-- dlls/kernel32/nls/hrv.nls | 4 ++-- dlls/kernel32/nls/hun.nls | 4 ++-- dlls/kernel32/nls/hye.nls | 4 ++-- dlls/kernel32/nls/isl.nls | 4 ++-- dlls/kernel32/nls/kan.nls | 4 ++-- dlls/kernel32/nls/kkz.nls | 4 ++-- dlls/kernel32/nls/mar.nls | 4 ++-- dlls/kernel32/nls/mki.nls | 4 ++-- dlls/kernel32/nls/msb.nls | 4 ++-- dlls/kernel32/nls/msl.nls | 4 ++-- dlls/kernel32/nls/nls.nls | 2 +- dlls/kernel32/nls/san.nls | 4 ++-- dlls/kernel32/nls/sky.nls | 4 ++-- dlls/kernel32/nls/sqi.nls | 4 ++-- dlls/kernel32/nls/srb.nls | 4 ++-- dlls/kernel32/nls/srl.nls | 4 ++-- dlls/kernel32/nls/srm.nls | 4 ++-- dlls/kernel32/nls/sve.nls | 4 ++-- dlls/kernel32/nls/svf.nls | 4 ++-- dlls/kernel32/nls/syr.nls | 4 ++-- dlls/kernel32/nls/tel.nls | 4 ++-- dlls/kernel32/nls/tha.nls | 4 ++-- dlls/kernel32/nls/trk.nls | 4 ++-- dlls/kernel32/nls/vit.nls | 4 ++-- dlls/kernel32/nls/zhh.nls | 4 ++-- 69 files changed, 134 insertions(+), 134 deletions(-) diff --git a/dlls/kernel32/nls/are.nls b/dlls/kernel32/nls/are.nls index b044d3299b4..6a2d49c2a84 100644 --- a/dlls/kernel32/nls/are.nls +++ b/dlls/kernel32/nls/are.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "20" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "0c01" + LOCALE_IDEFAULTLANGUAGE "0C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "67" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "0c01" + LOCALE_ILANGUAGE "0C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/arh.nls b/dlls/kernel32/nls/arh.nls index ce2fe000d43..e0936e04df9 100644 --- a/dlls/kernel32/nls/arh.nls +++ b/dlls/kernel32/nls/arh.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "973" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "3c01" + LOCALE_IDEFAULTLANGUAGE "3C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "17" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "3c01" + LOCALE_ILANGUAGE "3C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/arj.nls b/dlls/kernel32/nls/arj.nls index fc4f15c509f..b8eca8144f3 100644 --- a/dlls/kernel32/nls/arj.nls +++ b/dlls/kernel32/nls/arj.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "962" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "2c01" + LOCALE_IDEFAULTLANGUAGE "2C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "126" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "2c01" + LOCALE_ILANGUAGE "2C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/art.nls b/dlls/kernel32/nls/art.nls index 55e34ac77f1..119db3295fd 100644 --- a/dlls/kernel32/nls/art.nls +++ b/dlls/kernel32/nls/art.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "216" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "1c01" + LOCALE_IDEFAULTLANGUAGE "1C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "234" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "1c01" + LOCALE_ILANGUAGE "1C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls index 4a6a77aa721..5e63f4565b7 100644 --- a/dlls/kernel32/nls/ast.nls +++ b/dlls/kernel32/nls/ast.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTLANGUAGE "040A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "04a5" + LOCALE_ILANGUAGE "04A5" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index e2860d088f0..9dfe7e41898 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_IDEFAULTCODEPAGE "866" LOCALE_IDEFAULTCOUNTRY "994" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "082c" + LOCALE_IDEFAULTLANGUAGE "082C" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "5" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "082c" + LOCALE_ILANGUAGE "082C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/azl.nls b/dlls/kernel32/nls/azl.nls index 86d49a6b5fc..d7aab6220a9 100644 --- a/dlls/kernel32/nls/azl.nls +++ b/dlls/kernel32/nls/azl.nls @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "5" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042c" + LOCALE_ILANGUAGE "042C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls index f97ae8ebe3e..3b9491728b8 100644 --- a/dlls/kernel32/nls/dea.nls +++ b/dlls/kernel32/nls/dea.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "43" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" - LOCALE_IDEFAULTLANGUAGE "0c07" + LOCALE_IDEFAULTLANGUAGE "0C07" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "14" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c07" + LOCALE_ILANGUAGE "0C07" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ena.nls b/dlls/kernel32/nls/ena.nls index f34a20b96d2..45f5486f378 100644 --- a/dlls/kernel32/nls/ena.nls +++ b/dlls/kernel32/nls/ena.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "61" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "0c09" + LOCALE_IDEFAULTLANGUAGE "0C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "12" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c09" + LOCALE_ILANGUAGE "0C09" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls index 8b09c536c23..8a765940a69 100644 --- a/dlls/kernel32/nls/enb.nls +++ b/dlls/kernel32/nls/enb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "2c09" + LOCALE_IDEFAULTLANGUAGE "2C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" diff --git a/dlls/kernel32/nls/ens.nls b/dlls/kernel32/nls/ens.nls index ee2403196f2..44a8a5062c5 100644 --- a/dlls/kernel32/nls/ens.nls +++ b/dlls/kernel32/nls/ens.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA LOCALE_IDEFAULTCODEPAGE "437" LOCALE_IDEFAULTCOUNTRY "27" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "1c09" + LOCALE_IDEFAULTLANGUAGE "1C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "209" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "1c09" + LOCALE_ILANGUAGE "1C09" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ent.nls b/dlls/kernel32/nls/ent.nls index 48bfb26b15c..5d733185b93 100644 --- a/dlls/kernel32/nls/ent.nls +++ b/dlls/kernel32/nls/ent.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "2c09" + LOCALE_IDEFAULTLANGUAGE "2C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "225" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "2c09" + LOCALE_ILANGUAGE "2C09" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index bbd617eac48..d5928f75c92 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -50,7 +50,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "048f" + LOCALE_IDEFAULTLANGUAGE "048F" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -58,7 +58,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "39070" /* World */ LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "048f" + LOCALE_ILANGUAGE "048F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esa.nls b/dlls/kernel32/nls/esa.nls index a311d796eb7..f7b4a4dd1bc 100644 --- a/dlls/kernel32/nls/esa.nls +++ b/dlls/kernel32/nls/esa.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "507" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "180a" + LOCALE_IDEFAULTLANGUAGE "180A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "192" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "180a" + LOCALE_ILANGUAGE "180A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esb.nls b/dlls/kernel32/nls/esb.nls index ce95402300d..972577620bf 100644 --- a/dlls/kernel32/nls/esb.nls +++ b/dlls/kernel32/nls/esb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "591" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "400a" + LOCALE_IDEFAULTLANGUAGE "400A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "26" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "400a" + LOCALE_ILANGUAGE "400A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esc.nls b/dlls/kernel32/nls/esc.nls index 60ed24e7067..78b567aad50 100644 --- a/dlls/kernel32/nls/esc.nls +++ b/dlls/kernel32/nls/esc.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "506" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "140a" + LOCALE_IDEFAULTLANGUAGE "140A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "54" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "140a" + LOCALE_ILANGUAGE "140A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esd.nls b/dlls/kernel32/nls/esd.nls index 93b6bb0005b..758fd8f3602 100644 --- a/dlls/kernel32/nls/esd.nls +++ b/dlls/kernel32/nls/esd.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "1c0a" + LOCALE_IDEFAULTLANGUAGE "1C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "65" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "1c0a" + LOCALE_ILANGUAGE "1C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ese.nls b/dlls/kernel32/nls/ese.nls index a68c027440b..4dab3cae0fd 100644 --- a/dlls/kernel32/nls/ese.nls +++ b/dlls/kernel32/nls/ese.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "503" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "440a" + LOCALE_IDEFAULTLANGUAGE "440A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "72" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "440a" + LOCALE_ILANGUAGE "440A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esf.nls b/dlls/kernel32/nls/esf.nls index 65f47d73a20..11285da4379 100644 --- a/dlls/kernel32/nls/esf.nls +++ b/dlls/kernel32/nls/esf.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "593" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "300a" + LOCALE_IDEFAULTLANGUAGE "300A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "66" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "300a" + LOCALE_ILANGUAGE "300A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esg.nls b/dlls/kernel32/nls/esg.nls index a9c9a8a8603..44638b1380e 100644 --- a/dlls/kernel32/nls/esg.nls +++ b/dlls/kernel32/nls/esg.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "502" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "100a" + LOCALE_IDEFAULTLANGUAGE "100A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "99" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "100a" + LOCALE_ILANGUAGE "100A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esh.nls b/dlls/kernel32/nls/esh.nls index 5593836b44b..3f2352a5131 100644 --- a/dlls/kernel32/nls/esh.nls +++ b/dlls/kernel32/nls/esh.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "504" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "480a" + LOCALE_IDEFAULTLANGUAGE "480A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "106" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "480a" + LOCALE_ILANGUAGE "480A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esi.nls b/dlls/kernel32/nls/esi.nls index ac4bdb79d0f..53c5f7d3922 100644 --- a/dlls/kernel32/nls/esi.nls +++ b/dlls/kernel32/nls/esi.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "505" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "4c0a" + LOCALE_IDEFAULTLANGUAGE "4C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "182" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "4c0a" + LOCALE_ILANGUAGE "4C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esl.nls b/dlls/kernel32/nls/esl.nls index 57f35643b62..279adc473a0 100644 --- a/dlls/kernel32/nls/esl.nls +++ b/dlls/kernel32/nls/esl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "56" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "340a" + LOCALE_IDEFAULTLANGUAGE "340A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "46" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "340a" + LOCALE_ILANGUAGE "340A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esm.nls b/dlls/kernel32/nls/esm.nls index 8c404f1733b..26ac3fd7b13 100644 --- a/dlls/kernel32/nls/esm.nls +++ b/dlls/kernel32/nls/esm.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "52" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "080a" + LOCALE_IDEFAULTLANGUAGE "080A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "166" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "080a" + LOCALE_ILANGUAGE "080A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls index 0cb88fa3666..c73a392aa80 100644 --- a/dlls/kernel32/nls/esn.nls +++ b/dlls/kernel32/nls/esn.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "0c0a" + LOCALE_IDEFAULTLANGUAGE "0C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c0a" + LOCALE_ILANGUAGE "0C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/eso.nls b/dlls/kernel32/nls/eso.nls index 9f7131066a5..bdb17378541 100644 --- a/dlls/kernel32/nls/eso.nls +++ b/dlls/kernel32/nls/eso.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "57" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "240a" + LOCALE_IDEFAULTLANGUAGE "240A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "51" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "240a" + LOCALE_ILANGUAGE "240A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls index a557a52b7d4..72849314ed0 100644 --- a/dlls/kernel32/nls/esp.nls +++ b/dlls/kernel32/nls/esp.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTLANGUAGE "040A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040a" + LOCALE_ILANGUAGE "040A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esr.nls b/dlls/kernel32/nls/esr.nls index 752120dadf1..ee6661c3367 100644 --- a/dlls/kernel32/nls/esr.nls +++ b/dlls/kernel32/nls/esr.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "51" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "280a" + LOCALE_IDEFAULTLANGUAGE "280A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "187" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "280a" + LOCALE_ILANGUAGE "280A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ess.nls b/dlls/kernel32/nls/ess.nls index 30c96a0bf78..8493dbbc90e 100644 --- a/dlls/kernel32/nls/ess.nls +++ b/dlls/kernel32/nls/ess.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "54" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "2c0a" + LOCALE_IDEFAULTLANGUAGE "2C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "11" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "2c0a" + LOCALE_ILANGUAGE "2C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esu.nls b/dlls/kernel32/nls/esu.nls index eb2ec3b04a5..484d6275190 100644 --- a/dlls/kernel32/nls/esu.nls +++ b/dlls/kernel32/nls/esu.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "500a" + LOCALE_IDEFAULTLANGUAGE "500A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "202" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "500a" + LOCALE_ILANGUAGE "500A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esv.nls b/dlls/kernel32/nls/esv.nls index 155ebef33c3..83de1f7302f 100644 --- a/dlls/kernel32/nls/esv.nls +++ b/dlls/kernel32/nls/esv.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "58" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "200a" + LOCALE_IDEFAULTLANGUAGE "200A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "249" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "200a" + LOCALE_ILANGUAGE "200A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esy.nls b/dlls/kernel32/nls/esy.nls index 9444f436a11..66f6decea97 100644 --- a/dlls/kernel32/nls/esy.nls +++ b/dlls/kernel32/nls/esy.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "598" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "380a" + LOCALE_IDEFAULTLANGUAGE "380A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "246" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "380a" + LOCALE_ILANGUAGE "380A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esz.nls b/dlls/kernel32/nls/esz.nls index 82eb4241b2f..1a98f283fe7 100644 --- a/dlls/kernel32/nls/esz.nls +++ b/dlls/kernel32/nls/esz.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "595" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "3c0a" + LOCALE_IDEFAULTLANGUAGE "3C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "185" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "3c0a" + LOCALE_ILANGUAGE "3C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/euq.nls b/dlls/kernel32/nls/euq.nls index 38d34312eab..af73fd58c80 100644 --- a/dlls/kernel32/nls/euq.nls +++ b/dlls/kernel32/nls/euq.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042d" + LOCALE_IDEFAULTLANGUAGE "042D" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042d" + LOCALE_ILANGUAGE "042D" LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/fin.nls b/dlls/kernel32/nls/fin.nls index 29b7d2e8979..d3e7c76e679 100644 --- a/dlls/kernel32/nls/fin.nls +++ b/dlls/kernel32/nls/fin.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "358" LOCALE_IDEFAULTEBCDICCODEPAGE "20278" - LOCALE_IDEFAULTLANGUAGE "040b" + LOCALE_IDEFAULTLANGUAGE "040B" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "77" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040b" + LOCALE_ILANGUAGE "040B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls index 9a588a932e6..ca9b9d55aec 100644 --- a/dlls/kernel32/nls/fra.nls +++ b/dlls/kernel32/nls/fra.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "33" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "040c" + LOCALE_IDEFAULTLANGUAGE "040C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "84" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040c" + LOCALE_ILANGUAGE "040C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls index 7ee0b297515..57c55e3cc16 100644 --- a/dlls/kernel32/nls/frb.nls +++ b/dlls/kernel32/nls/frb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "32" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "080c" + LOCALE_IDEFAULTLANGUAGE "080C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "21" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "080c" + LOCALE_ILANGUAGE "080C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls index 79eac11d96b..f2736f715fb 100644 --- a/dlls/kernel32/nls/frc.nls +++ b/dlls/kernel32/nls/frc.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "2" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "0c0c" + LOCALE_IDEFAULTLANGUAGE "0C0C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "39" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c0c" + LOCALE_ILANGUAGE "0C0C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls index 29d2ad0c9cf..3001a6ba243 100644 --- a/dlls/kernel32/nls/frl.nls +++ b/dlls/kernel32/nls/frl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "352" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "140c" + LOCALE_IDEFAULTLANGUAGE "140C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "147" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "140c" + LOCALE_ILANGUAGE "140C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls index fa38552812c..867d48e5aa9 100644 --- a/dlls/kernel32/nls/frm.nls +++ b/dlls/kernel32/nls/frm.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "377" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "180c" + LOCALE_IDEFAULTLANGUAGE "180C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "158" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "180c" + LOCALE_ILANGUAGE "180C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls index cefb9d36db0..573d512488a 100644 --- a/dlls/kernel32/nls/frs.nls +++ b/dlls/kernel32/nls/frs.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "41" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "100c" + LOCALE_IDEFAULTLANGUAGE "100C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "223" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "100c" + LOCALE_ILANGUAGE "100C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/gae.nls b/dlls/kernel32/nls/gae.nls index e817403c431..359c816df1b 100644 --- a/dlls/kernel32/nls/gae.nls +++ b/dlls/kernel32/nls/gae.nls @@ -35,7 +35,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND LOCALE_IDEFAULTCODEPAGE "437" LOCALE_IDEFAULTCOUNTRY "353" LOCALE_IDEFAULTEBCDICCODEPAGE "20285" - LOCALE_IDEFAULTLANGUAGE "083c" + LOCALE_IDEFAULTLANGUAGE "083C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "68" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "083c" + LOCALE_ILANGUAGE "083C" LOCALE_ILDATE "0" LOCALE_ILZERO "1" LOCALE_IMEASURE "1" diff --git a/dlls/kernel32/nls/glc.nls b/dlls/kernel32/nls/glc.nls index f60a0aac69b..7f23993b888 100644 --- a/dlls/kernel32/nls/glc.nls +++ b/dlls/kernel32/nls/glc.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTLANGUAGE "040A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls index 2d69ffd4676..d6b6016f7fd 100644 --- a/dlls/kernel32/nls/heb.nls +++ b/dlls/kernel32/nls/heb.nls @@ -35,7 +35,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "862" LOCALE_IDEFAULTCOUNTRY "972" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040d" + LOCALE_IDEFAULTLANGUAGE "040D" LOCALE_IDEFAULTMACCODEPAGE "10005" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "117" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040d" + LOCALE_ILANGUAGE "040D" LOCALE_ILDATE "1" LOCALE_ILZERO "0" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls index 958e15e59e4..0a238bfd1b9 100644 --- a/dlls/kernel32/nls/hrv.nls +++ b/dlls/kernel32/nls/hrv.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "385" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "041a" + LOCALE_IDEFAULTLANGUAGE "041A" LOCALE_IDEFAULTMACCODEPAGE "10082" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "108" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041a" + LOCALE_ILANGUAGE "041A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/hun.nls b/dlls/kernel32/nls/hun.nls index c3dbb9773f9..1f0a33508d8 100644 --- a/dlls/kernel32/nls/hun.nls +++ b/dlls/kernel32/nls/hun.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "36" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040e" + LOCALE_IDEFAULTLANGUAGE "040E" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "109" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040e" + LOCALE_ILANGUAGE "040E" LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls index 2000280fe1e..1bea036afe0 100644 --- a/dlls/kernel32/nls/hye.nls +++ b/dlls/kernel32/nls/hye.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "374" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042b" + LOCALE_IDEFAULTLANGUAGE "042B" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "7" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042b" + LOCALE_ILANGUAGE "042B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/isl.nls b/dlls/kernel32/nls/isl.nls index 5a6c3d67e34..c2976b881a1 100644 --- a/dlls/kernel32/nls/isl.nls +++ b/dlls/kernel32/nls/isl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "354" LOCALE_IDEFAULTEBCDICCODEPAGE "20871" - LOCALE_IDEFAULTLANGUAGE "040f" + LOCALE_IDEFAULTLANGUAGE "040F" LOCALE_IDEFAULTMACCODEPAGE "10079" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "110" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040f" + LOCALE_ILANGUAGE "040F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/kan.nls b/dlls/kernel32/nls/kan.nls index e6934d1a428..87e9d092924 100644 --- a/dlls/kernel32/nls/kan.nls +++ b/dlls/kernel32/nls/kan.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044b" + LOCALE_IDEFAULTLANGUAGE "044B" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044b" + LOCALE_ILANGUAGE "044B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/kkz.nls b/dlls/kernel32/nls/kkz.nls index 5a8451563bd..2c45cc659e3 100644 --- a/dlls/kernel32/nls/kkz.nls +++ b/dlls/kernel32/nls/kkz.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "866" LOCALE_IDEFAULTCOUNTRY "7" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "043f" + LOCALE_IDEFAULTLANGUAGE "043F" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "137" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "043f" + LOCALE_ILANGUAGE "043F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/mar.nls b/dlls/kernel32/nls/mar.nls index 3069a59070b..1cd6cc00191 100644 --- a/dlls/kernel32/nls/mar.nls +++ b/dlls/kernel32/nls/mar.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044e" + LOCALE_IDEFAULTLANGUAGE "044E" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044e" + LOCALE_ILANGUAGE "044E" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/mki.nls b/dlls/kernel32/nls/mki.nls index 30efc19b37c..af5f392ef55 100644 --- a/dlls/kernel32/nls/mki.nls +++ b/dlls/kernel32/nls/mki.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "866" LOCALE_IDEFAULTCOUNTRY "389" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042f" + LOCALE_IDEFAULTLANGUAGE "042F" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "19618" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042f" + LOCALE_ILANGUAGE "042F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/msb.nls b/dlls/kernel32/nls/msb.nls index 0e232cfcb04..93c469c7d33 100644 --- a/dlls/kernel32/nls/msb.nls +++ b/dlls/kernel32/nls/msb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "673" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "083e" + LOCALE_IDEFAULTLANGUAGE "083E" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "37" LOCALE_IINTLCURRDIGITS "0" - LOCALE_ILANGUAGE "083e" + LOCALE_ILANGUAGE "083E" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/msl.nls b/dlls/kernel32/nls/msl.nls index 1df52003c28..e77e1ba09ce 100644 --- a/dlls/kernel32/nls/msl.nls +++ b/dlls/kernel32/nls/msl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "60" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "043e" + LOCALE_IDEFAULTLANGUAGE "043E" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "167" LOCALE_IINTLCURRDIGITS "0" - LOCALE_ILANGUAGE "043e" + LOCALE_ILANGUAGE "043E" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls index b29f0bc3a1a..0dc5e889ca0 100644 --- a/dlls/kernel32/nls/nls.nls +++ b/dlls/kernel32/nls/nls.nls @@ -48,7 +48,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "181" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c13" + LOCALE_ILANGUAGE "0C13" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/san.nls b/dlls/kernel32/nls/san.nls index 4f44f3e3d9b..0c7a8fdc2d7 100644 --- a/dlls/kernel32/nls/san.nls +++ b/dlls/kernel32/nls/san.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044f" + LOCALE_IDEFAULTLANGUAGE "044F" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044f" + LOCALE_ILANGUAGE "044F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls index 29647b2b1b4..2bfe4bd868d 100644 --- a/dlls/kernel32/nls/sky.nls +++ b/dlls/kernel32/nls/sky.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "421" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "041b" + LOCALE_IDEFAULTLANGUAGE "041B" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "143" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041b" + LOCALE_ILANGUAGE "041B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/sqi.nls b/dlls/kernel32/nls/sqi.nls index 6f4048230ea..eb449821784 100644 --- a/dlls/kernel32/nls/sqi.nls +++ b/dlls/kernel32/nls/sqi.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "355" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "041c" + LOCALE_IDEFAULTLANGUAGE "041C" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "6" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041c" + LOCALE_ILANGUAGE "041C" LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index eb500cf0fd8..108f70b4697 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_IDEFAULTCODEPAGE "855" LOCALE_IDEFAULTCOUNTRY "381" LOCALE_IDEFAULTEBCDICCODEPAGE "21025" - LOCALE_IDEFAULTLANGUAGE "0c1a" + LOCALE_IDEFAULTLANGUAGE "0C1A" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "271" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c1a" + LOCALE_ILANGUAGE "0C1A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 516bb512aae..aa287d5c0d9 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "381" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "081a" + LOCALE_IDEFAULTLANGUAGE "081A" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "271" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "081a" + LOCALE_ILANGUAGE "081A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/srm.nls b/dlls/kernel32/nls/srm.nls index f4b1169943a..593cc61dc14 100644 --- a/dlls/kernel32/nls/srm.nls +++ b/dlls/kernel32/nls/srm.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "381" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "241a" + LOCALE_IDEFAULTLANGUAGE "241A" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "271" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "241a" + LOCALE_ILANGUAGE "241A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/sve.nls b/dlls/kernel32/nls/sve.nls index 6c8db124a6e..db3f05b7809 100644 --- a/dlls/kernel32/nls/sve.nls +++ b/dlls/kernel32/nls/sve.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "46" LOCALE_IDEFAULTEBCDICCODEPAGE "20278" - LOCALE_IDEFAULTLANGUAGE "041d" + LOCALE_IDEFAULTLANGUAGE "041D" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "221" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041d" + LOCALE_ILANGUAGE "041D" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/svf.nls b/dlls/kernel32/nls/svf.nls index 59982e8a39b..d0f63d0cb93 100644 --- a/dlls/kernel32/nls/svf.nls +++ b/dlls/kernel32/nls/svf.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "358" LOCALE_IDEFAULTEBCDICCODEPAGE "20278" - LOCALE_IDEFAULTLANGUAGE "081d" + LOCALE_IDEFAULTLANGUAGE "081D" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "77" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "081d" + LOCALE_ILANGUAGE "081D" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/syr.nls b/dlls/kernel32/nls/syr.nls index 6f8aa766027..a140509ce73 100644 --- a/dlls/kernel32/nls/syr.nls +++ b/dlls/kernel32/nls/syr.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "963" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "045a" + LOCALE_IDEFAULTLANGUAGE "045A" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "222" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "045a" + LOCALE_ILANGUAGE "045A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/tel.nls b/dlls/kernel32/nls/tel.nls index 37586776ea7..206e89b8ece 100644 --- a/dlls/kernel32/nls/tel.nls +++ b/dlls/kernel32/nls/tel.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044a" + LOCALE_IDEFAULTLANGUAGE "044A" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044a" + LOCALE_ILANGUAGE "044A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 2097b3728da..39099c473e3 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "874" LOCALE_IDEFAULTCOUNTRY "66" LOCALE_IDEFAULTEBCDICCODEPAGE "20838" - LOCALE_IDEFAULTLANGUAGE "041e" + LOCALE_IDEFAULTLANGUAGE "041E" LOCALE_IDEFAULTMACCODEPAGE "10021" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "227" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041e" + LOCALE_ILANGUAGE "041E" LOCALE_ILDATE "1" LOCALE_ILZERO "0" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls index 3954b4b63e4..343d2de06b6 100644 --- a/dlls/kernel32/nls/trk.nls +++ b/dlls/kernel32/nls/trk.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "857" LOCALE_IDEFAULTCOUNTRY "90" LOCALE_IDEFAULTEBCDICCODEPAGE "20905" - LOCALE_IDEFAULTLANGUAGE "041f" + LOCALE_IDEFAULTLANGUAGE "041F" LOCALE_IDEFAULTMACCODEPAGE "10081" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "235" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041f" + LOCALE_ILANGUAGE "041F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 17389243dc6..7697e481c1e 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1258" LOCALE_IDEFAULTCOUNTRY "84" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042a" + LOCALE_IDEFAULTLANGUAGE "042A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "251" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042a" + LOCALE_ILANGUAGE "042A" LOCALE_ILDATE "1" LOCALE_ILZERO "0" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index f6aca66bd1d..624c2d8990d 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_IDEFAULTCODEPAGE "950" LOCALE_IDEFAULTCOUNTRY "852" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "0c04" + LOCALE_IDEFAULTLANGUAGE "0C04" LOCALE_IDEFAULTMACCODEPAGE "10002" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "104" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c04" + LOCALE_ILANGUAGE "0C04" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" -- 2.30.2

1 0

[PATCH] msdasql/tests: Fix the spelling of the command_text variable.
by Francois Gouget 07 Dec '21

07 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msdasql/tests/provider.c | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b520b127d67..dfe3e3af886 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -187,7 +187,7 @@ static void test_command_interfaces(IUnknown *cmd) { HRESULT hr; ICommandProperties *commandProp; - ICommandText *comand_text; + ICommandText *command_text; IConvertType *convertype; ICommandPrepare *commandprepare; ICommandStream *commandstream; @@ -204,9 +204,9 @@ static void test_command_interfaces(IUnknown *cmd) ok(hr == S_OK, "got 0x%08x\n", hr); ICommandWithParameters_Release(cmdwithparams); - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -238,70 +238,70 @@ static void test_command_interfaces(IUnknown *cmd) static void test_command_text(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; OLECHAR *str; GUID dialect; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); if (0) { /* Crashes under windows */ - hr = ICommandText_SetCommandText(comand_text, NULL, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, NULL, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, NULL); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, NULL, &str); + hr = ICommandText_GetCommandText(command_text, NULL, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); /* dialect empty value */ - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); dialect = DBGUID_DEFAULT; - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_command_dbsession(IUnknown *cmd, IUnknown *session) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *sess; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetDBSession(comand_text, &IID_IUnknown, &sess); + hr = ICommandText_GetDBSession(command_text, &IID_IUnknown, &sess); ok(hr == S_OK, "got 0x%08x\n", hr); ok(session == sess, "different session pointers\n"); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) @@ -353,33 +353,33 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; DBROWCOUNT affected; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(unk == NULL, "Unexepcted value\n"); + todo_wine ok(unk == NULL, "Unexpected value\n"); todo_wine ok(affected == -1, "got %ld\n", affected); if (unk) IUnknown_Release(unk); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(unk != NULL, "Unexepcted value\n"); + ok(unk != NULL, "Unexpected value\n"); if (hr == S_OK) { ok(affected == -1, "wrong affected value\n"); @@ -387,13 +387,13 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); - test_rowset_interfaces(rowset, comand_text); + test_rowset_interfaces(rowset, command_text); IRowset_Release(rowset); IUnknown_Release(unk); } - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } -- 2.30.2

1 0

[PATCH] win32u: Fix the trailing linefeed in a TRACE().
by Francois Gouget 07 Dec '21

07 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2072597a968..56523210bdf 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1291,7 +1291,7 @@ static BOOL update_display_cache(void) .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, }; - TRACE( "adding default fake monitor\n "); + TRACE( "adding default fake monitor\n"); add_monitor( &default_monitor, &ctx ); } release_display_manager_ctx( &ctx ); -- 2.30.2

1 0

[PATCH] msvcp120/tests: Compare thread IDs in test_thrd, not thread handles
by Alex Henrie 07 Dec '21

07 Dec '21

Fixes an intermittent testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 495ee9dd6fb..3241e577b88 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2093,8 +2093,8 @@ static void test_thrd(void) tb = p__Thrd_current(); ok(ta.id == tb.id, "got a %d b %d\n", ta.id, tb.id); ok(ta.id == GetCurrentThreadId(), "expected %d, got %d\n", GetCurrentThreadId(), ta.id); - /* these can be different if new threads are created at same time */ - ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); + /* the handles can be different if new threads are created at same time, but the IDs are always the same */ + ok(GetThreadId(ta.hnd) == GetThreadId(tb.hnd), "got a %d b %d\n", GetThreadId(ta.hnd), GetThreadId(tb.hnd)); ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd); -- 2.34.1

2 1

[PATCH 1/4] server: Split waitable object off completion port.
by Paul Gofman 07 Dec '21

07 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/completion.c | 118 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 24 deletions(-) diff --git a/server/completion.c b/server/completion.c index 6933195e72d..8dd8d4b1247 100644 --- a/server/completion.c +++ b/server/completion.c @@ -56,15 +56,50 @@ struct type_descr completion_type = }, }; -struct completion +struct completion_wait { struct object obj; struct list queue; unsigned int depth; }; +struct completion +{ + struct object obj; + struct completion_wait *wait; +}; + +static void completion_wait_dump( struct object*, int ); +static int completion_wait_signaled( struct object *obj, struct wait_queue_entry *entry ); +static void completion_wait_destroy( struct object * ); + +static const struct object_ops completion_wait_ops = +{ + sizeof(struct completion_wait), /* size */ + &no_type, /* type */ + completion_wait_dump, /* dump */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + completion_wait_signaled, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + completion_wait_destroy /* destroy */ +}; + static void completion_dump( struct object*, int ); -static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ); +static int completion_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static void completion_remove_queue( struct object *obj, struct wait_queue_entry *entry ); static void completion_destroy( struct object * ); static const struct object_ops completion_ops = @@ -72,9 +107,9 @@ static const struct object_ops completion_ops = sizeof(struct completion), /* size */ &completion_type, /* type */ completion_dump, /* dump */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - completion_signaled, /* signaled */ + completion_add_queue, /* add_queue */ + completion_remove_queue, /* remove_queue */ + NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ @@ -100,30 +135,63 @@ struct comp_msg unsigned int status; }; -static void completion_destroy( struct object *obj) +static void completion_wait_destroy( struct object *obj) { - struct completion *completion = (struct completion *) obj; + struct completion_wait *wait = (struct completion_wait *)obj; struct comp_msg *tmp, *next; - LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &completion->queue, struct comp_msg, queue_entry ) + LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &wait->queue, struct comp_msg, queue_entry ) { free( tmp ); } } +static void completion_wait_dump( struct object *obj, int verbose ) +{ + struct completion_wait *wait = (struct completion_wait *)obj; + + assert( obj->ops == &completion_wait_ops ); + fprintf( stderr, "Completion depth=%u\n", wait->depth ); +} + +static int completion_wait_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion_wait *wait = (struct completion_wait *)obj; + + assert( obj->ops == &completion_wait_ops ); + return !list_empty( &wait->queue ); +} + static void completion_dump( struct object *obj, int verbose ) { - struct completion *completion = (struct completion *) obj; + struct completion *completion = (struct completion *)obj; + + assert( obj->ops == &completion_ops ); + completion->wait->obj.ops->dump( &completion->wait->obj, verbose ); +} + +static int completion_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion *completion = (struct completion *)obj; + + assert( obj->ops == &completion_ops ); + return completion->wait->obj.ops->add_queue( &completion->wait->obj, entry ); +} + +static void completion_remove_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion *completion = (struct completion *)obj; assert( obj->ops == &completion_ops ); - fprintf( stderr, "Completion depth=%u\n", completion->depth ); + completion->wait->obj.ops->remove_queue( &completion->wait->obj, entry ); } -static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ) +static void completion_destroy( struct object *obj ) { struct completion *completion = (struct completion *)obj; - return !list_empty( &completion->queue ); + assert( obj->ops == &completion_ops ); + release_object( &completion->wait->obj ); } static struct completion *create_completion( struct object *root, const struct unicode_str *name, @@ -132,15 +200,17 @@ static struct completion *create_completion( struct object *root, const struct u { struct completion *completion; - if ((completion = create_named_object( root, &completion_ops, name, attr, sd ))) + if (!(completion = create_named_object( root, &completion_ops, name, attr, sd ))) return NULL; + if (get_error() == STATUS_OBJECT_NAME_EXISTS) return completion; + if (!(completion->wait = alloc_object( &completion_wait_ops ))) { - if (get_error() != STATUS_OBJECT_NAME_EXISTS) - { - list_init( &completion->queue ); - completion->depth = 0; - } + release_object( completion ); + set_error( STATUS_NO_MEMORY ); + return NULL; } + list_init( &completion->wait->queue ); + completion->wait->depth = 0; return completion; } @@ -162,9 +232,9 @@ void add_completion( struct completion *completion, apc_param_t ckey, apc_param_ msg->status = status; msg->information = information; - list_add_tail( &completion->queue, &msg->queue_entry ); - completion->depth++; - wake_up( &completion->obj, 1 ); + list_add_tail( &completion->wait->queue, &msg->queue_entry ); + completion->wait->depth++; + wake_up( &completion->wait->obj, 1 ); } /* create a completion */ @@ -218,13 +288,13 @@ DECL_HANDLER(remove_completion) if (!completion) return; - entry = list_head( &completion->queue ); + entry = list_head( &completion->wait->queue ); if (!entry) set_error( STATUS_PENDING ); else { list_remove( entry ); - completion->depth--; + completion->wait->depth--; msg = LIST_ENTRY( entry, struct comp_msg, queue_entry ); reply->ckey = msg->ckey; reply->cvalue = msg->cvalue; @@ -243,7 +313,7 @@ DECL_HANDLER(query_completion) if (!completion) return; - reply->depth = completion->depth; + reply->depth = completion->wait->depth; release_object( completion ); } -- 2.33.1

1 3

[PATCH 1/9] gdi32/tests: Test deleting the bitmap used for pattern brush creation.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Test that the bitmap for pattern brush creation can be deleted after CreatePatternBrush() and the created brush will still function normally. However, the bitmap object can not be retrieved from LOGBRUSH.lbHatch if the bitmap is deleted. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/brush.c | 67 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index f04ee22ab6d..0841eb2f2e1 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -120,9 +120,14 @@ static void test_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; BITMAPINFO *info = (BITMAPINFO *)buffer; - HBRUSH brush; - HBITMAP bitmap; + HBITMAP bitmap, bitmap2, old_bitmap; + HBRUSH brush, brush2; + HDC hdc, hdc_screen; + COLORREF color; + BOOL result; LOGBRUSH br; + BITMAP bm; + RECT rect; INT ret; void *bits; DIBSECTION dib; @@ -269,6 +274,64 @@ static void test_pattern_brush(void) ok( !brush, "CreatePatternBrush succeeded\n" ); GlobalFree( mem ); + + /* Test deleting bitmap after brush creation */ + /* Create hdc and bitmaps */ + hdc_screen = GetDC( NULL ); + hdc = CreateCompatibleDC( hdc_screen ); + bitmap = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + bitmap2 = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + + /* Fill the first bitmap with 0xff5511 */ + old_bitmap = SelectObject( hdc, bitmap ); + SetRect( &rect, 0, 0, 16, 16 ); + brush = CreateSolidBrush( 0xff5511 ); + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + DeleteObject( brush ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + + /* Create a pattern brush with the first bitmap filled with 0xff5511 */ + brush = CreatePatternBrush( bitmap ); + ok( brush != NULL, "CreatePatternBrush failed, error %u.\n", GetLastError() ); + + /* Delete the first bitmap used for pattern brush creation */ + SelectObject( hdc, bitmap2 ); + DeleteObject( bitmap ); + + memset( &br, 0, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + + /* The first bitmap is now invalid */ + memset( &bm, 0, sizeof (bm)); + ret = GetObjectW( bitmap, sizeof(bm), &bm ); + ok( !ret, "wrong size %u\n", ret ); + + /* Fill hdc with 0xabcdef */ + brush2 = CreateSolidBrush( 0xabcdef ); + result = FillRect( hdc, &rect, brush2 ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xabcdef, "Expected color %#x, got %#x.\n", 0xabcdef, color ); + DeleteObject( brush2 ); + + /* Fill hdc with the brush created with the deleted bitmap */ + /* FillRect() succeeds and hdc is filled with the deleted bitmap content */ + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + DeleteObject( brush ); + + SelectObject( hdc, old_bitmap ); + DeleteObject( bitmap2 ); + DeleteDC( hdc ); + ReleaseDC( NULL, hdc_screen ); } static void test_palette_brush(void) -- 2.32.0

2 1

[PATCH 1/4] user32/tests: Fix cursor state test failures for win10.
by Ziqing Hui 07 Dec '21

07 Dec '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/user32/tests/cursoricon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 33ca2e3cb63..267aff70fb5 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2505,7 +2505,7 @@ static void test_ShowCursor(void) memset( &info, 0, sizeof(info) ); info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } event_start = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2529,7 +2529,7 @@ static void test_ShowCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global show count is not affected since we don't have a window */ - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } parent_id = 0; @@ -2582,7 +2582,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } count = ShowCursor( TRUE ); @@ -2594,7 +2594,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } } -- 2.25.1

1 3

[PATCH v2] win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Huw Davies 07 Dec '21

07 Dec '21

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Houkago Cinderella verifies that otmpFamilyName matches the desired font name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52176 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/win32u/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index fca3ed0fc76..3fa90ebc0f8 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1799,17 +1799,17 @@ static struct gdi_font_face *find_best_matching_face( const struct gdi_font_fami static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR *subst, const LOGFONTW *lf, FONTSIGNATURE fs, - BOOL can_use_bitmap ) + BOOL can_use_bitmap, const WCHAR **orig_name ) { struct gdi_font_family *family; struct gdi_font_face *face; family = find_family_from_any_name( name ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; if (subst) { family = find_family_from_any_name( subst ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; } /* search by full face name */ @@ -1824,6 +1824,11 @@ static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, cons if ((face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; } return NULL; + +found: + if (orig_name && family != face->family) + *orig_name = family->family_name; + return face; } static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, @@ -1863,7 +1868,7 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs } static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *csi, BOOL can_use_bitmap, - BOOL *substituted ) + BOOL *substituted, const WCHAR **orig_name ) { BOOL want_vertical = (lf->lfFaceName[0] == '@'); struct gdi_font_face *face; @@ -1888,7 +1893,7 @@ static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *substituted = TRUE; } - if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap ))) + if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap, orig_name ))) return face; } *substituted = FALSE; /* substitution is no longer relevant */ @@ -2460,7 +2465,7 @@ static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) struct gdi_font *child; struct gdi_font_face *face; - if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE ))) return; + if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE, NULL ))) return; if (!(child = create_gdi_font( face, family_name, &font->lf ))) return; child->matrix = font->matrix; @@ -4077,6 +4082,7 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit struct gdi_font_face *face; INT height; CHARSETINFO csi; + const WCHAR *orig_name = NULL; BOOL substituted = FALSE; static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; @@ -4093,14 +4099,14 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit TRACE( "returning cached gdiFont(%p)\n", font ); return font; } - if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted ))) + if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted, &orig_name ))) { FIXME( "can't find a single appropriate font - bailing\n" ); return NULL; } height = lf->lfHeight; - font = create_gdi_font( face, NULL, lf ); + font = create_gdi_font( face, orig_name, lf ); font->use_logfont_name = substituted; font->matrix = dcmat; font->can_use_bitmap = can_use_bitmap; -- 2.23.0

1 0

[PATCH 9/9] comctl32/propsheet: Return a pattern brush when handling WM_CTLCOLORSTATIC for theming.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Fix a regression from 2f1bbd8 that makes the static control for DPI sample text in winecfg not refreshing its background when moving the DPI slider. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 11 ++++++++++- dlls/comctl32/tests/propsheet.c | 11 +---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c9b42e6ed7..9309250f65a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1309,10 +1309,19 @@ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM if (lr) return lr; + brush = get_propsheet_background_brush(hwnd); + if (!brush) + break; + hdc = (HDC)wp; SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); SetBkMode(hdc, TRANSPARENT); - return (LRESULT)GetStockObject(NULL_BRUSH); + + org.x = 0; + org.y = 0; + MapWindowPoints((HWND)lp, hwnd, &org, 1); + SetBrushOrgEx(hdc, -org.x, -org.y, NULL); + return (LRESULT)brush; } } diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0b012df1cca..6cc29a8b6f1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1293,7 +1293,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is changed after WM_CTLCOLORSTATIC */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - todo_wine ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ @@ -1302,7 +1301,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - todo_wine_if(is_theme_active) ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); ok(hbrush2 != hbrush, "Expected a different brush.\n"); @@ -1311,13 +1309,11 @@ static void test_WM_CTLCOLORSTATIC(void) count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, log_brush.lbStyle); memset(&bmp, 0, sizeof(bmp)); count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); @@ -1340,9 +1336,7 @@ static void test_WM_CTLCOLORSTATIC(void) size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); @@ -1415,13 +1409,11 @@ static void test_WM_CTLCOLORSTATIC(void) SetLastError(0xdeadbeef); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); error = GetLastError(); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); todo_wine ok(error == ERROR_INVALID_PARAMETER, "Expected error %u, got %u.\n", ERROR_INVALID_PARAMETER, error); ret = DeleteObject(hbrush); - todo_wine ok(!ret, "DeleteObject succeeded.\n"); /* Should still report the same brush handle after the brush handle was freed */ @@ -1432,10 +1424,8 @@ static void test_WM_CTLCOLORSTATIC(void) hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); SendMessageW(sheethwnd, WM_THEMECHANGED, 0, 0); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(is_theme_active) ok(hbrush2 != hbrush, "Expected a different brush.\n"); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); } else @@ -1443,6 +1433,7 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is at (0,0) */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + todo_wine_if(is_theme_active) ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); todo_wine_if(is_theme_active) -- 2.32.0

1 0

[PATCH 8/9] uxtheme: Do not hook DefDlgProc() for theming.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Currently there is no need to hook DefDlgProc(). Tests show that dialog theming shouldn't be implemented in DefDlgProc(). Also fix a double free bug because WM_DESTROY in UXTHEME_DefDlgProc() calls CloseThemeData() even when the theme handle is not opened when handling WM_CREATE in UXTHEME_DefDlgProc(). The bug can be demonstrated by running comctl32/tests/propsheet.c tests with Light theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 9 ++--- dlls/comctl32/tests/static.c | 5 +-- dlls/user32/defdlg.c | 34 +++++-------------- dlls/user32/hook.c | 1 - dlls/user32/user_private.h | 1 - dlls/uxtheme/Makefile.in | 1 - dlls/uxtheme/dialog.c | 59 --------------------------------- dlls/uxtheme/system.c | 1 - dlls/uxtheme/uxthemedll.h | 1 - include/winuser.h | 1 - 10 files changed, 11 insertions(+), 102 deletions(-) delete mode 100644 dlls/uxtheme/dialog.c diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 199b280879e..0b012df1cca 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1320,9 +1320,7 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(hdlg) != NULL) ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(pGetWindowTheme(sheethwnd) == NULL, "Expected NULL theme handle.\n"); memset(&cls, 0, sizeof(cls)); @@ -1336,18 +1334,15 @@ static void test_WM_CTLCOLORSTATIC(void) hwnd = CreateWindowA("TestClass", "test", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, 0, 0, NULL); ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); theme = pOpenThemeData(hwnd, L"Tab"); - /* Light theme triggers a double free bug in uxtheme */ - todo_wine_if(!theme) ok(theme != NULL, "OpenThemeData failed.\n"); size.cx = 0; size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); - todo_wine_if(!theme) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine_if(theme) + todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(theme) + todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b507cf1e02b..529396b3f0d 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -408,11 +408,11 @@ static void test_WM_CTLCOLORSTATIC(void) HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; - BOOL ret, todo = FALSE; int mode, old_mode; HBRUSH brush; HRESULT hr; POINT org; + BOOL ret; struct { @@ -434,8 +434,6 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - todo = !!pGetWindowTheme(dialog); - dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); @@ -447,7 +445,6 @@ static void test_WM_CTLCOLORSTATIC(void) ret = pIsThemeDialogTextureEnabled(dialog); ok(ret, "Expected theme dialog texture supported.\n"); - todo_wine_if(todo) ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 4f44a93cd49..81c7cb0f207 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -354,7 +354,10 @@ out: return dlgInfo; } -static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcA (USER32.@) + */ +LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -408,7 +411,10 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } -static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcW (USER32.@) + */ +LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -461,27 +467,3 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } - -LRESULT WINAPI USER_DefDlgProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - if (unicode) - return USER_DefDlgProcW( hwnd, msg, wParam, lParam ); - else - return USER_DefDlgProcA( hwnd, msg, wParam, lParam ); -} - -/*********************************************************************** - * DefDlgProcA (USER32.@) - */ -LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * DefDlgProcW (USER32.@) - */ -LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, TRUE ); -} diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f5b4c6ab8a1..159797020f2 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -83,7 +83,6 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { - USER_DefDlgProc, USER_ScrollBarDraw, USER_ScrollBarProc, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c2152900a9b..96704ac68ae 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -302,7 +302,6 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #endif extern struct user_api_hook *user_api DECLSPEC_HIDDEN; -LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 933650f4261..01751d3243a 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = msimg32 C_SRCS = \ buffer.c \ - dialog.c \ draw.c \ main.c \ metric.c \ diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c deleted file mode 100644 index 776f54e1d31..00000000000 --- a/dlls/uxtheme/dialog.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Theming - Dialogs - * - * Copyright (c) 2005 by Frank Richter - * - * 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 - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "uxthemedll.h" -#include "vssym32.h" -#include "wine/debug.h" - -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) -{ - HTHEME theme = GetWindowTheme ( hWnd ); - static const WCHAR themeClass[] = L"Window"; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - theme = OpenThemeData( hWnd, themeClass ); - return result; - - case WM_DESTROY: - CloseThemeData ( theme ); - SetWindowTheme( hWnd, NULL, NULL ); - OpenThemeData( hWnd, NULL ); - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - default: - /* Call old proc */ - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 0; -} diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 37c484387ec..61a608e5962 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1245,7 +1245,6 @@ BOOL WINAPI ThemeHooksInstall(void) { struct user_api_hook hooks; - hooks.pDefDlgProc = UXTHEME_DefDlgProc; hooks.pScrollBarDraw = UXTHEME_ScrollBarDraw; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67130774392..c43ad703884 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -106,7 +106,6 @@ extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..1d37bd44344 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4435,7 +4435,6 @@ struct SCROLL_TRACKING_INFO struct user_api_hook { - LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL); -- 2.32.0

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2021