fix for ff hang when tb drag drop message or attachment over tab bar, r=roc, 514148
authorPhil Lacy <philbaseless-firefox@yahoo.com>
Tue, 29 Sep 2009 13:39:16 -0700
changeset 33277 d6be20db5b51b9dd99131ac8a68b8b621f460d67
parent 33276 dab2d59ebd97cf652d26c6b9ee751923f69800b9
child 33278 1e2e64a82a171356688747dc4f06b3a13adfbbd2
push idunknown
push userunknown
push dateunknown
reviewersroc, 514148
bugs514148
milestone1.9.3a1pre
fix for ff hang when tb drag drop message or attachment over tab bar, r=roc, 514148
widget/src/windows/nsDragService.cpp
--- a/widget/src/windows/nsDragService.cpp
+++ b/widget/src/windows/nsDragService.cpp
@@ -435,16 +435,18 @@ nsDragService::GetNumDropItems(PRUint32 
     if (mDataObject->QueryGetData(&fe2) == S_OK) {
       STGMEDIUM stm;
       if (mDataObject->GetData(&fe2, &stm) == S_OK) {
         HDROP hdrop = (HDROP)GlobalLock(stm.hGlobal);
         *aNumItems = ::DragQueryFileW(hdrop, 0xFFFFFFFF, NULL, 0);
         ::GlobalUnlock(stm.hGlobal);
         ::ReleaseStgMedium(&stm);
       }
+      else
+        *aNumItems = 1;
     }
     else
       *aNumItems = 1;
   }
 
   return NS_OK;
 }