From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 4 Feb 2014 10:45:55 +0000 (+0000)
Subject: [RECYCLEBIN]
X-Git-Tag: ReactOS-0.3.16-CLT2014~321
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=1aba3408717992160a0a388ad955ba6b899c9cdf

[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

svn path=/trunk/; revision=61972
---

diff --git a/reactos/lib/recyclebin/recyclebin.c b/reactos/lib/recyclebin/recyclebin.c
index 7bee36c62d8..fbc1df66069 100644
--- a/reactos/lib/recyclebin/recyclebin.c
+++ b/reactos/lib/recyclebin/recyclebin.c
@@ -6,11 +6,7 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 BOOL WINAPI
 CloseRecycleBinHandle(
diff --git a/reactos/lib/recyclebin/recyclebin.h b/reactos/lib/recyclebin/recyclebin.h
index fecd2119246..af436ba77fb 100644
--- a/reactos/lib/recyclebin/recyclebin.h
+++ b/reactos/lib/recyclebin/recyclebin.h
@@ -8,12 +8,15 @@ extern "C" {
 
 #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 */
diff --git a/reactos/lib/recyclebin/recyclebin_generic.c b/reactos/lib/recyclebin/recyclebin_generic.c
index f50c2dfcfb9..746b63968ed 100644
--- a/reactos/lib/recyclebin/recyclebin_generic.c
+++ b/reactos/lib/recyclebin/recyclebin_generic.c
@@ -6,11 +6,7 @@
  * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 struct RecycleBinGeneric
 {
diff --git a/reactos/lib/recyclebin/recyclebin_generic_enumerator.c b/reactos/lib/recyclebin/recyclebin_generic_enumerator.c
index 3b94fa74bd8..f46efe2a8fd 100644
--- a/reactos/lib/recyclebin/recyclebin_generic_enumerator.c
+++ b/reactos/lib/recyclebin/recyclebin_generic_enumerator.c
@@ -6,11 +6,7 @@
  * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
 #include "recyclebin_private.h"
-#include <stdio.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
 
 struct RecycleBinGenericEnum
 {
diff --git a/reactos/lib/recyclebin/recyclebin_private.h b/reactos/lib/recyclebin/recyclebin_private.h
index 3db2f73c84c..a59ba70a5d5 100644
--- a/reactos/lib/recyclebin/recyclebin_private.h
+++ b/reactos/lib/recyclebin/recyclebin_private.h
@@ -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 */
 
diff --git a/reactos/lib/recyclebin/recyclebin_v5.c b/reactos/lib/recyclebin/recyclebin_v5.c
index 3090055cdbe..ed648432915 100644
--- a/reactos/lib/recyclebin/recyclebin_v5.c
+++ b/reactos/lib/recyclebin/recyclebin_v5.c
@@ -6,11 +6,9 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
-#include "recyclebin_v5.h"
-#include <stdio.h>
+#include "recyclebin_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
+#include "sddl.h"
 
 static BOOL
 IntDeleteRecursive(
diff --git a/reactos/lib/recyclebin/recyclebin_v5.h b/reactos/lib/recyclebin/recyclebin_v5.h
index 7b0567833e5..cdfb5264165 100644
--- a/reactos/lib/recyclebin/recyclebin_v5.h
+++ b/reactos/lib/recyclebin/recyclebin_v5.h
@@ -3,8 +3,6 @@
  * Copyright (C) 2006 Hervé Poussineau <hpoussin@reactos.org>
  */
 
-#include "recyclebin_private.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/reactos/lib/recyclebin/recyclebin_v5_enumerator.c b/reactos/lib/recyclebin/recyclebin_v5_enumerator.c
index 37413f352a8..f47055951db 100644
--- a/reactos/lib/recyclebin/recyclebin_v5_enumerator.c
+++ b/reactos/lib/recyclebin/recyclebin_v5_enumerator.c
@@ -6,10 +6,7 @@
  * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define COBJMACROS
-#include "recyclebin_v5.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
+#include "recyclebin_private.h"
 
 struct RecycleBin5File
 {