[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
This commit is contained in:
Amine Khaldi 2013-12-22 19:02:59 +00:00
parent 212abd9a8a
commit 06c2684e83
39 changed files with 92 additions and 551 deletions

View file

@ -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 <vfw.h>
//#include "mmsystem.h"
#include "comctl32.h"
#include <wine/debug.h>
#include <vfw.h>
WINE_DEFAULT_DEBUG_CHANNEL(animate);

View file

@ -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);

View file

@ -24,85 +24,36 @@
#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
{
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;

View file

@ -26,37 +26,9 @@
* 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);
static const WCHAR strMRUList[] = { 'M','R','U','L','i','s','t',0 };

View file

@ -52,26 +52,10 @@
* -- ICC_WIN95_CLASSES
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "comctl32.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>
#define NO_SHLWAPI_STREAM
#include <shlwapi.h>
#include "comctl32.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);

View file

@ -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);

View file

@ -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 <objbase.h>
#include "comctl32.h"
#include <wine/debug.h>
#include <objbase.h>
WINE_DEFAULT_DEBUG_CHANNEL(dpa);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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 <objbase.h>
//#include "wingdi.h"
#include <winnls.h>
//#include "winuser.h"
//#include "commctrl.h"
#include "comctl32.h"
#include <objbase.h>
#include <commoncontrols.h>
#include <wine/debug.h>
#include <wine/exception.h>
WINE_DEFAULT_DEBUG_CHANNEL(imagelist);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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

View file

@ -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);

View file

@ -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);

View file

@ -22,24 +22,8 @@
*
*/
#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);
/*************************************************************************

View file

@ -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);

View file

@ -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);

View file

@ -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 */

View file

@ -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);

View file

@ -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.

View file

@ -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)

View file

@ -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)

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -30,21 +30,6 @@
*
*/
#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"
WINE_DEFAULT_DEBUG_CHANNEL(trackbar);

View file

@ -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);

View file

@ -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);