[PATCH 1/3] shlwapi: Use the public definition of shared shell memory allocation functions.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/shell32/changenotify.c | 1 + dlls/shell32/shellord.c | 2 +- dlls/shell32/undocshell.h | 24 ------------------------ include/shlwapi.h | 7 ++++++- 4 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 40ccb891589..35c090ceb67 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -27,6 +27,7 @@ #include "wine/debug.h" #include "shell32_main.h" #include "pidl.h" +#include "shlwapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 57308e1c988..af00f125662 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1353,7 +1353,7 @@ BOOL WINAPI IsUserAnAdmin(VOID) * * See shlwapi.SHAllocShared */ -HANDLE WINAPI SHAllocShared(LPVOID lpvData, DWORD dwSize, DWORD dwProcId) +HANDLE WINAPI SHAllocShared(const void *lpvData, DWORD dwSize, DWORD dwProcId) { GET_FUNC(pSHAllocShared, shlwapi, (char*)7, NULL); return pSHAllocShared(lpvData, dwSize, dwProcId); diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 61c2ff4069f..f5c5ed8d43a 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -31,30 +31,6 @@ extern "C" { #endif /* defined(__cplusplus) */
-/**************************************************************************** - * 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, - DWORD pid); - -BOOL WINAPI SHFreeShared( - HANDLE hMem, - DWORD pid); - -LPVOID WINAPI SHLockShared( - HANDLE hMem, - DWORD pid); - -BOOL WINAPI SHUnlockShared(LPVOID pv); - /**************************************************************************** * System Imagelist Routines */ diff --git a/include/shlwapi.h b/include/shlwapi.h index ca15bd20777..07ca0fac837 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1171,7 +1171,12 @@ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname,
BOOL WINAPI SHIsLowMemoryMachine(DWORD type);
-#include <poppack.h> +#include <poppack.h> + +HANDLE WINAPI SHAllocShared(const void *data, DWORD size, DWORD pid); +BOOL WINAPI SHFreeShared(HANDLE handle, DWORD pid); +void * WINAPI SHLockShared(HANDLE handle, DWORD pid); +BOOL WINAPI SHUnlockShared(void *data);
#ifdef __cplusplus } /* extern "C" */
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/shell32/autocomplete.c | 1 - dlls/shell32/brsfolder.c | 3 +- dlls/shell32/clipboard.c | 1 - dlls/shell32/cpanelfolder.c | 1 - dlls/shell32/dataobject.c | 1 - dlls/shell32/dialogs.c | 1 - dlls/shell32/folders.c | 1 - dlls/shell32/iconcache.c | 1 - dlls/shell32/pidl.c | 1 - dlls/shell32/shell32_main.c | 1 - dlls/shell32/shell32_main.h | 1 - dlls/shell32/shelllink.c | 1 - dlls/shell32/shellole.c | 1 - dlls/shell32/shellord.c | 1 - dlls/shell32/shellpath.c | 1 - dlls/shell32/shellreg.c | 1 - dlls/shell32/shellstring.c | 3 +- dlls/shell32/shfldr_desktop.c | 1 - dlls/shell32/shfldr_fs.c | 1 - dlls/shell32/shfldr_mycomp.c | 1 - dlls/shell32/shfldr_netplaces.c | 1 - dlls/shell32/shlfileop.c | 1 - dlls/shell32/shlfolder.c | 1 - dlls/shell32/shlview.c | 1 - dlls/shell32/shlview_cmenu.c | 1 - dlls/shell32/undocshell.h | 184 -------------------------------- 26 files changed, 3 insertions(+), 210 deletions(-) delete mode 100644 dlls/shell32/undocshell.h
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 0718f782460..79b95432880 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -36,7 +36,6 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" -#include "undocshell.h" #include "shlwapi.h" #include "winerror.h" #include "objbase.h" diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 7800e6ee563..3df7119edf7 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -28,10 +28,9 @@ #define NONAMELESSUNION
#include "wine/debug.h" -#include "undocshell.h" -#include "commoncontrols.h" #include "pidl.h" #include "shell32_main.h" +#include "commoncontrols.h" #include "shellapi.h" #include "shresdef.h" #include "shellfolder.h" diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index 578e933105b..2f5c63bed9d 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -43,7 +43,6 @@ #include "winreg.h" #include "wingdi.h" #include "pidl.h" -#include "undocshell.h" #include "shell32_main.h" #include "shlwapi.h"
diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 7cd0bf6bb98..83d84b74404 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -39,7 +39,6 @@ #include "commctrl.h" #include "cpanel.h" #include "pidl.h" -#include "undocshell.h" #include "shell32_main.h" #include "shresdef.h" #include "shlwapi.h" diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 5c0dbc6bf87..803c9fe935f 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -30,7 +30,6 @@ #include "winerror.h" #include "shell32_main.h" #include "wine/debug.h" -#include "undocshell.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 70548389e15..9d35e15c3f4 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -34,7 +34,6 @@ #include "shlobj.h" #include "shell32_main.h" #include "shresdef.h" -#include "undocshell.h"
/* RunFileDlg flags */ #define RFF_NOBROWSE 0x01 diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 35c5414a287..1fa4310eba3 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -28,7 +28,6 @@ #include "winbase.h" #include "winerror.h" #include "objbase.h" -#include "undocshell.h" #include "shlguid.h"
#include "wine/debug.h" diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 1c61374a732..eeed5b0a09b 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -35,7 +35,6 @@ #include "objbase.h" #include "pidl.h" #include "shell32_main.h" -#include "undocshell.h" #include "shresdef.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 7a9fbe1398a..f22c6275665 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -37,7 +37,6 @@ #include "shlguid.h" #include "winerror.h" #include "winnls.h" -#include "undocshell.h" #include "shell32_main.h" #include "shlwapi.h"
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 526c51e8a30..6b418343ee1 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -40,7 +40,6 @@ #include "propsys.h" #include "commoncontrols.h"
-#include "undocshell.h" #include "pidl.h" #include "shell32_main.h" #include "version.h" diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 14011489e86..ca93293e50b 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -32,7 +32,6 @@ #include "commctrl.h" #include "objbase.h" #include "docobj.h" -#include "undocshell.h" #include "shlobj.h" #include "shellapi.h" #include "wine/heap.h" diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 656357bf0a9..2f3c4b20f28 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -45,7 +45,6 @@ #include "winuser.h" #include "wingdi.h" #include "shlobj.h" -#include "undocshell.h"
#include "pidl.h" #include "shell32_main.h" diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 5b72fecf07e..b1ba0c8343b 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -39,7 +39,6 @@ #include "winreg.h" #include "winerror.h"
-#include "undocshell.h" #include "shell32_main.h"
#include "wine/debug.h" diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index af00f125662..97aad0fe14f 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -41,7 +41,6 @@ #include "winuser.h" #include "shlobj.h" #include "shell32_main.h" -#include "undocshell.h" #include "pidl.h" #include "shlwapi.h" #include "commdlg.h" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2c62f9d4b6a..d42b64646f8 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -46,7 +46,6 @@ #include "shtypes.h" #include "shresdef.h" #include "shell32_main.h" -#include "undocshell.h" #include "pidl.h" #include "shlwapi.h" #include "sddl.h" diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 751ebc31a00..dedf67babc1 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -30,7 +30,6 @@ #include "shlobj.h" #include "winreg.h"
-#include "undocshell.h" #include "shell32_main.h"
#include "wine/debug.h" diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index a75b8025293..5604058703e 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -34,11 +34,12 @@ #include "shlobj.h" #include "shlwapi.h" #include "shell32_main.h" -#include "undocshell.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
+DWORD WINAPI CheckEscapesW(WCHAR *string, DWORD len); + /************************* STRRET functions ****************************/
static const char *debugstr_strret(STRRET *s) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 099651eda20..adfef92417b 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -39,7 +39,6 @@ #include "shlguid.h"
#include "pidl.h" -#include "undocshell.h" #include "shell32_main.h" #include "shresdef.h" #include "shlwapi.h" diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 214b9326342..6c2a64f9336 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -39,7 +39,6 @@ #include "shlguid.h"
#include "pidl.h" -#include "undocshell.h" #include "shell32_main.h" #include "shresdef.h" #include "shlwapi.h" diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index c5004671f47..b4905202503 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -35,7 +35,6 @@ #include "wingdi.h" #include "pidl.h" #include "shlguid.h" -#include "undocshell.h" #include "shell32_main.h" #include "shresdef.h" #include "shlwapi.h" diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 8d98ae76e16..cda6bd6df69 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -33,7 +33,6 @@ #include "winreg.h"
#include "pidl.h" -#include "undocshell.h" #include "shell32_main.h" #include "shresdef.h" #include "wine/debug.h" diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 87a445dd35c..44b125c03bb 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -41,7 +41,6 @@ #include "shlwapi.h" #include "shell32_main.h" #include "shfldr.h" -#include "undocshell.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 2ea6af11271..fd05c0f8da8 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -40,7 +40,6 @@ #include "shlguid.h"
#include "pidl.h" -#include "undocshell.h" #include "shell32_main.h" #include "shlwapi.h" #include "wine/debug.h" diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 463af7ab92c..8374e9a0fc6 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -55,7 +55,6 @@ #include "winuser.h" #include "shlobj.h" #include "shobjidl.h" -#include "undocshell.h" #include "shresdef.h" #include "wine/debug.h"
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 6c05904bb91..7a8e69a80aa 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "pidl.h" -#include "undocshell.h" #include "shlobj.h" #include "winreg.h" #include "prsht.h" diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h deleted file mode 100644 index f5c5ed8d43a..00000000000 --- a/dlls/shell32/undocshell.h +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright 1999, 2000 Juergen Schmied - * - * 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 __WINE_UNDOCSHELL_H -#define __WINE_UNDOCSHELL_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "shlobj.h" - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -/**************************************************************************** - * System Imagelist Routines - */ - -int WINAPI Shell_GetCachedImageIndex( - LPCSTR lpszFileName, - UINT nIconIndex, - BOOL bSimulateDoc); - -HICON WINAPI SHGetFileIcon( - DWORD dwReserved, - LPCSTR lpszPath, - DWORD dwFileAttributes, - UINT uFlags); - -BOOL WINAPI FileIconInit(BOOL bFullInit); - -/**************************************************************************** - * Drag And Drop Routines - */ - -HRESULT WINAPI SHRegisterDragDrop( - HWND hWnd, - LPDROPTARGET lpDropTarget); - -HRESULT WINAPI SHRevokeDragDrop(HWND hWnd); - -BOOL WINAPI DAD_DragEnter(HWND hWnd); - -BOOL WINAPI DAD_SetDragImageFromListView( - HWND hWnd, - POINT pt); - -BOOL WINAPI DAD_ShowDragImage(BOOL bShow); - -HRESULT WINAPI CIDLData_CreateFromIDArray( - LPCITEMIDLIST pidlFolder, - DWORD cpidlFiles, - LPCITEMIDLIST *lppidlFiles, - LPDATAOBJECT *ppdataObject); - -/**************************************************************************** - * Path Manipulation Routines - */ - -BOOL WINAPI PathAppendAW(LPVOID lpszPath1, LPCVOID lpszPath2); - -LPVOID WINAPI PathCombineAW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile); - -LPVOID WINAPI PathAddBackslashAW(LPVOID path); - -LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive); - -LPVOID WINAPI PathFindExtensionAW(LPCVOID path); - -LPVOID WINAPI PathFindFileNameAW(LPCVOID path); - -LPVOID WINAPI PathGetExtensionAW(LPCVOID lpszPath, DWORD void1, DWORD void2); - -LPVOID WINAPI PathGetArgsAW(LPVOID lpszPath); - -BOOL WINAPI PathRemoveFileSpecAW(LPVOID lpszPath); - -void WINAPI PathRemoveBlanksAW(LPVOID lpszPath); - -VOID WINAPI PathQuoteSpacesAW(LPVOID path); - -void WINAPI PathUnquoteSpacesAW(LPVOID lpszPath); - -BOOL WINAPI PathIsUNCAW(LPCVOID lpszPath); - -BOOL WINAPI PathIsRelativeAW(LPCVOID lpszPath); - -BOOL WINAPI PathIsRootAW(LPCVOID x); - -BOOL WINAPI PathIsExeAW(LPCVOID lpszPath); - -BOOL WINAPI PathIsDirectoryAW(LPCVOID lpszPath); - -BOOL WINAPI PathFileExistsAW(LPCVOID lpszPath); - -BOOL WINAPI PathMatchSpecAW(LPVOID lpszPath, LPVOID lpszSpec); - -BOOL WINAPI PathMakeUniqueNameAW( - LPVOID lpszBuffer, - DWORD dwBuffSize, - LPCVOID lpszShortName, - LPCVOID lpszLongName, - LPCVOID lpszPathName); - - -BOOL WINAPI PathQualifyAW(LPCVOID path); - -BOOL WINAPI PathResolveAW(LPVOID lpszPath, LPCVOID *alpszPaths, DWORD dwFlags); - -VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int nIDDlgItem, LPCVOID lpszPath); - -HRESULT WINAPI PathProcessCommandAW(LPCVOID lpszPath, LPVOID lpszBuff, - DWORD dwBuffSize, DWORD dwFlags); - -void WINAPI PathStripPathAW(LPVOID lpszPath); - -BOOL WINAPI PathStripToRootAW(LPVOID lpszPath); - -void WINAPI PathRemoveArgsAW(LPVOID lpszPath); - -void WINAPI PathRemoveExtensionAW(LPVOID lpszPath); - -int WINAPI PathParseIconLocationAW(LPVOID lpszPath); - -BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2); - -BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); - -/**************************************************************************** - * Shell Namespace Routines - */ - -/**************************************************************************** - * Misc Stuff - */ - -WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, - WORD cKids, const HWND *lpKids); - -/* SHCreateDefClassObject callback function */ -typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)( - LPUNKNOWN pUnkOuter, - REFIID riidObject, - LPVOID *ppvObject); - -HRESULT WINAPI SHCreateDefClassObject( - REFIID riidFactory, - LPVOID *ppvFactory, - LPFNCDCOCALLBACK lpfnCallback, - LPDWORD lpdwUsage, - REFIID riidObject); - -void WINAPI SHFreeUnusedLibraries(void); - -DWORD WINAPI CheckEscapesA(LPSTR string, DWORD len); -DWORD WINAPI CheckEscapesW(LPWSTR string, DWORD len); - -/* policy functions */ -BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey); - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* __WINE_UNDOCSHELL_H */
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/shell32/tests/shlfileop.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 9eab928c12f..1c7f25ccd52 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -29,10 +29,6 @@
#include "wine/test.h"
-#ifndef FOF_NORECURSION -#define FOF_NORECURSION 0x1000 -#endif - /* Error codes could be pre-Win32 */ #define DE_SAMEFILE 0x71 #define DE_MANYSRC1DEST 0x72
-
Zebediah Figura