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

Zhiyi Zhang : uxtheme: Support parsing taskdialog class.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: 4d42d20e420f5a8b1bfdd45f644ae1850fddeee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d42d20e420f5a8b1bfdd45f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 10:20:03 2022 +0800 uxtheme: Support parsing taskdialog class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 35 +++++++++++++++++++++++++++++++++++ include/vsstyle.h | 2 ++ 2 files changed, 37 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 00c80259dbb..834af6b2f74 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1061,6 +1061,40 @@ static const MSSTYLES_CLASS_MAP classTaskbar[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classTaskdialog[] = { + {TDLG_PRIMARYPANEL, 0, L"PRIMARYPANEL"}, + {TDLG_MAININSTRUCTIONPANE, 0, L"MAININSTRUCTIONPANE"}, + {TDLG_MAINICON, 0, L"MAINICON"}, + {TDLG_CONTENTPANE, 0, L"CONTENTPANE"}, + {TDLG_CONTENTICON, 0, L"CONTENTICON"}, + {TDLG_EXPANDEDCONTENT, 0, L"EXPANDEDCONTENT"}, + {TDLG_COMMANDLINKPANE, 0, L"COMMANDLINKPANE"}, + {TDLG_SECONDARYPANEL, 0, L"SECONDARYPANEL"}, + {TDLG_CONTROLPANE, 0, L"CONTROLPANE"}, + {TDLG_CONTROLPANE, TDLGCPS_STANDALONE, L"STANDALONE"}, + {TDLG_BUTTONSECTION, 0, L"BUTTONSECTION"}, + {TDLG_BUTTONWRAPPER, 0, L"BUTTONWRAPPER"}, + {TDLG_EXPANDOTEXT, 0, L"EXPANDOTEXT"}, + {TDLG_EXPANDOBUTTON, 0, L"EXPANDOBUTTON"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_NORMAL, L"NORMAL"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_HOVER, L"HOVER"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_PRESSED, L"PRESSED"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDNORMAL, L"EXPANDEDNORMAL"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDHOVER, L"EXPANDEDHOVER"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDPRESSED, L"EXPANDEDPRESSED"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_NORMALDISABLED, L"NORMALDISABLED"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDDISABLED, L"EXPANDEDDISABLED"}, + {TDLG_VERIFICATIONTEXT, 0, L"VERIFICATIONTEXT"}, + {TDLG_FOOTNOTEPANE, 0, L"FOOTNOTEPANE"}, + {TDLG_FOOTNOTEAREA, 0, L"FOOTNOTEAREA"}, + {TDLG_FOOTNOTESEPARATOR, 0, L"FOOTNOTESEPARATOR"}, + {TDLG_EXPANDEDFOOTERAREA, 0, L"EXPANDEDFOOTERAREA"}, + {TDLG_PROGRESSBAR, 0, L"PROGRESSBAR"}, + {TDLG_IMAGEALIGNMENT, 0, L"IMAGEALIGNMENT"}, + {TDLG_RADIOBUTTONPANE, 0, L"RADIOBUTTONPANE"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_BUTTON, 0, L"BUTTON"}, {TP_BUTTON, TS_NORMAL, L"NORMAL"}, @@ -1352,6 +1386,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classTab, L"TAB"}, {classTaskband, L"TASKBAND"}, {classTaskbar, L"TASKBAR"}, + {classTaskdialog, L"TASKDIALOG"}, {classToolbar, L"TOOLBAR"}, {classTooltip, L"TOOLTIP"}, {classTrackbar, L"TRACKBAR"}, diff --git a/include/vsstyle.h b/include/vsstyle.h index b527c15a29a..a81f621ef0f 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1293,6 +1293,8 @@ enum EXPANDOBUTTONSTATES { TDLGEBS_EXPANDEDNORMAL = 4, TDLGEBS_EXPANDEDHOVER = 5, TDLGEBS_EXPANDEDPRESSED = 6, + TDLGEBS_NORMALDISABLED = 7, + TDLGEBS_EXPANDEDDISABLED = 8, }; /* TEXTSTYLE class */

1 0

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

23 Jun '22

Module: wine Branch: master Commit: c9af75ca0c738de117d93babfdaefb591503ccc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9af75ca0c738de117d93bab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 30 17:57:09 2022 +0800 uxtheme: Support parsing more treeview 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 834af6b2f74..d6119380035 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1222,10 +1222,14 @@ static const MSSTYLES_CLASS_MAP classTreeview[] = { {TVP_TREEITEM, TREIS_SELECTED, L"SELECTED"}, {TVP_TREEITEM, TREIS_DISABLED, L"DISABLED"}, {TVP_TREEITEM, TREIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {TVP_TREEITEM, TREIS_HOTSELECTED, L"HOTSELECTED"}, {TVP_GLYPH, 0, L"GLYPH"}, {TVP_GLYPH, GLPS_CLOSED, L"CLOSED"}, {TVP_GLYPH, GLPS_OPENED, L"OPENED"}, {TVP_BRANCH, 0, L"BRANCH"}, + {TVP_HOTGLYPH, 0, L"HOTGLYPH"}, + {TVP_HOTGLYPH, HGLPS_CLOSED, L"CLOSED"}, + {TVP_HOTGLYPH, HGLPS_OPENED, L"OPENED"}, {0, 0, L""} };

1 0

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

23 Jun '22

Module: wine Branch: master Commit: f6f07e0c6df6bf58c5b0c48830379f558183fa1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f07e0c6df6bf58c5b0c488… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 17:01:14 2022 +0800 uxtheme: Support parsing more toolbar parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 21 +++++++++++++++++++++ include/vsstyle.h | 1 + 2 files changed, 22 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index d6119380035..2d1363a0dee 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1103,6 +1103,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_BUTTON, TS_DISABLED, L"DISABLED"}, {TP_BUTTON, TS_CHECKED, L"CHECKED"}, {TP_BUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_BUTTON, TS_NEARHOT, L"NEARHOT"}, + {TP_BUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_DROPDOWNBUTTON, 0, L"DROPDOWNBUTTON"}, {TP_DROPDOWNBUTTON, TS_NORMAL, L"NORMAL"}, {TP_DROPDOWNBUTTON, TS_HOT, L"HOT"}, @@ -1110,6 +1112,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_DROPDOWNBUTTON, TS_DISABLED, L"DISABLED"}, {TP_DROPDOWNBUTTON, TS_CHECKED, L"CHECKED"}, {TP_DROPDOWNBUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_DROPDOWNBUTTON, TS_NEARHOT, L"NEARHOT"}, + {TP_DROPDOWNBUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SPLITBUTTON, 0, L"SPLITBUTTON"}, {TP_SPLITBUTTON, TS_NORMAL, L"NORMAL"}, {TP_SPLITBUTTON, TS_HOT, L"HOT"}, @@ -1117,6 +1121,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SPLITBUTTON, TS_DISABLED, L"DISABLED"}, {TP_SPLITBUTTON, TS_CHECKED, L"CHECKED"}, {TP_SPLITBUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SPLITBUTTON, TS_NEARHOT, L"NEARHOT"}, + {TP_SPLITBUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SPLITBUTTONDROPDOWN, 0, L"SPLITBUTTONDROPDOWN"}, {TP_SPLITBUTTONDROPDOWN, TS_NORMAL, L"NORMAL"}, {TP_SPLITBUTTONDROPDOWN, TS_HOT, L"HOT"}, @@ -1124,6 +1130,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SPLITBUTTONDROPDOWN, TS_DISABLED, L"DISABLED"}, {TP_SPLITBUTTONDROPDOWN, TS_CHECKED, L"CHECKED"}, {TP_SPLITBUTTONDROPDOWN, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SPLITBUTTONDROPDOWN, TS_NEARHOT, L"NEARHOT"}, + {TP_SPLITBUTTONDROPDOWN, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SEPARATOR, 0, L"SEPARATOR"}, {TP_SEPARATOR, TS_NORMAL, L"NORMAL"}, {TP_SEPARATOR, TS_HOT, L"HOT"}, @@ -1131,6 +1139,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SEPARATOR, TS_DISABLED, L"DISABLED"}, {TP_SEPARATOR, TS_CHECKED, L"CHECKED"}, {TP_SEPARATOR, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SEPARATOR, TS_NEARHOT, L"NEARHOT"}, + {TP_SEPARATOR, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SEPARATORVERT, 0, L"SEPARATORVERT"}, {TP_SEPARATORVERT, TS_NORMAL, L"NORMAL"}, {TP_SEPARATORVERT, TS_HOT, L"HOT"}, @@ -1138,6 +1148,17 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SEPARATORVERT, TS_DISABLED, L"DISABLED"}, {TP_SEPARATORVERT, TS_CHECKED, L"CHECKED"}, {TP_SEPARATORVERT, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SEPARATORVERT, TS_NEARHOT, L"NEARHOT"}, + {TP_SEPARATORVERT, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, + {TP_DROPDOWNBUTTONGLYPH, 0, L"DROPDOWNBUTTONGLYPH"}, + {TP_DROPDOWNBUTTONGLYPH, TS_NORMAL, L"NORMAL"}, + {TP_DROPDOWNBUTTONGLYPH, TS_HOT, L"HOT"}, + {TP_DROPDOWNBUTTONGLYPH, TS_PRESSED, L"PRESSED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_DISABLED, L"DISABLED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_CHECKED, L"CHECKED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_NEARHOT, L"NEARHOT"}, + {TP_DROPDOWNBUTTONGLYPH, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index a81f621ef0f..36693ceb890 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1344,6 +1344,7 @@ enum TOOLBARPARTS { TP_SPLITBUTTONDROPDOWN = 4, TP_SEPARATOR = 5, TP_SEPARATORVERT = 6, + TP_DROPDOWNBUTTONGLYPH = 7, }; #define TOOLBARSTYLEPARTS TOOLBARPARTS;

1 0

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

23 Jun '22

Module: wine Branch: master Commit: 84c83af00b4c666d913d0a1b8eed179835125cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=84c83af00b4c666d913d0a1b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 17:11:52 2022 +0800 uxtheme: Support parsing more tooltip parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 11 +++++++++++ include/vsstyle.h | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 2d1363a0dee..f69be5f5fd4 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1179,6 +1179,17 @@ static const MSSTYLES_CLASS_MAP classTooltip[] = { {TTP_CLOSE, TTCS_NORMAL, L"NORMAL"}, {TTP_CLOSE, TTCS_HOT, L"HOT"}, {TTP_CLOSE, TTCS_PRESSED, L"PRESSED"}, + {TTP_BALLOONSTEM, 0, L"BALLOONSTEM"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGUPLEFTWALL, L"POINTINGUPLEFTWALL"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGUPCENTERED, L"POINTINGUPCENTERED"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGUPRIGHTWALL, L"POINTINGUPRIGHTWALL"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGDOWNRIGHTWALL, L"POINTINGDOWNRIGHTWALL"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGDOWNCENTERED, L"POINTINGDOWNCENTERED"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGDOWNLEFTWALL, L"POINTINGDOWNLEFTWALL"}, + {TTP_WRENCH, 0, L"WRENCH"}, + {TTP_WRENCH, TTWS_NORMAL, L"NORMAL"}, + {TTP_WRENCH, TTWS_HOT, L"HOT"}, + {TTP_WRENCH, TTWS_PRESSED, L"PRESSED"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 36693ceb890..09948cf8dd5 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1376,6 +1376,7 @@ enum TOOLTIPPARTS { TTP_BALLOONTITLE = 4, TTP_CLOSE = 5, TTP_BALLOONSTEM = 6, + TTP_WRENCH = 7, }; #define TOOLTIPSTYLEPARTS TOOLTIPPARTS; @@ -1405,6 +1406,12 @@ enum BALLOONSTEMSTATES { TTBSS_POINTINGDOWNLEFTWALL = 6, }; +enum WRENCHSTATES { + TTWS_NORMAL = 1, + TTWS_HOT = 2, + TTWS_PRESSED = 3, +}; + /* TRACKBARSTYLE class */ #if defined(_MSC_VER) || defined(__MINGW32__) #define VSCLASS_TRACKBARSTYLE L"TRACKBARSTYLE"

1 0

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

23 Jun '22

Module: wine Branch: master Commit: 71bef6c985c3d37e4fbfdd7ac8983e3296814359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71bef6c985c3d37e4fbfdd7a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 17:35:39 2022 +0800 uxtheme: Support parsing more window parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 5 +++++ include/vsstyle.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index f69be5f5fd4..e1973305076 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -2,6 +2,7 @@ * msstyle data maps * * Copyright (C) 2004 Kevin Koltzau + * Copyright 2021-2022 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1397,6 +1398,10 @@ static const MSSTYLES_CLASS_MAP classWindow[] = { {WP_SMALLFRAMERIGHTSIZINGTEMPLATE, 0, L"SMALLFRAMERIGHTSIZINGTEMPLATE"}, {WP_FRAMEBOTTOMSIZINGTEMPLATE, 0, L"FRAMEBOTTOMSIZINGTEMPLATE"}, {WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE, 0, L"SMALLFRAMEBOTTOMSIZINGTEMPLATE"}, + {WP_FRAME, 0, L"FRAME"}, + {WP_FRAME, FS_ACTIVE, L"ACTIVE"}, + {WP_FRAME, FS_INACTIVE, L"INACTIVE"}, + {WP_BORDER, 0, L"BORDER"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 09948cf8dd5..4bc3469ae87 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1589,6 +1589,7 @@ enum WINDOWPARTS { WP_FRAMEBOTTOMSIZINGTEMPLATE = 36, WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37, WP_FRAME = 38, + WP_BORDER = 39, }; #define WINDOWSTYLEPARTS WINDOWPARTS;

1 0

Cressida Silver : WWN 421.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: website Branch: master Commit: 83d228a6fd9fcff6d5cf130d1d3f38e58f2ec36d URL: https://source.winehq.org/git/website.git/?a=commit;h=83d228a6fd9fcff6d5cf1… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Wed Jun 22 12:47:49 2022 -0500 WWN 421. --- news/en/2022062402.xml | 13 ++ wwn/en/wn20220624_421.xml | 433 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 446 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=83d228a6fd9fcff6d…

1 0

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

22 Jun '22

Module: wine Branch: master Commit: f38d5b31444a01db32880b8903fdbfdf3ade172d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38d5b31444a01db32880b89… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 15:56:27 2022 +0800 uxtheme: Support parsing more rebar parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index fa79c9d8840..2d8ea05bb5c 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -808,6 +808,18 @@ static const MSSTYLES_CLASS_MAP classRebar[] = { {RP_CHEVRON, CHEVS_HOT, L"HOT"}, {RP_CHEVRON, CHEVS_PRESSED, L"PRESSED"}, {RP_CHEVRONVERT, 0, L"CHEVRONVERT"}, + {RP_CHEVRONVERT, CHEVSV_NORMAL, L"NORMAL"}, + {RP_CHEVRONVERT, CHEVSV_HOT, L"HOT"}, + {RP_CHEVRONVERT, CHEVSV_PRESSED, L"PRESSED"}, + {RP_BACKGROUND, 0, L"BACKGROUND"}, + {RP_SPLITTER, 0, L"SPLITTER"}, + {RP_SPLITTER, SPLITS_NORMAL, L"NORMAL"}, + {RP_SPLITTER, SPLITS_HOT, L"HOT"}, + {RP_SPLITTER, SPLITS_PRESSED, L"PRESSED"}, + {RP_SPLITTERVERT, 0, L"SPLITTERVERT"}, + {RP_SPLITTERVERT, SPLITSV_NORMAL, L"NORMAL"}, + {RP_SPLITTERVERT, SPLITSV_HOT, L"HOT"}, + {RP_SPLITTERVERT, SPLITSV_PRESSED, L"PRESSED"}, {0, 0, L""} };

1 0

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

22 Jun '22

Module: wine Branch: master Commit: 461c49ec84ed872df12c68aa98dc9a3f2e502d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=461c49ec84ed872df12c68aa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 16:08:48 2022 +0800 uxtheme: Support parsing more scrollbar parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 27 +++++++++++++++++++++++++++ include/vsstyle.h | 1 + 2 files changed, 28 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 2d8ea05bb5c..b8e9eb95e43 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -841,41 +841,68 @@ static const MSSTYLES_CLASS_MAP classScrollbar[] = { {SBP_ARROWBTN, ABS_RIGHTHOT, L"RIGHTHOT"}, {SBP_ARROWBTN, ABS_RIGHTPRESSED, L"RIGHTPRESSED"}, {SBP_ARROWBTN, ABS_RIGHTDISABLED, L"RIGHTDISABLED"}, + {SBP_ARROWBTN, ABS_UPHOVER, L"UPHOVER"}, + {SBP_ARROWBTN, ABS_DOWNHOVER, L"DOWNHOVER"}, + {SBP_ARROWBTN, ABS_LEFTHOVER, L"LEFTHOVER"}, + {SBP_ARROWBTN, ABS_RIGHTHOVER, L"RIGHTHOVER"}, {SBP_THUMBBTNHORZ, 0, L"THUMBBTNHORZ"}, {SBP_THUMBBTNHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNHORZ, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_THUMBBTNVERT, 0, L"THUMBBTNVERT"}, {SBP_THUMBBTNVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNVERT, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNVERT, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKHORZ, 0, L"LOWERTRACKHORZ"}, {SBP_LOWERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKHORZ, 0, L"UPPERTRACKHORZ"}, {SBP_UPPERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKVERT, 0, L"LOWERTRACKVERT"}, {SBP_LOWERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKVERT, 0, L"UPPERTRACKVERT"}, {SBP_UPPERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERHORZ, 0, L"GRIPPERHORZ"}, + {SBP_GRIPPERHORZ, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERHORZ, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERHORZ, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERVERT, 0, L"GRIPPERVERT"}, + {SBP_GRIPPERVERT, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERVERT, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERVERT, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERVERT, SCRBS_HOVER, L"HOVER"}, {SBP_SIZEBOX, 0, L"SIZEBOX"}, {SBP_SIZEBOX, SZB_RIGHTALIGN, L"RIGHTALIGN"}, {SBP_SIZEBOX, SZB_LEFTALIGN, L"LEFTALIGN"}, + {SBP_SIZEBOX, SZB_TOPRIGHTALIGN, L"TOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_TOPLEFTALIGN, L"TOPLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMRIGHTALIGN, L"HALFBOTTOMRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMLEFTALIGN, L"HALFBOTTOMLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPRIGHTALIGN, L"HALFTOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPLEFTALIGN, L"HALFTOPLEFTALIGN"}, + {SBP_SIZEBOXBKGND, 0, L"SIZEBOXBKGND"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 3075b4cdc08..b527c15a29a 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1045,6 +1045,7 @@ enum SCROLLBARPARTS { SBP_GRIPPERHORZ = 8, SBP_GRIPPERVERT = 9, SBP_SIZEBOX = 10, + SBP_SIZEBOXBKGND = 11, }; #define SCROLLBARSTYLEPARTS SCROLLBARPARTS;

1 0

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

22 Jun '22

Module: wine Branch: master Commit: 28ba7e41f8644a582c36510a39cea820a193cbc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28ba7e41f8644a582c36510a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 16:32:27 2022 +0800 uxtheme: Support parsing more start panel parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b8e9eb95e43..8da93ef321d 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -948,6 +948,35 @@ static const MSSTYLES_CLASS_MAP classStartpanel[] = { {SPP_LOGOFFBUTTONS, SPLS_PRESSED, L"PRESSED"}, {SPP_USERPICTURE, 0, L"USERPICTURE"}, {SPP_PREVIEW, 0, L"PREVIEW"}, + {SPP_MOREPROGRAMSTAB, 0, L"MOREPROGRAMSTAB"}, + {SPP_MOREPROGRAMSTAB, SPMPT_NORMAL, L"NORMAL"}, + {SPP_MOREPROGRAMSTAB, SPMPT_HOT, L"HOT"}, + {SPP_MOREPROGRAMSTAB, SPMPT_SELECTED, L"SELECTED"}, + {SPP_MOREPROGRAMSTAB, SPMPT_DISABLED, L"DISABLED"}, + {SPP_MOREPROGRAMSTAB, SPMPT_FOCUSED, L"FOCUSED"}, + {SPP_NSCHOST, 0, L"NSCHOST"}, + {SPP_SOFTWAREEXPLORER, 0, L"SOFTWAREEXPLORER"}, + {SPP_SOFTWAREEXPLORER, SPSE_NORMAL, L"NORMAL"}, + {SPP_SOFTWAREEXPLORER, SPSE_HOT, L"HOT"}, + {SPP_SOFTWAREEXPLORER, SPSE_SELECTED, L"SELECTED"}, + {SPP_SOFTWAREEXPLORER, SPSE_DISABLED, L"DISABLED"}, + {SPP_SOFTWAREEXPLORER, SPSE_FOCUSED, L"FOCUSED"}, + {SPP_OPENBOX, 0, L"OPENBOX"}, + {SPP_OPENBOX, SPOB_NORMAL, L"NORMAL"}, + {SPP_OPENBOX, SPOB_HOT, L"HOT"}, + {SPP_OPENBOX, SPOB_SELECTED, L"SELECTED"}, + {SPP_OPENBOX, SPOB_DISABLED, L"DISABLED"}, + {SPP_OPENBOX, SPOB_FOCUSED, L"FOCUSED"}, + {SPP_SEARCHVIEW, 0, L"SEARCHVIEW"}, + {SPP_MOREPROGRAMSARROWBACK, 0, L"MOREPROGRAMSARROWBACK"}, + {SPP_MOREPROGRAMSARROWBACK, SPSB_NORMAL, L"NORMAL"}, + {SPP_MOREPROGRAMSARROWBACK, SPSB_HOT, L"HOT"}, + {SPP_MOREPROGRAMSARROWBACK, SPSB_PRESSED, L"PRESSED"}, + {SPP_TOPMATCH, 0, L"TOPMATCH"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, 0, L"LOGOFFSPLITBUTTONDROPDOWN"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, SPLS_NORMAL, L"NORMAL"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, SPLS_HOT, L"HOT"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, SPLS_PRESSED, L"PRESSED"}, {0, 0, L""} };

1 0

Paul Gofman : opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat().
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: cc8d8b5ee33561e984d4abe4112ddd6324f77115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8d8b5ee33561e984d4abe4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 25 18:58:21 2022 -0500 opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat(). Patch by Matteo Bruni. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/opengl32/wgl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index bd7f7d22e98..49f1e4700b4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -564,27 +564,27 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } - if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) + if (ppfd->cStencilBits) { - if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || - ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) + if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || + ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) goto found; - if (best.cDepthBits != format.cDepthBits) + if (best.cStencilBits != format.cStencilBits) { - TRACE( "depth mismatch for iPixelFormat=%d\n", i ); + TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); continue; } } - if (ppfd->cStencilBits) + if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) { - if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || - ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) + if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || + ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) goto found; - if (best.cStencilBits != format.cStencilBits) + if (best.cDepthBits != format.cDepthBits) { - TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); + TRACE( "depth mismatch for iPixelFormat=%d\n", i ); continue; } }

1 0