Skip to content

W
wine-winehq
Commit 6235c076 authored by Michael Jung's avatar Michael Jung Committed by Alexandre Julliard
Browse files
Options

Initialize all members in UnixFolder constructor.

Support NULL value pidls in GetDisplayNameOf method.
parent 95277391
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
dlls/shell32/shfldr_unixfs.c
View file @ 6235c076
...@@ -798,7 +798,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i ...@@ -798,7 +798,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i
if ((GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING) && if ((GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING) &&
(GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)) (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER))
{ {
if (!pidl->mkid.cb) { if (!pidl || !pidl->mkid.cb) {
lpName->uType = STRRET_CSTR; lpName->uType = STRRET_CSTR;
if (This->m_dwPathMode == PATHMODE_UNIX) { if (This->m_dwPathMode == PATHMODE_UNIX) {
strcpy(lpName->u.cStr, This->m_pszPath); strcpy(lpName->u.cStr, This->m_pszPath);
...@@ -1523,7 +1523,9 @@ static HRESULT CreateUnixFolder(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, D ...@@ -1523,7 +1523,9 @@ static HRESULT CreateUnixFolder(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, D
pUnixFolder->lpISFHelperVtbl = &UnixFolder_ISFHelper_Vtbl; pUnixFolder->lpISFHelperVtbl = &UnixFolder_ISFHelper_Vtbl;
pUnixFolder->m_cRef = 0; pUnixFolder->m_cRef = 0;
pUnixFolder->m_pszPath = NULL; pUnixFolder->m_pszPath = NULL;
pUnixFolder->m_pidlLocation = NULL;
pUnixFolder->m_dwPathMode = dwPathMode; pUnixFolder->m_dwPathMode = dwPathMode;
pUnixFolder->m_dwAttributes = 0;
pUnixFolder->m_pCLSID = pCLSID; pUnixFolder->m_pCLSID = pCLSID;
UnixFolder_IShellFolder2_AddRef(STATIC_CAST(IShellFolder2, pUnixFolder)); UnixFolder_IShellFolder2_AddRef(STATIC_CAST(IShellFolder2, pUnixFolder));
......
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