Author: gedmurphy
Date: Wed May 25 20:25:42 2011
New Revision: 51909
URL: http://svn.reactos.org/svn/reactos?rev=51909&view=rev
Log:
[SHELL32_NEW]
- Merge 50114 and 50144
- Add NULL checks in IShellView and IDropTarget implementations. Should fix bug
#5780.
- Bug 5756: TRANSLATION: multiple modules: Bulgarian by CCTAHEB
Modified:
branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc
branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc?rev=51909&r1=51908&r2=51909&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1]
Wed May 25 20:25:42 2011
@@ -666,8 +666,8 @@
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,11 +751,11 @@
IDS_INSTALLNEWFONT "Ñëàãàíå íà íîâ øðèôò..."
IDS_DEFAULT_CLUSTER_SIZE "Ïîäðàçáèðàí ðàçïðåäåëèòåëåí ðàçìåð"
- IDS_COPY_OF "Copy of"
-
- IDS_SHLEXEC_NOASSOC "There is no Windows program configured to
open this type of file."
-END
-
-
-
-
+ IDS_COPY_OF "Ïðåçàïèñ íà"
+
+ IDS_SHLEXEC_NOASSOC "Íÿìà ïðèëîæåíèå çà Óèíäîóñ, íàñòðîåíî äà
îòâàðÿ òîçè âèä ôàéëîâå."
+END
+
+
+
+
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=51909&r1=51908&r2=51909&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
May 25 20:25:42 2011
@@ -1928,8 +1928,6 @@
{
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 @@
{
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 @@
*/
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 @@
*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 @@
pCurDropTarget->DragLeave();
pCurDropTarget.Release();
}
- pCurDataObject.Release();
+
+ if (pCurDataObject != NULL)
+ {
+ pCurDataObject.Release();
+ }
+
iDragOverItem = 0;
return S_OK;
