June 2022 - Wine-commits - list.winehq.org

Bhavesh Davda : wined3d: Add GPU information for NVIDIA Ampere A10 and AMD Radeon Pro V620 GPUs.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: c53e4ee4655cee3470de3112383344c1c9be0f93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c53e4ee4655cee3470de3112… Author: Bhavesh Davda <bhaveshd(a)hotmail.com> Date: Sat Jun 18 02:30:22 2022 +0000 wined3d: Add GPU information for NVIDIA Ampere A10 and AMD Radeon Pro V620 GPUs. Signed-off-by: Bhavesh Davda <bhaveshd(a)hotmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 05e8c112388..d341668b808 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1311,6 +1311,7 @@ cards_nvidia_binary[] = { /* Direct 3D 11 */ {"Tesla T4", CARD_NVIDIA_TESLA_T4}, + {"Ampere A10", CARD_NVIDIA_AMPERE_A10}, {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925b2df0401..6f8d1edad6e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -475,6 +475,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_AMPERE_A10, "NVIDIA Ampere A10", DRIVER_NVIDIA_KEPLER, 24576}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -536,6 +537,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620, "Radeon Pro V620", DRIVER_AMD_RX, 32768}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620_VF, "Radeon Pro V620 VF", DRIVER_AMD_RX, 32768}, {HW_VENDOR_AMD, CARD_AMD_VANGOGH, "AMD VANGOGH", DRIVER_AMD_RX, 4096}, /* Red Hat */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 73d13d6dd73..5f058d11ba9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3014,6 +3014,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, + CARD_AMD_RADEON_PRO_V620 = 0x73a1, + CARD_AMD_RADEON_PRO_V620_VF = 0x73ae, CARD_AMD_VANGOGH = 0x163f, CARD_NVIDIA_RIVA_128 = 0x0018, @@ -3160,6 +3162,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, CARD_NVIDIA_TESLA_T4 = 0x1eb8, + CARD_NVIDIA_AMPERE_A10 = 0x2236, CARD_REDHAT_VIRGL = 0x1010,

1 0

Connor McAdams : uiautomationcore: Initialize VARIANT in test_uia_prov_from_acc_properties() (Coverity).
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 350220af30ceb631b03e5872680326dd7cd97647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=350220af30ceb631b03e5872… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Jun 21 12:36:40 2022 -0400 uiautomationcore: Initialize VARIANT in test_uia_prov_from_acc_properties() (Coverity). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 298a3942cbb..710991d5a3d 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -2078,6 +2078,7 @@ static void test_uia_prov_from_acc_properties(void) int i, x; /* MSAA role to UIA control type test. */ + VariantInit(&v); for (i = 0; i < ARRAY_SIZE(msaa_role_uia_types); i++) { const struct msaa_role_uia_type *role = &msaa_role_uia_types[i];

1 0

Zhiyi Zhang : uxtheme: Support parsing more button parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 22adfc67b4dcbacf1c0991a15c056db0e5b639b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22adfc67b4dcbacf1c0991a1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:31:55 2022 +0800 uxtheme: Support parsing more button parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/vsstyle.h | 9 +++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 07fafbe0bde..7a0a64cc470 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -341,6 +341,7 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_PUSHBUTTON, PBS_PRESSED, L"PRESSED"}, {BP_PUSHBUTTON, PBS_DISABLED, L"DISABLED"}, {BP_PUSHBUTTON, PBS_DEFAULTED, L"DEFAULTED"}, + {BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, L"DEFAULTED_ANIMATING"}, {BP_RADIOBUTTON, 0, L"RADIOBUTTON"}, {BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, {BP_RADIOBUTTON, RBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, @@ -363,6 +364,14 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_CHECKBOX, CBS_MIXEDHOT, L"MIXEDHOT"}, {BP_CHECKBOX, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, {BP_CHECKBOX, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX, CBS_IMPLICITNORMAL, L"IMPLICITNORMAL"}, + {BP_CHECKBOX, CBS_IMPLICITHOT, L"IMPLICITHOT"}, + {BP_CHECKBOX, CBS_IMPLICITPRESSED, L"IMPLICITPRESSED"}, + {BP_CHECKBOX, CBS_IMPLICITDISABLED, L"IMPLICITDISABLED"}, + {BP_CHECKBOX, CBS_EXCLUDEDNORMAL, L"EXCLUDEDNORMAL"}, + {BP_CHECKBOX, CBS_EXCLUDEDHOT, L"EXCLUDEDHOT"}, + {BP_CHECKBOX, CBS_EXCLUDEDPRESSED, L"EXCLUDEDPRESSED"}, + {BP_CHECKBOX, CBS_EXCLUDEDDISABLED, L"EXCLUDEDDISABLED"}, {BP_GROUPBOX, 0, L"GROUPBOX"}, {BP_GROUPBOX, GBS_NORMAL, L"NORMAL"}, {BP_GROUPBOX, GBS_DISABLED, L"DISABLED"}, @@ -380,6 +389,42 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_COMMANDLINKGLYPH, CMDLGS_PRESSED, L"PRESSED"}, {BP_COMMANDLINKGLYPH, CMDLGS_DISABLED, L"DISABLED"}, {BP_COMMANDLINKGLYPH, CMDLGS_DEFAULTED, L"DEFAULTED"}, + {BP_RADIOBUTTON_HCDISABLED, 0, L"RADIOBUTTON_HCDISABLED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, 0, L"CHECKBOX_HCDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDNORMAL, L"MIXEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDHOT, L"MIXEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITNORMAL, L"IMPLICITNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITHOT, L"IMPLICITHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITPRESSED, L"IMPLICITPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITDISABLED, L"IMPLICITDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDNORMAL, L"EXCLUDEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDHOT, L"EXCLUDEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDPRESSED, L"EXCLUDEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDDISABLED, L"EXCLUDEDDISABLED"}, + {BP_GROUPBOX_HCDISABLED, 0, L"GROUPBOX_HCDISABLED"}, + {BP_GROUPBOX_HCDISABLED, GBS_NORMAL, L"NORMAL"}, + {BP_GROUPBOX_HCDISABLED, GBS_DISABLED, L"DISABLED"}, + {BP_PUSHBUTTONDROPDOWN, 0, L"PUSHBUTTONDROPDOWN"}, + {BP_PUSHBUTTONDROPDOWN, PBDDS_NORMAL, L"NORMAL"}, + {BP_PUSHBUTTONDROPDOWN, PBDDS_DISABLED, L"DISABLED"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index d6ea9071f64..f5af8492aef 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -72,6 +72,10 @@ enum BUTTONPARTS { BP_USERBUTTON = 5, BP_COMMANDLINK = 6, BP_COMMANDLINKGLYPH = 7, + BP_RADIOBUTTON_HCDISABLED = 8, + BP_CHECKBOX_HCDISABLED = 9, + BP_GROUPBOX_HCDISABLED = 10, + BP_PUSHBUTTONDROPDOWN = 11, }; #define BUTTONSTYLEPARTS BUTTONPARTS; @@ -141,6 +145,11 @@ enum COMMANDLINKGLYPHSTATES { CMDLGS_DEFAULTED = 5, }; +enum PUSHBUTTONDROPDOWNSTATES { + PBDDS_NORMAL = 1, + PBDDS_DISABLED = 2, +}; + /* COMBOBOXSTYLE class */ #if defined(_MSC_VER) || defined(__MINGW32__) #define VSCLASS_COMBOBOXSTYLE L"COMBOBOXSTYLE"

1 0

Zhiyi Zhang : uxtheme: Support parsing more clock states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: f1aa061d8f475271ea5c9f039cd8d9eb25d56f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1aa061d8f475271ea5c9f03… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:39:49 2022 +0800 uxtheme: Support parsing more clock states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 2 ++ include/vssym32.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 7a0a64cc470..8597be2b40e 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -431,6 +431,8 @@ static const MSSTYLES_CLASS_MAP classButton[] = { static const MSSTYLES_CLASS_MAP classClock[] = { {CLP_TIME, 0, L"TIME"}, {CLP_TIME, CLS_NORMAL, L"NORMAL"}, + {CLP_TIME, CLS_HOT, L"HOT"}, + {CLP_TIME, CLS_PRESSED, L"PRESSED"}, {0, 0, L""} }; diff --git a/include/vssym32.h b/include/vssym32.h index 8685fb7f7f0..8bc161a213c 100644 --- a/include/vssym32.h +++ b/include/vssym32.h @@ -522,6 +522,8 @@ enum CLOCKPARTS { enum CLOCKSTATES { CLS_NORMAL = 1, + CLS_HOT = 2, + CLS_PRESSED = 3, }; /* TRAYNOTIFY class */

1 0

Zhiyi Zhang : uxtheme: Support parsing more combobox parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: b334d89d5dbce8e119eb229cdd0bc6a5288d90c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b334d89d5dbce8e119eb229c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 2 17:29:57 2022 +0800 uxtheme: Support parsing more combobox parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 34 ++++++++++++++++++++++++++++++++++ include/vsstyle.h | 6 ++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 8597be2b40e..b5063f3a6ed 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -442,6 +442,40 @@ static const MSSTYLES_CLASS_MAP classCombobox[] = { {CP_DROPDOWNBUTTON, CBXS_HOT, L"HOT"}, {CP_DROPDOWNBUTTON, CBXS_PRESSED, L"PRESSED"}, {CP_DROPDOWNBUTTON, CBXS_DISABLED, L"DISABLED"}, + {CP_BACKGROUND, 0, L"BACKGROUND"}, + {CP_TRANSPARENTBACKGROUND, 0, L"TRANSPARENTBACKGROUND"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_NORMAL, L"NORMAL"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_HOT, L"HOT"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_DISABLED, L"DISABLED"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_FOCUSED, L"FOCUSED"}, + {CP_BORDER, 0, L"BORDER"}, + {CP_BORDER, CBB_NORMAL, L"NORMAL"}, + {CP_BORDER, CBB_HOT, L"HOT"}, + {CP_BORDER, CBB_FOCUSED, L"FOCUSED"}, + {CP_BORDER, CBB_DISABLED, L"DISABLED"}, + {CP_READONLY, 0, L"READONLY"}, + {CP_READONLY, CBRO_NORMAL, L"NORMAL"}, + {CP_READONLY, CBRO_HOT, L"HOT"}, + {CP_READONLY, CBRO_PRESSED, L"PRESSED"}, + {CP_READONLY, CBRO_DISABLED, L"DISABLED"}, + {CP_DROPDOWNBUTTONRIGHT, 0, L"DROPDOWNBUTTONRIGHT"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_NORMAL, L"NORMAL"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_HOT, L"HOT"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_PRESSED, L"PRESSED"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_DISABLED, L"DISABLED"}, + {CP_DROPDOWNBUTTONLEFT, 0, L"DROPDOWNBUTTONLEFT"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_NORMAL, L"NORMAL"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_HOT, L"HOT"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_PRESSED, L"PRESSED"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_DISABLED, L"DISABLED"}, + {CP_CUEBANNER, 0, L"CUEBANNER"}, + {CP_CUEBANNER, CBCB_NORMAL, L"NORMAL"}, + {CP_CUEBANNER, CBCB_HOT, L"HOT"}, + {CP_CUEBANNER, CBCB_PRESSED, L"PRESSED"}, + {CP_CUEBANNER, CBCB_DISABLED, L"DISABLED"}, + {CP_DROPDOWNITEM, 0, L"DROPDOWNITEM"}, + {CP_DROPDOWNITEM, CBDI_NORMAL, L"NORMAL"}, + {CP_DROPDOWNITEM, CBDI_HIGHLIGHTED, L"HIGHLIGHTED"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index f5af8492aef..3075b4cdc08 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -168,6 +168,7 @@ enum COMBOBOXPARTS { CP_DROPDOWNBUTTONRIGHT = 6, CP_DROPDOWNBUTTONLEFT = 7, CP_CUEBANNER = 8, + CP_DROPDOWNITEM = 9, }; #define COMBOBOXSTYLEPARTS COMBOBOXPARTS; @@ -221,6 +222,11 @@ enum CUEBANNERSTATES { CBCB_DISABLED = 4, }; +enum DROPDOWNITEMSTATES { + CBDI_NORMAL = 1, + CBDI_HIGHLIGHTED = 2, +}; + /* COMMUNICATIONSSTYLE class */ #if defined(_MSC_VER) || defined(__MINGW32__) #define VSCLASS_COMMUNICATIONSSTYLE L"COMMUNICATIONSSTYLE"

1 0

Zhiyi Zhang : uxtheme: Support parsing more edit parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 968c3de0c52b8c40a38af55e3306104b58dbe1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=968c3de0c52b8c40a38af55e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:53:45 2022 +0800 uxtheme: Support parsing more edit parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b5063f3a6ed..45268a45267 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -488,7 +488,41 @@ static const MSSTYLES_CLASS_MAP classEdit[] = { {EP_EDITTEXT, ETS_FOCUSED, L"FOCUSED"}, {EP_EDITTEXT, ETS_READONLY, L"READONLY"}, {EP_EDITTEXT, ETS_ASSIST, L"ASSIST"}, + {EP_EDITTEXT, ETS_CUEBANNER, L"CUEBANNER"}, {EP_CARET, 0, L"CARET"}, + {EP_BACKGROUND, 0, L"BACKGROUND"}, + {EP_BACKGROUND, EBS_NORMAL, L"NORMAL"}, + {EP_BACKGROUND, EBS_HOT, L"HOT"}, + {EP_BACKGROUND, EBS_DISABLED, L"DISABLED"}, + {EP_BACKGROUND, EBS_FOCUSED, L"FOCUSED"}, + {EP_BACKGROUND, EBS_READONLY, L"READONLY"}, + {EP_BACKGROUND, EBS_ASSIST, L"ASSIST"}, + {EP_PASSWORD, 0, L"PASSWORD"}, + {EP_BACKGROUNDWITHBORDER, 0, L"BACKGROUNDWITHBORDER"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_NORMAL, L"NORMAL"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_HOT, L"HOT"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_DISABLED, L"DISABLED"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_NOSCROLL, 0, L"EDITBORDER_NOSCROLL"}, + {EP_EDITBORDER_NOSCROLL, EPSN_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_NOSCROLL, EPSN_HOT, L"HOT"}, + {EP_EDITBORDER_NOSCROLL, EPSN_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_NOSCROLL, EPSN_DISABLED, L"DISABLED"}, + {EP_EDITBORDER_HSCROLL, 0, L"EDITBORDER_HSCROLL"}, + {EP_EDITBORDER_HSCROLL, EPSH_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_HSCROLL, EPSH_HOT, L"HOT"}, + {EP_EDITBORDER_HSCROLL, EPSH_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_HSCROLL, EPSH_DISABLED, L"DISABLED"}, + {EP_EDITBORDER_VSCROLL, 0, L"EDITBORDER_VSCROLL"}, + {EP_EDITBORDER_VSCROLL, EPSV_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_VSCROLL, EPSV_HOT, L"HOT"}, + {EP_EDITBORDER_VSCROLL, EPSV_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_VSCROLL, EPSV_DISABLED, L"DISABLED"}, + {EP_EDITBORDER_HVSCROLL, 0, L"EDITBORDER_HVSCROLL"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_HOT, L"HOT"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_DISABLED, L"DISABLED"}, {0, 0, L""} };

1 0

Zhiyi Zhang : uxtheme: Support parsing more header parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: d2a7b967ee0bd76990918138467ef3d43e23d854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2a7b967ee0bd76990918138… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 2 17:15:44 2022 +0800 uxtheme: Support parsing more header parts and states. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 45268a45267..17fae04968b 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -571,6 +571,15 @@ static const MSSTYLES_CLASS_MAP classHeader[] = { {HP_HEADERITEM, HIS_NORMAL, L"NORMAL"}, {HP_HEADERITEM, HIS_HOT, L"HOT"}, {HP_HEADERITEM, HIS_PRESSED, L"PRESSED"}, + {HP_HEADERITEM, HIS_SORTEDNORMAL, L"SORTEDNORMAL"}, + {HP_HEADERITEM, HIS_SORTEDHOT, L"SORTHOT"}, + {HP_HEADERITEM, HIS_SORTEDPRESSED, L"SORTPRESSED"}, + {HP_HEADERITEM, HIS_ICONNORMAL, L"ICONNORMAL"}, + {HP_HEADERITEM, HIS_ICONHOT, L"ICONHOT"}, + {HP_HEADERITEM, HIS_ICONPRESSED, L"ICONPRESSED"}, + {HP_HEADERITEM, HIS_ICONSORTEDNORMAL, L"ICONSORTEDNORMAL"}, + {HP_HEADERITEM, HIS_ICONSORTEDHOT, L"ICONSORTEDHOT"}, + {HP_HEADERITEM, HIS_ICONSORTEDPRESSED, L"ICONSORTEDPRESSED"}, {HP_HEADERITEMLEFT, 0, L"HEADERITEMLEFT"}, {HP_HEADERITEMLEFT, HILS_NORMAL, L"NORMAL"}, {HP_HEADERITEMLEFT, HILS_HOT, L"HOT"}, @@ -582,6 +591,17 @@ static const MSSTYLES_CLASS_MAP classHeader[] = { {HP_HEADERSORTARROW, 0, L"HEADERSORTARROW"}, {HP_HEADERSORTARROW, HSAS_SORTEDUP, L"SORTEDUP"}, {HP_HEADERSORTARROW, HSAS_SORTEDDOWN, L"SORTEDDOWN"}, + {HP_HEADERDROPDOWN, 0, L"HEADERDROPDOWN"}, + {HP_HEADERDROPDOWN, HDDS_NORMAL, L"NORMAL"}, + {HP_HEADERDROPDOWN, HDDS_SOFTHOT, L"SOFTHOT"}, + {HP_HEADERDROPDOWN, HDDS_HOT, L"HOT"}, + {HP_HEADERDROPDOWNFILTER, 0, L"HEADERDROPDOWNFILTER"}, + {HP_HEADERDROPDOWNFILTER, HDDFS_NORMAL, L"NORMAL"}, + {HP_HEADERDROPDOWNFILTER, HDDFS_SOFTHOT, L"SOFTHOT"}, + {HP_HEADERDROPDOWNFILTER, HDDFS_HOT, L"HOT"}, + {HP_HEADEROVERFLOW, 0, L"HEADEROVERFLOW"}, + {HP_HEADEROVERFLOW, HOFS_NORMAL, L"NORMAL"}, + {HP_HEADEROVERFLOW, HOFS_HOT, L"HOT"}, {0, 0, L""} };

1 0

Zhiyi Zhang : comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: bfb49ad04c7863afe7585f6c151c29a7e51b20bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb49ad04c7863afe7585f6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 27 18:32:32 2022 +0800 comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND. Tested manually on XP, Win 7 and Win 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/toolbar.c | 31 +++++++++++++++++-------------- include/commctrl.h | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9b059996b65..bea294958c5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1062,20 +1062,23 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, if (theme) { - int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; - int stateId = TS_NORMAL; - - if (tbcd.nmcd.uItemState & CDIS_DISABLED) - stateId = TS_DISABLED; - else if (tbcd.nmcd.uItemState & CDIS_SELECTED) - stateId = TS_PRESSED; - else if (tbcd.nmcd.uItemState & CDIS_CHECKED) - stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; - else if ((tbcd.nmcd.uItemState & CDIS_HOT) - || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) - stateId = TS_HOT; - - DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); + if (!(dwItemCDFlag & TBCDRF_NOBACKGROUND)) + { + int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; + int stateId = TS_NORMAL; + + if (tbcd.nmcd.uItemState & CDIS_DISABLED) + stateId = TS_DISABLED; + else if (tbcd.nmcd.uItemState & CDIS_SELECTED) + stateId = TS_PRESSED; + else if (tbcd.nmcd.uItemState & CDIS_CHECKED) + stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; + else if ((tbcd.nmcd.uItemState & CDIS_HOT) + || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) + stateId = TS_HOT; + + DrawThemeBackground(theme, hdc, partId, stateId, &rc, NULL); + } } else TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); diff --git a/include/commctrl.h b/include/commctrl.h index b829e4498ea..725ef64764f 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1380,7 +1380,7 @@ typedef struct _NMTBCUSTOMDRAW #define TBCDRF_NOETCHEDEFFECT 0x00100000 /* No etched effect for */ /* disabled items */ #define TBCDRF_BLENDICON 0x00200000 /* ILD_BLEND50 on the icon image */ -#define TBCDRF_NOBACKGROUND 0x00400000 /* ILD_BLEND50 on the icon image */ +#define TBCDRF_NOBACKGROUND 0x00400000 /* Don't draw button background */ #define TBCDRF_USECDCOLORS 0x00800000

1 0

Zhiyi Zhang : comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 7f491491f85edbeeeb58572609b2eb7e7bd4ea1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f491491f85edbeeeb585726… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 30 15:08:14 2022 +0800 comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 60 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 31c360304c6..897405098c2 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -62,6 +62,7 @@ static BOOL g_fExpectedHotItemOld; static BOOL g_fExpectedHotItemNew; static DWORD g_dwExpectedDispInfoMask; static BOOL g_ResetDispTextPtr; +static BOOL g_TestCheckedItemPrePaint; static const struct message ttgetdispinfo_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TBN_GETINFOTIPA }, @@ -348,6 +349,28 @@ static LRESULT parent_wnd_notify(LPARAM lParam) } return 0; } + case NM_CUSTOMDRAW: + { + NMTBCUSTOMDRAW *cd = (NMTBCUSTOMDRAW *)lParam; + + switch (cd->nmcd.dwDrawStage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW; + case CDDS_ITEMPREPAINT: + { + if (g_TestCheckedItemPrePaint) + { + cd->clrBtnHighlight = RGB(0xff, 0, 0); + cd->clrBtnFace = RGB(0xff, 0, 0); + return TBCDRF_NOBACKGROUND; + } + return CDRF_DODEFAULT; + } + } + + return 0; + } } return 0; } @@ -2617,34 +2640,49 @@ static void test_visual(void) HDC mem_dc1, mem_dc2, toolbar_dc; TBBUTTON tbbutton; int width, height; + COLORREF color; HTHEME theme; HWND toolbar; RECT rect; BOOL ret; - if (!is_theme_active) - { - skip("Theming is not active, skipping visual tests.\n"); - return; - } - - /* Test that toolbar shouldn't use outside theme handles */ toolbar = CreateWindowA(TOOLBARCLASSNAMEA, "", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hMainWnd, 0, 0, NULL); ok(!!toolbar, "Failed to create a toolbar window.\n"); - /* Toolbar needs data for it to show */ + /* Test that the comctl32 55AA pattern brush is not used to draw checked background when theming is on */ memset(&tbbutton, 0, sizeof(tbbutton)); - tbbutton.fsState = TBSTATE_ENABLED; - tbbutton.iString = (INT_PTR)"test"; + tbbutton.idCommand = 1000; + tbbutton.fsState = TBSTATE_ENABLED | TBSTATE_CHECKED; + tbbutton.iString = (INT_PTR)" "; SendMessageA(toolbar, TB_BUTTONSTRUCTSIZE, sizeof(tbbutton), 0); ret = SendMessageA(toolbar, TB_ADDBUTTONSA, 1, (LPARAM)&tbbutton); ok(ret, "TB_ADDBUTTONSA failed.\n"); flush_events(); + g_TestCheckedItemPrePaint = TRUE; + ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); + ok(ret, "RedrawWindow failed.\n"); + g_TestCheckedItemPrePaint = FALSE; + + toolbar_dc = GetDC(toolbar); + color = GetPixel(toolbar_dc, 5, 5); + if (is_theme_active) + todo_wine + ok(color != RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); + else + ok(color == RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); + if (!is_theme_active) + { + skip("Theming is not active, skipping the rest of visual tests.\n"); + ReleaseDC(toolbar, toolbar_dc); + DestroyWindow(toolbar); + return; + } + + /* Test that toolbar shouldn't use outside theme handles */ theme = pGetWindowTheme(toolbar); ok(!theme, "Expected theme not opened by window.\n"); - toolbar_dc = GetDC(toolbar); GetClientRect(toolbar, &rect); width = rect.right - rect.left; height = rect.bottom - rect.top;

1 0

Zhiyi Zhang : comctl32/toolbar: Don't use pattern brushes to draw checked background.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 9b5df952a3df292f09ae62bb206bef3ea75fdd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b5df952a3df292f09ae62bb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 30 15:10:31 2022 +0800 comctl32/toolbar: Don't use pattern brushes to draw checked background. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/toolbar.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 897405098c2..f66094a0b3a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2666,7 +2666,6 @@ static void test_visual(void) toolbar_dc = GetDC(toolbar); color = GetPixel(toolbar_dc, 5, 5); if (is_theme_active) - todo_wine ok(color != RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); else ok(color == RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index bea294958c5..02538eeb649 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1042,7 +1042,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))) OffsetRect(&rcText, 1, 1); - if (!(tbcd.nmcd.uItemState & CDIS_HOT) && + if (!theme && !(tbcd.nmcd.uItemState & CDIS_HOT) && ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE))) TOOLBAR_DrawPattern (&rc, &tbcd);

1 0