From: Zhiyi Zhang zzhang@codeweavers.com
Signed-off-by: Zhiyi Zhang zzhang@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"
From: Zhiyi Zhang zzhang@codeweavers.com
Signed-off-by: Zhiyi Zhang zzhang@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 */
From: Zhiyi Zhang zzhang@codeweavers.com
Signed-off-by: Zhiyi Zhang zzhang@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"
From: Zhiyi Zhang zzhang@codeweavers.com
Signed-off-by: Zhiyi Zhang zzhang@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""} };
From: Zhiyi Zhang zzhang@codeweavers.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang zzhang@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""} };
-
Zhiyi Zhang -
Zhiyi Zhang (＠zhiyi)