Author: akhaldi Date: Tue Jan 21 17:58:34 2014 New Revision: 61745
URL: http://svn.reactos.org/svn/reactos?rev=61745&view=rev Log: [COMCTL32] * 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
Modified: trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/lang/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Da.rc trunk/reactos/dll/win32/comctl32/lang/comctl_De.rc trunk/reactos/dll/win32/comctl32/lang/comctl_El.rc trunk/reactos/dll/win32/comctl32/lang/comctl_En.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Es.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/lang/comctl_He.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/lang/comctl_It.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Lt.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/lang/comctl_No.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Si.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Sk.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Sr.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Th.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Zh.rc trunk/reactos/dll/win32/comctl32/listview.c
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] Tue Jan 21 17:58:34 2014 @@ -24,7 +24,7 @@ #ifndef __WINE_COMCTL32_H #define __WINE_COMCTL32_H
-#include <config.h> +#include <wine/config.h>
#include <stdarg.h> #include <assert.h> @@ -32,17 +32,16 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H
+#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT - -#define COBJMACROS
#include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> #include <winreg.h> -#include <commctrl.h> +#include <objbase.h> #include <uxtheme.h> #include <vssym32.h>
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] Tue Jan 21 17:58:34 2014 @@ -39,9 +39,9 @@ * -- FORMATCALLBACK */
+#include "comctl32.h" + #include <math.h> - -#include "comctl32.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] Tue Jan 21 17:58:34 2014 @@ -30,8 +30,6 @@ */
#include "comctl32.h" - -#include <objbase.h>
WINE_DEFAULT_DEBUG_CHANNEL(dpa);
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] Tue Jan 21 17:58:34 2014 @@ -39,7 +39,6 @@
#include "comctl32.h"
-#include <objbase.h> #include <commoncontrols.h> #include <wine/exception.h>
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Bg.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Cs.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Da.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_De.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_El.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_En.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Es.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Fr.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_He.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Hu.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_It.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Ja.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Ko.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Lt.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Nl.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_No.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Pl.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Pt.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Si.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Sk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Sk.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Sr.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Sv.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Th.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Th.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_THAI, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Uk.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/com... ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Zh.rc [iso-8859-1] Tue Jan 21 17:58:34 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "comctl32.h"
LANGUAGE LANG_CHINESE, SUBLANG_DEFAULT
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] Tue Jan 21 17:58:34 2014 @@ -134,9 +134,9 @@ * -- LVGroupComparE */
+#include "comctl32.h" + #include <stdio.h> - -#include "comctl32.h"
WINE_DEFAULT_DEBUG_CHANNEL(listview);
@@ -8597,7 +8597,7 @@ 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;
@@ -8608,8 +8608,8 @@ } else { - size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); - size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); + size->cx = GetSystemMetrics(is_small ? SM_CXSMICON : SM_CXICON); + size->cy = GetSystemMetrics(is_small ? SM_CYSMICON : SM_CYICON); } }