April 2019 - Wine-devel - list.winehq.org

[PATCH v2 1/2] kernel32: Add Asturian locale
by Alex Henrie 20 Apr '19

20 Apr '19

From: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ast.nls | 170 +++++++++++++++++++++++++++++++++++++ include/winnt.rh | 1 + tools/wrc/utils.c | 1 + 4 files changed, 174 insertions(+) create mode 100644 dlls/kernel32/nls/ast.nls diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 3f9cfd46d4..14d300634c 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -246,6 +246,8 @@ /* Wine extensions */ +#include "nls/ast.nls" /* 0x04a5 LANG_ASTURIAN, SUBLANG_DEFAULT */ + #include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ #include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls new file mode 100644 index 0000000000..90acba06af --- /dev/null +++ b/dlls/kernel32/nls/ast.nls @@ -0,0 +1,170 @@ +/* + * Locale definitions for Asturian + * + * Copyright 2019 Enol Puente for Softastur + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "34" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "34" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "04a5" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ESP" + LOCALE_SABBREVDAYNAME1 "Llu" + LOCALE_SABBREVDAYNAME2 "Mar" + LOCALE_SABBREVDAYNAME3 "Mie" + LOCALE_SABBREVDAYNAME4 "Xue" + LOCALE_SABBREVDAYNAME5 "Vie" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" + LOCALE_SABBREVLANGNAME "AST" + LOCALE_SABBREVMONTHNAME1 "Xin" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Abr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Xun" + LOCALE_SABBREVMONTHNAME7 "Xnt" + LOCALE_SABBREVMONTHNAME8 "Ago" + LOCALE_SABBREVMONTHNAME9 "Set" + LOCALE_SABBREVMONTHNAME10 "Och" + LOCALE_SABBREVMONTHNAME11 "Pay" + LOCALE_SABBREVMONTHNAME12 "Avi" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Spain" + LOCALE_SCURRENCY "€" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Llunes" + LOCALE_SDAYNAME2 "Martes" + LOCALE_SDAYNAME3 "Miércoles" + LOCALE_SDAYNAME4 "Xueves" + LOCALE_SDAYNAME5 "Vienres" + LOCALE_SDAYNAME6 "Sábadu" + LOCALE_SDAYNAME7 "Domingu" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Spain" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Asturian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "ES" + LOCALE_SISO639LANGNAME "ast" + LOCALE_SLANGUAGE "Asturian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Xineru" + LOCALE_SMONTHNAME2 "Febreru" + LOCALE_SMONTHNAME3 "Marzu" + LOCALE_SMONTHNAME4 "Abril" + LOCALE_SMONTHNAME5 "Mayu" + LOCALE_SMONTHNAME6 "Xunu" + LOCALE_SMONTHNAME7 "Xunetu" + LOCALE_SMONTHNAME8 "Agostu" + LOCALE_SMONTHNAME9 "Setiembre" + LOCALE_SMONTHNAME10 "Ochobre" + LOCALE_SMONTHNAME11 "Payares" + LOCALE_SMONTHNAME12 "Avientu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "ast-ES" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "España" + LOCALE_SNATIVECURRNAME "Euru" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Asturianu" + LOCALE_SNATIVELANGNAME "Asturianu" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "AST " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "ast" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "Ll" + LOCALE_SSHORTESTDAYNAME2 "Ma" + LOCALE_SSHORTESTDAYNAME3 "Mi" + LOCALE_SSHORTESTDAYNAME4 "Xu" + LOCALE_SSHORTESTDAYNAME5 "Vi" + LOCALE_SSHORTESTDAYNAME6 "Sá" + LOCALE_SSHORTESTDAYNAME7 "Do" + LOCALE_SSHORTTIME "HH:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM' / 'yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5533a531f1..a1e07b85b2 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -457,6 +457,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 }, -- 2.21.0

2 3

[PATCH 2/2] user32: Fix edit control margins in CJK font case.
by Akihiro Sagawa 20 Apr '19

20 Apr '19

This patch is the last part of CJK margin updates. After mergining, I'll reflect recent changes to comctl32. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 37 +++++++++++++++++++++++++------------ dlls/user32/tests/edit.c | 4 ---- 2 files changed, 25 insertions(+), 16 deletions(-)

2 1

[PATCH 1/2] user32/tests: Add more margin tests in CJK font case.
by Akihiro Sagawa 20 Apr '19

20 Apr '19

In WM_SETFONT with a combination of CJK font and non-CJK charset, Unicode version control uses ABC width for margins, while ANSI version one uses EC_USEFONTINFO width for margins. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)

2 1

[PATCH 1/2] kernel32: Add Asturian locale
by Alex Henrie 20 Apr '19

20 Apr '19

From: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ast.nls | 170 +++++++++++++++++++++++++++++++++++++ include/winnt.rh | 1 + 3 files changed, 173 insertions(+) create mode 100644 dlls/kernel32/nls/ast.nls diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 3f9cfd46d4..14d300634c 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -246,6 +246,8 @@ /* Wine extensions */ +#include "nls/ast.nls" /* 0x04a5 LANG_ASTURIAN, SUBLANG_DEFAULT */ + #include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ #include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls new file mode 100644 index 0000000000..90acba06af --- /dev/null +++ b/dlls/kernel32/nls/ast.nls @@ -0,0 +1,170 @@ +/* + * Locale definitions for Asturian + * + * Copyright 2019 Enol Puente for Softastur + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "34" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "34" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "04a5" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ESP" + LOCALE_SABBREVDAYNAME1 "Llu" + LOCALE_SABBREVDAYNAME2 "Mar" + LOCALE_SABBREVDAYNAME3 "Mie" + LOCALE_SABBREVDAYNAME4 "Xue" + LOCALE_SABBREVDAYNAME5 "Vie" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" + LOCALE_SABBREVLANGNAME "AST" + LOCALE_SABBREVMONTHNAME1 "Xin" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Abr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Xun" + LOCALE_SABBREVMONTHNAME7 "Xnt" + LOCALE_SABBREVMONTHNAME8 "Ago" + LOCALE_SABBREVMONTHNAME9 "Set" + LOCALE_SABBREVMONTHNAME10 "Och" + LOCALE_SABBREVMONTHNAME11 "Pay" + LOCALE_SABBREVMONTHNAME12 "Avi" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Spain" + LOCALE_SCURRENCY "€" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Llunes" + LOCALE_SDAYNAME2 "Martes" + LOCALE_SDAYNAME3 "Miércoles" + LOCALE_SDAYNAME4 "Xueves" + LOCALE_SDAYNAME5 "Vienres" + LOCALE_SDAYNAME6 "Sábadu" + LOCALE_SDAYNAME7 "Domingu" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Spain" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Asturian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "ES" + LOCALE_SISO639LANGNAME "ast" + LOCALE_SLANGUAGE "Asturian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Xineru" + LOCALE_SMONTHNAME2 "Febreru" + LOCALE_SMONTHNAME3 "Marzu" + LOCALE_SMONTHNAME4 "Abril" + LOCALE_SMONTHNAME5 "Mayu" + LOCALE_SMONTHNAME6 "Xunu" + LOCALE_SMONTHNAME7 "Xunetu" + LOCALE_SMONTHNAME8 "Agostu" + LOCALE_SMONTHNAME9 "Setiembre" + LOCALE_SMONTHNAME10 "Ochobre" + LOCALE_SMONTHNAME11 "Payares" + LOCALE_SMONTHNAME12 "Avientu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "ast-ES" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "España" + LOCALE_SNATIVECURRNAME "Euru" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Asturianu" + LOCALE_SNATIVELANGNAME "Asturianu" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "AST " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "ast" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "Ll" + LOCALE_SSHORTESTDAYNAME2 "Ma" + LOCALE_SSHORTESTDAYNAME3 "Mi" + LOCALE_SSHORTESTDAYNAME4 "Xu" + LOCALE_SSHORTESTDAYNAME5 "Vi" + LOCALE_SSHORTESTDAYNAME6 "Sá" + LOCALE_SSHORTESTDAYNAME7 "Do" + LOCALE_SSHORTTIME "HH:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM' / 'yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 -- 2.21.0

2 3

[PATCH] regedit: Use an I-beam cursor in the hex edit dialog.
by Zebediah Figura 20 Apr '19

20 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/regedit/hexedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 951779bf24..7322a86e1f 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -643,7 +643,7 @@ void HexEdit_Register(void) wndClass.lpfnWndProc = HexEdit_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(HEXEDIT_INFO *); - wndClass.hCursor = NULL; + wndClass.hCursor = LoadCursorW(0, (const WCHAR *)IDC_IBEAM); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = szHexEditClass; -- 2.21.0

2 1

[PATCH] winex11: The correct way to search the target window for drag&drop operations.
by John Found 19 Apr '19

19 Apr '19

-- John Found <johnfound(a)asm32.info>

3 16

[PATCH] kernel32: Add implementation of CAL_SSHORTESTDAYNAME* and other flags
by Vijay Kiran Kamuju 19 Apr '19

19 Apr '19

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/time.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index c425eb8280..7807f99a6c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1068,6 +1068,13 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: case CAL_SYEARMONTH: + case CAL_SSHORTESTDAYNAME1: + case CAL_SSHORTESTDAYNAME2: + case CAL_SSHORTESTDAYNAME3: + case CAL_SSHORTESTDAYNAME4: + case CAL_SSHORTESTDAYNAME5: + case CAL_SSHORTESTDAYNAME6: + case CAL_SSHORTESTDAYNAME7: return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) @@ -1090,6 +1097,12 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; + case CAL_SMONTHDAY: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; + case CAL_SABBREVERASTRING: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; default: FIXME("Unknown caltype %d\n", calinfo); SetLastError(ERROR_INVALID_FLAGS); -- 2.21.0

1 0

[PATCH v3 1/2] jscript: stub Enumerator object
by Andreas Maier 19 Apr '19

19 Apr '19

Enumerator is an MS extension. Its needed to succeed VyChat219.msi installation. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/Makefile.in | 1 + dlls/jscript/enumerator.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 17 +++-- dlls/jscript/jscript.h | 3 + 4 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 dlls/jscript/enumerator.c diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 34ed193742..1cc58a5ed6 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ decode.c \ dispex.c \ engine.c \ + enumerator.c \ error.c \ function.c \ global.c \ diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c new file mode 100644 index 0000000000..aa7737ac52 --- /dev/null +++ b/dlls/jscript/enumerator.c @@ -0,0 +1,190 @@ +/* + * Copyright 2019 Andreas Maier + * + * 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 <assert.h> + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + jsdisp_t dispex; +} EnumeratorInstance; + +static const WCHAR atEndW[] = {'a','t','E','n','d',0}; +static const WCHAR itemW[] = {'i','t','e','m',0}; +static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; +static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; + +static void Enumerator_destructor(jsdisp_t *dispex) +{ + TRACE("Enumerator_destructor\n"); + + heap_free(dispex); +} + +HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_atEnd\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_item\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_moveFirst\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_moveNext\n"); + + return E_NOTIMPL; +} + +static const builtin_prop_t Enumerator_props[] = { + {atEndW, Enumerator_atEnd, PROPF_METHOD}, + {itemW, Enumerator_item, PROPF_METHOD}, + {moveFirstW, Enumerator_moveFirst, PROPF_METHOD}, + {moveNextW, Enumerator_moveNext, PROPF_METHOD}, +}; + +static const builtin_info_t Enumerator_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0}, + ARRAY_SIZE(Enumerator_props), + Enumerator_props, + NULL, + NULL +}; + +static const builtin_info_t EnumeratorInst_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0, NULL}, + 0, + NULL, + Enumerator_destructor, + NULL +}; + +static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsdisp_t *obj; + HRESULT hres; + + TRACE("EnumeratorConstr_value\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + if (argc != 1) + return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + + hres = create_enumerator(ctx, &argv[0], &obj); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(obj); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, EnumeratorInstance **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + enumerator = heap_alloc_zero(sizeof(EnumeratorInstance)); + if(!enumerator) + return E_OUTOFMEMORY; + + if(object_prototype) + hres = init_dispex(&enumerator->dispex, ctx, &Enumerator_info, object_prototype); + else + hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, + ctx->enumerator_constr); + + if(FAILED(hres)) { + heap_free(enumerator); + return hres; + } + + *ret = enumerator; + return S_OK; +} + +static const builtin_info_t EnumeratorConstr_info = { + JSCLASS_FUNCTION, + DEFAULT_FUNCTION_VALUE, + 0, + NULL, + NULL, + NULL +}; + +HRESULT create_enumerator_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; + + hres = alloc_enumerator(ctx, object_prototype, &enumerator); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, EnumeratorConstr_value, + EnumeratorW, &EnumeratorConstr_info, + PROPF_CONSTR|7, &enumerator->dispex, ret); + jsdisp_release(&enumerator->dispex); + + return hres; +} + +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + hres = alloc_enumerator(ctx, NULL, &enumerator); + if(FAILED(hres)) + return hres; + + *ret = &enumerator->dispex; + return S_OK; +} diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 33de641483..92b146c83a 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -113,13 +113,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -942,7 +935,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, @@ -1019,6 +1011,15 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = create_enumerator_constr(ctx, object_prototype, &ctx->enumerator_constr); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, EnumeratorW, PROPF_WRITABLE, + jsval_obj(ctx->enumerator_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2af5b598bd..baebcc4b6c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -326,6 +326,7 @@ HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_json(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) DECLSPEC_HIDDEN; typedef enum { NO_HINT, @@ -436,6 +437,7 @@ struct _script_ctx_t { jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; jsdisp_t *error_constr; jsdisp_t *eval_error_constr; jsdisp_t *range_error_constr; @@ -468,6 +470,7 @@ HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -- 2.11.0

2 3

[PATCH] ntdll: Reuse signal to trap translation for FreeBSD on ARM
by André Hentschel 19 Apr '19

19 Apr '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5db3c51301f..e01c8ce2193 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -148,7 +148,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si enum arm_trap_code trap = TRAP_sig(sigcontext); if (trap) return trap; - /* trap is 0 on arm64 kernel */ +#endif + switch (signal) { case SIGILL: @@ -158,11 +159,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si case SIGBUS: return TRAP_ARM_ALIGNFLT; default: - return trap; + return TRAP_ARM_UNKNOWN; } -#else - return TRAP_ARM_UNKNOWN; /* unknown trap code */ -#endif } /*********************************************************************** -- 2.17.1

1 0

[PATCH 5/5] wined3d: Don't bother allocating "free_timestamp_queries" in context_create().
by Henri Verbeet 19 Apr '19

19 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ab5d9c3ee97..f4179d7d206 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1896,12 +1896,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!(context = heap_alloc_zero(sizeof(*context)))) return NULL; - context->free_timestamp_query_size = 4; - if (!(context->free_timestamp_queries = heap_calloc(context->free_timestamp_query_size, - sizeof(*context->free_timestamp_queries)))) - goto out; list_init(&context->timestamp_queries); - list_init(&context->occlusion_queries); list_init(&context->fences); list_init(&context->so_statistics_queries); @@ -1982,7 +1977,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_timestamp_queries); heap_free(context); return NULL; } -- 2.11.0

1 0