mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 09:50:07 +00:00
[SHELL32]
* 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:
parent
94e3683b77
commit
1bb3dbb528
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <windowsx.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
|
||||
|
|
|
@ -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,4 +1,3 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#pragma once
|
||||
|
||||
class CMenuDeskBar:
|
||||
public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>,
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
|
||||
const char * const SHELL_Authors[] = { "Copyright 1993-2012 WINE team", "Copyright 1998-2012 ReactOS Team", 0 };
|
||||
|
|
|
@ -63,4 +63,4 @@ BEGIN_COM_MAP(CAutoComplete)
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _AUTOCOMPLETE_H_
|
||||
#endif /* _AUTOCOMPLETE_H_ */
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
|
||||
/* original margins and control size */
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
|
||||
namespace
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shlctrl);
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HWND hwndOwner ;
|
||||
|
|
|
@ -50,4 +50,4 @@ BEGIN_COM_MAP(CDropTargetHelper)
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _DRAGDROPHELPER_H_
|
||||
#endif /* _DRAGDROPHELPER_H_ */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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_ */
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -116,4 +116,4 @@ BEGIN_COM_MAP(CFileDefExt)
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _FILE_DEF_EXT_H_
|
||||
#endif /* _FILE_DEF_EXT_H_ */
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL (fprop);
|
||||
|
||||
#define MAX_PROPERTY_SHEET_PAGE (32)
|
||||
|
||||
/// Folder Options:
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL (shell);
|
||||
|
||||
|
||||
/*
|
||||
This folder should not exist. It is just a file system folder...
|
||||
*/
|
||||
|
|
|
@ -84,4 +84,4 @@ class CAdminToolsFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHFLDR_ADMINTOOLS_H_
|
||||
#endif /* _SHFLDR_ADMINTOOLS_H_ */
|
||||
|
|
|
@ -107,4 +107,4 @@ class CControlPanelFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHFLDR_CPANEL_H_
|
||||
#endif /* _SHFLDR_CPANEL_H_ */
|
||||
|
|
|
@ -105,4 +105,4 @@ class CDesktopFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _CDESKTOPFOLDER_H_
|
||||
#endif /* _CDESKTOPFOLDER_H_ */
|
||||
|
|
|
@ -92,4 +92,4 @@ class CFontsFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHFLDR_FONTS_H_
|
||||
#endif /* _SHFLDR_FONTS_H_ */
|
||||
|
|
|
@ -126,4 +126,4 @@ struct _DoDropData {
|
|||
DWORD pdwEffect;
|
||||
};
|
||||
|
||||
#endif // _CFSFOLDER_H_
|
||||
#endif /* _CFSFOLDER_H_ */
|
||||
|
|
|
@ -82,4 +82,4 @@ class CDrivesFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _CDRIVESFOLDER_H_
|
||||
#endif /* _CDRIVESFOLDER_H_ */
|
||||
|
|
|
@ -81,4 +81,4 @@ class CMyDocsFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHFLDR_MYDOCUMENTS_H_
|
||||
#endif /* _SHFLDR_MYDOCUMENTS_H_ */
|
||||
|
|
|
@ -82,4 +82,4 @@ class CNetFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHFLDR_NETPLACES_H_
|
||||
#endif /* _SHFLDR_NETPLACES_H_ */
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
|
||||
#include <precomp.h>
|
||||
|
||||
#include <winspool.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL (shell);
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
@ -85,4 +85,4 @@ class CPrinterFolder :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHFLDR_PRINTERS_H_
|
||||
#endif /* _SHFLDR_PRINTERS_H_ */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -110,4 +110,4 @@ class CRecycleBin :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHFLDR_RECYCLEBIN_H_
|
||||
#endif /* _SHFLDR_RECYCLEBIN_H_ */
|
||||
|
|
|
@ -99,4 +99,4 @@ BEGIN_COM_MAP(CNewMenu)
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHV_ITEM_NEW_H_
|
||||
#endif /* _SHV_ITEM_NEW_H_ */
|
||||
|
|
|
@ -68,4 +68,4 @@ class COpenWithMenu :
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHE_OCMENU_H_
|
||||
#endif /* _SHE_OCMENU_H_ */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
*/
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
#include "shell32_version.h"
|
||||
#include <reactos/version.h>
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -60,4 +60,4 @@ BEGIN_COM_MAP(CShellItem)
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHELLITEM_H_
|
||||
#endif /* _SHELLITEM_H_ */
|
||||
|
|
|
@ -36,6 +36,8 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <appmgmt.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
|
||||
#define SHLINK_LOCAL 0
|
||||
|
|
|
@ -179,4 +179,4 @@ BEGIN_COM_MAP(CShellLink)
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _SHELLLINK_H_
|
||||
#endif /* _SHELLLINK_H_ */
|
||||
|
|
|
@ -22,6 +22,9 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <mmsystem.h>
|
||||
#include <commoncontrols.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
WINE_DECLARE_DEBUG_CHANNEL(pidl);
|
||||
|
||||
|
|
|
@ -26,6 +26,8 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <sddl.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
|
||||
/*
|
||||
|
|
|
@ -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_ */
|
||||
|
|
|
@ -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)))
|
||||
|
|
|
@ -50,6 +50,8 @@ TODO:
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <atlwin.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
|
||||
#undef SV_CLASS_NAME
|
||||
|
|
|
@ -152,4 +152,4 @@ BEGIN_COM_MAP(CMenuBandSite)
|
|||
END_COM_MAP()
|
||||
};
|
||||
|
||||
#endif // _STARTMENU_H_
|
||||
#endif /* _STARTMENU_H_ */
|
||||
|
|
|
@ -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__ */
|
||||
|
|
Loading…
Reference in a new issue