Skip to content

W
wine-cw
Commit 487b9f5f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Moved some more definitions out of undocshell.h into the exported

headers.
parent 951b0a22
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 147 deletions
dlls/shell32/iconcache.c
View file @ 487b9f5f
......@@ -325,7 +325,7 @@ BOOL PidlToSicIndex (
LPCITEMIDLIST pidl,
BOOL bBigIcon,
UINT uFlags,
UINT * pIndex)
int * pIndex)
{
IExtractIconA *ei;
char szIconFile[MAX_PATH]; /* file containing the icon */
......@@ -362,11 +362,11 @@ BOOL PidlToSicIndex (
*
*/
int WINAPI SHMapPIDLToSystemImageListIndex(
LPSHELLFOLDER sh,
IShellFolder *sh,
LPCITEMIDLIST pidl,
UINT * pIndex)
int *pIndex)
{
UINT Index;
int Index;
TRACE("(SF=%p,pidl=%p,%p)\n",sh,pidl,pIndex);
pdump(pidl);
......
dlls/shell32/shell32_main.h
View file @ 487b9f5f
......@@ -52,7 +52,7 @@ BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)
#define INVALID_INDEX -1
BOOL SIC_Initialize(void);
void SIC_Destroy(void);
BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, UINT * pIndex);
BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex);
INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex );
/* Classes Root */
......
dlls/shell32/shellord.c
View file @ 487b9f5f
......@@ -1023,7 +1023,7 @@ void WINAPI SHFreeUnusedLibraries (void)
* DAD_AutoScroll [SHELL32.129]
*
*/
DWORD WINAPI DAD_AutoScroll(HWND hwnd, LPSCROLLSAMPLES samples, LPPOINT pt)
BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, LPPOINT pt)
{
FIXME("hwnd = %p %p %p\n",hwnd,samples,pt);
return 0;
......
dlls/shell32/undocshell.h
View file @ 487b9f5f
......@@ -62,7 +62,6 @@ void WINAPI ILGlobalFree(LPITEMIDLIST pidl);
LPITEMIDLIST WINAPI SHSimpleIDListFromPathA (LPCSTR lpszPath);
LPITEMIDLIST WINAPI SHSimpleIDListFromPathW (LPCWSTR lpszPath);
LPITEMIDLIST WINAPI SHSimpleIDListFromPathAW (LPCVOID lpszPath);
HRESULT WINAPI SHILCreateFromPathA (
LPCSTR path,
......@@ -74,21 +73,14 @@ HRESULT WINAPI SHILCreateFromPathW (
LPITEMIDLIST * ppidl,
DWORD *attributes);
HRESULT WINAPI SHILCreateFromPathAW (
LPCVOID path,
LPITEMIDLIST * ppidl,
DWORD *attributes);
LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR path);
LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR path);
LPITEMIDLIST WINAPI ILCreateFromPathAW(LPCVOID path);
/*
string functions
*/
BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
BOOL WINAPI StrRetToStrNAW(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST*);
/****************************************************************************
......@@ -154,24 +146,10 @@ BOOL WINAPI GetFileNameFromBrowse(
LPCSTR lpstrFilter,
LPCSTR lpstrTitle);
BOOL WINAPI SHFindFiles(
LPCITEMIDLIST pidlRoot,
LPCITEMIDLIST pidlSavedSearch);
BOOL WINAPI SHFindComputer(
LPCITEMIDLIST pidlRoot,
LPCITEMIDLIST pidlSavedSearch);
/* SHObjectProperties flags */
#define OPF_PRINTERNAME 0x01
#define OPF_PATHNAME 0x02
BOOL WINAPI SHObjectProperties(
HWND hwndOwner,
UINT uFlags,
LPCSTR lpstrName,
LPCSTR lpstrParameters);
void WINAPI SHHandleDiskFull(HWND hwndOwner,
UINT uDrive);
......@@ -185,31 +163,10 @@ DWORD WINAPI SHNetConnectionDialog(
LPCSTR lpstrRemoteName,
DWORD dwType);
int WINAPIV ShellMessageBoxA(
HINSTANCE hInstance,
HWND hWnd,
LPCSTR lpText,
LPCSTR lpCaption,
UINT uType,
...);
int WINAPIV ShellMessageBoxW(
HINSTANCE hInstance,
HWND hWnd,
LPCWSTR lpText,
LPCWSTR lpCaption,
UINT uType,
...);
#define ShellMessageBox WINELIB_NAME_AW(ShellMessageBox)
/****************************************************************************
* Memory Routines
*/
LPVOID WINAPI SHAlloc(ULONG cb);
void WINAPI SHFree(LPVOID pv);
HANDLE WINAPI SHAllocShared(
LPVOID pv,
ULONG cb,
......@@ -269,11 +226,6 @@ HICON WINAPI SHGetFileIcon(
DWORD dwFileAttributes,
UINT uFlags);
int WINAPI SHMapPIDLToSystemImageListIndex(
LPSHELLFOLDER psf,
LPCITEMIDLIST pidl,
UINT * pOpenIndex);
BOOL WINAPI FileIconInit(BOOL bFullInit);
/****************************************************************************
......@@ -417,58 +369,14 @@ HRESULT WINAPI SHRegisterDragDrop(
HRESULT WINAPI SHRevokeDragDrop(HWND hWnd);
HRESULT WINAPI SHDoDragDrop(
HWND hWnd,
LPDATAOBJECT lpDataObject,
LPDROPSOURCE lpDropSource,
DWORD dwOKEffect,
LPDWORD pdwEffect);
BOOL WINAPI DAD_DragEnter(HWND hWnd);
BOOL WINAPI DAD_DragEnterEx(
HWND hWnd,
POINT pt);
BOOL WINAPI DAD_DragMove(POINT pt);
/* DAD_AutoScroll return values */
#define DAD_SCROLL_UP 1
#define DAD_SCROLL_DOWN 2
#define DAD_SCROLL_LEFT 4
#define DAD_SCROLL_RIGHT 8
/* DAD_AutoScroll sample structure */
typedef struct
{
DWORD dwCount;
DWORD dwLastTime;
BOOL bWrapped;
POINT aptPositions[3];
DWORD adwTimes[3];
} SCROLLSAMPLES, *LPSCROLLSAMPLES;
DWORD WINAPI DAD_AutoScroll(HWND hWnd,
LPSCROLLSAMPLES lpSamples,
LPPOINT lppt);
BOOL WINAPI DAD_DragLeave();
BOOL WINAPI DAD_SetDragImageFromListView(
HWND hWnd,
POINT pt);
BOOL WINAPI DAD_SetDragImage(
HIMAGELIST himlTrack,
LPPOINT lppt);
BOOL WINAPI DAD_ShowDragImage(BOOL bShow);
HRESULT WINAPI SHCreateStdEnumFmtEtc(
DWORD cFormats,
const FORMATETC *lpFormats,
LPENUMFORMATETC *ppenumFormatetc);
HRESULT WINAPI CIDLData_CreateFromIDArray(
LPCITEMIDLIST pidlFolder,
DWORD cpidlFiles,
......@@ -802,57 +710,12 @@ HRESULT WINAPI SHCreateLinks(
UINT uFlags,
LPITEMIDLIST *lppidlLinks);
/* SHGetNewLinkInfo flags */
#define SHGNLI_PIDL 0x01
#define SHGNLI_PREFIXNAME 0x02
#define SHGNLI_NOUNIQUE 0x04
BOOL WINAPI SHGetNewLinkInfoA(
LPCSTR pszLinkTo,
LPCSTR pszDir,
LPSTR pszName,
BOOL *pfMustCopy,
UINT uFlags);
BOOL WINAPI SHGetNewLinkInfoW(
LPCWSTR pszLinkTo,
LPCWSTR pszDir,
LPWSTR pszName,
BOOL *pfMustCopy,
UINT uFlags);
#define SHGetNewLinkInfo WINELIB_NAME_AW(SHGetNewLinkInfo)
DWORD WINAPI CheckEscapesA(LPSTR string, DWORD len);
DWORD WINAPI CheckEscapesW(LPWSTR string, DWORD len);
/* policy functions */
BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey);
/* cabinet functions */
#include "pshpack1.h"
typedef struct {
WORD cLength;
WORD nVersion;
BOOL fFullPathTitle:1;
BOOL fSaveLocalView:1;
BOOL fNotShell:1;
BOOL fSimpleDefault:1;
BOOL fDontShowDescBar:1;
BOOL fNewWindowMode:1;
BOOL fShowCompColor:1;
BOOL fDontPrettyNames:1;
BOOL fAdminsCreateCommonGroups:1;
UINT fUnusedFlags:7;
UINT fMenuEnumFilter;
} CABINETSTATE;
#include "poppack.h"
BOOL WINAPI ReadCabinetState(CABINETSTATE *, int);
BOOL WINAPI WriteCabinetState(CABINETSTATE *);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
......
include/shellapi.h
View file @ 487b9f5f
......@@ -342,6 +342,19 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW lpData);
#define Shell_NotifyIcon WINELIB_NAME_AW(Shell_NotifyIcon)
/******************************************
* Links
*/
#define SHGNLI_PIDL 0x01
#define SHGNLI_PREFIXNAME 0x02
#define SHGNLI_NOUNIQUE 0x04
#define SHGNLI_NOLNK 0x08
BOOL WINAPI SHGetNewLinkInfoA(LPCSTR,LPCSTR,LPSTR,BOOL*,UINT);
BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR,LPCWSTR,LPWSTR,BOOL*,UINT);
#define SHGetNewLinkInfo WINELIB_NAME_AW(SHGetNewLinkInfo)
/******************************************
* Misc
*/
......@@ -365,6 +378,9 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
BOOL WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
BOOL WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
#define ShellAbout WINELIB_NAME_AW(ShellAbout)
int WINAPIV ShellMessageBoxA(HINSTANCE,HWND,LPCSTR,LPCSTR,UINT,...);
int WINAPIV ShellMessageBoxW(HINSTANCE,HWND,LPCWSTR,LPCWSTR,UINT,...);
#define ShellMessageBox WINELIB_NAME_AW(ShellMessageBox)
#ifdef __cplusplus
} /* extern "C" */
......
include/shlobj.h
View file @ 487b9f5f
......@@ -33,11 +33,26 @@ extern "C" {
#include <shtypes.h>
#include <shobjidl.h>
HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,LPUNKNOWN,REFIID,LPVOID*);
BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
LPVOID WINAPI SHAlloc(ULONG);
HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*);
HRESULT WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IEnumFORMATETC**);
BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST);
void WINAPI SHFree(LPVOID);
BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST pidl,LPSTR pszPath);
BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl,LPWSTR pszPath);
#define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*);
LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR);
int WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*);
/* SHObjectProperties flags */
#define SHOP_PRINTERNAME 0x01
#define SHOP_FILEPATH 0x02
#define SHOP_VOLUMEGUID 0x04
BOOL WINAPI SHObjectProperties(HWND,UINT,LPCWSTR,LPCWSTR);
/*****************************************************************************
* Predeclare interfaces
......@@ -854,12 +869,60 @@ DECL_WINELIB_TYPE_AW(FILEGROUPDESCRIPTOR)
DECL_WINELIB_TYPE_AW(LPFILEGROUPDESCRIPTOR)
/****************************************************************************
* Cabinet functions
*/
typedef struct {
WORD cLength;
WORD nVersion;
BOOL fFullPathTitle:1;
BOOL fSaveLocalView:1;
BOOL fNotShell:1;
BOOL fSimpleDefault:1;
BOOL fDontShowDescBar:1;
BOOL fNewWindowMode:1;
BOOL fShowCompColor:1;
BOOL fDontPrettyNames:1;
BOOL fAdminsCreateCommonGroups:1;
UINT fUnusedFlags:7;
UINT fMenuEnumFilter;
} CABINETSTATE, *LPCABINETSTATE;
#define CABINETSTATE_VERSION 2
BOOL WINAPI ReadCabinetState(CABINETSTATE *, int);
BOOL WINAPI WriteCabinetState(CABINETSTATE *);
/****************************************************************************
* Path Manipulation Routines
*/
VOID WINAPI PathGetShortPath(LPWSTR pszPath);
#include <poppack.h>
/****************************************************************************
* Drag And Drop Routines
*/
/* DAD_AutoScroll sample structure */
#define NUM_POINTS 3
typedef struct
{
int iNextSample;
DWORD dwLastScroll;
BOOL bFull;
POINT pts[NUM_POINTS];
DWORD dwTimes[NUM_POINTS];
} AUTO_SCROLL_DATA;
BOOL WINAPI DAD_SetDragImage(HIMAGELIST,LPPOINT);
BOOL WINAPI DAD_DragEnterEx(HWND,POINT);
BOOL WINAPI DAD_DragEnterEx2(HWND,POINT,IDataObject*);
BOOL WINAPI DAD_DragMove(POINT);
BOOL WINAPI DAD_DragLeave(void);
BOOL WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,LPPOINT);
HRESULT WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWORD,LPDWORD);
/*****************************************************************************
* IFileSystemBindData interface
*/
......@@ -940,6 +1003,9 @@ struct IFileSystemBindDataVtbl {
LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL);
LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST);
LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST);
LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR);
LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR);
#define ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath)
LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST,LPCITEMIDLIST);
LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST,LPCITEMIDLIST);
LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment