Author: akhaldi Date: Sun Dec 22 19:02:59 2013 New Revision: 61341
URL: http://svn.reactos.org/svn/reactos?rev=61341&view=rev Log: [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
Added: trunk/reactos/dll/win32/comctl32/resource.h (with props) Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/draglist.c trunk/reactos/dll/win32/comctl32/dsa.c trunk/reactos/dll/win32/comctl32/flatsb.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/hotkey.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/nativefont.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/smoothscroll.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/string.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theme_button.c trunk/reactos/dll/win32/comctl32/theme_combo.c trunk/reactos/dll/win32/comctl32/theme_dialog.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theme_listbox.c trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c
Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate.... ============================================================================== --- trunk/reactos/dll/win32/comctl32/animate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/animate.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -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 <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <winnls.h> -//#include "commctrl.h" +#include "comctl32.h" + #include <vfw.h> -//#include "mmsystem.h" -#include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(animate);
Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex.... ============================================================================== --- trunk/reactos/dll/win32/comctl32/comboex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comboex.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -30,17 +30,7 @@ * */
-//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h> -#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(comboex);
Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32... ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -24,84 +24,35 @@ #ifndef __WINE_COMCTL32_H #define __WINE_COMCTL32_H
-#define WIN32_NO_STATUS +#include <config.h> + +#include <stdarg.h> +#include <assert.h> + #define _INC_WINDOWS #define COM_NO_WINDOWS_H
-#ifndef RC_INVOKED -#include <stdarg.h> -#endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#define COBJMACROS
#include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> -//#include "winnls.h" +#include <winreg.h> #include <commctrl.h> +#include <uxtheme.h> +#include <vssym32.h> + +#include <wine/unicode.h> +#include <wine/debug.h> + +#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 { @@ -137,8 +88,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 {
Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32... ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -26,36 +26,8 @@ * COMCTL32.DLL (internally). * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <string.h> -//#include <ctype.h> -//#include <limits.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -#include <winreg.h> -//#include "commctrl.h" -//#include "objbase.h" -//#include "winerror.h" - -#include <wine/unicode.h> + #include "comctl32.h" - -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctrl... ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,26 +52,10 @@ * -- ICC_WIN95_CLASSES */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -#include <winnls.h> -//#include "commctrl.h" -//#include "winerror.h" -#include <winreg.h> +#include "comctl32.h" + #define NO_SHLWAPI_STREAM #include <shlwapi.h> -#include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetime... ============================================================================== --- trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -40,20 +40,8 @@ */
#include <math.h> -//#include <string.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <limits.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" + #include "comctl32.h" -#include <wine/debug.h> -#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(datetime);
Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?re... ============================================================================== --- trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -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 <stdarg.h> -//#include <limits.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "commctrl.h" +#include "comctl32.h" + #include <objbase.h> - -#include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(dpa);
Modified: trunk/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/draglist... ============================================================================== --- trunk/reactos/dll/win32/comctl32/draglist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/draglist.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,16 +29,7 @@ * */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.c?re... ============================================================================== --- trunk/reactos/dll/win32/comctl32/dsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dsa.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,15 +29,7 @@ * http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32 */
-#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h> - #include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(dsa);
Modified: trunk/reactos/dll/win32/comctl32/flatsb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/flatsb.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/flatsb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/flatsb.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,15 +29,7 @@ * */
-#include <stdarg.h> -#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winerror.h> -#include <winuser.h> -#include <commctrl.h> #include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -27,25 +27,7 @@ * - New Windows Vista features */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <stdlib.h> -//#include <string.h> - -//#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 <vssym32.h> -#include <uxtheme.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(header);
Modified: trunk/reactos/dll/win32/comctl32/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/hotkey.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/hotkey.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -28,16 +28,7 @@ * */
-//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(hotkey);
Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imagelis... ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -37,26 +37,10 @@ * - Thread-safe locking */
-#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdlib.h> -//#include <string.h> - -#define COBJMACROS - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> +#include "comctl32.h" + #include <objbase.h> -//#include "wingdi.h" -#include <winnls.h> -//#include "winuser.h" -//#include "commctrl.h" -#include "comctl32.h" #include <commoncontrols.h> -#include <wine/debug.h> #include <wine/exception.h>
WINE_DEFAULT_DEBUG_CHANNEL(imagelist);
Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddres... ============================================================================== --- trunk/reactos/dll/win32/comctl32/ipaddress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/ipaddress.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -32,21 +32,7 @@ * */
-//#include <ctype.h> -//#include <stdlib.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/unicode.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ipaddress);
Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listview... ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -134,28 +134,9 @@ * -- LVGroupComparE */
-#include <config.h> -//#include "wine/port.h" - -#include <assert.h> -//#include <ctype.h> -//#include <string.h> -//#include <stdlib.h> -//#include <stdarg.h> #include <stdio.h>
-//#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 <uxtheme.h> - -#include <wine/debug.h> -#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(listview);
Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthcal... ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -39,23 +39,7 @@ * -- search for FIXME */
-//#include <math.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/unicode.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(monthcal);
Modified: trunk/reactos/dll/win32/comctl32/nativefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/nativefo... ============================================================================== --- trunk/reactos/dll/win32/comctl32/nativefont.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/nativefont.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -27,15 +27,7 @@ * - All notifications. */
-#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> #include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(nativefont);
Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c?... ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,16 +52,7 @@ * Robert Shearman rob@codeweavers.com */
-//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(pager);
Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progress... ============================================================================== --- trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -34,18 +34,7 @@ * */
-//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(progress);
Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshee... ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,23 +52,7 @@ * o PSP_USEREFPARENT */
-//#include <stdarg.h> -//#include <string.h> - -#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 <uxtheme.h> - -#include <wine/debug.h> -#include <wine/unicode.h>
/****************************************************************************** * Data structures
Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c?... ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -77,22 +77,7 @@ * at least RB_INSERTBAND */
-#include <assert.h> -//#include <stdarg.h> -#include <stdlib.h> -//#include <string.h> - -//#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 <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(rebar);
Added: trunk/reactos/dll/win32/comctl32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/resource... ============================================================================== --- trunk/reactos/dll/win32/comctl32/resource.h (added) +++ trunk/reactos/dll/win32/comctl32/resource.h [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -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
Propchange: trunk/reactos/dll/win32/comctl32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc?... ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -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 <windef.h> +#include <winuser.h> +#include <commctrl.h> + +#include "resource.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/comctl32/smoothscroll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/smoothsc... ============================================================================== --- trunk/reactos/dll/win32/comctl32/smoothscroll.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/smoothscroll.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -21,14 +21,7 @@ * - actually add smooth scrolling */
-#include <stdarg.h> - -#include <windef.h> -//#include "winbase.h" -#include <winreg.h> -//#include "winerror.h" -#include <winuser.h> -#include <wine/debug.h> +#include "comctl32.h"
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -40,20 +40,7 @@ * -- CCS_VERT (defaults to RIGHT) */
-#include <stdarg.h> -#include <string.h> - -#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 <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(statusbar);
Modified: trunk/reactos/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/string.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/string.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -22,23 +22,7 @@ * */
-#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> /* atoi */ - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" - #include "comctl32.h" - -#include <wine/unicode.h> - -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink.... ============================================================================== --- trunk/reactos/dll/win32/comctl32/syslink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/syslink.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -27,17 +27,7 @@ * If you discover missing features, or bugs, please note them below. */
-//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/unicode.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(syslink);
Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?re... ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,21 +52,7 @@ * */
-#include <assert.h> -//#include <stdarg.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h> -//#include <math.h>
WINE_DEFAULT_DEBUG_CHANNEL(tab);
Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_bu... ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,16 +19,6 @@ * */
-#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h"
#define BUTTON_TYPE 0x0f /* bit mask for the available button types */
Modified: trunk/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_co... ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_combo.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */
-#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(themingcombo);
Modified: trunk/reactos/dll/win32/comctl32/theme_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_di... ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_dialog.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */
-#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h>
/********************************************************************** * The dialog subclass window proc.
Modified: trunk/reactos/dll/win32/comctl32/theme_edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_ed... ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */
-#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h>
/* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region)
Modified: trunk/reactos/dll/win32/comctl32/theme_listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_li... ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_listbox.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */
-#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h>
/* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region)
Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming.... ============================================================================== --- trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,15 +19,7 @@ * */
-#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> #include "comctl32.h" -#include <uxtheme.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(theming);
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar.... ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -68,21 +68,7 @@ * */
-#include <stdarg.h> -#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <wingdi.h> -#include <winuser.h> -#include <wine/unicode.h> -#include <winnls.h> -#include <commctrl.h> #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(toolbar);
Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltips... ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -89,20 +89,7 @@ * */
- - -//#include <stdarg.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/unicode.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(tooltips);
Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackbar... ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,21 +29,6 @@ * If you discover missing features, or bugs, please note them below. * */ - -#include <stdarg.h> -//#include <stdio.h> -#include <stdlib.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -//#include "winnls.h" -//#include "commctrl.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h>
#include "comctl32.h"
Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview... ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -40,29 +40,7 @@ * Scroll (instead of repaint) as much as possible. */
-#include <config.h> -//#include "wine/port.h" - -#include <assert.h> -//#include <ctype.h> -//#include <stdarg.h> -//#include <string.h> -//#include <limits.h> -//#include <stdlib.h> - -#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 <uxtheme.h> -#include <vssym32.h> -#include <wine/unicode.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(treeview);
Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/updown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/updown.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -28,22 +28,7 @@ * */
-//#include <stdlib.h> -//#include <string.h> -//#include <stdarg.h> -//#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/unicode.h> -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(updown);