From 77b2185e1c2f8c35cd8b6372af32c59037d17f6b Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
Date: Wed, 15 Nov 2000 22:15:52 +0000
Subject: [PATCH] Remove redundant includes. Eliminate use of USER internal
 structures.

---
 dlls/comctl32/monthcal.c | 1 -
 dlls/comctl32/rebar.c    | 8 +++-----
 dlls/commdlg/colordlg.c  | 1 -
 dlls/commdlg/finddlg.c   | 1 -
 dlls/commdlg/fontdlg.c   | 1 -
 dlls/commdlg/printdlg.c  | 1 -
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 1eaeb373a5d..0e0d519024c 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -24,7 +24,6 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "win.h"
 #include "winnls.h"
 #include "commctrl.h"
 #include "comctl32.h"
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 1a1cb1605e3..e4ff860938f 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -43,7 +43,6 @@
 #include "class.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "win.h"
 #include "wine/unicode.h"
 #include "wine/winestring.h"
 #include "commctrl.h"
@@ -1091,15 +1090,14 @@ REBAR_InternalEraseBkGnd (HWND hwnd, WPARAM wParam, LPARAM lParam, RECT *clip)
      /*  default brush, then with any band that has a different   */
      /*  background color.                                        */
 {
-    WND * wndPtr = WIN_FindWndPtr( hwnd );
+    HBRUSH hbrBackground = GetClassWord(hwnd, GCW_HBRBACKGROUND);
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
     RECT eraserect;
     REBAR_BAND *lpBand;
     INT i;
 
-    if (wndPtr->class->hbrBackground)
-        FillRect( (HDC) wParam, clip, wndPtr->class->hbrBackground);
-    WIN_ReleaseWndPtr(wndPtr);
+    if (hbrBackground)
+        FillRect( (HDC) wParam, clip, hbrBackground);
 
     for(i=0; i<infoPtr->uNumBands; i++) {
         lpBand = &infoPtr->bands[i];
diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index 0019739e443..c7fcfb21775 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -25,7 +25,6 @@
 #include "dlgs.h"
 #include "module.h"
 #include "debugtools.h"
-#include "winproc.h"
 #include "cderr.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg);
diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c
index 5880c200855..e265f7d8571 100644
--- a/dlls/commdlg/finddlg.c
+++ b/dlls/commdlg/finddlg.c
@@ -15,7 +15,6 @@
 #include "ldt.h"
 #include "module.h"
 #include "debugtools.h"
-#include "winproc.h"
 #include "cderr.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg)
diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index 92edc987b12..a4b6a85845f 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -23,7 +23,6 @@
 #include "module.h"
 #include "debugtools.h"
 #include "font.h"
-#include "winproc.h"
 #include "cderr.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg);
diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index d2a8cf97a06..3bfc5143b2a 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -21,7 +21,6 @@
 #include "dlgs.h"
 #include "module.h"
 #include "debugtools.h"
-#include "winproc.h"
 #include "cderr.h"
 #include "winspool.h"
 #include "winerror.h"
-- 
2.11.4.GIT