[ros-diffs] [akhaldi] 61456: [UXTHEME] * Set the default debugging channel globally through the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

Author: akhaldi
Date: Sat Dec 28 00:19:58 2013
New Revision: 61456

URL: http://svn.reactos.org/svn/reactos?rev=61456&view=rev
Log:
[UXTHEME]
* Set the default debugging channel globally through the main header.
* Remove one time inclusions from the main header and put them back where they belong.
CORE-7716

Modified:
    trunk/reactos/dll/win32/uxtheme/buffer.c
    trunk/reactos/dll/win32/uxtheme/draw.c
    trunk/reactos/dll/win32/uxtheme/main.c
    trunk/reactos/dll/win32/uxtheme/metric.c
    trunk/reactos/dll/win32/uxtheme/msstyles.c
    trunk/reactos/dll/win32/uxtheme/ncscrollbar.c
    trunk/reactos/dll/win32/uxtheme/nonclient.c
    trunk/reactos/dll/win32/uxtheme/property.c
    trunk/reactos/dll/win32/uxtheme/stylemap.c
    trunk/reactos/dll/win32/uxtheme/system.c
    trunk/reactos/dll/win32/uxtheme/themehooks.c
    trunk/reactos/dll/win32/uxtheme/uxini.c
    trunk/reactos/dll/win32/uxtheme/uxthemep.h

Modified: trunk/reactos/dll/win32/uxtheme/buffer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c?...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/buffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/buffer.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,9 +19,6 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

/***********************************************************************
  *      BufferedPaintInit                                  (UXTHEME.@)

Modified: trunk/reactos/dll/win32/uxtheme/draw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?re...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/draw.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/draw.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,9 +19,8 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+
+#include <stdlib.h>

/***********************************************************************
  * Defines and global variables

Modified: trunk/reactos/dll/win32/uxtheme/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?re...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/main.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,9 +19,6 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

/***********************************************************************/

Modified: trunk/reactos/dll/win32/uxtheme/metric.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c?...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/metric.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/metric.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,9 +19,6 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

/***********************************************************************
  *      GetThemeSysBool                                     (UXTHEME.@)

Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles....
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/msstyles.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/msstyles.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,10 +19,8 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
+
 #include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

/***********************************************************************
  * Defines and global variables

Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscrollb...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -10,9 +10,8 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+
+#include <assert.h>

static BOOL SCROLL_trackVertical;
 static enum SCROLL_HITTEST SCROLL_trackHitTest;

Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclient...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/nonclient.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/nonclient.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -7,9 +7,6 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

HFONT hMenuFont = NULL;
 HFONT hMenuFontBold = NULL;

Modified: trunk/reactos/dll/win32/uxtheme/property.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property....
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/property.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/property.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,9 +19,6 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

/***********************************************************************
  *      GetThemeBool                                        (UXTHEME.@)

Modified: trunk/reactos/dll/win32/uxtheme/stylemap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/stylemap....
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/stylemap.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/stylemap.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,7 +19,6 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>

typedef struct _MSSTYLES_PROPERTY_MAP {
     WORD dwPrimitiveType;

Modified: trunk/reactos/dll/win32/uxtheme/system.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c?...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/system.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/system.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,9 +19,9 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+
+#include <winreg.h>
+#include <uxundoc.h>

/***********************************************************************
  * Defines and global variables

Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehook...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/themehooks.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/themehooks.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -7,9 +7,6 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

USERAPIHOOK user32ApiHook;
 BYTE gabDWPmessages[UAHOWP_MAX_SIZE];

Modified: trunk/reactos/dll/win32/uxtheme/uxini.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?r...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/uxini.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/uxini.c	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -19,10 +19,7 @@
  */

#include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
-
+#include <winnls.h>
 /***********************************************************************
  * Defines and global variables
  */

Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep....
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/uxthemep.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/uxthemep.h	[iso-8859-1] Sat Dec 28 00:19:58 2013
@@ -1,20 +1,18 @@
 #include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>

#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <winreg.h>
-#include <winnls.h>
 #include <winuser.h>
 #include <windowsx.h>
 #include <undocuser.h>
 #include <uxtheme.h>
-#include <uxundoc.h>
 #include <vfwmsgs.h>
 #include <tmschema.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

#define TMT_ENUM 200