[PATCH 0/1] MR1083: hhctrl.ocx: Fix toolbar icons order

[Stanislav Motylkov (＠binarymaster)]

In `hhtoolbar.bmp` the "Expand" icon comes first, then "Collapse".

![](https://gitlab.winehq.org/wine/wine/-/raw/master/dlls/hhctrl.ocx/hhtoolbar.b...)

External issue link in ReactOS Jira: [CORE-12198](https://jira.reactos.org/browse/CORE-12198)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1083

[PATCH 1/1] hhctrl.ocx: Fix toolbar icons order

[Stanislav Motylkov]

From: Stanislav Motylkov <x86corez(a)gmail.com>

In `hhtoolbar.bmp` the "Expand" icon comes first, then "Collapse".
---
 dlls/hhctrl.ocx/resource.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h
index b35b7c75cdc..2630da760cb 100644
--- a/dlls/hhctrl.ocx/resource.h
+++ b/dlls/hhctrl.ocx/resource.h
@@ -39,9 +39,9 @@
 #define HHTB_REFRESH    1
 #define HHTB_HOME       2
 #define HHTB_SYNC       3
-#define HHTB_CONTRACT   4
-#define HHTB_EXPAND     5
-#define HHTB_NUMBITMAPS HHTB_EXPAND
+#define HHTB_EXPAND     4
+#define HHTB_CONTRACT   5
+#define HHTB_NUMBITMAPS HHTB_CONTRACT
 
 #define MIID_SELECTALL  10
 #define MIID_VIEWSOURCE 11
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1083

[PATCH 1/1] hhctrl.ocx: Fix toolbar icons order

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=125072

Your paranoid android.


=== debian11 (32 bit report) ===

ddraw:
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x1000.
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x3000.

=== debian11 (build log) ===

Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24742.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24742.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24742.

[PATCH 0/1] MR1083: hhctrl.ocx: Fix toolbar icons order - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1083