Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32_NEW]

Browse source 
- Merge 50114 and 50144

- Add NULL checks in IShellView and IDropTarget implementations. Should fix bug #5780.
- Bug 5756: TRANSLATION: multiple modules: Bulgarian by CCTAHEB

svn path=/branches/shell32_new-bringup/; revision=51909
This commit is contained in:
Ged Murphy 2011-05-25 20:25:42 +00:00
parent c95b75e6f3
commit 0026704626
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/shell32/lang/bg-BG.rc
View file

@ -666,8 +666,8 @@ BEGIN
IDS_RESTART_PROMPT "Искате ли да презапуснете системата?"
IDS_SHUTDOWN_TITLE "Изключване"
IDS_SHUTDOWN_PROMPT "Искате ли да изключите компютъра?"
IDS_LOGOFF_TITLE "Log Off"
IDS_LOGOFF_PROMPT "Do you want to log off?"
IDS_LOGOFF_TITLE "Излизане"
IDS_LOGOFF_PROMPT "Искате ли да излезете?"
// shell folder path default values
IDS_PROGRAMS "Пусков изборник\\Приложения"
@ -751,9 +751,9 @@ BEGIN
IDS_INSTALLNEWFONT "Слагане на нов шрифт..."
IDS_DEFAULT_CLUSTER_SIZE "Подразбиран разпределителен размер"
IDS_COPY_OF "Copy of"
IDS_COPY_OF "Презапис на"
IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file."
IDS_SHLEXEC_NOASSOC "Няма приложение за Уиндоус, настроено да отваря този вид файлове."
END

27
dll/win32/shell32/shlview.cpp
View file

@ -1928,8 +1928,6 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
{
ERR("no IID_ISFHelper for destination\n");
//IShellFolder_Release(psfFrom);
//IShellFolder_Release(psfTarget);
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
@ -1941,9 +1939,6 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
{
ERR("no IID_ISFHelper for source\n");
//ISFHelper_Release(psfhlpdst);
///IShellFolder_Release(psfFrom);
//IShellFolder_Release(psfTarget);
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
@ -1955,13 +1950,10 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
*/
hr = psfhlpdst->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl);
//ISFHelper_Release(psfhlpdst);
//ISFHelper_Release(psfhlpsrc);
//IShellFolder_Release(psfFrom);
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
//IDataObject_Release(pda);
TRACE("paste end hr %x\n", hr);
break;
}
@ -2134,7 +2126,15 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTI
*phWnd = 0;
TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",this, lpPrevView,lpfs, psb, prcView, phWnd);
TRACE("-- vmode=%x flags=%x left=%i top=%i right=%i bottom=%i\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom);
if (lpfs != NULL)
TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags);
if (prcView != NULL)
TRACE("-- left=%i top=%i right=%i bottom=%i\n", prcView->left, prcView->top, prcView->right, prcView->bottom);
/* Validate the Shell Browser */
if (psb == NULL)
return E_UNEXPECTED;
/*set up the member variables*/
pShellBrowser = psb;
@ -2513,7 +2513,12 @@ HRESULT WINAPI CDefView::DragLeave()
pCurDropTarget->DragLeave();
pCurDropTarget.Release();
}
pCurDataObject.Release();
if (pCurDataObject != NULL)
{
pCurDataObject.Release();
}
iDragOverItem = 0;
return S_OK;