[akhaldi] 61972: [RECYCLEBIN] * Move some inclusions to the main header. * Improve header inclusions. * Set the default debugging channel globally through the main header. * Remove inclusions and d...

Author: akhaldi
Date: Tue Feb  4 10:45:55 2014
New Revision: 61972

URL: http://svn.reactos.org/svn/reactos?rev=61972&view=rev
Log:
[RECYCLEBIN]
* Move some inclusions to the main header.
* Improve header inclusions.
* 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/lib/recyclebin/recyclebin.c
    trunk/reactos/lib/recyclebin/recyclebin.h
    trunk/reactos/lib/recyclebin/recyclebin_generic.c
    trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c
    trunk/reactos/lib/recyclebin/recyclebin_private.h
    trunk/reactos/lib/recyclebin/recyclebin_v5.c
    trunk/reactos/lib/recyclebin/recyclebin_v5.h
    trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c

Modified: trunk/reactos/lib/recyclebin/recyclebin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin.c	[iso-8859-1] Tue Feb  4 10:45:55 2014
@@ -6,11 +6,7 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 BOOL WINAPI
 CloseRecycleBinHandle(

Modified: trunk/reactos/lib/recyclebin/recyclebin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin.h	[iso-8859-1] Tue Feb  4 10:45:55 2014
@@ -8,12 +8,15 @@
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <winnls.h>
 #include <winver.h>
 #include <shellapi.h>
 #include <objbase.h>
+
 #define ANY_SIZE 1
 
 /* Structures used by the API Interface */

Modified: trunk/reactos/lib/recyclebin/recyclebin_generic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin_generic.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin_generic.c	[iso-8859-1] Tue Feb  4 10:45:55
2014
@@ -6,11 +6,7 @@
  * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 struct RecycleBinGeneric
 {

Modified: trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c	[iso-8859-1] Tue Feb  4
10:45:55 2014
@@ -6,11 +6,7 @@
  * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 struct RecycleBinGenericEnum
 {

Modified: trunk/reactos/lib/recyclebin/recyclebin_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin_private.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin_private.h	[iso-8859-1] Tue Feb  4 10:45:55
2014
@@ -1,6 +1,12 @@
+#include <stdio.h>
+
+#define COBJMACROS
+
 #include "recyclebin.h"
-#include "sddl.h"
+#include "recyclebin_v5.h"
+
 #include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 /* Defines */
 

Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin_v5.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin_v5.c	[iso-8859-1] Tue Feb  4 10:45:55 2014
@@ -6,11 +6,9 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
-#define COBJMACROS
-#include "recyclebin_v5.h"
-#include <stdio.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
+#include "recyclebin_private.h"
+
+#include "sddl.h"
 
 static BOOL
 IntDeleteRecursive(

Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin_v5.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin_v5.h	[iso-8859-1] Tue Feb  4 10:45:55 2014
@@ -2,8 +2,6 @@
  * This file is under the GPLv2 licence
  * Copyright (C) 2006 Hervé Poussineau &lt;hpoussin(a)reactos.org&gt;
  */
-
-#include "recyclebin_private.h"
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_…
==============================================================================
--- trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c	[iso-8859-1] Tue Feb  4
10:45:55 2014
@@ -6,10 +6,7 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
-#define COBJMACROS
-#include "recyclebin_v5.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
+#include "recyclebin_private.h"
 
 struct RecycleBin5File
 {