From 06c2684e832894f7d12f8cdfd44e344be9a4f43d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 22 Dec 2013 19:02:59 +0000 Subject: [PATCH] [COMCTL32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61341 --- reactos/dll/win32/comctl32/animate.c | 17 +---- reactos/dll/win32/comctl32/comboex.c | 10 --- reactos/dll/win32/comctl32/comctl32.h | 85 +++++----------------- reactos/dll/win32/comctl32/comctl32undoc.c | 28 ------- reactos/dll/win32/comctl32/commctrl.c | 18 +---- reactos/dll/win32/comctl32/datetime.c | 12 --- reactos/dll/win32/comctl32/dpa.c | 18 +---- reactos/dll/win32/comctl32/draglist.c | 9 --- reactos/dll/win32/comctl32/dsa.c | 8 -- reactos/dll/win32/comctl32/flatsb.c | 8 -- reactos/dll/win32/comctl32/header.c | 18 ----- reactos/dll/win32/comctl32/hotkey.c | 9 --- reactos/dll/win32/comctl32/imagelist.c | 20 +---- reactos/dll/win32/comctl32/ipaddress.c | 14 ---- reactos/dll/win32/comctl32/listview.c | 19 ----- reactos/dll/win32/comctl32/monthcal.c | 16 ---- reactos/dll/win32/comctl32/nativefont.c | 8 -- reactos/dll/win32/comctl32/pager.c | 9 --- reactos/dll/win32/comctl32/progress.c | 11 --- reactos/dll/win32/comctl32/propsheet.c | 16 ---- reactos/dll/win32/comctl32/rebar.c | 15 ---- reactos/dll/win32/comctl32/resource.h | 62 ++++++++++++++++ reactos/dll/win32/comctl32/rsrc.rc | 10 +-- reactos/dll/win32/comctl32/smoothscroll.c | 9 +-- reactos/dll/win32/comctl32/status.c | 13 ---- reactos/dll/win32/comctl32/string.c | 16 ---- reactos/dll/win32/comctl32/syslink.c | 10 --- reactos/dll/win32/comctl32/tab.c | 14 ---- reactos/dll/win32/comctl32/theme_button.c | 10 --- reactos/dll/win32/comctl32/theme_combo.c | 11 --- reactos/dll/win32/comctl32/theme_dialog.c | 11 --- reactos/dll/win32/comctl32/theme_edit.c | 11 --- reactos/dll/win32/comctl32/theme_listbox.c | 11 --- reactos/dll/win32/comctl32/theming.c | 8 -- reactos/dll/win32/comctl32/toolbar.c | 14 ---- reactos/dll/win32/comctl32/tooltips.c | 13 ---- reactos/dll/win32/comctl32/trackbar.c | 15 ---- reactos/dll/win32/comctl32/treeview.c | 22 ------ reactos/dll/win32/comctl32/updown.c | 15 ---- 39 files changed, 92 insertions(+), 551 deletions(-) create mode 100644 reactos/dll/win32/comctl32/resource.h diff --git a/reactos/dll/win32/comctl32/animate.c b/reactos/dll/win32/comctl32/animate.c index 0cfa6d83a92..bbef6036e96 100644 --- a/reactos/dll/win32/comctl32/animate.c +++ b/reactos/dll/win32/comctl32/animate.c @@ -33,22 +33,9 @@ * - check for the 'rec ' list in some AVI files */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include -#include -#include -#include -//#include "winuser.h" -#include -//#include "commctrl.h" -#include -//#include "mmsystem.h" #include "comctl32.h" -#include + +#include WINE_DEFAULT_DEBUG_CHANNEL(animate); diff --git a/reactos/dll/win32/comctl32/comboex.c b/reactos/dll/win32/comctl32/comboex.c index 515512944d0..0d6e41fa6a3 100644 --- a/reactos/dll/win32/comctl32/comboex.c +++ b/reactos/dll/win32/comctl32/comboex.c @@ -30,17 +30,7 @@ * */ -//#include -//#include -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(comboex); diff --git a/reactos/dll/win32/comctl32/comctl32.h b/reactos/dll/win32/comctl32/comctl32.h index 38cac431f1f..70e162a9dc4 100644 --- a/reactos/dll/win32/comctl32/comctl32.h +++ b/reactos/dll/win32/comctl32/comctl32.h @@ -24,85 +24,36 @@ #ifndef __WINE_COMCTL32_H #define __WINE_COMCTL32_H -#define WIN32_NO_STATUS +#include + +#include +#include + #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#ifndef RC_INVOKED -#include -#endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#define COBJMACROS #include #include #include #include -//#include "winnls.h" +#include #include +#include +#include + +#include +#include + +#include "resource.h" extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; -/* Property sheet / Wizard */ -#define IDD_PROPSHEET 1006 -#define IDD_WIZARD 1020 - -#define IDC_TABCONTROL 12320 -#define IDC_APPLY_BUTTON 12321 -#define IDC_BACK_BUTTON 12323 -#define IDC_NEXT_BUTTON 12324 -#define IDC_FINISH_BUTTON 12325 -#define IDC_SUNKEN_LINE 12326 -#define IDC_SUNKEN_LINEHEADER 12327 - -#define IDS_CLOSE 4160 - -/* Toolbar customization dialog */ -#define IDD_TBCUSTOMIZE 200 - -#define IDC_AVAILBTN_LBOX 201 -#define IDC_RESET_BTN 202 -#define IDC_TOOLBARBTN_LBOX 203 -#define IDC_REMOVE_BTN 204 -#define IDC_HELP_BTN 205 -#define IDC_MOVEUP_BTN 206 -#define IDC_MOVEDN_BTN 207 - -#define IDS_SEPARATOR 1024 - -/* Toolbar imagelist bitmaps */ -#define IDB_STD_SMALL 120 -#define IDB_STD_LARGE 121 -#define IDB_VIEW_SMALL 124 -#define IDB_VIEW_LARGE 125 -#define IDB_HIST_SMALL 130 -#define IDB_HIST_LARGE 131 - -#define IDM_TODAY 4163 -#define IDM_GOTODAY 4164 - -/* Treeview Checkboxes */ - -#define IDT_CHECK 401 - - -/* Cursors */ -#define IDC_MOVEBUTTON 102 -#define IDC_COPY 104 -#define IDC_DIVIDER 106 -#define IDC_DIVIDEROPEN 107 - - -/* DragList resources */ -#define IDI_DRAGARROW 501 - -/* HOTKEY internal strings */ -#define HKY_NONE 2048 - -/* Tooltip icons */ -#define IDI_TT_INFO_SM 22 -#define IDI_TT_WARN_SM 25 -#define IDI_TT_ERROR_SM 28 - typedef struct { COLORREF clrBtnHighlight; /* COLOR_BTNHIGHLIGHT */ @@ -138,8 +89,6 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; -#define COMCTL32_VERSION_MINOR 81 - /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { SUBCLASSPROC subproc; diff --git a/reactos/dll/win32/comctl32/comctl32undoc.c b/reactos/dll/win32/comctl32/comctl32undoc.c index bdf20f554c8..6c6cc77ba59 100644 --- a/reactos/dll/win32/comctl32/comctl32undoc.c +++ b/reactos/dll/win32/comctl32/comctl32undoc.c @@ -26,37 +26,9 @@ * COMCTL32.DLL (internally). * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include -//#include "wine/port.h" - -//#include -//#include -//#include -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -#include -//#include "commctrl.h" -//#include "objbase.h" -//#include "winerror.h" - -#include #include "comctl32.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(commctrl); static const WCHAR strMRUList[] = { 'M','R','U','L','i','s','t',0 }; diff --git a/reactos/dll/win32/comctl32/commctrl.c b/reactos/dll/win32/comctl32/commctrl.c index a0315d1f9a4..3d5cd27f9a7 100644 --- a/reactos/dll/win32/comctl32/commctrl.c +++ b/reactos/dll/win32/comctl32/commctrl.c @@ -52,26 +52,10 @@ * -- ICC_WIN95_CLASSES */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "comctl32.h" -#include -//#include -//#include - -#include -#include -//#include "wingdi.h" -//#include "winuser.h" -#include -//#include "commctrl.h" -//#include "winerror.h" -#include #define NO_SHLWAPI_STREAM #include -#include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/datetime.c b/reactos/dll/win32/comctl32/datetime.c index 825b4427d1e..6a13f55f4b5 100644 --- a/reactos/dll/win32/comctl32/datetime.c +++ b/reactos/dll/win32/comctl32/datetime.c @@ -40,20 +40,8 @@ */ #include -//#include -//#include -//#include -//#include -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(datetime); diff --git a/reactos/dll/win32/comctl32/dpa.c b/reactos/dll/win32/comctl32/dpa.c index eceabca1ef4..19fbe45c80b 100644 --- a/reactos/dll/win32/comctl32/dpa.c +++ b/reactos/dll/win32/comctl32/dpa.c @@ -29,23 +29,9 @@ * http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include -//#include - -#include -#include -//#include "winuser.h" -//#include "commctrl.h" -#include - #include "comctl32.h" -#include + +#include WINE_DEFAULT_DEBUG_CHANNEL(dpa); diff --git a/reactos/dll/win32/comctl32/draglist.c b/reactos/dll/win32/comctl32/draglist.c index 4b82f259422..ecf78663101 100644 --- a/reactos/dll/win32/comctl32/draglist.c +++ b/reactos/dll/win32/comctl32/draglist.c @@ -29,16 +29,7 @@ * */ -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/dsa.c b/reactos/dll/win32/comctl32/dsa.c index 88a83c93686..ce4ca8120b0 100644 --- a/reactos/dll/win32/comctl32/dsa.c +++ b/reactos/dll/win32/comctl32/dsa.c @@ -29,15 +29,7 @@ * http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32 */ -#include - -#include -#include -#include -#include - #include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(dsa); diff --git a/reactos/dll/win32/comctl32/flatsb.c b/reactos/dll/win32/comctl32/flatsb.c index e4173974ec2..5aed8a2865b 100644 --- a/reactos/dll/win32/comctl32/flatsb.c +++ b/reactos/dll/win32/comctl32/flatsb.c @@ -29,15 +29,7 @@ * */ -#include -#include -#include -#include -#include -#include -#include #include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/header.c b/reactos/dll/win32/comctl32/header.c index 1db23601d10..9f8fe84a2ba 100644 --- a/reactos/dll/win32/comctl32/header.c +++ b/reactos/dll/win32/comctl32/header.c @@ -27,25 +27,7 @@ * - New Windows Vista features */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include -#include -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wine/unicode.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(header); diff --git a/reactos/dll/win32/comctl32/hotkey.c b/reactos/dll/win32/comctl32/hotkey.c index 94ccae5ce02..e436c4cfaa7 100644 --- a/reactos/dll/win32/comctl32/hotkey.c +++ b/reactos/dll/win32/comctl32/hotkey.c @@ -28,16 +28,7 @@ * */ -//#include -//#include -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(hotkey); diff --git a/reactos/dll/win32/comctl32/imagelist.c b/reactos/dll/win32/comctl32/imagelist.c index dfce617c3bb..27d98aefdac 100644 --- a/reactos/dll/win32/comctl32/imagelist.c +++ b/reactos/dll/win32/comctl32/imagelist.c @@ -37,26 +37,10 @@ * - Thread-safe locking */ -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include -//#include - -#define COBJMACROS - -//#include "winerror.h" -#include -#include -#include -//#include "wingdi.h" -#include -//#include "winuser.h" -//#include "commctrl.h" #include "comctl32.h" + +#include #include -#include #include WINE_DEFAULT_DEBUG_CHANNEL(imagelist); diff --git a/reactos/dll/win32/comctl32/ipaddress.c b/reactos/dll/win32/comctl32/ipaddress.c index 4310f6f7663..35e7f06eab8 100644 --- a/reactos/dll/win32/comctl32/ipaddress.c +++ b/reactos/dll/win32/comctl32/ipaddress.c @@ -32,21 +32,7 @@ * */ -//#include -//#include -//#include -//#include -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(ipaddress); diff --git a/reactos/dll/win32/comctl32/listview.c b/reactos/dll/win32/comctl32/listview.c index 7a6b0ffb0ef..0d98cda8ee5 100644 --- a/reactos/dll/win32/comctl32/listview.c +++ b/reactos/dll/win32/comctl32/listview.c @@ -134,28 +134,9 @@ * -- LVGroupComparE */ -#include -//#include "wine/port.h" - -#include -//#include -//#include -//#include -//#include #include -//#include "windef.h" -//#include "winbase.h" -//#include "winnt.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include - -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(listview); diff --git a/reactos/dll/win32/comctl32/monthcal.c b/reactos/dll/win32/comctl32/monthcal.c index 675f6223706..2151e3cb0fb 100644 --- a/reactos/dll/win32/comctl32/monthcal.c +++ b/reactos/dll/win32/comctl32/monthcal.c @@ -39,23 +39,7 @@ * -- search for FIXME */ -//#include -//#include -//#include -//#include -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(monthcal); diff --git a/reactos/dll/win32/comctl32/nativefont.c b/reactos/dll/win32/comctl32/nativefont.c index 0ea3ec9d797..c64acfca038 100644 --- a/reactos/dll/win32/comctl32/nativefont.c +++ b/reactos/dll/win32/comctl32/nativefont.c @@ -27,15 +27,7 @@ * - All notifications. */ -#include - -#include -#include -#include -#include -#include #include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(nativefont); diff --git a/reactos/dll/win32/comctl32/pager.c b/reactos/dll/win32/comctl32/pager.c index 9685acca7e9..9a98de2d245 100644 --- a/reactos/dll/win32/comctl32/pager.c +++ b/reactos/dll/win32/comctl32/pager.c @@ -52,16 +52,7 @@ * Robert Shearman */ -//#include -//#include -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(pager); diff --git a/reactos/dll/win32/comctl32/progress.c b/reactos/dll/win32/comctl32/progress.c index f165714b4b8..1c5231620d6 100644 --- a/reactos/dll/win32/comctl32/progress.c +++ b/reactos/dll/win32/comctl32/progress.c @@ -34,18 +34,7 @@ * */ -//#include -//#include -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(progress); diff --git a/reactos/dll/win32/comctl32/propsheet.c b/reactos/dll/win32/comctl32/propsheet.c index 03b275f8033..0744b1d2f82 100644 --- a/reactos/dll/win32/comctl32/propsheet.c +++ b/reactos/dll/win32/comctl32/propsheet.c @@ -52,23 +52,7 @@ * o PSP_USEREFPARENT */ -//#include -//#include - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" -//#include "prsht.h" #include "comctl32.h" -#include - -#include -#include /****************************************************************************** * Data structures diff --git a/reactos/dll/win32/comctl32/rebar.c b/reactos/dll/win32/comctl32/rebar.c index d6eed2e740e..c94f3021223 100644 --- a/reactos/dll/win32/comctl32/rebar.c +++ b/reactos/dll/win32/comctl32/rebar.c @@ -77,22 +77,7 @@ * at least RB_INSERTBAND */ -#include -//#include -#include -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "wine/unicode.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(rebar); diff --git a/reactos/dll/win32/comctl32/resource.h b/reactos/dll/win32/comctl32/resource.h new file mode 100644 index 00000000000..877210d3660 --- /dev/null +++ b/reactos/dll/win32/comctl32/resource.h @@ -0,0 +1,62 @@ +#pragma once + +/* Property sheet / Wizard */ +#define IDD_PROPSHEET 1006 +#define IDD_WIZARD 1020 + +#define IDC_TABCONTROL 12320 +#define IDC_APPLY_BUTTON 12321 +#define IDC_BACK_BUTTON 12323 +#define IDC_NEXT_BUTTON 12324 +#define IDC_FINISH_BUTTON 12325 +#define IDC_SUNKEN_LINE 12326 +#define IDC_SUNKEN_LINEHEADER 12327 + +#define IDS_CLOSE 4160 + +/* Toolbar customization dialog */ +#define IDD_TBCUSTOMIZE 200 + +#define IDC_AVAILBTN_LBOX 201 +#define IDC_RESET_BTN 202 +#define IDC_TOOLBARBTN_LBOX 203 +#define IDC_REMOVE_BTN 204 +#define IDC_HELP_BTN 205 +#define IDC_MOVEUP_BTN 206 +#define IDC_MOVEDN_BTN 207 + +#define IDS_SEPARATOR 1024 + +/* Toolbar imagelist bitmaps */ +#define IDB_STD_SMALL 120 +#define IDB_STD_LARGE 121 +#define IDB_VIEW_SMALL 124 +#define IDB_VIEW_LARGE 125 +#define IDB_HIST_SMALL 130 +#define IDB_HIST_LARGE 131 + +#define IDM_TODAY 4163 +#define IDM_GOTODAY 4164 + +/* Treeview Checkboxes */ + +#define IDT_CHECK 401 + +/* Cursors */ +#define IDC_MOVEBUTTON 102 +#define IDC_COPY 104 +#define IDC_DIVIDER 106 +#define IDC_DIVIDEROPEN 107 + +/* DragList resources */ +#define IDI_DRAGARROW 501 + +/* HOTKEY internal strings */ +#define HKY_NONE 2048 + +/* Tooltip icons */ +#define IDI_TT_INFO_SM 22 +#define IDI_TT_WARN_SM 25 +#define IDI_TT_ERROR_SM 28 + +#define COMCTL32_VERSION_MINOR 81 diff --git a/reactos/dll/win32/comctl32/rsrc.rc b/reactos/dll/win32/comctl32/rsrc.rc index 0ef81f12b5c..c14d18e5eab 100644 --- a/reactos/dll/win32/comctl32/rsrc.rc +++ b/reactos/dll/win32/comctl32/rsrc.rc @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" -#include "comctl32.h" +#include +#include +#include + +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/comctl32/smoothscroll.c b/reactos/dll/win32/comctl32/smoothscroll.c index 8527407ae12..52fb8cb7a33 100644 --- a/reactos/dll/win32/comctl32/smoothscroll.c +++ b/reactos/dll/win32/comctl32/smoothscroll.c @@ -21,14 +21,7 @@ * - actually add smooth scrolling */ -#include - -#include -//#include "winbase.h" -#include -//#include "winerror.h" -#include -#include +#include "comctl32.h" WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/status.c b/reactos/dll/win32/comctl32/status.c index 45df80305ea..f2e8adb3a21 100644 --- a/reactos/dll/win32/comctl32/status.c +++ b/reactos/dll/win32/comctl32/status.c @@ -40,20 +40,7 @@ * -- CCS_VERT (defaults to RIGHT) */ -#include -#include - -#include -#include -#include -#include -#include -#include -#include #include "comctl32.h" -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(statusbar); diff --git a/reactos/dll/win32/comctl32/string.c b/reactos/dll/win32/comctl32/string.c index 8a579a57a4a..0437cad522d 100644 --- a/reactos/dll/win32/comctl32/string.c +++ b/reactos/dll/win32/comctl32/string.c @@ -22,24 +22,8 @@ * */ -#include -//#include "wine/port.h" - -//#include -//#include -//#include /* atoi */ - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" - #include "comctl32.h" -#include - -#include - WINE_DEFAULT_DEBUG_CHANNEL(commctrl); /************************************************************************* diff --git a/reactos/dll/win32/comctl32/syslink.c b/reactos/dll/win32/comctl32/syslink.c index 385a335fee8..75085197e5e 100644 --- a/reactos/dll/win32/comctl32/syslink.c +++ b/reactos/dll/win32/comctl32/syslink.c @@ -27,17 +27,7 @@ * If you discover missing features, or bugs, please note them below. */ -//#include -//#include -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(syslink); diff --git a/reactos/dll/win32/comctl32/tab.c b/reactos/dll/win32/comctl32/tab.c index 58727b2e26d..046d59151a7 100644 --- a/reactos/dll/win32/comctl32/tab.c +++ b/reactos/dll/win32/comctl32/tab.c @@ -52,21 +52,7 @@ * */ -#include -//#include -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include -#include -//#include WINE_DEFAULT_DEBUG_CHANNEL(tab); diff --git a/reactos/dll/win32/comctl32/theme_button.c b/reactos/dll/win32/comctl32/theme_button.c index 64f4deff71c..ffbee17fb92 100644 --- a/reactos/dll/win32/comctl32/theme_button.c +++ b/reactos/dll/win32/comctl32/theme_button.c @@ -19,16 +19,6 @@ * */ -#include -//#include -//#include - -#include -#include -#include -#include -#include -#include #include "comctl32.h" #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ diff --git a/reactos/dll/win32/comctl32/theme_combo.c b/reactos/dll/win32/comctl32/theme_combo.c index 7a49b0791f9..1e8b46befd3 100644 --- a/reactos/dll/win32/comctl32/theme_combo.c +++ b/reactos/dll/win32/comctl32/theme_combo.c @@ -19,18 +19,7 @@ * */ -#include -//#include -//#include - -#include -#include -#include -#include -#include -#include #include "comctl32.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(themingcombo); diff --git a/reactos/dll/win32/comctl32/theme_dialog.c b/reactos/dll/win32/comctl32/theme_dialog.c index bbb7975b204..1b8567150ad 100644 --- a/reactos/dll/win32/comctl32/theme_dialog.c +++ b/reactos/dll/win32/comctl32/theme_dialog.c @@ -19,18 +19,7 @@ * */ -#include -//#include -//#include - -#include -#include -#include -#include -#include -#include #include "comctl32.h" -#include /********************************************************************** * The dialog subclass window proc. diff --git a/reactos/dll/win32/comctl32/theme_edit.c b/reactos/dll/win32/comctl32/theme_edit.c index 28e89a92fde..83559411cc8 100644 --- a/reactos/dll/win32/comctl32/theme_edit.c +++ b/reactos/dll/win32/comctl32/theme_edit.c @@ -19,18 +19,7 @@ * */ -#include -//#include -//#include - -#include -#include -#include -#include -#include -#include #include "comctl32.h" -#include /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) diff --git a/reactos/dll/win32/comctl32/theme_listbox.c b/reactos/dll/win32/comctl32/theme_listbox.c index 00de62006f9..e6ce0237a22 100644 --- a/reactos/dll/win32/comctl32/theme_listbox.c +++ b/reactos/dll/win32/comctl32/theme_listbox.c @@ -19,18 +19,7 @@ * */ -#include -//#include -//#include - -#include -#include -#include -#include -#include -#include #include "comctl32.h" -#include /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) diff --git a/reactos/dll/win32/comctl32/theming.c b/reactos/dll/win32/comctl32/theming.c index 862f87e6d8c..19481e5d285 100644 --- a/reactos/dll/win32/comctl32/theming.c +++ b/reactos/dll/win32/comctl32/theming.c @@ -19,15 +19,7 @@ * */ -#include - -#include -#include -#include -#include #include "comctl32.h" -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(theming); diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c index 90a58b96335..e803c3c340e 100644 --- a/reactos/dll/win32/comctl32/toolbar.c +++ b/reactos/dll/win32/comctl32/toolbar.c @@ -68,21 +68,7 @@ * */ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include "comctl32.h" -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(toolbar); diff --git a/reactos/dll/win32/comctl32/tooltips.c b/reactos/dll/win32/comctl32/tooltips.c index a51fa35483a..c1c9415c682 100644 --- a/reactos/dll/win32/comctl32/tooltips.c +++ b/reactos/dll/win32/comctl32/tooltips.c @@ -89,20 +89,7 @@ * */ - - -//#include -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(tooltips); diff --git a/reactos/dll/win32/comctl32/trackbar.c b/reactos/dll/win32/comctl32/trackbar.c index cabad2ca937..c6aecd62ebb 100644 --- a/reactos/dll/win32/comctl32/trackbar.c +++ b/reactos/dll/win32/comctl32/trackbar.c @@ -30,21 +30,6 @@ * */ -#include -//#include -#include -//#include - -#include -#include -#include -#include -//#include "winnls.h" -//#include "commctrl.h" -#include -#include -#include - #include "comctl32.h" WINE_DEFAULT_DEBUG_CHANNEL(trackbar); diff --git a/reactos/dll/win32/comctl32/treeview.c b/reactos/dll/win32/comctl32/treeview.c index 3d13de5aeea..28a884b62da 100644 --- a/reactos/dll/win32/comctl32/treeview.c +++ b/reactos/dll/win32/comctl32/treeview.c @@ -40,29 +40,7 @@ * Scroll (instead of repaint) as much as possible. */ -#include -//#include "wine/port.h" - -#include -//#include -//#include -//#include -//#include -//#include - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(treeview); diff --git a/reactos/dll/win32/comctl32/updown.c b/reactos/dll/win32/comctl32/updown.c index 32162267a9f..425b0fc152a 100644 --- a/reactos/dll/win32/comctl32/updown.c +++ b/reactos/dll/win32/comctl32/updown.c @@ -28,22 +28,7 @@ * */ -//#include -//#include -//#include -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include -#include -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(updown);