January 2018 - Wine-Commits

Hugh Bellamy : gdiplus: Define GpHatchStyle.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: a37ea9543dc90ed2090bfe3509f134df1607e31c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37ea9543dc90ed2090bfe35… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Fri Sep 15 16:39:59 2017 +0100 gdiplus: Define GpHatchStyle. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c022c46613c137ab53185b5e7752aff14a085c4b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/brush.c | 6 +++--- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/tests/brush.c | 22 ++++++++++++++++++++++ include/gdiplusflat.h | 4 ++-- include/gdiplusgpstubs.h | 1 + 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a184276..9265ea6 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -227,7 +227,7 @@ static const char HatchBrushes[][8] = { { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ }; -GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) +GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) { @@ -241,7 +241,7 @@ GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); @@ -892,7 +892,7 @@ GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch *brush, ARGB *forecol) return Ok; } -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, HatchStyle *hatchstyle) +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, GpHatchStyle *hatchstyle) { TRACE("(%p, %p)\n", brush, hatchstyle); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 340e9bd..58689a7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -123,7 +123,7 @@ extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; extern void delete_element(region_element *element) DECLSPEC_HIDDEN; -extern GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; +extern GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; static inline INT gdip_round(REAL x) { @@ -258,7 +258,7 @@ struct GpBrush{ struct GpHatch{ GpBrush brush; - HatchStyle hatchstyle; + GpHatchStyle hatchstyle; ARGB forecol; ARGB backcol; }; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 0942e88..ca324c2 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1269,6 +1269,27 @@ static void test_pathgradientblend(void) expect(Ok, status); } +static void test_getHatchStyle(void) +{ + GpStatus status; + GpHatch *brush; + GpHatchStyle hatchStyle; + + GdipCreateHatchBrush(HatchStyleHorizontal, 11, 12, &brush); + + status = GdipGetHatchStyle(NULL, &hatchStyle); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, &hatchStyle); + expect(Ok, status); + expect(HatchStyleHorizontal, hatchStyle); + + GdipDeleteBrush((GpBrush *)brush); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1297,6 +1318,7 @@ START_TEST(brush) test_pathgradientcenterpoint(); test_pathgradientpresetblend(); test_pathgradientblend(); + test_getHatchStyle(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 101d73d..5cfdc59 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -385,10 +385,10 @@ GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL, GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL); /* HatchBrush */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**); +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle,ARGB,ARGB,GpHatch**); GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*); GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*); -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*); +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,GpHatchStyle*); /* Image */ GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 5a65cd8..67b6ac1 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -95,5 +95,6 @@ typedef FlushIntention GpFlushIntention; typedef CoordinateSpace GpCoordinateSpace; typedef PenAlignment GpPenAlignment; typedef PenType GpPenType; +typedef HatchStyle GpHatchStyle; #endif

1 0

Nikolay Sivov : kernel32/nls: Added Nepali locale data.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 852b0cbf07dec81c5486366feace20277b63f91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=852b0cbf07dec81c5486366f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:59:30 2017 +0300 kernel32/nls: Added Nepali locale data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 452c1ef66df73e178a26d317a99bea15aea72d53) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/nep.nls | 162 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 363e7ab..cddac46 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -232,6 +232,8 @@ #include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ +#include "nls/nep.nls" /* 0x0461 LANG_NEPALI, SUBLANG_NEPALI_NEPAL */ + #include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ #include "nls/brf.nls" /* 0x047e LANG_BRETON, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls new file mode 100644 index 0000000..3b13f8a --- /dev/null +++ b/dlls/kernel32/nls/nep.nls @@ -0,0 +1,162 @@ +/* + * Locale definitions for Nepali + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL +{ + LOCALE_FONTSIGNATURE L"\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "977" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "0" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "977" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0461" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0461" + LOCALE_ILDATE "0" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "9" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "0" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "पूर्वाह्न" + LOCALE_S2359 "अपराह्न" + LOCALE_SABBREVCTRYNAME "NPL" + LOCALE_SABBREVDAYNAME1 "सोम" + LOCALE_SABBREVDAYNAME2 "मङ्गल" + LOCALE_SABBREVDAYNAME3 "बुध" + LOCALE_SABBREVDAYNAME4 "बिही" + LOCALE_SABBREVDAYNAME5 "शुक्र" + LOCALE_SABBREVDAYNAME6 "शनि" + LOCALE_SABBREVDAYNAME7 "आइत" + LOCALE_SABBREVLANGNAME "NEP" + LOCALE_SABBREVMONTHNAME1 "जन" + LOCALE_SABBREVMONTHNAME2 "फेब" + LOCALE_SABBREVMONTHNAME3 "मार्च" + LOCALE_SABBREVMONTHNAME4 "अप्रिल" + LOCALE_SABBREVMONTHNAME5 "मे" + LOCALE_SABBREVMONTHNAME6 "जून" + LOCALE_SABBREVMONTHNAME7 "जुलाई" + LOCALE_SABBREVMONTHNAME8 "अग" + LOCALE_SABBREVMONTHNAME9 "सेप्ट" + LOCALE_SABBREVMONTHNAME10 "अक्ट" + LOCALE_SABBREVMONTHNAME11 "नोभ" + LOCALE_SABBREVMONTHNAME12 "डिस" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Nepal" + LOCALE_SCURRENCY "रु" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "सोमवार" + LOCALE_SDAYNAME2 "मङ्गलवार" + LOCALE_SDAYNAME3 "बुधवार" + LOCALE_SDAYNAME4 "बिहीवार" + LOCALE_SDAYNAME5 "शुक्रवार" + LOCALE_SDAYNAME6 "शनिवार" + LOCALE_SDAYNAME7 "आइतवार" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Nepal" + LOCALE_SENGCURRNAME "Nepalese Rupee" + LOCALE_SENGLANGUAGE "Nepali" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "NPR" + LOCALE_SISO3166CTRYNAME "NP" + LOCALE_SISO639LANGNAME "ne" + LOCALE_SLANGUAGE "Nepali (Nepal)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "जनवरी" + LOCALE_SMONTHNAME2 "फेब्रुअरी" + LOCALE_SMONTHNAME3 "मार्च" + LOCALE_SMONTHNAME4 "अप्रिल" + LOCALE_SMONTHNAME5 "मे" + LOCALE_SMONTHNAME6 "जून" + LOCALE_SMONTHNAME7 "जुलाई" + LOCALE_SMONTHNAME8 "अगस्त" + LOCALE_SMONTHNAME9 "सेप्टेम्बर" + LOCALE_SMONTHNAME10 "अक्टोबर" + LOCALE_SMONTHNAME11 "नोभेम्बर" + LOCALE_SMONTHNAME12 "डिसेम्बर" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "ne-NP" + LOCALE_SNATIVECTRYNAME "नेपाल" + LOCALE_SNATIVECURRNAME "रुपैयाँ" + LOCALE_SNATIVEDIGITS "०१२३४५६७८९" + LOCALE_SNATIVEDISPLAYNAME "नेपाली (नेपाल)" + LOCALE_SNATIVELANGNAME "नेपाली" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "NEP " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Deva;" + LOCALE_SSHORTDATE "M/d/yyyy" + LOCALE_SSHORTESTDAYNAME1 "सो" + LOCALE_SSHORTESTDAYNAME2 "म" + LOCALE_SSHORTESTDAYNAME3 "बु" + LOCALE_SSHORTESTDAYNAME4 "बि" + LOCALE_SSHORTESTDAYNAME5 "शु" + LOCALE_SSHORTESTDAYNAME6 "श" + LOCALE_SSHORTESTDAYNAME7 "आ" + LOCALE_SSHORTTIME "h:mm tt" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "h:mm:ss tt" + 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" +}

1 0

Nikolay Sivov : kernel32/nls: Added Bangla (India) locale data.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 35055014c06170fbd84b8817ca3e5a54b6836331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35055014c06170fbd84b8817… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 17:30:22 2017 +0300 kernel32/nls: Added Bangla (India) locale data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2f6e6605b494b2412f9e4363149fec704c04d4e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ben.nls | 162 +++++++++++++++++++++++++++++++++++++++++++++ include/winnt.rh | 3 + 3 files changed, 167 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index cddac46..37b20e3 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -208,6 +208,8 @@ #include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ +#include "nls/ben.nls" /* 0x0445 LANG_BANGLA, SUBLANG_BANGLA_INDIA */ + #include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ #include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls new file mode 100644 index 0000000..9dcfa70 --- /dev/null +++ b/dlls/kernel32/nls/ben.nls @@ -0,0 +1,162 @@ +/* + * Locale definitions for Bangla + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA +{ + LOCALE_FONTSIGNATURE L"\x0000\x0001\x0000\x0000\x0000\x0000\x0000\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0445" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0445" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "AM" + LOCALE_S2359 "PM" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "সোম." + LOCALE_SABBREVDAYNAME2 "মঙ্গল." + LOCALE_SABBREVDAYNAME3 "বুধ." + LOCALE_SABBREVDAYNAME4 "বৃহস্পতি." + LOCALE_SABBREVDAYNAME5 "শুক্র." + LOCALE_SABBREVDAYNAME6 "শনি." + LOCALE_SABBREVDAYNAME7 "রবি." + LOCALE_SABBREVLANGNAME "BNG" + LOCALE_SABBREVMONTHNAME1 "জানু." + LOCALE_SABBREVMONTHNAME2 "ফেব্রু." + LOCALE_SABBREVMONTHNAME3 "মার্চ" + LOCALE_SABBREVMONTHNAME4 "এপ্রিল" + LOCALE_SABBREVMONTHNAME5 "মে" + LOCALE_SABBREVMONTHNAME6 "জুন" + LOCALE_SABBREVMONTHNAME7 "জুলাই" + LOCALE_SABBREVMONTHNAME8 "আগ." + LOCALE_SABBREVMONTHNAME9 "সেপ্টে." + LOCALE_SABBREVMONTHNAME10 "অক্টো." + LOCALE_SABBREVMONTHNAME11 "নভে." + LOCALE_SABBREVMONTHNAME12 "ডিসে." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "₹" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "সোমবার" + LOCALE_SDAYNAME2 "মঙ্গলবার" + LOCALE_SDAYNAME3 "বুধবার" + LOCALE_SDAYNAME4 "বৃহস্পতিবার" + LOCALE_SDAYNAME5 "শুক্রবার" + LOCALE_SDAYNAME6 "শনিবার" + LOCALE_SDAYNAME7 "রবিবার" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Bangla" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "bn" + LOCALE_SLANGUAGE "Bangla (India)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "জানুয়ারী" + LOCALE_SMONTHNAME2 "ফেব্রুয়ারী" + LOCALE_SMONTHNAME3 "মার্চ" + LOCALE_SMONTHNAME4 "এপ্রিল" + LOCALE_SMONTHNAME5 "মে" + LOCALE_SMONTHNAME6 "জুন" + LOCALE_SMONTHNAME7 "জুলাই" + LOCALE_SMONTHNAME8 "আগস্ট" + LOCALE_SMONTHNAME9 "সেপ্টেম্বর" + LOCALE_SMONTHNAME10 "অক্টোবর" + LOCALE_SMONTHNAME11 "নভেম্বর" + LOCALE_SMONTHNAME12 "ডিসেম্বর" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "bn-IN" + LOCALE_SNATIVECTRYNAME "ভারত" + LOCALE_SNATIVECURRNAME "টাকা" + LOCALE_SNATIVEDIGITS "০১২৩৪৫৬৭৮৯" + LOCALE_SNATIVEDISPLAYNAME "বাংলা (ভারত)" + LOCALE_SNATIVELANGNAME "বাংলা" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "BEN " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Beng;" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSHORTESTDAYNAME1 "স" + LOCALE_SSHORTESTDAYNAME2 "ম" + LOCALE_SSHORTESTDAYNAME3 "বু" + LOCALE_SSHORTESTDAYNAME4 "বৃ" + LOCALE_SSHORTESTDAYNAME5 "শু" + LOCALE_SSHORTESTDAYNAME6 "শ" + LOCALE_SSHORTESTDAYNAME7 "র" + LOCALE_SSHORTTIME "HH.mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME "." + LOCALE_STIMEFORMAT "HH.mm.ss" + LOCALE_SYEARMONTH "MMMM, yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/include/winnt.rh b/include/winnt.rh index 1013a24..5f07168 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -45,6 +45,7 @@ #define LANG_ARMENIAN 0x2b #define LANG_ASSAMESE 0x4d #define LANG_AZERI 0x2c +#define LANG_BANGLA 0x45 #define LANG_BASHKIR 0x6d #define LANG_BASQUE 0x2d #define LANG_BELARUSIAN 0x23 @@ -211,6 +212,8 @@ #define SUBLANG_ASSAMESE_INDIA 0x01 #define SUBLANG_AZERI_LATIN 0x01 #define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_BANGLA_BANGLADESH 0x02 +#define SUBLANG_BANGLA_INDIA 0x01 #define SUBLANG_BASHKIR_RUSSIA 0x01 #define SUBLANG_BASQUE_BASQUE 0x01 #define SUBLANG_BELARUSIAN_BELARUS 0x01

1 0

Huw Davies : gdi32: Respect the rop mode in SetPixel.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 16ba8ec24db68e8fdc343f0a3da85953f95128e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ba8ec24db68e8fdc343f0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 10:47:04 2017 +0100 gdi32: Respect the rop mode in SetPixel. Based on a patch by Tim Worthington. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8e9af9e01635733376962bea58b04f001a90ac66) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/tests/dib.c | 70 ++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16ba8ec24db68e8fdc34…

1 0

Huw Davies : gdi32: Add a helper to fill rectangles with a given pixel.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: b5565f2a523f3323924d36b91e4d491121cc9515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5565f2a523f3323924d36b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 10:47:03 2017 +0100 gdi32: Add a helper to fill rectangles with a given pixel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46e6ee48f3cd5a6eeec50db2a8c7db17025c606f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 770e89e..adf16c4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -257,6 +257,7 @@ extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; extern void release_cached_font( struct cached_font *font ) DECLSPEC_HIDDEN; +extern BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) DECLSPEC_HIDDEN; static inline void init_clipped_rects( struct clipped_rects *clip_rects ) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index cde20e3..8e55d1a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1754,6 +1754,20 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) } /********************************************************************** + * fill_with_pixel + * + * Fill a number of rectangles with a given pixel color and rop mode + */ +BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) +{ + rop_mask mask; + + calc_rop_masks( rop, pixel, &mask ); + dib->funcs->solid_rects( dib, num, rects, mask.and, mask.xor ); + return TRUE; +} + +/********************************************************************** * solid_brush * * Fill a number of rectangles with the solid brush @@ -1762,12 +1776,9 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { DC *dc = get_physdev_dc( &pdev->dev ); - rop_mask brush_color; DWORD color = get_pixel_color( dc, &pdev->dib, brush->colorref, TRUE ); - calc_rop_masks( rop, color, &brush_color ); - dib->funcs->solid_rects( dib, num, rects, brush_color.and, brush_color.xor ); - return TRUE; + return fill_with_pixel( dc, dib, color, num, rects, rop ); } static BOOL alloc_brush_mask_bits( dib_brush *brush )

1 0

Dmitry Timoshkov : user32: DialogBoxParam should return -1 when dialog control creation fails.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 89d3f104d7949daa68a414c14c159ef53c4210f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d3f104d7949daa68a414c1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 18 19:42:11 2017 +0800 user32: DialogBoxParam should return -1 when dialog control creation fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3d66e753e7eb00495690bf54abc27943a9e089db) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dialog.c | 14 ++++++++------ dlls/user32/tests/dialog.c | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8b77ae2..c2aad8d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -835,11 +835,12 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, HRSRC hrsrc; LPCDLGTEMPLATEA ptr; + if (owner && !IsWindow(owner)) return 0; + if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return 0; + if (!(hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ))) return -1; + return DIALOG_DoDialogBox( hwnd, owner ); } @@ -853,11 +854,12 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, HRSRC hrsrc; LPCDLGTEMPLATEW ptr; + if (owner && !IsWindow(owner)) return 0; + if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return 0; + if (!(hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ))) return -1; + return DIALOG_DoDialogBox( hwnd, owner ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 45886aa..1970e8f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1273,7 +1273,6 @@ static void test_DialogBoxParamA(void) SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); -todo_wine ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); ok(GetLastError() == 0, "got %d\n", GetLastError());

1 0

Akihiro Sagawa : msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 09a6695799f9b371f98d0eadc4632b76e1ae3933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09a6695799f9b371f98d0ead… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 4 23:06:37 2017 +0900 msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 82bf4edf36fd34f9fdadeddb991c6bf03dded871) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3fe8df8..58e19a9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1833,8 +1833,10 @@ static void test_mbstowcs(void) { static const wchar_t wSimple[] = { 't','e','x','t',0 }; static const wchar_t wHiragana[] = { 0x3042,0x3043,0 }; + static const wchar_t wEmpty[] = { 0 }; static const char mSimple[] = "text"; static const char mHiragana[] = { 0x82,0xa0,0x82,0xa1,0 }; + static const char mEmpty[] = { 0 }; const wchar_t *pwstr; wchar_t wOut[6]; @@ -1863,6 +1865,13 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wSimple, 4*sizeof(wchar_t)), "wOut = %s\n", wine_dbgstr_w(wOut)); ok(wOut[4] == '!', "wOut[4] != \'!\'\n"); + ret = mbstowcs(NULL, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + + ret = mbstowcs(wOut, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(NULL, wSimple, 0); ok(ret == 4, "wcstombs did not return 4\n"); @@ -1874,6 +1883,13 @@ static void test_mbstowcs(void) ok(ret == 2, "wcstombs did not return 2\n"); ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + ret = wcstombs(NULL, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + + ret = wcstombs(mOut, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; @@ -1883,10 +1899,18 @@ static void test_mbstowcs(void) ok(ret == 2, "mbstowcs did not return 2\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = mbstowcs(wOut, mEmpty, 6); + todo_wine ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(mOut, wHiragana, 6); ok(ret == 4, "wcstombs did not return 4\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + ret = wcstombs(mOut, wEmpty, 6); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!pmbstowcs_s || !pwcstombs_s) { setlocale(LC_ALL, "C"); win_skip("mbstowcs_s or wcstombs_s not available\n"); @@ -1903,6 +1927,11 @@ static void test_mbstowcs(void) ok(ret == 3, "mbstowcs_s did not return 3\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, wOut, 6, mEmpty, _TRUNCATE); + todo_wine ok(err == 0, "err = %d\n", err); + todo_wine ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 3, "mbstowcs_s did not return 3\n"); @@ -1917,6 +1946,11 @@ static void test_mbstowcs(void) ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, mOut, 6, wEmpty, _TRUNCATE); + ok(err == 0, "err = %d\n", err); + ok(ret == 1, "wcstombs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 5, "wcstombs_s did not return 5\n");

1 0

Nikolay Sivov : kernel32/nls: Added genitive month names for Croatian.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 58fd65c2b353f07ad476ef999b47315011c6804b URL: https://source.winehq.org/git/wine.git/?a=commit;h=58fd65c2b353f07ad476ef99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:57 2017 +0300 kernel32/nls: Added genitive month names for Croatian. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 188501e5875a7843ed1d400b4e6399bf85962c32) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/hrv.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls index 6b38507..4289a0a 100644 --- a/dlls/kernel32/nls/hrv.nls +++ b/dlls/kernel32/nls/hrv.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "siječanj" - LOCALE_SMONTHNAME2 "veljača" - LOCALE_SMONTHNAME3 "ožujak" - LOCALE_SMONTHNAME4 "travanj" - LOCALE_SMONTHNAME5 "svibanj" - LOCALE_SMONTHNAME6 "lipanj" - LOCALE_SMONTHNAME7 "srpanj" - LOCALE_SMONTHNAME8 "kolovoz" - LOCALE_SMONTHNAME9 "rujan" - LOCALE_SMONTHNAME10 "listopad" - LOCALE_SMONTHNAME11 "studeni" - LOCALE_SMONTHNAME12 "prosinac" + LOCALE_SMONTHNAME1 "siječanj\0siječnja" + LOCALE_SMONTHNAME2 "veljača\0veljače" + LOCALE_SMONTHNAME3 "ožujak\0ožujka" + LOCALE_SMONTHNAME4 "travanj\0travnja" + LOCALE_SMONTHNAME5 "svibanj\0svibnja" + LOCALE_SMONTHNAME6 "lipanj\0lipnja" + LOCALE_SMONTHNAME7 "srpanj\0srpnja" + LOCALE_SMONTHNAME8 "kolovoz\0kolovoza" + LOCALE_SMONTHNAME9 "rujan\0rujna" + LOCALE_SMONTHNAME10 "listopad\0listopada" + LOCALE_SMONTHNAME11 "studeni\0studenog" + LOCALE_SMONTHNAME12 "prosinac\0prosinca" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "hr-HR"

1 0

Anton Romanov : windowscodecs: PNGEncoder: Return 32bppRGBA pixel format by default.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 36bb9a572f6dff807d728cf09f706fcc76cb21d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36bb9a572f6dff807d728cf0… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sun Aug 20 23:40:50 2017 -0700 windowscodecs: PNGEncoder: Return 32bppRGBA pixel format by default. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 267bca1f3b17ee22ba24972ad10757d997d01a20) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2e3a42b..cbdd98b 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1327,6 +1327,7 @@ struct png_pixelformat { }; static const struct png_pixelformat formats[] = { + {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, {&GUID_WICPixelFormat24bppBGR, 24, 8, PNG_COLOR_TYPE_RGB, 0, 1}, {&GUID_WICPixelFormatBlackWhite, 1, 1, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat2bppGray, 2, 2, PNG_COLOR_TYPE_GRAY, 0, 0}, @@ -1334,7 +1335,6 @@ static const struct png_pixelformat formats[] = { {&GUID_WICPixelFormat8bppGray, 8, 8, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat16bppGray, 16, 16, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1}, - {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, {&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0}, {NULL},

1 0

Dmitry Timoshkov : user32/tests: Test DialogBoxParam using a dialog template with invalid control class.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 3a12abebaa5b734910f5255e1642ffab3d096b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a12abebaa5b734910f5255e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 18 19:41:57 2017 +0800 user32/tests: Test DialogBoxParam using a dialog template with invalid control class. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a62a8601db26bd8c39e561505876c6c41b8156bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/dialog.c | 6 ++++++ dlls/user32/tests/resource.rc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index a37c678..45886aa 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1272,6 +1272,12 @@ static void test_DialogBoxParamA(void) "got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError()); SetLastError(0xdeadbeef); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); +todo_wine + ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); + ok(GetLastError() == 0, "got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); ok(ret == 0, "DefDlgProcA returned %ld, expected 0\n", ret); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index f116b85..756e38f 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -124,6 +124,12 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +TEST_DIALOG_INVALID_CLASS DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +{ + CONTROL "",1,"wine invalid class",WS_CHILD,0,0,40,10 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0