[ros-diffs] [gadamopoulos] 68773: [SHELL32] - Move a couple of headers in the dialogs directory.

Author: gadamopoulos
Date: Wed Aug 19 16:26:16 2015
New Revision: 68773

URL: http://svn.reactos.org/svn/reactos?rev=68773&view=rev
Log:
[SHELL32]
- Move a couple of headers in the dialogs directory.

Added:
    trunk/reactos/dll/win32/shell32/dialogs/drvdefext.h
      - copied unchanged from r68772, trunk/reactos/dll/win32/shell32/drvdefext.h
    trunk/reactos/dll/win32/shell32/dialogs/filedefext.h
      - copied unchanged from r68772, trunk/reactos/dll/win32/shell32/filedefext.h
Removed:
    trunk/reactos/dll/win32/shell32/drvdefext.h
    trunk/reactos/dll/win32/shell32/filedefext.h
Modified:
    trunk/reactos/dll/win32/shell32/precomp.h

Removed: trunk/reactos/dll/win32/shell32/drvdefext.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex…
==============================================================================
--- trunk/reactos/dll/win32/shell32/drvdefext.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/drvdefext.h	(removed)
@@ -1,75 +0,0 @@
-/*
- * Provides default drive shell extension
- *
- * Copyright 2012 Rafal Harabien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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 _DRV_DEF_EXT_H_
-#define _DRV_DEF_EXT_H_
-
-class CDrvDefExt :
-	public CComCoClass<CDrvDefExt, &CLSID_ShellDrvDefExt>,
-	public CComObjectRootEx<CComMultiThreadModelNoCS>,
-	public IShellExtInit,
-	public IContextMenu,
-	public IShellPropSheetExt,
-	public IObjectWithSite
-{
-private:
-    VOID PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem);
-    VOID InitGeneralPage(HWND hwndDlg);
-    static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam);
-    static INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam);
-    static INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam);
-
-    WCHAR m_wszDrive[MAX_PATH];
-    UINT m_FreeSpacePerc;
-
-public:
-	CDrvDefExt();
-	~CDrvDefExt();
-
-	// IShellExtInit
-	virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject
*pDataObj, HKEY hkeyProgID);
-
-    // IContextMenu
-	virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst,
UINT idCmdLast, UINT uFlags);
-	virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
-	virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved,
LPSTR pszName, UINT cchMax);
-
-	// IShellPropSheetExt
-	virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
-	virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage,
LPARAM lParam);
-
-    // IObjectWithSite
-	virtual HRESULT WINAPI SetSite(IUnknown *punk);
-	virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite);
-
-DECLARE_REGISTRY_RESOURCEID(IDR_DRVDEFEXT)
-DECLARE_NOT_AGGREGATABLE(CDrvDefExt)
-
-DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-BEGIN_COM_MAP(CDrvDefExt)
-	COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit)
-	COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu)
-	COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt)
-	COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
-END_COM_MAP()
-};
-
-#endif /* _DRV_DEF_EXT_H_ */

Removed: trunk/reactos/dll/win32/shell32/filedefext.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe…
==============================================================================
--- trunk/reactos/dll/win32/shell32/filedefext.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/filedefext.h	(removed)
@@ -1,128 +0,0 @@
-/*
- * Provides default file shell extension
- *
- * Copyright 2012 Rafal Harabien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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 _FILE_DEF_EXT_H_
-#define _FILE_DEF_EXT_H_
-
-class CFileVersionInfo
-{
-    private:
-        PVOID m_pInfo;
-        WORD m_wLang, m_wCode;
-        WCHAR m_wszLang[64];
-        
-        typedef struct _LANGANDCODEPAGE_
-        {
-            WORD wLang;
-            WORD wCode;
-        } LANGANDCODEPAGE, *LPLANGANDCODEPAGE;
-
-    public:
-        inline CFileVersionInfo():
-            m_pInfo(NULL), m_wLang(0), m_wCode(0)
-        {
-            m_wszLang[0] = L'\0';
-        }
-
-        inline ~CFileVersionInfo()
-        {
-            if (m_pInfo)
-                HeapFree(GetProcessHeap(), 0, m_pInfo);
-        }
-
-        BOOL Load(LPCWSTR pwszPath);
-        LPCWSTR GetString(LPCWSTR pwszName);
-        VS_FIXEDFILEINFO *GetFixedInfo();
-        LPCWSTR GetLangName();
-};
-
-class CFileDefExt :
-	public CComCoClass<CFileDefExt, &CLSID_ShellFileDefExt>,
-	public CComObjectRootEx<CComMultiThreadModelNoCS>,
-	public IShellExtInit,
-	public IContextMenu,
-	public IShellPropSheetExt,
-	public IObjectWithSite
-{
-private:
-    VOID InitOpensWithField(HWND hwndDlg);
-    BOOL InitFileType(HWND hwndDlg);
-    BOOL InitFilePath(HWND hwndDlg);
-    static BOOL GetFileTimeString(LPFILETIME lpFileTime, LPWSTR pwszResult, UINT
cchResult);
-    BOOL InitFileAttr(HWND hwndDlg);
-    BOOL InitGeneralPage(HWND hwndDlg);
-    BOOL SetVersionLabel(HWND hwndDlg, DWORD idCtrl, LPCWSTR pwszName);
-    BOOL AddVersionString(HWND hwndDlg, LPCWSTR pwszName);
-    BOOL InitVersionPage(HWND hwndDlg);
-    static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam);
-	static INT_PTR CALLBACK VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam);
-	BOOL CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, LPDWORD ticks);
-
-	WCHAR m_wszPath[MAX_PATH];
-	CFileVersionInfo m_VerInfo;
-	BOOL m_bDir;
-
-	DWORD m_cFiles;
-    DWORD m_cFolders;
-    ULARGE_INTEGER m_DirSize;
-
-    static DWORD WINAPI _CountFolderAndFilesThreadProc(LPVOID lpParameter);
-
-public:
-	CFileDefExt();
-	~CFileDefExt();
-
-	// IShellExtInit
-	virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject
*pdtobj, HKEY hkeyProgID);
-
-    // IContextMenu
-	virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst,
UINT idCmdLast, UINT uFlags);
-	virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
-	virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved,
LPSTR pszName, UINT cchMax);
-
-	// IShellPropSheetExt
-	virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
-	virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage,
LPARAM lParam);
-
-    // IObjectWithSite
-	virtual HRESULT WINAPI SetSite(IUnknown *punk);
-	virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite);
-
-DECLARE_REGISTRY_RESOURCEID(IDR_FILEDEFEXT)
-DECLARE_NOT_AGGREGATABLE(CFileDefExt)
-
-DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-BEGIN_COM_MAP(CFileDefExt)
-	COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit)
-	COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu)
-	COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt)
-	COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
-END_COM_MAP()
-};
-
-struct _CountFolderAndFilesData {
-    CFileDefExt *This;
-    HWND hwndDlg;
-    LPWSTR pwszBuf;
-    UINT cchBufMax;
-};
-
-#endif /* _FILE_DEF_EXT_H_ */

Modified: trunk/reactos/dll/win32/shell32/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/precomp.h	[iso-8859-1] Wed Aug 19 16:26:16 2015
@@ -62,8 +62,8 @@
 #include "droptargets/CexeDropHandler.h"
 #include "COpenWithMenu.h"
 #include "CNewMenu.h"
-#include "filedefext.h"
-#include "drvdefext.h"
+#include "dialogs/filedefext.h"
+#include "dialogs/drvdefext.h"
 #include "CQueryAssociations.h"
 #include "shellmenu/CBandSite.h"
 #include "shellmenu/CMenuBand.h"