Kirill K. Smirnov : winhelp: Use color specified in . hlp file for background, not just WHITE_BRUSH.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4d00b282e157550475625f255a74aab5abc1d665
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4d00b282e157550475625f255a...

Author: Kirill K. Smirnov <lich(a)math.spbu.ru>
Date:   Fri Oct 13 16:19:48 2006 +0400

winhelp: Use color specified in .hlp file for background, not just WHITE_BRUSH.

---

 programs/winhelp/winhelp.c |    7 +++++++
 programs/winhelp/winhelp.h |    2 ++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index a2fa88d..9cf7993 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -272,6 +272,7 @@ static BOOL WINHELP_RegisterWinClasses(v
 
     class_text = class_main;
     class_text.lpfnWndProc         = WINHELP_TextWndProc;
+    class_text.hbrBackground       = 0;
     class_text.lpszClassName       = TEXT_WIN_CLASS_NAME;
 
     class_shadow = class_main;
@@ -395,6 +396,7 @@ static BOOL     WINHELP_ReuseWindow(WINH
     win->hTextWnd      = oldwin->hTextWnd;
     win->hHistoryWnd   = oldwin->hHistoryWnd;
     oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0;
+    win->hBrush = oldwin->hBrush;
 
     SetWindowLong(win->hMainWnd,      0, (LONG)win);
     SetWindowLong(win->hButtonBoxWnd, 0, (LONG)win);
@@ -857,6 +859,7 @@ static LRESULT CALLBACK WINHELP_TextWndP
         win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams;
         SetWindowLong(hWnd, 0, (LONG) win);
         win->hTextWnd = hWnd;
+        win->hBrush = CreateSolidBrush(win->info->sr_color);
         if (win->info->win_style & WS_POPUP) Globals.hPopupWnd = win->hMainWnd = hWnd;
         WINHELP_InitFonts(hWnd);
         break;
@@ -989,6 +992,8 @@ static LRESULT CALLBACK WINHELP_TextWndP
         win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
         scroll_pos = GetScrollPos(hWnd, SB_VERT);
 
+        /* No DPtoLP needed - MM_TEXT map mode */
+        if (ps.fErase) FillRect(hDc, &ps.rcPaint, win->hBrush);
         for (line = win->first_line; line; line = line->next)
         {
             for (part = &line->first_part; part; part = part->next)
@@ -998,6 +1003,7 @@ static LRESULT CALLBACK WINHELP_TextWndP
                 case hlp_line_part_text:
                     SelectObject(hDc, part->u.text.hFont);
                     SetTextColor(hDc, part->u.text.color);
+                    SetBkColor(hDc, win->info->sr_color);
                     TextOut(hDc, part->rect.left, part->rect.top - scroll_pos,
                             part->u.text.lpsText, part->u.text.wTextLen);
                     if (part->u.text.wUnderline)
@@ -1122,6 +1128,7 @@ static LRESULT CALLBACK WINHELP_TextWndP
         if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0;
 
         bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main"));
+        DeleteObject(win->hBrush);
 
         WINHELP_DeleteWindow(win);
 
diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h
index 2536b06..b7227bf 100644
--- a/programs/winhelp/winhelp.h
+++ b/programs/winhelp/winhelp.h
@@ -111,6 +111,8 @@ typedef struct tagWinHelp
     HCURSOR             hArrowCur;
     HCURSOR             hHandCur;
 
+    HBRUSH              hBrush;
+
     HLPFILE_WINDOWINFO* info;
 
     /* FIXME: for now it's a fixed size */