Author: cmihail
Date: Wed Sep 7 01:33:31 2011
New Revision: 53613
URL: http://svn.reactos.org/svn/reactos?rev=53613&view=rev
Log:
[shell32.dll]
- Another round of fixing badly initialized variables. Again Amine Khaldi being
the hero.
Modified:
branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp
branches/shell32_new-bringup/dll/win32/shell32/shfldr_netplaces.cpp
branches/shell32_new-bringup/dll/win32/shell32/shfldr_printers.cpp
branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp
branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp
branches/shell32_new-bringup/dll/win32/shell32/shv_item_new.cpp
Modified: branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp?rev=53613&r1=53612&r2=53613&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp [iso-8859-1]
Wed Sep 7 01:33:31 2011
@@ -2253,7 +2253,7 @@
* 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;
Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_netplaces.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shfldr_netplaces.cpp?rev=53613&r1=53612&r2=53613&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shfldr_netplaces.cpp
[iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shfldr_netplaces.cpp
[iso-8859-1] Wed Sep 7 01:33:31 2011
@@ -45,6 +45,7 @@
CNetFolder::CNetFolder()
{
+ pidlRoot = NULL;
}
CNetFolder::~CNetFolder()
Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_printers.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shfldr_printers.cpp?rev=53613&r1=53612&r2=53613&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shfldr_printers.cpp
[iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shfldr_printers.cpp
[iso-8859-1] Wed Sep 7 01:33:31 2011
@@ -325,6 +325,8 @@
CPrinterFolder::CPrinterFolder()
{
+ pidlRoot = NULL;
+ dwAttributes = 0;
}
CPrinterFolder::~CPrinterFolder()
Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp?rev=53613&r1=53612&r2=53613&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed
Sep 7 01:33:31 2011
@@ -781,13 +781,15 @@
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 @@
TRACE("%p\n",this);
+ DbgPrint("[shell32, CDefView::OnCreate] Called\n");
+
if(CreateList())
{
if(InitList())
@@ -881,7 +885,7 @@
}
}
- 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 @@
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 @@
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)
@@ -2161,6 +2168,8 @@
{
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)
Modified: branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp?rev=53613&r1=53612&r2=53613&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp
[iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp
[iso-8859-1] Wed Sep 7 01:33:31 2011
@@ -619,6 +619,7 @@
mii.fType = MFT_STRING;
mii.fState = MFS_ENABLED;
mii.wID = 0x4000;
+ mii.dwTypeData = NULL;
iIdSCMFirst = mii.wID;
curEntry = shead;
@@ -657,6 +658,10 @@
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 @@
UINT indexMenu;
SFGAOF rfg;
HRESULT hr;
- BOOL bAddSep;
+ BOOL bAddSep = FALSE;
GUID * guid;
BOOL bClipboardData;
STRRET strFile;
Modified: branches/shell32_new-bringup/dll/win32/shell32/shv_item_new.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shv_item_new.cpp?rev=53613&r1=53612&r2=53613&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shv_item_new.cpp
[iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shv_item_new.cpp
[iso-8859-1] Wed Sep 7 01:33:31 2011
@@ -28,6 +28,7 @@
CNewMenu::CNewMenu()
{
s_SnHead = NULL;
+ szPath = NULL;
}
CNewMenu::~CNewMenu()
