https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49165276f27f79bfab5c4…
commit 49165276f27f79bfab5c48664865ef44cd40142e
Author: Andreas Maier <staubim(a)quantentunnel.de>
AuthorDate: Sat Jun 22 16:36:14 2019 +0200
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Sat Jun 22 16:36:14 2019 +0200
[COMCTL32] Fix CORE-14619 (Checkbox buttons theming regression) (#1674)
* [COMCTL32] Fix CORE-14619 (Checkbox buttons theming regression)
Fix cb_states / rb_states lookup table.
* [README.WINE] comctl32 is synced to WineStaging-3.3.
See commit b3fb8555 .
---
dll/win32/comctl32/button.c | 10 +++++-----
media/doc/README.WINE | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c
index aacb96f7a29..1b345180870 100644
--- a/dll/win32/comctl32/button.c
+++ b/dll/win32/comctl32/button.c
@@ -1898,15 +1898,15 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO
*infoPtr, HDC hDC, Bu
{
static const int cb_states[3][5] =
{
- { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED,
CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDNORMAL },
- { CBS_CHECKEDNORMAL, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDDISABLED,
CBS_CHECKEDNORMAL },
- { CBS_MIXEDNORMAL, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDDISABLED,
CBS_MIXEDNORMAL }
+ { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT,
CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL },
+ { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED,
CBS_CHECKEDNORMAL },
+ { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED,
CBS_MIXEDNORMAL }
};
static const int rb_states[2][5] =
{
- { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED,
RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDNORMAL },
- { RBS_CHECKEDNORMAL, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDDISABLED,
RBS_CHECKEDNORMAL }
+ { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT,
RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL },
+ { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED,
RBS_CHECKEDNORMAL }
};
SIZE sz;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 0274793364e..ebd0f73d913 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -55,7 +55,7 @@ reactos/dll/win32/browseui # Out of sync
reactos/dll/win32/cabinet # Synced to WineStaging-3.3
reactos/dll/win32/clusapi # Synced to WineStaging-3.3
reactos/dll/win32/comcat # Synced to WineStaging-3.3
-reactos/dll/win32/comctl32 # Synced to Wine-3.0
+reactos/dll/win32/comctl32 # Synced to WineStaging-3.3
reactos/dll/win32/comdlg32 # Synced to WineStaging-4.0
reactos/dll/win32/compstui # Synced to WineStaging-3.3
reactos/dll/win32/credui # Synced to WineStaging-4.0