Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61812
This commit is contained in:
Amine Khaldi 2014-01-25 17:24:24 +00:00
parent 94e3683b77
commit 1bb3dbb528
46 changed files with 56 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/shell32/CMenuBand.cpp
View file

@ -7,6 +7,7 @@
*/
#include "precomp.h"
#include <windowsx.h>
WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);

3
reactos/dll/win32/shell32/CMenuBand.h
View file

@ -1,3 +1,4 @@
#pragma once
class CMenuBand;
@ -160,4 +161,4 @@ BEGIN_COM_MAP(CMenuBand)
COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc)
END_COM_MAP()
};
};

1
reactos/dll/win32/shell32/CMenuDeskBar.cpp
View file

@ -1,4 +1,3 @@
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);

1
reactos/dll/win32/shell32/CMenuDeskBar.h
View file

@ -1,3 +1,4 @@
#pragma once
class CMenuDeskBar:
public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>,

1
reactos/dll/win32/shell32/authors.cpp
View file

@ -1,2 +1 @@
const char * const SHELL_Authors[] = { "Copyright 1993-2012 WINE team", "Copyright 1998-2012 ReactOS Team", 0 };

2
reactos/dll/win32/shell32/autocomplete.h
View file

@ -63,4 +63,4 @@ BEGIN_COM_MAP(CAutoComplete)
END_COM_MAP()
};
#endif // _AUTOCOMPLETE_H_
#endif /* _AUTOCOMPLETE_H_ */

1
reactos/dll/win32/shell32/brsfolder.cpp
View file

@ -25,7 +25,6 @@
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* original margins and control size */

1
reactos/dll/win32/shell32/changenotify.cpp
View file

@ -20,7 +20,6 @@
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
namespace

1
reactos/dll/win32/shell32/control.cpp
View file

@ -17,7 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(shlctrl);

1
reactos/dll/win32/shell32/dialogs.cpp
View file

@ -20,7 +20,6 @@
#include "precomp.h"
typedef struct
{
HWND hwndOwner ;

2
reactos/dll/win32/shell32/dragdrophelper.h
View file

@ -50,4 +50,4 @@ BEGIN_COM_MAP(CDropTargetHelper)
END_COM_MAP()
};
#endif // _DRAGDROPHELPER_H_
#endif /* _DRAGDROPHELPER_H_ */

3
reactos/dll/win32/shell32/drvdefext.cpp
View file

@ -19,8 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define _USE_MATH_DEFINES
#include "precomp.h"
#define _USE_MATH_DEFINES
#include <math.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);

5
reactos/dll/win32/shell32/drvdefext.h
View file

@ -19,7 +19,7 @@
*/
#ifndef _DRV_DEF_EXT_H_
#define _FILE_DEF_EXT_H_
#define _DRV_DEF_EXT_H_
class CDrvDefExt :
public CComCoClass<CDrvDefExt, &CLSID_ShellDrvDefExt>,
@ -72,5 +72,4 @@ BEGIN_COM_MAP(CDrvDefExt)
END_COM_MAP()
};
#endif // _FILE_DEF_EXT_H_
#endif /* _DRV_DEF_EXT_H_ */

3
reactos/dll/win32/shell32/enumidlist.h
View file

@ -13,6 +13,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ENUMIDLIST_H__
#define __ENUMIDLIST_H__
@ -49,4 +50,4 @@ BEGIN_COM_MAP(IEnumIDListImpl)
END_COM_MAP()
};
#endif /* ndef __ENUMIDLIST_H__ */
#endif /* __ENUMIDLIST_H__ */

2
reactos/dll/win32/shell32/filedefext.h
View file

@ -116,4 +116,4 @@ BEGIN_COM_MAP(CFileDefExt)
END_COM_MAP()
};
#endif // _FILE_DEF_EXT_H_
#endif /* _FILE_DEF_EXT_H_ */

2
reactos/dll/win32/shell32/folder_options.cpp
View file

@ -20,8 +20,8 @@
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL (fprop);
#define MAX_PROPERTY_SHEET_PAGE (32)
/// Folder Options:

1
reactos/dll/win32/shell32/folders/admintools.cpp
View file

@ -23,7 +23,6 @@
WINE_DEFAULT_DEBUG_CHANNEL (shell);
/*
This folder should not exist. It is just a file system folder...
*/

2
reactos/dll/win32/shell32/folders/admintools.h
View file

@ -84,4 +84,4 @@ class CAdminToolsFolder :
END_COM_MAP()
};
#endif // _SHFLDR_ADMINTOOLS_H_
#endif /* _SHFLDR_ADMINTOOLS_H_ */

2
reactos/dll/win32/shell32/folders/cpanel.h
View file

@ -107,4 +107,4 @@ class CControlPanelFolder :
END_COM_MAP()
};
#endif // _SHFLDR_CPANEL_H_
#endif /* _SHFLDR_CPANEL_H_ */

2
reactos/dll/win32/shell32/folders/desktop.h
View file

@ -105,4 +105,4 @@ class CDesktopFolder :
END_COM_MAP()
};
#endif // _CDESKTOPFOLDER_H_
#endif /* _CDESKTOPFOLDER_H_ */

2
reactos/dll/win32/shell32/folders/fonts.h
View file

@ -92,4 +92,4 @@ class CFontsFolder :
END_COM_MAP()
};
#endif // _SHFLDR_FONTS_H_
#endif /* _SHFLDR_FONTS_H_ */

2
reactos/dll/win32/shell32/folders/fs.h
View file

@ -126,4 +126,4 @@ struct _DoDropData {
DWORD pdwEffect;
};
#endif // _CFSFOLDER_H_
#endif /* _CFSFOLDER_H_ */

2
reactos/dll/win32/shell32/folders/mycomp.h
View file

@ -82,4 +82,4 @@ class CDrivesFolder :
END_COM_MAP()
};
#endif // _CDRIVESFOLDER_H_
#endif /* _CDRIVESFOLDER_H_ */

2
reactos/dll/win32/shell32/folders/mydocuments.h
View file

@ -81,4 +81,4 @@ class CMyDocsFolder :
END_COM_MAP()
};
#endif // _SHFLDR_MYDOCUMENTS_H_
#endif /* _SHFLDR_MYDOCUMENTS_H_ */

2
reactos/dll/win32/shell32/folders/netplaces.h
View file

@ -82,4 +82,4 @@ class CNetFolder :
END_COM_MAP()
};
#endif // _SHFLDR_NETPLACES_H_
#endif /* _SHFLDR_NETPLACES_H_ */

2
reactos/dll/win32/shell32/folders/printers.cpp
View file

@ -23,6 +23,8 @@
#include <precomp.h>
#include <winspool.h>
WINE_DEFAULT_DEBUG_CHANNEL (shell);
/***********************************************************************

2
reactos/dll/win32/shell32/folders/printers.h
View file

@ -85,4 +85,4 @@ class CPrinterFolder :
END_COM_MAP()
};
#endif // _SHFLDR_PRINTERS_H_
#endif /* _SHFLDR_PRINTERS_H_ */

6
reactos/dll/win32/shell32/folders/recyclebin.cpp
View file

@ -19,10 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define MAX_PROPERTY_SHEET_PAGE 32
#include <precomp.h>
#include <ntquery.h>
#define MAX_PROPERTY_SHEET_PAGE 32
WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin);
typedef struct

2
reactos/dll/win32/shell32/folders/recyclebin.h
View file

@ -110,4 +110,4 @@ class CRecycleBin :
END_COM_MAP()
};
#endif // _SHFLDR_RECYCLEBIN_H_
#endif /* _SHFLDR_RECYCLEBIN_H_ */

2
reactos/dll/win32/shell32/newmenu.h
View file

@ -99,4 +99,4 @@ BEGIN_COM_MAP(CNewMenu)
END_COM_MAP()
};
#endif // _SHV_ITEM_NEW_H_
#endif /* _SHV_ITEM_NEW_H_ */

2
reactos/dll/win32/shell32/openwithmenu.h
View file

@ -68,4 +68,4 @@ class COpenWithMenu :
END_COM_MAP()
};
#endif // _SHE_OCMENU_H_
#endif /* _SHE_OCMENU_H_ */

2
reactos/dll/win32/shell32/pidl.h
View file

@ -302,4 +302,4 @@ LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida);
BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type);
#endif
#endif /* __WINE_PIDL_H */

15
reactos/dll/win32/shell32/precomp.h
View file

@ -12,33 +12,23 @@
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winreg.h>
#include <winuser.h>
#include <wincon.h>
#include <shellapi.h>
#include <commdlg.h>
#include <ddeml.h>
#include <mmsystem.h>
#include <winspool.h>
#include <shlguid_undoc.h>
#include <shlwapi.h>
#include <shlobj.h>
#include <shlobj_undoc.h>
#include <shlwapi_undoc.h>
#include <appmgmt.h>
#include <ntquery.h>
#include <recyclebin.h>
#include <ndk/rtlfuncs.h>
#include <fmifs/fmifs.h>
#include <sddl.h>
#include <commoncontrols.h>
#include <tchar.h>
#include <strsafe.h>
#include <atlbase.h>
#include <atlcom.h>
#include <atlwin.h>
//#include "base/shell/explorer-new/todo.h"
//#include "dlgs.h"
@ -51,8 +41,6 @@
#include "enumidlist.h"
#include "shfldr.h"
#include "shellfolder.h"
#include "xdg.h"
#include "shellitem.h"
#include "shelllink.h"
#include "dragdrophelper.h"
@ -76,6 +64,7 @@
#include "CMenuDeskBar.h"
#include <wine/debug.h>
#include <wine/unicode.h>
extern const GUID CLSID_AdminFolderShortcut;
extern const GUID CLSID_FontsFolderShortcut;
@ -87,4 +76,4 @@ extern const GUID CLSID_UnixDosFolder;
extern const GUID SHELL32_AdvtShortcutProduct;
extern const GUID SHELL32_AdvtShortcutComponent;
#endif
#endif /* _PRECOMP_H__ */

1
reactos/dll/win32/shell32/shell32_main.cpp
View file

@ -20,6 +20,7 @@
*/
#include "precomp.h"
#include "shell32_version.h"
#include <reactos/version.h>

5
reactos/dll/win32/shell32/shell32_main.h
View file

@ -22,9 +22,6 @@
#ifndef __WINE_SHELL_MAIN_H
#define __WINE_SHELL_MAIN_H
#include <wine/unicode.h>
/*******************************************
* global SHELL32.DLL variables
*/
@ -205,4 +202,4 @@ LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT
EXTERN_C HRESULT WINAPI DoRegisterServer(void);
EXTERN_C HRESULT WINAPI DoUnregisterServer(void);
#endif
#endif /* __WINE_SHELL_MAIN_H */

2
reactos/dll/win32/shell32/shell32_version.h
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#pragma once
#define WINE_FILEVERSION_MAJOR 5
#define WINE_FILEVERSION_MINOR 0
#define WINE_FILEVERSION_BUILD 3900

2
reactos/dll/win32/shell32/shellitem.h
View file

@ -60,4 +60,4 @@ BEGIN_COM_MAP(CShellItem)
END_COM_MAP()
};
#endif // _SHELLITEM_H_
#endif /* _SHELLITEM_H_ */

2
reactos/dll/win32/shell32/shelllink.cpp
View file

@ -36,6 +36,8 @@
#include "precomp.h"
#include <appmgmt.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define SHLINK_LOCAL 0

2
reactos/dll/win32/shell32/shelllink.h
View file

@ -179,4 +179,4 @@ BEGIN_COM_MAP(CShellLink)
END_COM_MAP()
};
#endif // _SHELLLINK_H_
#endif /* _SHELLLINK_H_ */

3
reactos/dll/win32/shell32/shellord.cpp
View file

@ -22,6 +22,9 @@
#include "precomp.h"
#include <mmsystem.h>
#include <commoncontrols.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
WINE_DECLARE_DEBUG_CHANNEL(pidl);

2
reactos/dll/win32/shell32/shellpath.cpp
View file

@ -26,6 +26,8 @@
#include "precomp.h"
#include <sddl.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/*

2
reactos/dll/win32/shell32/shfldr.h
View file

@ -75,4 +75,4 @@ static int __inline SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str)
void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags);
BOOL SHELL_FS_HideExtension(LPWSTR pwszPath);
#endif // _SHFLDR_H_
#endif /* _SHFLDR_H_ */

3
reactos/dll/win32/shell32/shlfileop.cpp
View file

@ -21,9 +21,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
//#define NO_SHLWAPI_STREAM
#include "precomp.h"
#include "xdg.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define IsAttrib(x, y) ((INVALID_FILE_ATTRIBUTES != (x)) && ((x) & (y)))

2
reactos/dll/win32/shell32/shlview.cpp
View file

@ -50,6 +50,8 @@ TODO:
#include "precomp.h"
#include <atlwin.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
#undef SV_CLASS_NAME

2
reactos/dll/win32/shell32/startmenu.h
View file

@ -152,4 +152,4 @@ BEGIN_COM_MAP(CMenuBandSite)
END_COM_MAP()
};
#endif // _STARTMENU_H_
#endif /* _STARTMENU_H_ */

3
reactos/dll/win32/shell32/xdg.h
View file

@ -13,6 +13,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __XDG_H__
#define __XDG_H__
@ -48,4 +49,4 @@ HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count);
void TRASH_DisposeElement(TRASH_ELEMENT *element);
#endif /* ndef __XDG_H__ */
#endif /* __XDG_H__ */