[shell32.dll]

- Another round of fixing badly initialized variables. Again Amine Khaldi being the hero.

svn path=/branches/shell32_new-bringup/; revision=53613
This commit is contained in:
Claudiu Mihail 2011-09-07 01:33:31 +00:00
parent 270842aeb0
commit 7a20b6f2bb
6 changed files with 22 additions and 4 deletions

View file

@ -2253,7 +2253,7 @@ EXTERN_C HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv)
* SHParseDisplayName [shell version 6.0]
*/
EXTERN_C HRESULT WINAPI SHParseDisplayName(LPCWSTR pszName, IBindCtx *pbc,
LPITEMIDLIST *ppidl, SFGAOF sfgaoIn, SFGAOF *psfgaoOut)
LPITEMIDLIST *ppidl, SFGAOF sfgaoIn, SFGAOF *psfgaoOut)
{
CComPtr<IShellFolder> psfDesktop;
HRESULT hr=E_FAIL;

View file

@ -45,6 +45,7 @@ static shvheader NetworkPlacesSFHeader[] = {
CNetFolder::CNetFolder()
{
pidlRoot = NULL;
}
CNetFolder::~CNetFolder()

View file

@ -325,6 +325,8 @@ BOOL CPrintersEnum::CreatePrintersEnumList(DWORD dwFlags)
CPrinterFolder::CPrinterFolder()
{
pidlRoot = NULL;
dwAttributes = 0;
}
CPrinterFolder::~CPrinterFolder()

View file

@ -781,13 +781,15 @@ HRESULT CDefView::FillList()
TRACE("%p\n",this);
DbgPrint("[shell32, CDefView::FillList] Called\n");
/* get the itemlist from the shfolder*/
hRes = pSFParent->EnumObjects(m_hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS, &pEnumIDList);
if (hRes != S_OK)
{
if (hRes==S_FALSE)
return(NOERROR);
return(hRes);
return(hRes);
}
/* create a pointer array */
@ -873,6 +875,8 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
TRACE("%p\n",this);
DbgPrint("[shell32, CDefView::OnCreate] Called\n");
if(CreateList())
{
if(InitList())
@ -881,7 +885,7 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
}
}
if (SUCCEEDED(this->QueryInterface(IID_IDropTarget, (LPVOID*)&pdt)))
if (SUCCEEDED(this->QueryInterface(IID_IDropTarget, (LPVOID*)&pdt)))
RegisterDragDrop(m_hWnd, pdt);
/* register for receiving notifications */
@ -1014,6 +1018,7 @@ UINT CDefView::GetSelections()
lvItem.stateMask = LVIS_SELECTED;
lvItem.iItem = 0;
lvItem.iSubItem = 0;
lvItem.state = 0;
while(SendMessageW(hWndList, LVM_GETITEMW, 0, (LPARAM)&lvItem) && (i < cidl))
{
@ -2139,6 +2144,8 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTI
TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",this, lpPrevView,lpfs, psb, prcView, phWnd);
DbgPrint("[shell32, CDefView::CreateViewWindow] Called lpfs = 0x%x, psb = 0x%x\n", lpfs, psb);
if (lpfs != NULL)
TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags);
if (prcView != NULL)
@ -2162,6 +2169,8 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTI
TRACE("-- CommDlgBrowser\n");
}
DbgPrint("[shell32, CDefView::CreateViewWindow] About to call the create function\n");
Create(hWndParent, prcView, NULL, WS_CHILD | WS_TABSTOP, 0, 0U);
if (m_hWnd == NULL)
return E_FAIL;

View file

@ -619,6 +619,7 @@ IDefaultContextMenuImpl::AddStaticContextMenusToMenu(
mii.fType = MFT_STRING;
mii.fState = MFS_ENABLED;
mii.wID = 0x4000;
mii.dwTypeData = NULL;
iIdSCMFirst = mii.wID;
curEntry = shead;
@ -657,6 +658,10 @@ IDefaultContextMenuImpl::AddStaticContextMenusToMenu(
szVerb[(sizeof(szVerb)/sizeof(WCHAR))-1] = L'\0';
mii.dwTypeData = szVerb;
}
else
{
TRACE("Failed to laod string, defaulting to default (NULL) value for mii.dwTypeData\n");
}
}
else
{
@ -752,7 +757,7 @@ IDefaultContextMenuImpl::BuildShellItemContextMenu(
UINT indexMenu;
SFGAOF rfg;
HRESULT hr;
BOOL bAddSep;
BOOL bAddSep = FALSE;
GUID * guid;
BOOL bClipboardData;
STRRET strFile;

View file

@ -28,6 +28,7 @@ static WCHAR szNew[MAX_PATH];
CNewMenu::CNewMenu()
{
s_SnHead = NULL;
szPath = NULL;
}
CNewMenu::~CNewMenu()