system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 03:45:57 +00:00
Code Issues Projects Releases Wiki Activity

Removed shell.h. Cleaned up the nested includes mess in wine/obj_*.h.

Browse Source
This commit is contained in:
Alexandre Julliard 2000-09-26 00:00:55 +00:00
parent 60e175294b
commit 74af67ef42
82 changed files with 152 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/comctl32/imagelist.c
View File

@ -22,12 +22,13 @@
* limited in functionality too.
*/
#include "winerror.h"
#include "winbase.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "commctrl.h"
#include "imagelist.h"
#include "debugtools.h"
#include "winerror.h"
DEFAULT_DEBUG_CHANNEL(imagelist);

2
dlls/commdlg/cdlg.h
View File

@ -88,7 +88,7 @@ typedef struct {
#define PD32_MILIMETERS 1587
#include "commctrl.h"
#include "wine/undocshell.h"
#include "shlobj.h"
#include "shellapi.h"
/* IMAGELIST */

3
dlls/ole32/antimoniker.c
View File

@ -8,6 +8,9 @@
#include "winbase.h"
#include "winerror.h"
#include "wine/unicode.h"
#include "wine/obj_base.h"
#include "wine/obj_misc.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "debugtools.h"

4
dlls/ole32/bindctx.c
View File

@ -7,7 +7,11 @@
#include <string.h>
#include <assert.h>
#include "winerror.h"
#include "winbase.h"
#include "wine/unicode.h"
#include "wine/obj_base.h"
#include "wine/obj_misc.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "debugtools.h"
#include "heap.h"

4
dlls/ole32/compositemoniker.c
View File

@ -7,6 +7,10 @@
#include "winbase.h"
#include "winerror.h"
#include "debugtools.h"
#include "wine/obj_base.h"
#include "wine/obj_misc.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_inplace.h"
#include "wine/unicode.h"
#include "ole2.h"

5
dlls/ole32/datacache.c
View File

@ -35,6 +35,11 @@
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_misc.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_dataobject.h"
#include "wine/obj_oleview.h"
#include "wine/obj_cache.h"
#include "wine/unicode.h"

2
dlls/ole32/errorinfo.c
View File

@ -14,6 +14,8 @@
#include "winerror.h"
#include "thread.h"
#include "debugtools.h"
#include "wine/obj_base.h"
#include "wine/obj_oleaut.h"
#include "wine/obj_errorinfo.h"
#include "wine/unicode.h"

10
dlls/ole32/itemmoniker.c
View File

@ -4,13 +4,15 @@
* Copyright 1999 Noomen Hamza
***************************************************************************************/
#include "wine/obj_base.h"
#include "wine/obj_moniker.h"
#include "winbase.h"
#include <assert.h>
#include "winerror.h"
#include "winbase.h"
#include "debugtools.h"
#include "wine/winestring.h"
#include "wine/obj_base.h"
#include "wine/obj_misc.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_inplace.h"
#include "wine/unicode.h"

5
dlls/ole32/moniker.c
View File

@ -7,6 +7,11 @@
#include <assert.h>
#include "winerror.h"
#include "wtypes.h"
#include "winbase.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_misc.h"
#include "wine/obj_moniker.h"
#include "debugtools.h"
#include "heap.h"

3
dlls/ole32/ole2impl.c
View File

@ -4,10 +4,11 @@
* Copyright (C) 1999-2000 Abey George
*/
#include "ole2.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "debugtools.h"
#include "ole2.h"
#include "olestd.h"
#include "winreg.h"

5
dlls/ole32/ole2stubs.c
View File

@ -5,13 +5,14 @@
* Move these functions to dlls/ole32/ole2impl.c when you implement them.
*/
#include "ole2.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "ole2.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
DEFAULT_DEBUG_CHANNEL(ole);
/******************************************************************************
* OleCreateLinkToFile [OLE32.96]

1
dlls/ole32/stg_bigblockfile.c
View File

@ -26,6 +26,7 @@
#include "winbase.h"
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "ole2.h"

3
dlls/ole32/stg_stream.c
View File

@ -16,11 +16,10 @@
#include "winbase.h"
#include "winerror.h"
#include "debugtools.h"
#include "wine/obj_storage.h"
#include "storage32.h"
DEFAULT_DEBUG_CHANNEL(storage)
DEFAULT_DEBUG_CHANNEL(storage);
/*

1
dlls/ole32/storage32.h
View File

@ -17,6 +17,7 @@
#include "wtypes.h"
#include "winnt.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
/*

2
dlls/oleaut32/connpt.c
View File

@ -9,6 +9,8 @@
#include <assert.h>
#include "winerror.h"
#include "winbase.h"
#include "wingdi.h"
#include "olectl.h"
#include "wine/obj_base.h"
#include "wine/obj_connection.h"

2
dlls/oleaut32/olefont.c
View File

@ -9,6 +9,8 @@
#include <assert.h>
#include <string.h>
#include "winerror.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/unicode.h"
#include "oleauto.h" /* for SysAllocString(....) */
#include "wine/obj_olefont.h"

1
dlls/olepro32/olepro32stubs.c
View File

@ -7,6 +7,7 @@
*/
#include "debugtools.h"
#include "winbase.h"
#include "ole2.h"
#include "windef.h"

2
dlls/shell32/classes.c
View File

@ -11,11 +11,11 @@
#include "winerror.h"
#include "winreg.h"
#include "wine/obj_queryassociations.h"
#include "shlobj.h"
#include "shell32_main.h"
#include "shlguid.h"
#include "shresdef.h"
#include "wine/obj_queryassociations.h"
DEFAULT_DEBUG_CHANNEL(shell);

4
dlls/shell32/enumidlist.c
View File

@ -8,10 +8,10 @@
#include <string.h>
#include "debugtools.h"
#include "winreg.h"
#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
#include "wine/undocshell.h"
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
#include "pidl.h"
#include "shlguid.h"

7
dlls/shell32/memorystream.c
View File

@ -11,13 +11,14 @@
#include <string.h>
#include "wine/obj_storage.h"
#include "heap.h"
#include "winbase.h"
#include "winerror.h"
#include "shlobj.h"
#include "debugtools.h"
#include "heap.h"
#include "shell32_main.h"
DEFAULT_DEBUG_CHANNEL(shell)
DEFAULT_DEBUG_CHANNEL(shell);
static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj);
static ULONG WINAPI IStream_fnAddRef(IStream *iface);

4
dlls/shell32/pidl.c
View File

@ -13,15 +13,15 @@
#include <string.h>
#include "winbase.h"
#include "debugtools.h"
#include "shell.h"
#include "shlguid.h"
#include "winerror.h"
#include "winnls.h"
#include "wine/winestring.h"
#include "wine/undocshell.h"
#include "shell32_main.h"
#include "shellapi.h"
#include "pidl.h"
#include "wine/undocshell.h"
DEFAULT_DEBUG_CHANNEL(pidl);
DECLARE_DEBUG_CHANNEL(shell);

9
dlls/shell32/shell32_main.h
View File

@ -6,7 +6,6 @@
#define __WINE_SHELL_MAIN_H
#include "commctrl.h"
#include "shell.h"
#include "docobj.h"
#include "wine/obj_shellfolder.h"
@ -63,10 +62,6 @@ extern HRESULT (WINAPI* pRevokeDragDrop)(HWND hwnd);
*/
BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
HRESULT WINAPI StrRetToStrN (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
/* Iconcache */
#define INVALID_INDEX -1
BOOL SIC_Initialize(void);
@ -165,6 +160,10 @@ void FreeChangeNotifications(void);
/* file operation */
BOOL SHELL_DeleteDirectoryA(LPCSTR pszDir, BOOL bShowUI);
HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD);
extern HINSTANCE SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);
inline static BOOL SHELL_OsIsUnicode(void)
{
/* if high-bit of version is 0, we are emulating NT */

1
dlls/shell32/shellfolder.h
View File

@ -7,7 +7,6 @@
#define __WINE_SHELLFOLDER_HELP_H
#include "winbase.h"
#include "shell.h"
#include "wine/obj_base.h"
#include "wine/obj_shellfolder.h"

2
dlls/shell32/shellguid.c
View File

@ -6,6 +6,8 @@
* this in in a single file due to interfering definitions
*
*/
#include "winbase.h"
#include "initguid.h"
#include "shlwapi.h"

8
dlls/shell32/shelllink.c
View File

@ -8,14 +8,14 @@
#include <string.h>
#include "debugtools.h"
#include "winerror.h"
#include "winbase.h"
#include "winnls.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_shelllink.h"
#include "shlobj.h"
#include "wine/winestring.h"
#include "wine/undocshell.h"
#include "heap.h"
#include "winnls.h"
#include "pidl.h"
#include "shell32_main.h"
#include "shlguid.h"

7
dlls/shell32/shellstring.c
View File

@ -8,6 +8,7 @@
#include "debugtools.h"
#include "heap.h"
#include "shlobj.h"
#include "shlwapi.h"
#include "shellapi.h"
#include "shell32_main.h"
@ -26,17 +27,17 @@ DEFAULT_DEBUG_CHANNEL(shell);
* NOTES
* the pidl is for STRRET OFFSET
*/
HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
{
return StrRetToBufA( src, pidl, dest, len );
}
HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
{
return StrRetToBufW( src, pidl, dest, len );
}
HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
{
if(SHELL_OsIsUnicode())
return StrRetToStrNW (dest, len, src, pidl);

2
dlls/shell32/shlfileop.c
View File

@ -4,10 +4,10 @@
#include <string.h>
#include "debugtools.h"
#include "shellapi.h"
#include "shell32_main.h"
#include "shlobj.h"
#include "shresdef.h"
#include "shell32_main.h"
#include "wine/undocshell.h"
DEFAULT_DEBUG_CHANNEL(shell);

4
dlls/shell32/shlfolder.c
View File

@ -14,11 +14,13 @@
#include "debugtools.h"
#include "winerror.h"
#include "winbase.h"
#include "oleidl.h"
#include "shlguid.h"
#include "pidl.h"
#include "wine/winestring.h"
#include "wine/obj_base.h"
#include "wine/obj_dragdrop.h"
#include "wine/obj_shellfolder.h"
@ -30,7 +32,7 @@
#define INITGUID
#include "initguid.h"
#include "shellfolder.h"
#include "wine/obj_queryassociations.h"
DEFAULT_DEBUG_CHANNEL(shell)

1
dlls/shell32/shlmenu.c
View File

@ -3,6 +3,7 @@
*/
#include <string.h>
#include "shlobj.h"
#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
#include "wine/obj_shellfolder.h"

10
dlls/shell32/shlview.c
View File

@ -27,15 +27,7 @@
#include "servprov.h"
#include "shlguid.h"
#include "wine/obj_base.h"
#include "wine/obj_shellfolder.h"
#include "wine/obj_shellview.h"
#include "wine/obj_oleview.h"
#include "wine/obj_commdlgbrowser.h"
#include "wine/obj_shellbrowser.h"
#include "wine/obj_dockingwindowframe.h"
#include "wine/obj_extracticon.h"
#include "wine/obj_dragdrop.h"
#include "shlobj.h"
#include "wine/undocshell.h"
#include "shresdef.h"
#include "debugtools.h"

3
dlls/shell32/shv_bg_cmenu.c
View File

@ -16,10 +16,9 @@
#include "shell32_main.h"
#include "shellfolder.h"
#include "shell.h" /* DROPFILESTRUCT */
#include "wine/undocshell.h"
DEFAULT_DEBUG_CHANNEL(shell)
DEFAULT_DEBUG_CHANNEL(shell);
/**************************************************************************
* IContextMenu Implementation

5
dlls/shell32/systray.c
View File

@ -13,12 +13,13 @@
#include <stdlib.h>
#include <string.h>
#include "heap.h"
#include "wine/winestring.h"
#include "shlobj.h"
#include "shellapi.h"
#include "shell32_main.h"
#include "windows.h"
#include "commctrl.h"
#include "debugtools.h"
#include "heap.h"
#include "config.h"
DEFAULT_DEBUG_CHANNEL(shell)

3
dlls/shlwapi/regstream.c
View File

@ -4,8 +4,9 @@
#include <string.h>
#include "winerror.h"
#include "winbase.h"
#include "winreg.h"
#include "wine/obj_storage.h"
#include "shlobj.h"
#include "heap.h"
#include "debugtools.h"

1
dlls/shlwapi/shlwapi_main.c
View File

@ -10,6 +10,7 @@
#include "debugtools.h"
#include "initguid.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
DEFAULT_DEBUG_CHANNEL(shell);

7
dlls/shlwapi/string.c
View File

@ -5,10 +5,13 @@
#include "winerror.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "shlwapi.h"
#include "shlobj.h"
#include "wine/unicode.h"
#include "wine/winestring.h"
#include "heap.h"
#include "debugtools.h"
@ -332,7 +335,7 @@ LPWSTR WINAPI StrCatBuffW(LPWSTR front, LPCWSTR back, INT size)
* NOTES
* the pidl is for STRRET OFFSET
*/
HRESULT WINAPI StrRetToBufA (LPSTRRET src, LPITEMIDLIST pidl, LPSTR dest, DWORD len)
HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len)
{
TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
@ -370,7 +373,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, LPITEMIDLIST pidl, LPSTR dest, DWORD
* NOTES
* the pidl is for STRRET OFFSET
*/
HRESULT WINAPI StrRetToBufW (LPSTRRET src, LPITEMIDLIST pidl, LPWSTR dest, DWORD len)
HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len)
{
TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);

2
include/dlgs.h
View File

@ -5,8 +5,6 @@
#ifndef __WINE_DLGS_H
#define __WINE_DLGS_H
#include "wine/obj_shellview.h"
#define ctlFirst 0x0400
#define ctlLast 0x04ff
/* Push buttons */

2
include/main.h
View File

@ -14,4 +14,6 @@ extern void MAIN_ParseDebugOptions(const char *options);
extern BOOL RELAY_Init(void);
extern int RELAY_ShowDebugmsgRelay(const char *func);
extern void SHELL_LoadRegistry(void);
#endif /* __WINE_MAIN_H */

4
include/ocidl.h
View File

@ -1,10 +1,14 @@
#ifndef __WINE_OCIDL_H
#define __WINE_OCIDL_H
#include "windows.h"
#include "ole2.h"
#include "wine/obj_base.h"
/* the following depend only on obj_base.h */
#include "wine/obj_storage.h"
#include "wine/obj_oleaut.h"
#include "wine/obj_olefont.h"
#include "wine/obj_picture.h"

4
include/ole2.h
View File

@ -7,9 +7,11 @@
#include "windef.h"
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_misc.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_base.h"
#include "wine/obj_dataobject.h"
#include "wine/obj_dragdrop.h"
#include "wine/obj_inplace.h"
#include "wine/obj_oleobj.h"

1
include/oleauto.h
View File

@ -2,6 +2,7 @@
#define __WINE_OLEAUTO_H
#include "wtypes.h"
#include "wine/obj_base.h"
#include "wine/obj_oleaut.h"
#include "wine/obj_errorinfo.h"

1
include/oleidl.h
View File

@ -3,6 +3,7 @@
#include "wine/obj_base.h"
#include "wine/obj_misc.h"
/* the following depend only on obj_base.h */
#include "wine/obj_storage.h"

95
include/shell.h
View File

@ -1,95 +0,0 @@
/*
* Shell Library definitions
*/
#ifndef __WINE_SHELL_H
#define __WINE_SHELL_H
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/****************************************************************************
* shell 16
*/
extern void SHELL_LoadRegistry(void);
/* global functions used from shell32 */
extern HINSTANCE SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);
extern HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD);
/****************************************************************************
* shell 32
*/
/****************************************************************************
* common return codes
*/
#define SHELL_ERROR_SUCCESS 0L
#define SHELL_ERROR_BADDB 1L
#define SHELL_ERROR_BADKEY 2L
#define SHELL_ERROR_CANTOPEN 3L
#define SHELL_ERROR_CANTREAD 4L
#define SHELL_ERROR_CANTWRITE 5L
#define SHELL_ERROR_OUTOFMEMORY 6L
#define SHELL_ERROR_INVALID_PARAMETER 7L
#define SHELL_ERROR_ACCESS_DENIED 8L
/****************************************************************************
* common shell file structures
*/
/******************************
* DRAG&DROP API
*/
typedef struct { /* structure for dropped files */
WORD wSize;
POINT16 ptMousePos;
BOOL16 fInNonClientArea;
/* memory block with filenames follows */
} DROPFILESTRUCT16, *LPDROPFILESTRUCT16;
typedef struct { /* structure for dropped files */
DWORD lSize;
POINT ptMousePos;
BOOL fInNonClientArea;
BOOL fWideChar;
/* memory block with filenames follows */
} DROPFILESTRUCT, *LPDROPFILESTRUCT;
/****************************************************************************
* SHITEMID, ITEMIDLIST, PIDL API
*/
#include "pshpack1.h"
typedef struct
{ WORD cb; /* nr of bytes in this item */
BYTE abID[1];/* first byte in this item */
} SHITEMID,*LPSHITEMID;
typedef LPSHITEMID const LPCSHITEMID;
typedef struct
{ SHITEMID mkid; /* first itemid in list */
} ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST;
#include "poppack.h"
BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
#define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
/****************************************************************************
* SHAddToRecentDocs API
*/
#define SHARD_PIDL 0x00000001L
#define SHARD_PATH 0x00000002L
DWORD WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
/****************************************************************************
* other functions
*/
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_SHELL_H */

57
include/shlobj.h
View File

@ -1,20 +1,9 @@
#ifndef __WINE_SHLOBJ_H
#define __WINE_SHLOBJ_H
#include "wine/obj_base.h"
#include "wine/obj_shelllink.h"
#include "wine/obj_shellfolder.h"
#include "wine/obj_shellbrowser.h"
#include "wine/obj_contextmenu.h"
#include "wine/obj_shellextinit.h"
#include "wine/obj_extracticon.h"
#include "wine/obj_commdlgbrowser.h"
#include "wine/obj_dockingwindowframe.h"
#include "windef.h"
#include "winbase.h" /* WIN32_FIND_* */
#include "ole2.h"
#include "shell.h"
#include "commctrl.h"
#include "prsht.h"
@ -22,6 +11,42 @@
extern "C" {
#endif /* defined(__cplusplus) */
/****************************************************************************
* SHITEMID, ITEMIDLIST, PIDL API
*/
#include "pshpack1.h"
typedef struct
{
WORD cb; /* nr of bytes in this item */
BYTE abID[1]; /* first byte in this item */
} SHITEMID, *LPSHITEMID;
typedef LPSHITEMID const LPCSHITEMID;
typedef struct _ITEMIDLIST
{
SHITEMID mkid; /* first itemid in list */
} ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST;
#include "poppack.h"
BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
#define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
#include "wine/obj_inplace.h"
#include "wine/obj_oleaut.h"
#include "wine/obj_shellfolder.h"
#include "wine/obj_shellview.h"
#include "wine/obj_shelllink.h"
#include "wine/obj_shellbrowser.h"
#include "wine/obj_contextmenu.h"
#include "wine/obj_shellextinit.h"
#include "wine/obj_extracticon.h"
#include "wine/obj_commdlgbrowser.h"
#include "wine/obj_dockingwindowframe.h"
/*****************************************************************************
* Predeclare interfaces
*/
@ -95,6 +120,16 @@ ICOM_DEFINE(IShellIcon, IUnknown)
/*** IShellIcon methods ***/
#define IShellIcon_GetIconOf(p,a,b,c) ICOM_CALL3(GetIconOf,p,a,b,c)
/****************************************************************************
* SHAddToRecentDocs API
*/
#define SHARD_PIDL 0x00000001L
#define SHARD_PATHA 0x00000002L
#define SHARD_PATHW 0x00000003L
#define SHARD_PATH WINELIB_NAME_AW(SHARD_PATH)
DWORD WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
/****************************************************************************
* Shell Execute API
*/

12
include/shlwapi.h
View File

@ -1,9 +1,7 @@
#ifndef __WINE_SHLWAPI_H
#define __WINE_SHLWAPI_H
#include "windef.h"
#include "wine/obj_queryassociations.h"
#include "wine/obj_shellfolder.h"
#include "objbase.h"
#ifdef __cplusplus
extern "C" {
@ -113,10 +111,10 @@ LPSTR WINAPI StrDupA(LPCSTR lpSrc);
LPWSTR WINAPI StrDupW(LPCWSTR lpSrc);
#define StrDup WINELIB_NAME_AW(StrDup)
HRESULT WINAPI StrRetToBufA(LPSTRRET src, LPITEMIDLIST pidl, LPSTR dest,
DWORD len);
HRESULT WINAPI StrRetToBufW(LPSTRRET src, LPITEMIDLIST pidl, LPWSTR dest,
DWORD len);
struct _STRRET;
struct _ITEMIDLIST;
HRESULT WINAPI StrRetToBufA(struct _STRRET *src, const struct _ITEMIDLIST *pidl, LPSTR dest, DWORD len);
HRESULT WINAPI StrRetToBufW(struct _STRRET *src, const struct _ITEMIDLIST *pidl, LPWSTR dest, DWORD len);
#define StrRetToBuf WINELIB_NAME_AW(StrRetToBuf)
void WINAPI PathRemoveBlanksA(LPSTR lpszPath);

1
include/windows.h
View File

@ -9,7 +9,6 @@ extern "C" {
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "shell.h"
#include "winreg.h"
#include "winnetwk.h"
#include "winver.h"

5
include/wine/obj_cache.h
View File

@ -7,11 +7,6 @@
#ifndef __WINE_WINE_OBJ_CACHE_H
#define __WINE_WINE_OBJ_CACHE_H
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_dataobject.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

2
include/wine/obj_channel.h
View File

@ -5,8 +5,6 @@
#ifndef __WINE_WINE_OBJ_CHANNEL_H
#define __WINE_WINE_OBJ_CHANNEL_H
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

2
include/wine/obj_clientserver.h
View File

@ -5,8 +5,6 @@
#ifndef __WINE_WINE_OBJ_CLIENTSERVER_H
#define __WINE_WINE_OBJ_CLIENTSERVER_H
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

6
include/wine/obj_commdlgbrowser.h
View File

@ -5,12 +5,6 @@
#ifndef __WINE_WINE_OBJ_COMMDLGBROWSER_H
#define __WINE_WINE_OBJ_COMMDLGBROWSER_H
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/obj_base.h"
#include "wine/obj_shellview.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

3
include/wine/obj_connection.h
View File

@ -7,9 +7,6 @@
#ifndef __WINE_WINE_OBJ_CONNECTION_H
#define __WINE_WINE_OBJ_CONNECTION_H
#include "wine/obj_base.h"
#include "winbase.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

5
include/wine/obj_contextmenu.h
View File

@ -9,11 +9,6 @@
#ifndef __WINE_WINE_OBJ_CONTEXTMENU_H
#define __WINE_WINE_OBJ_CONTEXTMENU_H
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

7
include/wine/obj_control.h
View File

@ -7,13 +7,6 @@
#ifndef __WINE_WINE_OBJ_CONTROL_H
#define __WINE_WINE_OBJ_CONTROL_H
#include "winbase.h"
#include "wine/obj_oleaut.h" /* for DISPID */
#include "wine/obj_oleview.h"
#include "wine/obj_inplace.h"
#include "wine/obj_dragdrop.h"
struct tagMSG;
#ifdef __cplusplus

4
include/wine/obj_dataobject.h
View File

@ -6,10 +6,6 @@
#ifndef __WINE_WINE_OBJ_DATAOBJECT_H
#define __WINE_WINE_OBJ_DATAOBJECT_H
#include "wine/obj_base.h"
#include "wine/obj_moniker.h"
#include "wine/obj_storage.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

6
include/wine/obj_dockingwindowframe.h
View File

@ -5,12 +5,6 @@
#ifndef __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
#define __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/obj_base.h"
#include "wine/obj_inplace.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

5
include/wine/obj_dragdrop.h
View File

@ -5,11 +5,6 @@
#ifndef __WINE_WINE_OBJ_DRAGDROP_H
#define __WINE_WINE_OBJ_DRAGDROP_H
#include "winnt.h"
#include "windef.h"
#include "wine/obj_base.h"
#include "wine/obj_dataobject.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

4
include/wine/obj_enumidlist.h
View File

@ -7,10 +7,6 @@
#ifndef __WINE_WINE_OBJ_ENUMIDLIST_H
#define __WINE_WINE_OBJ_ENUMIDLIST_H
#include "wine/obj_base.h"
#include "shell.h"
#include "winbase.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

3
include/wine/obj_errorinfo.h
View File

@ -5,9 +5,6 @@
#ifndef __WINE_WINE_OBJ_ERRORINFO_H
#define __WINE_WINE_OBJ_ERRORINFO_H
#include "wine/obj_base.h"
#include "wine/obj_oleaut.h"
DEFINE_GUID(IID_IErrorInfo,0x1CF2B120,0x547D,0x101B,0x8E,0x65,0x08,0x00,0x2B,0x2B,0xD1,0x19);
typedef struct IErrorInfo IErrorInfo,*LPERRORINFO;

6
include/wine/obj_extracticon.h
View File

@ -5,12 +5,6 @@
#ifndef __WINE_WINE_OBJ_EXTRACTICON_H
#define __WINE_WINE_OBJ_EXTRACTICON_H
#include "winbase.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

2
include/wine/obj_inplace.h
View File

@ -7,9 +7,7 @@
#ifndef __WINE_WINE_OBJ_INPLACE_H
#define __WINE_WINE_OBJ_INPLACE_H
struct tagMSG;
#include "wine/obj_moniker.h"
#ifdef __cplusplus
extern "C" {

3
include/wine/obj_marshal.h
View File

@ -6,9 +6,6 @@
#ifndef __WINE_WINE_OBJ_MARSHAL_H
#define __WINE_WINE_OBJ_MARSHAL_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

2
include/wine/obj_misc.h
View File

@ -8,8 +8,6 @@
#ifndef __WINE_WINE_OBJ_MISC_H
#define __WINE_WINE_OBJ_MISC_H
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

4
include/wine/obj_moniker.h
View File

@ -4,10 +4,6 @@
#ifndef __WINE_WINE_OBJ_MONIKER_H
#define __WINE_WINE_OBJ_MONIKER_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_misc.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

2
include/wine/obj_oleaut.h
View File

@ -5,8 +5,6 @@
#ifndef __WINE_WINE_OBJ_OLEAUT_H
#define __WINE_WINE_OBJ_OLEAUT_H
#include "wine/obj_base.h"
/*****************************************************************************
* Predeclare the interfaces
*/

4
include/wine/obj_olefont.h
View File

@ -7,10 +7,6 @@
#ifndef __WINE_WINE_OBJ_OLEFONT_H
#define __WINE_WINE_OBJ_OLEFONT_H
#include "wine/obj_oleaut.h"
#include "wine/obj_base.h"
#include "wingdi.h" /* TEXTMETRIC*/
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

5
include/wine/obj_oleobj.h
View File

@ -7,11 +7,6 @@
#ifndef __WINE_WINE_OBJ_OLEOBJ_H
#define __WINE_WINE_OBJ_OLEOBJ_H
#include "wine/obj_moniker.h"
#include "wine/obj_inplace.h"
#include "wine/obj_dataobject.h"
struct tagMSG;
struct tagLOGPALETTE;

7
include/wine/obj_oleundo.h
View File

@ -7,13 +7,6 @@
#ifndef __WINE_WINE_OBJ_OLEUNDO_H
#define __WINE_WINE_OBJ_OLEUNDO_H
#include "wine/obj_base.h"
#include "wine/obj_dataobject.h"
#include "wine/obj_inplace.h"
#include "wine/obj_olefont.h"
#include "wine/obj_property.h"
#include "winbase.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

4
include/wine/obj_oleview.h
View File

@ -6,10 +6,6 @@
#ifndef __WINE_WINE_OBJ_OLEVIEW_H
#define __WINE_WINE_OBJ_OLEVIEW_H
#include "wine/obj_base.h"
#include "wine/obj_dataobject.h"
struct tagLOGPALETTE;
#ifdef __cplusplus

5
include/wine/obj_picture.h
View File

@ -7,11 +7,6 @@
#ifndef __WINE_WINE_OBJ_PICTURE_H
#define __WINE_WINE_OBJ_PICTURE_H
#include "wine/obj_base.h"
#include "wine/obj_oleaut.h"
#include "windows.h"
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

6
include/wine/obj_property.h
View File

@ -7,12 +7,6 @@
#ifndef __WINE_WINE_OBJ_PROPERTY_H
#define __WINE_WINE_OBJ_PROPERTY_H
#include "wine/obj_oleaut.h" /* for DISPID */
#include "wine/obj_storage.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

3
include/wine/obj_propertystorage.h
View File

@ -5,9 +5,6 @@
#ifndef __WINE_WINE_OBJ_PROPERTYSTORAGE_H
#define __WINE_WINE_OBJ_PROPERTYSTORAGE_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

3
include/wine/obj_queryassociations.h
View File

@ -5,9 +5,6 @@
#ifndef __WINE_WINE_OBJ_QUERYASSOCIATIONS_H
#define __WINE_WINE_OBJ_QUERYASSOCIATIONS_H
#include "winbase.h"
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

9
include/wine/obj_shellbrowser.h
View File

@ -5,15 +5,6 @@
#ifndef __WINE_WINE_OBJ_SHELLBROWSER_H
#define __WINE_WINE_OBJ_SHELLBROWSER_H
#include "winbase.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/obj_base.h"
#include "wine/obj_inplace.h" /* IOleWindow */
#include "wine/obj_shellview.h" /* IShellView */
#include "commctrl.h" /* TBBUTTON */
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

7
include/wine/obj_shellextinit.h
View File

@ -5,13 +5,6 @@
#ifndef __WINE_WINE_OBJ_SHELLEXTINIT_H
#define __WINE_WINE_OBJ_SHELLEXTINIT_H
#include "shell.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/obj_base.h"
#include "wine/obj_dataobject.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

7
include/wine/obj_shellfolder.h
View File

@ -7,13 +7,6 @@
#ifndef __WINE_WINE_OBJ_SHELLFOLDER_H
#define __WINE_WINE_OBJ_SHELLFOLDER_H
#include "wine/obj_base.h"
#include "wine/obj_moniker.h" /* for LPBC */
#include "wine/obj_enumidlist.h"
#include "wine/obj_oleaut.h"
#include "winbase.h"
#include "shell.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

4
include/wine/obj_shelllink.h
View File

@ -7,10 +7,6 @@
#ifndef __WINE_WINE_OBJ_SHELLLINK_H
#define __WINE_WINE_OBJ_SHELLLINK_H
#include "wine/obj_base.h"
#include "winbase.h"
#include "shell.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

9
include/wine/obj_shellview.h
View File

@ -5,15 +5,6 @@
#ifndef __WINE_WINE_OBJ_SHELLVIEW_H
#define __WINE_WINE_OBJ_SHELLVIEW_H
#include "winbase.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/obj_base.h"
#include "wine/obj_inplace.h"
#include "wine/obj_shellfolder.h"
#include "prsht.h" /* LPFNADDPROPSHEETPAGE */
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

4
include/wine/obj_storage.h
View File

@ -5,10 +5,6 @@
#ifndef __WINE_WINE_OBJ_STORAGE_H
#define __WINE_WINE_OBJ_STORAGE_H
#include "winnt.h"
#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */

10
include/wine/undocshell.h
View File

@ -3,9 +3,7 @@
#include "windef.h"
#include "commctrl.h"
#include "wine/obj_shellfolder.h"
#include "wine/obj_shellview.h"
#include "wine/obj_dragdrop.h"
#include "shlobj.h"
#ifdef __cplusplus
extern "C" {
@ -98,19 +96,19 @@ HRESULT WINAPI StrRetToStrNA (
LPVOID dest,
DWORD len,
LPSTRRET src,
LPITEMIDLIST pidl);
const ITEMIDLIST *pidl);
HRESULT WINAPI StrRetToStrNW (
LPVOID dest,
DWORD len,
LPSTRRET src,
LPITEMIDLIST pidl);
const ITEMIDLIST *pidl);
HRESULT WINAPI StrRetToStrNAW (
LPVOID dest,
DWORD len,
LPSTRRET src,
LPITEMIDLIST pidl);
const ITEMIDLIST *pidl);
/****************************************************************************

1
loader/main.c
View File

@ -14,7 +14,6 @@
#include "drive.h"
#include "file.h"
#include "options.h"
#include "shell.h"
#include "debugtools.h"
#include "server.h"
#include "loadorder.h"

1
programs/notepad/dialog.c
View File

@ -12,7 +12,6 @@
#include <winerror.h>
#ifdef WINELIB
#include "shell.h"
#include "options.h"
#endif

1
programs/regapi/regapi.c
View File

@ -14,7 +14,6 @@
#include <winerror.h>
#include <winnt.h>
#include <string.h>
#include <shell.h>
/******************************************************************************
* Defines and consts

3
programs/winhelp/macro.c
View File

@ -7,9 +7,6 @@
#include <stdio.h>
#include "windows.h"
#include "commdlg.h"
#ifdef WINELIB
#include "shell.h"
#endif
#include "winhelp.h"
#include "macro.h"