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.

svn path=/trunk/; revision=29882

diff --git a/reactos/dll/win32/shell32/lang/ko-KO.rc b/reactos/dll/win32/shell32/lang/ko-KO.rc
index 42c85ff..3551d6a 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ko-KO.rc
+++ b/reactos/dll/win32/shell32/lang/ko-KO.rc
@@ -112,18 +112,18 @@ BEGIN
        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 "\9eÞ\9cÃÁö"
++FONT 8, "MS Shell Dlg"
++{
++DEFPUSHBUTTON "¿¹(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
++PUSHBUTTON "\9eðµÎ ¿¹(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
++PUSHBUTTON " \9fÆ\8eÏ¿À(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
++PUSHBUTTON "Ãë\8cÒ(&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

diff --git a/reactos/dll/win32/shell32/shlview.c b/reactos/dll/win32/shell32/shlview.c
index 5eabe90..5a5b1e3 100644 (file)
--- a/reactos/dll/win32/shell32/shlview.c
+++ b/reactos/dll/win32/shell32/shlview.c
@@ -2340,12 +2340,14 @@ static HRESULT WINAPI ISVDropTarget_DragOver(IDropTarget *iface, DWORD grfKeySta
 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 @@ static HRESULT WINAPI ISVDropTarget_Drop(IDropTarget *iface, IDataObject* pDataO
 {
     IShellViewImpl *This = impl_from_IDropTarget(iface);
 
-    IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect);
+    if (This->pCurDropTarget)
+    {
+        IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect);
+        IDropTarget_Release(This->pCurDropTarget);
+        This->pCurDropTarget = NULL;
+    }
 
-    IDropTarget_Release(This->pCurDropTarget);
     IDataObject_Release(This->pCurDataObject);
     This->pCurDataObject = NULL;
-    This->pCurDropTarget = NULL;
     This->iDragOverItem = 0;
 
     return S_OK;