ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Remove __SHFreeAndNil macro. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-08-29 14:07:22 +02:00 committed by Alexandre Julliard
parent af468590f7
commit d3cb5c24a5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/shell32/shell32_main.h
View File

@ -156,12 +156,6 @@ static inline BOOL SHELL_OsIsUnicode(void)
return !(GetVersion() & 0x80000000);
}
#define __SHFreeAndNil(ptr) \
{\
SHFree(*ptr); \
*ptr = NULL; \
};
static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source)
{
int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0);

10
dlls/shell32/shfldr_fs.c
View File

@ -1482,9 +1482,15 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface,
pdump (ppfti->pidlTargetFolder);
if (This->pidlRoot)
__SHFreeAndNil (&This->pidlRoot); /* free the old */
{
SHFree(This->pidlRoot);
This->pidlRoot = NULL;
}
if (This->sPathTarget)
__SHFreeAndNil (&This->sPathTarget);
{
SHFree(This->sPathTarget);
This->sPathTarget = NULL;
}
/*
* Root path and pidl