Author: janderwald Date: Thu Oct 25 23:25:40 2007 New Revision: 29882
URL: http://svn.reactos.org/svn/reactos?rev=29882&view=rev Log: Hwang YunSong() hys545@dreamwiz.com - Updated Korean resource. Timo Kreuzer - check if theres a current IDrapDropTarget interface and only then perform actions on it See issue #1211 for more details.
Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/shlview.c
Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-K... ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Thu Oct 25 23:25:40 2007 @@ -112,18 +112,18 @@ PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END
-SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Message" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Yes to &all", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP - ICON "", IDD_ICON, 10, 10, 16, 16 - LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 -END ++SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 ++STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU ++CAPTION "ÞÃÁö" ++FONT 8, "MS Shell Dlg" ++{ ++DEFPUSHBUTTON "¿¹(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP ++PUSHBUTTON "ðµÎ ¿¹(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP ++PUSHBUTTON " ÆÏ¿À(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP ++PUSHBUTTON "ÃëÒ(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ++ICON "", IDD_ICON, 10, 10, 16, 16 ++LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 ++}
SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.c... ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Thu Oct 25 23:25:40 2007 @@ -2340,12 +2340,14 @@ static HRESULT WINAPI ISVDropTarget_DragLeave(IDropTarget *iface) { IShellViewImpl *This = impl_from_IDropTarget(iface);
- IDropTarget_DragLeave(This->pCurDropTarget); - - IDropTarget_Release(This->pCurDropTarget); + if (This->pCurDropTarget) + { + IDropTarget_DragLeave(This->pCurDropTarget); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } IDataObject_Release(This->pCurDataObject); This->pCurDataObject = NULL; - This->pCurDropTarget = NULL; This->iDragOverItem = 0;
return S_OK; @@ -2356,12 +2358,15 @@ { IShellViewImpl *This = impl_from_IDropTarget(iface);
- IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); - - IDropTarget_Release(This->pCurDropTarget); + if (This->pCurDropTarget) + { + IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } + IDataObject_Release(This->pCurDataObject); This->pCurDataObject = NULL; - This->pCurDropTarget = NULL; This->iDragOverItem = 0;
return S_OK;