Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Francois Gouget <fgouget@free.fr>

Browse source 
- Moved declarations from undocshell.h to shlobj.h to match the latest
  platform SDK.

svn path=/trunk/; revision=10923
This commit is contained in:
Gé van Geldorp 2004-09-19 22:02:28 +00:00
parent 2613fbbeb9
commit b22290537c
3 changed files with 39 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/lib/shell32/shellord.c
View file

@ -285,12 +285,12 @@ VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask)
* shell view to re-sort the item list. dwParam identifies the column
* that was clicked.
*/
int WINAPI SHShellFolderView_Message(
LRESULT WINAPI SHShellFolderView_Message(
HWND hwndCabinet,
DWORD dwMessage,
DWORD dwParam)
UINT uMessage,
LPARAM lParam)
{
FIXME("%p %08lx %08lx stub\n",hwndCabinet, dwMessage, dwParam);
FIXME("%p %08x %08lx stub\n",hwndCabinet, uMessage, lParam);
return 0;
}
@ -940,15 +940,15 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
* see IShellFolder::CreateViewObject
*/
HRESULT WINAPI SHCreateShellFolderViewEx(
LPCSHELLFOLDERVIEWINFO psvcbi, /* [in] shelltemplate struct */
LPSHELLVIEW* ppv) /* [out] IShellView pointer */
LPCSFV psvcbi, /* [in] shelltemplate struct */
IShellView **ppv) /* [out] IShellView pointer */
{
IShellView * psf;
HRESULT hRes;
TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=0x%08lx\n",
psvcbi->pshf, psvcbi->pidlFolder, psvcbi->lpfnCallback,
psvcbi->uViewMode, psvcbi->dwUser);
TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=%p\n",
psvcbi->pshf, psvcbi->pidlFolder, psvcbi->pfnCallback,
psvcbi->fvm, psvcbi->psvOuter);
psf = IShellView_Constructor(psvcbi->pshf);
@ -1269,8 +1269,8 @@ HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v)
* SHLoadOLE [SHELL32.151]
*
*/
HRESULT WINAPI SHLoadOLE(DWORD u)
{ FIXME("0x%04lx stub\n",u);
HRESULT WINAPI SHLoadOLE(LPARAM lParam)
{ FIXME("0x%04lx stub\n",lParam);
return S_OK;
}
/*************************************************************************

135
reactos/lib/shell32/undocshell.h
View file

@ -49,14 +49,6 @@ BOOL WINAPI ILGetDisplayNameEx(
LPVOID path,
DWORD type);
HRESULT WINAPI ILSaveToStream(
LPSTREAM pstrm,
LPCITEMIDLIST pidl);
HRESULT WINAPI ILLoadFromStream(
LPSTREAM pstrm,
LPITEMIDLIST *ppidl);
LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl);
void WINAPI ILGlobalFree(LPITEMIDLIST pidl);
@ -162,6 +154,11 @@ DWORD WINAPI SHNetConnectionDialog(
* Memory Routines
*/
/* The Platform SDK's shlobj.h header defines similar functions with a
* leading underscore. However those are unusable because of the leading
* underscore, because they have an incorrect calling convention, and
* because these functions are not exported by name anyway.
*/
HANDLE WINAPI SHAllocShared(
LPVOID pv,
ULONG cb,
@ -356,7 +353,6 @@ int WINAPI FileMenu_AddFilesForPidl(
/****************************************************************************
* Drag And Drop Routines
*/
HRESULT WINAPI SHLoadOLE(DWORD dwFlags);
HRESULT WINAPI SHRegisterDragDrop(
HWND hWnd,
@ -485,70 +481,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs);
* Shell Namespace Routines
*/
/* SHCreateShellFolderViewEx callback function */
typedef HRESULT (CALLBACK *LPFNSFVCALLBACK)(
DWORD dwUser,
LPSHELLFOLDER pshf,
HWND hWnd,
UINT uMsg,
WPARAM wParam,
LPARAM lParam);
/* SHCreateShellFolderViewEx structure */
typedef struct
{
DWORD dwSize;
LPSHELLFOLDER pshf;
DWORD dwUser;
LPCITEMIDLIST pidlFolder;
DWORD dwEventId;
LPFNSFVCALLBACK lpfnCallback;
UINT uViewMode;
} SHELLFOLDERVIEWINFO, * LPSHELLFOLDERVIEWINFO;
typedef const SHELLFOLDERVIEWINFO * LPCSHELLFOLDERVIEWINFO;
HRESULT WINAPI SHCreateShellFolderViewEx(
LPCSHELLFOLDERVIEWINFO pshfvi,
LPSHELLVIEW *ppshv);
/* SHCreateShellFolderViewEx callback messages */
#define SFVCB_ADDTOMENU 0x0001
#define SFVCB_INVOKECOMMAND 0x0002
#define SFVCB_GETMENUHELP 0x0003
#define SFVCB_GETTOOLBARTIP 0x0004
#define SFVCB_GETTOOLBARINFO 0x0005
#define SFVCB_ADDTOOLBARITEMS 0x0006
#define SFVCB_INITMENUPOPUP 0x0007
#define SFVCB_SELECTIONCHANGED 0x0008
#define SFVCB_DRAWMENUITEM 0x0009
#define SFVCB_MEASUREMENUITEM 0x000A
#define SFVCB_EXITMENULOOP 0x000B
#define SFVCB_VIEWRELEASE 0x000C
#define SFVCB_GETNAMELENGTH 0x000D
#define SFVCB_CHANGENOTIFY 0x000E
#define SFVCB_WINDOWCREATED 0x000F
#define SFVCB_WINDOWCLOSING 0x0010
#define SFVCB_LISTREFRESHED 0x0011
#define SFVCB_WINDOWFOCUSED 0x0012
#define SFVCB_REGISTERCOPYHOOK 0x0014
#define SFVCB_COPYHOOKCALLBACK 0x0015
#define SFVCB_GETDETAILSOF 0x0017
#define SFVCB_COLUMNCLICK 0x0018
#define SFVCB_GETCHANGENOTIFYPIDL 0x0019
#define SFVCB_GETESTIMATEDCOUNT 0x001A
#define SFVCB_ADJUSTVIEWMODE 0x001B
#define SFVCB_REMOVEFROMMENU 0x001C
#define SFVCB_ADDINGOBJECT 0x001D
#define SFVCB_REMOVINGOBJECT 0x001E
#define SFVCB_UPDATESTATUSBAR 0x001F
#define SFVCB_ISSLOWREFRESH 0x0020
#define SFVCB_GETCOMMANDDIR 0x0021
#define SFVCB_GETCOLUMNSTREAM 0x0022
#define SFVCB_CANSELECTALL 0x0023
#define SFVCB_DRAGSUCCEEDED 0x0024
#define SFVCB_ISSTRICTREFRESH 0x0025
#define SFVCB_ISCHILDOBJECT 0x0026
/* Generic structure used by several messages */
typedef struct
{
@ -559,30 +491,6 @@ typedef struct
} SFVCBINFO, * LPSFVCBINFO;
typedef const SFVCBINFO * LPCSFVCBINFO;
/* SFVCB_ADDTOMENU structure */
typedef struct
{
HMENU hMenu;
UINT indexMenu;
UINT idCmdFirst;
UINT idCmdLast;
} SFVMENUINFO, * LPSFVMENUINFO;
/* SFVCB_GETTOOLBARINFO structure */
typedef struct
{
UINT nButtons;
UINT uFlags;
} SFVTOOLBARINFO, * LPSFVTOOLBARINFO;
/* SFVTOOLBARINFO flags */
typedef enum
{
SFVTI_ADDTOEND = 0,
SFVTI_ADDTOFRONT = 1,
SFVTI_OVERWRITE = 2
} SFVTIF;
/* SFVCB_SELECTIONCHANGED structure */
typedef struct
{
@ -615,36 +523,6 @@ typedef struct
STRRET lpText;
} SFVCOLUMNINFO, * LPSFVCOLUMNINFO;
int WINAPI SHShellFolderView_Message(
HWND hwndCabinet,
DWORD dwMessage,
DWORD dwParam);
/* SHShellFolderView_Message messages */
#define SFVM_REARRANGE 0x0001
#define SFVM_GETARRANGECOLUMN 0x0002
#define SFVM_ADDOBJECT 0x0003
#define SFVM_GETITEMCOUNT 0x0004
#define SFVM_GETITEMPIDL 0x0005
#define SFVM_REMOVEOBJECT 0x0006
#define SFVM_UPDATEOBJECT 0x0007
#define SFVM_SETREDRAW 0x0008
#define SFVM_GETSELECTEDOBJECTS 0x0009
#define SFVM_ISDROPONSOURCE 0x000A
#define SFVM_MOVEICONS 0x000B
#define SFVM_GETDRAGPOINT 0x000C
#define SFVM_GETDROPPOINT 0x000D
#define SFVM_SETOBJECTPOS 0x000E
#define SFVM_ISDROPONBACKGROUND 0x000F
#define SFVM_CUTOBJECTS 0x0010
#define SFVM_TOGGLEAUTOARRANGE 0x0011
#define SFVM_LINEUPICONS 0x0012
#define SFVM_GETAUTOARRANGE 0x0013
#define SFVM_GETSELECTEDCOUNT 0x0014
#define SFVM_GETITEMSPACING 0x0015
#define SFVM_REFRESHOBJECT 0x0016
#define SFVM_SETCLIPBOARDPOINTS 0x0017
/****************************************************************************
* Misc Stuff
*/
@ -689,9 +567,6 @@ HRESULT WINAPI SHCreateDefClassObject(
LPDWORD lpdwUsage,
REFIID riidObject);
DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id);
DWORD WINAPI SHCLSIDFromStringW (LPCWSTR clsid, CLSID *id);
void WINAPI SHFreeUnusedLibraries();
/* SHCreateLinks flags */

23
reactos/w32api/include/shlobj.h
View file

@ -1581,9 +1581,30 @@ DECLARE_INTERFACE_(IDropTargetHelper, IUnknown)
#undef INTERFACE
#endif /* _WIN32_IE >= 0x0500 */
typedef HRESULT (CALLBACK *LPFNVIEWCALLBACK)(
IShellView* dwUser,
IShellFolder* pshf,
HWND hWnd,
UINT uMsg,
WPARAM wParam,
LPARAM lParam);
typedef struct _CSFV
{
UINT uSize;
IShellFolder* pshf;
IShellView* psvOuter;
LPCITEMIDLIST pidlFolder;
LONG lEvents;
LPFNVIEWCALLBACK pfnCallback;
FOLDERVIEWMODE fvm;
} CSFV, *LPCSFV;
void WINAPI SHAddToRecentDocs(UINT,PCVOID);
LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA);
LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW);
DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*);
DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*);
HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv);
void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID);
HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
@ -1648,6 +1669,7 @@ typedef IShellExecuteHookW IShellExecuteHook;
typedef IShellLinkW IShellLink;
typedef BROWSEINFOW BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
#define SHBrowseForFolder SHBrowseForFolderW
#define SHCLSIDFromString SHCLSIDFromStringW
#define SHGetDataFromIDList SHGetDataFromIDListW
#define SHGetPathFromIDList SHGetPathFromIDListW
#if (_WIN32_IE >= 0x0400)
@ -1666,6 +1688,7 @@ typedef IShellExecuteHookA IShellExecuteHook;
typedef IShellLinkA IShellLink;
typedef BROWSEINFOA BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
#define SHBrowseForFolder SHBrowseForFolderA
#define SHCLSIDFromString SHCLSIDFromStringW
#define SHGetDataFromIDList SHGetDataFromIDListA
#define SHGetPathFromIDList SHGetPathFromIDListA
#if (_WIN32_IE >= 0x0400)