[akhaldi] 61367: [HLINK] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in t...

Author: akhaldi
Date: Tue Dec 24 11:32:15 2013
New Revision: 61367

URL: http://svn.reactos.org/svn/reactos?rev=61367&view=rev
Log:
[HLINK]
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

Modified:
    trunk/reactos/dll/win32/hlink/browse_ctx.c
    trunk/reactos/dll/win32/hlink/extserv.c
    trunk/reactos/dll/win32/hlink/hlink_main.c
    trunk/reactos/dll/win32/hlink/hlink_private.h
    trunk/reactos/dll/win32/hlink/link.c

Modified: trunk/reactos/dll/win32/hlink/browse_ctx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/browse_ctx…
==============================================================================
--- trunk/reactos/dll/win32/hlink/browse_ctx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/browse_ctx.c	[iso-8859-1] Tue Dec 24 11:32:15 2013
@@ -20,10 +20,7 @@
 
 #include "hlink_private.h"
 
-#include <wine/debug.h>
 #include <wine/list.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
 
 struct link_entry
 {

Modified: trunk/reactos/dll/win32/hlink/extserv.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?…
==============================================================================
--- trunk/reactos/dll/win32/hlink/extserv.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/extserv.c	[iso-8859-1] Tue Dec 24 11:32:15 2013
@@ -18,11 +18,6 @@
 
 #include "hlink_private.h"
 
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
-
 typedef struct {
     IUnknown           IUnknown_inner;
     IAuthenticate      IAuthenticate_iface;

Modified: trunk/reactos/dll/win32/hlink/hlink_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main…
==============================================================================
--- trunk/reactos/dll/win32/hlink/hlink_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/hlink_main.c	[iso-8859-1] Tue Dec 24 11:32:15 2013
@@ -22,11 +22,6 @@
 
 #include <winreg.h>
 #include <rpcproxy.h>
-#include <hlguids.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
 
 static HINSTANCE instance;
 

Modified: trunk/reactos/dll/win32/hlink/hlink_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_priv…
==============================================================================
--- trunk/reactos/dll/win32/hlink/hlink_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/hlink_private.h	[iso-8859-1] Tue Dec 24 11:32:15 2013
@@ -16,22 +16,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
-
 #define COBJMACROS
 
-//#include "winerror.h"
 #include <windef.h>
 #include <winbase.h>
-//#include "winuser.h"
 #include <ole2.h>
 #include <hlink.h>
+#include <hlguids.h>
 
 #include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(hlink);
 
 extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
 extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

Modified: trunk/reactos/dll/win32/hlink/link.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/hlink/link.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/link.c	[iso-8859-1] Tue Dec 24 11:32:15 2013
@@ -21,11 +21,6 @@
 #include "hlink_private.h"
 
 #include <shellapi.h>
-#include <hlguids.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
 
 #define HLINK_SAVE_MAGIC    0x00000002
 #define HLINK_SAVE_MONIKER_PRESENT      0x01