Skip to content

W
wine-winehq
Commit d3cb5c24 authored by Sebastian Lackner's avatar Sebastian Lackner Committed by Alexandre Julliard
Browse files
Options

shell32: Remove __SHFreeAndNil macro.

Signed-off-by: 's avatarSebastian Lackner <sebastian@fds-team.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent af468590
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
dlls/shell32/shell32_main.h
View file @ d3cb5c24
...@@ -156,12 +156,6 @@ static inline BOOL SHELL_OsIsUnicode(void) ...@@ -156,12 +156,6 @@ static inline BOOL SHELL_OsIsUnicode(void)
return !(GetVersion() & 0x80000000); return !(GetVersion() & 0x80000000);
} }
#define __SHFreeAndNil(ptr) \
{\
SHFree(*ptr); \
*ptr = NULL; \
};
static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source)
{ {
int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0); int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0);
......
dlls/shell32/shfldr_fs.c
View file @ d3cb5c24
...@@ -1482,9 +1482,15 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface, ...@@ -1482,9 +1482,15 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface,
pdump (ppfti->pidlTargetFolder); pdump (ppfti->pidlTargetFolder);
if (This->pidlRoot) if (This->pidlRoot)
__SHFreeAndNil (&This->pidlRoot); /* free the old */ {
SHFree(This->pidlRoot);
This->pidlRoot = NULL;
}
if (This->sPathTarget) if (This->sPathTarget)
__SHFreeAndNil (&This->sPathTarget); {
SHFree(This->sPathTarget);
This->sPathTarget = NULL;
}
/* /*
* Root path and pidl * Root path and pidl
......
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