Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 04:43:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RECYCLEBIN]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-02-04 10:45:55 +00:00
parent 24209ff3c8
commit 1aba340871
8 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/recyclebin/recyclebin.c
View file

@ -6,11 +6,7 @@
* PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org) * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
*/ */
#define COBJMACROS
#include "recyclebin_private.h" #include "recyclebin_private.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
BOOL WINAPI BOOL WINAPI
CloseRecycleBinHandle( CloseRecycleBinHandle(

3
reactos/lib/recyclebin/recyclebin.h
View file

@ -8,12 +8,15 @@ extern "C" {
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winnls.h> #include <winnls.h>
#include <winver.h> #include <winver.h>
#include <shellapi.h> #include <shellapi.h>
#include <objbase.h> #include <objbase.h>
#define ANY_SIZE 1 #define ANY_SIZE 1
/* Structures used by the API Interface */ /* Structures used by the API Interface */

4
reactos/lib/recyclebin/recyclebin_generic.c
View file

@ -6,11 +6,7 @@
* PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org) * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org)
*/ */
#define COBJMACROS
#include "recyclebin_private.h" #include "recyclebin_private.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
struct RecycleBinGeneric struct RecycleBinGeneric
{ {

4
reactos/lib/recyclebin/recyclebin_generic_enumerator.c
View file

@ -6,11 +6,7 @@
* PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org) * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin@reactos.org)
*/ */
#define COBJMACROS
#include "recyclebin_private.h" #include "recyclebin_private.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
struct RecycleBinGenericEnum struct RecycleBinGenericEnum
{ {

8
reactos/lib/recyclebin/recyclebin_private.h
View file

@ -1,6 +1,12 @@
#include <stdio.h>
#define COBJMACROS
#include "recyclebin.h" #include "recyclebin.h"
#include "sddl.h" #include "recyclebin_v5.h"
#include <wine/debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
/* Defines */ /* Defines */

6
reactos/lib/recyclebin/recyclebin_v5.c
View file

@ -6,11 +6,9 @@
* PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org) * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
*/ */
#define COBJMACROS #include "recyclebin_private.h"
#include "recyclebin_v5.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); #include "sddl.h"
static BOOL static BOOL
IntDeleteRecursive( IntDeleteRecursive(

2
reactos/lib/recyclebin/recyclebin_v5.h
View file

@ -3,8 +3,6 @@
* Copyright (C) 2006 Hervé Poussineau <hpoussin@reactos.org> * Copyright (C) 2006 Hervé Poussineau <hpoussin@reactos.org>
*/ */
#include "recyclebin_private.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

5
reactos/lib/recyclebin/recyclebin_v5_enumerator.c
View file

@ -6,10 +6,7 @@
* PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org) * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
*/ */
#define COBJMACROS #include "recyclebin_private.h"
#include "recyclebin_v5.h"
WINE_DEFAULT_DEBUG_CHANNEL(recyclebin);
struct RecycleBin5File struct RecycleBin5File
{ {