[0.4.8][COMCTL32] Address regression CORE-14622

"Avira Antivir Personal 6.35.00.243" had issues painting its
setup wizard dialog with correct background color.
That part was a regression of SVN r74136 == git
b1b42795a94d8e3cb69e2d9e5bd0af4929610361

and also did not draw its umbrella bmp, which did never work
in ros up to now afaik.

https://reactos.org/testman/compare.php?ids=69394,69478 VBOX
https://reactos.org/testman/compare.php?ids=69395,69479 KVM

Thanks to patches author Doug Lyons and HBelusca.

Wine has been reported to be affected by that bug as well:
https://bugs.winehq.org/show_bug.cgi?id=46636
Not sure whether our patch will be accepted by Wine,
to my naive eye this looks like an interim solution.

fix picked from commit 0.4.14-dev-107-g
f2f833c53c27c58cf9b762fcc967aaaf41d2668f

diff --git a/dll/win32/comctl32/propsheet.c b/dll/win32/comctl32/propsheet.c
index e5f5d50..a149d11 100644 (file)
--- a/dll/win32/comctl32/propsheet.c
+++ b/dll/win32/comctl32/propsheet.c
@@ -1451,6 +1451,9 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
      (psInfo->ppshheader.dwFlags & PSH_WATERMARK) &&
      (ppshpage->dwFlags & PSP_HIDEHEADER))
   {
+#ifdef __REACTOS__
+    if (psInfo->ppshheader.u4.hbmWatermark)
+#endif
       SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1,
                         (DWORD_PTR)ppshpage);
   }