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

Zhiyi Zhang : uxtheme: Support parsing more tooltip parts and states.
by Alexandre Julliard June 23, 2022

June 23, 2022

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 taskdialog class.
by Alexandre Julliard June 23, 2022

June 23, 2022

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 window parts and states.
by Alexandre Julliard June 23, 2022

June 23, 2022

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

Zhiyi Zhang : uxtheme: Support parsing more toolbar parts and states.
by Alexandre Julliard June 23, 2022

June 23, 2022

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 tab parts.
by Alexandre Julliard June 23, 2022

June 23, 2022

Module: wine Branch: master Commit: c75b46045b2ca2711ce685ae6ed0eab8da9f1e1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c75b46045b2ca2711ce685ae… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 16:37:58 2022 +0800 uxtheme: Support parsing more tab parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 8da93ef321d..00c80259dbb 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1038,6 +1038,7 @@ static const MSSTYLES_CLASS_MAP classTab[] = { {TABP_TOPTABITEMBOTHEDGE, TTIBES_FOCUSED, L"FOCUSED"}, {TABP_PANE, 0, L"PANE"}, {TABP_BODY, 0, L"BODY"}, + {TABP_AEROWIZARDBODY, 0, L"AEROWIZARDBODY"}, {0, 0, L""} };

1 0

Cressida Silver : WWN 421.
by Alexandre Julliard June 23, 2022

June 23, 2022

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 start panel parts and states.
by Alexandre Julliard June 22, 2022

June 22, 2022

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

Zhiyi Zhang : uxtheme: Support parsing navigation class.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: e0eb7eb006ba227dafa7c5a3ab7152242ec59cc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0eb7eb006ba227dafa7c5a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 21 16:47:50 2022 +0800 uxtheme: Support parsing navigation class. 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 146df4f254a..fa79c9d8840 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -728,6 +728,25 @@ static const MSSTYLES_CLASS_MAP classMenuband[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classNavigation[] = { + {NAV_BACKBUTTON, 0, L"BACKBUTTON"}, + {NAV_BACKBUTTON, NAV_BB_NORMAL, L"NORMAL"}, + {NAV_BACKBUTTON, NAV_BB_HOT, L"HOT"}, + {NAV_BACKBUTTON, NAV_BB_PRESSED, L"PRESSED"}, + {NAV_BACKBUTTON, NAV_BB_DISABLED, L"DISABLED"}, + {NAV_FORWARDBUTTON, 0, L"FORWARDBUTTON"}, + {NAV_FORWARDBUTTON, NAV_FB_NORMAL, L"NORMAL"}, + {NAV_FORWARDBUTTON, NAV_FB_HOT, L"HOT"}, + {NAV_FORWARDBUTTON, NAV_FB_PRESSED, L"PRESSED"}, + {NAV_FORWARDBUTTON, NAV_FB_DISABLED, L"DISABLED"}, + {NAV_MENUBUTTON, 0, L"MENUBUTTON"}, + {NAV_MENUBUTTON, NAV_MB_NORMAL, L"NORMAL"}, + {NAV_MENUBUTTON, NAV_MB_HOT, L"HOT"}, + {NAV_MENUBUTTON, NAV_MB_PRESSED, L"PRESSED"}, + {NAV_MENUBUTTON, NAV_MB_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classPage[] = { {PGRP_UP, 0, L"UP"}, {PGRP_UP, UPS_NORMAL, L"NORMAL"}, @@ -1253,6 +1272,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classListview, L"LISTVIEW"}, {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, + {classNavigation, L"NAVIGATION"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, {classRebar, L"REBAR"},

1 0

Zhiyi Zhang : uxtheme: Support parsing more listview parts and states.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: 49d658cdc12973360ad239c85816e1092a0466ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=49d658cdc12973360ad239c8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 12:13:49 2022 +0800 uxtheme: Support parsing more listview parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 17fae04968b..146df4f254a 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -617,6 +617,49 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {LVP_LISTDETAIL, 0, L"LISTDETAIL"}, {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"}, {LVP_EMPTYTEXT, 0, L"EMPTYTEXT"}, + {LVP_GROUPHEADER, 0, L"GROUPHEADER"}, + {LVP_GROUPHEADER, LVGH_OPEN, L"OPEN"}, + {LVP_GROUPHEADER, LVGH_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADER, LVGH_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, 0, L"GROUPHEADERLINE"}, + {LVP_GROUPHEADERLINE, LVGHL_OPEN, L"OPEN"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_EXPANDBUTTON, 0, L"EXPANDBUTTON"}, + {LVP_EXPANDBUTTON, LVEB_NORMAL, L"NORMAL"}, + {LVP_EXPANDBUTTON, LVEB_HOVER, L"HOVER"}, + {LVP_EXPANDBUTTON, LVEB_PUSHED, L"PUSHED"}, + {LVP_COLLAPSEBUTTON, 0, L"COLLAPSEBUTTON"}, + {LVP_COLLAPSEBUTTON, LVCB_NORMAL, L"NORMAL"}, + {LVP_COLLAPSEBUTTON, LVCB_HOVER, L"HOVER"}, + {LVP_COLLAPSEBUTTON, LVCB_PUSHED, L"PUSHED"}, + {LVP_COLUMNDETAIL, 0, L"COLUMNDETAIL"}, {0, 0, L""} };

1 0

Biswapriyo Nath : include: Add IDXGIInfoQueue declaration in dxgidebug.idl.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: 21df12f1ac0cd1ab97cebd7e03f6a4a142cf82c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21df12f1ac0cd1ab97cebd7e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jun 18 02:11:19 2022 +0530 include: Add IDXGIInfoQueue declaration in dxgidebug.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/dxgidebug.idl | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl index 2daeb674f97..7806e0be013 100644 --- a/include/dxgidebug.idl +++ b/include/dxgidebug.idl @@ -18,6 +18,10 @@ import "oaidl.idl"; +const UINT DXGI_DEBUG_BINARY_VERSION = 1; + +typedef GUID DXGI_DEBUG_ID; + cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") @@ -30,6 +34,205 @@ typedef enum DXGI_DEBUG_RLO_FLAGS { DXGI_DEBUG_RLO_ALL = 0x0007 } DXGI_DEBUG_RLO_FLAGS; +typedef enum DXGI_INFO_QUEUE_MESSAGE_CATEGORY { + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_UNKNOWN, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_MISCELLANEOUS, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_INITIALIZATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_CLEANUP, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_COMPILATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_CREATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_SETTING, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_GETTING, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_RESOURCE_MANIPULATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_EXECUTION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_SHADER, +} DXGI_INFO_QUEUE_MESSAGE_CATEGORY; + +typedef enum DXGI_INFO_QUEUE_MESSAGE_SEVERITY { + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_CORRUPTION, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_ERROR, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_WARNING, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_INFO, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_MESSAGE +} DXGI_INFO_QUEUE_MESSAGE_SEVERITY; + +typedef int DXGI_INFO_QUEUE_MESSAGE_ID; +cpp_quote("#define DXGI_INFO_QUEUE_MESSAGE_ID_STRING_FROM_APPLICATION 0") + +typedef struct DXGI_INFO_QUEUE_MESSAGE { + DXGI_DEBUG_ID Producer; + DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category; + DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity; + DXGI_INFO_QUEUE_MESSAGE_ID ID; + const char *pDescription; + SIZE_T DescriptionByteLength; +} DXGI_INFO_QUEUE_MESSAGE; + +typedef struct DXGI_INFO_QUEUE_FILTER_DESC { + UINT NumCategories; + DXGI_INFO_QUEUE_MESSAGE_CATEGORY *pCategoryList; + UINT NumSeverities; + DXGI_INFO_QUEUE_MESSAGE_SEVERITY *pSeverityList; + UINT NumIDs; + DXGI_INFO_QUEUE_MESSAGE_ID *pIDList; +} DXGI_INFO_QUEUE_FILTER_DESC; + +typedef struct DXGI_INFO_QUEUE_FILTER { + DXGI_INFO_QUEUE_FILTER_DESC AllowList; + DXGI_INFO_QUEUE_FILTER_DESC DenyList; +} DXGI_INFO_QUEUE_FILTER; + +cpp_quote("#define DXGI_INFO_QUEUE_DEFAULT_MESSAGE_COUNT_LIMIT 1024") + +cpp_quote("HRESULT WINAPI DXGIGetDebugInterface(REFIID riid, void **ppDebug);") + +[ + uuid(d67441c7-672a-476f-9e82-cd55b44949ce), + object, + local, + pointer_default(unique) +] +interface IDXGIInfoQueue : IUnknown +{ + HRESULT SetMessageCountLimit( + [in] DXGI_DEBUG_ID producer, + [in] UINT64 limit); + + void ClearStoredMessages( + [in] DXGI_DEBUG_ID producer); + + HRESULT GetMessage( + [in] DXGI_DEBUG_ID producer, + [in] UINT64 index, + [out] DXGI_INFO_QUEUE_MESSAGE *message, + [in, out] SIZE_T *length); + + UINT64 GetNumStoredMessagesAllowedByRetrievalFilters( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumStoredMessages( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumMessagesDiscardedByMessageCountLimit( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetMessageCountLimit( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumMessagesAllowedByStorageFilter( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumMessagesDeniedByStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT AddStorageFilterEntries( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + HRESULT GetStorageFilter( + [in] DXGI_DEBUG_ID producer, + [out] DXGI_INFO_QUEUE_FILTER *filter, + [in, out] SIZE_T *length); + + void ClearStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushEmptyStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushDenyAllStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushCopyOfStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushStorageFilter( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + void PopStorageFilter( + [in] DXGI_DEBUG_ID producer); + + UINT GetStorageFilterStackSize( + [in] DXGI_DEBUG_ID producer); + + HRESULT AddRetrievalFilterEntries( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + HRESULT GetRetrievalFilter( + [in] DXGI_DEBUG_ID producer, + [out] DXGI_INFO_QUEUE_FILTER *filter, + [in, out] SIZE_T *length); + + void ClearRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushEmptyRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushDenyAllRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushCopyOfRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushRetrievalFilter( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + void PopRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + UINT GetRetrievalFilterStackSize( + [in] DXGI_DEBUG_ID producer); + + HRESULT AddMessage( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_CATEGORY category, + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity, + [in] DXGI_INFO_QUEUE_MESSAGE_ID id, + [in] LPCSTR description); + + HRESULT AddApplicationMessage( + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity, + [in] LPCSTR description); + + HRESULT SetBreakOnCategory( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_CATEGORY category, + [in] BOOL enable); + + HRESULT SetBreakOnSeverity( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity, + [in] BOOL enable); + + HRESULT SetBreakOnID( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_ID id, + [in] BOOL enable); + + BOOL GetBreakOnCategory( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_CATEGORY category); + + BOOL GetBreakOnSeverity( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity); + + BOOL GetBreakOnID( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_ID id); + + void SetMuteDebugOutput( + [in] DXGI_DEBUG_ID producer, + [in] BOOL mute); + + BOOL GetMuteDebugOutput( + [in] DXGI_DEBUG_ID producer); +} + [ object, local,

1 0