Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-20 17:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32]

Browse source 
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61745
This commit is contained in:
Amine Khaldi 2014-01-21 17:58:34 +00:00
parent bca9468bea
commit 20febaafd2
34 changed files with 10 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/comctl32/comctl32.h
View file

@ -24,7 +24,7 @@
#ifndef __WINE_COMCTL32_H #ifndef __WINE_COMCTL32_H
#define __WINE_COMCTL32_H #define __WINE_COMCTL32_H
#include <config.h> #include <wine/config.h>
#include <stdarg.h> #include <stdarg.h>
#include <assert.h> #include <assert.h>
@ -32,17 +32,16 @@
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#define COBJMACROS
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <wingdi.h> #include <wingdi.h>
#include <winuser.h> #include <winuser.h>
#include <winreg.h> #include <winreg.h>
#include <commctrl.h> #include <objbase.h>
#include <uxtheme.h> #include <uxtheme.h>
#include <vssym32.h> #include <vssym32.h>

4
reactos/dll/win32/comctl32/datetime.c
View file

@ -39,10 +39,10 @@
* -- FORMATCALLBACK * -- FORMATCALLBACK
*/ */
#include <math.h>
#include "comctl32.h" #include "comctl32.h"
#include <math.h>
WINE_DEFAULT_DEBUG_CHANNEL(datetime); WINE_DEFAULT_DEBUG_CHANNEL(datetime);
typedef struct typedef struct

2
reactos/dll/win32/comctl32/dpa.c
View file

@ -31,8 +31,6 @@
#include "comctl32.h" #include "comctl32.h"
#include <objbase.h>
WINE_DEFAULT_DEBUG_CHANNEL(dpa); WINE_DEFAULT_DEBUG_CHANNEL(dpa);
typedef struct _DPA typedef struct _DPA

1
reactos/dll/win32/comctl32/imagelist.c
View file

@ -39,7 +39,6 @@
#include "comctl32.h" #include "comctl32.h"
#include <objbase.h>
#include <commoncontrols.h> #include <commoncontrols.h>
#include <wine/exception.h> #include <wine/exception.h>

2
reactos/dll/win32/comctl32/lang/comctl_Bg.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Cs.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Da.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_De.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_El.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_GREEK, SUBLANG_DEFAULT LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_En.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Eo.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Es.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Fr.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_He.rc
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Hu.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_It.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Ja.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Ko.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Lt.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Nl.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_No.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Pl.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Pt.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Ro.rc
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Ru.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Si.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Sk.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Sr.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Sv.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Th.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_THAI, SUBLANG_DEFAULT LANGUAGE LANG_THAI, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Tr.rc
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Uk.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/comctl32/lang/comctl_Zh.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "comctl32.h"
LANGUAGE LANG_CHINESE, SUBLANG_DEFAULT LANGUAGE LANG_CHINESE, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

10
reactos/dll/win32/comctl32/listview.c
View file

@ -134,10 +134,10 @@
* -- LVGroupComparE * -- LVGroupComparE
*/ */
#include <stdio.h>
#include "comctl32.h" #include "comctl32.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(listview); WINE_DEFAULT_DEBUG_CHANNEL(listview);
typedef struct tagCOLUMN_INFO typedef struct tagCOLUMN_INFO
@ -8597,7 +8597,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy)
return oldspacing; return oldspacing;
} }
static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL is_small)
{ {
INT cx, cy; INT cx, cy;
@ -8608,8 +8608,8 @@ static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small)
} }
else else
{ {
size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); size->cx = GetSystemMetrics(is_small ? SM_CXSMICON : SM_CXICON);
size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); size->cy = GetSystemMetrics(is_small ? SM_CYSMICON : SM_CYICON);
} }
} }