Changeset 74380 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDataObject.cpp
- Timestamp:
- Sep 20, 2018 10:02:42 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDataObject.cpp
r69500 r74380 89 89 if (SUCCEEDED(hr)) 90 90 { 91 int rc2 = RTSemEventCreate(&m SemEvent);91 int rc2 = RTSemEventCreate(&mEventDropped); 92 92 AssertRC(rc2); 93 93 … … 208 208 if (mStatus == Dropping) 209 209 { 210 Log FlowFunc(("Waiting forevent ...\n"));211 int rc2 = RTSemEventWait(m SemEvent, RT_INDEFINITE_WAIT);212 LogFlowFunc(("rc2=%Rrc, mStatus=%ld\n", rc2, mStatus)); NOREF(rc2);210 LogRel2(("DnD: Waiting for drop event ...\n")); 211 int rc2 = RTSemEventWait(mEventDropped, RT_INDEFINITE_WAIT); 212 LogFlowFunc(("rc2=%Rrc, mStatus=%ld\n", rc2, mStatus)); RT_NOREF(rc2); 213 213 } 214 214 215 215 if (mStatus == Dropped) 216 216 { 217 LogRel2(("DnD: Drop event received\n")); 217 218 LogRel3(("DnD: cfFormat=%RI16, sFormat=%s, tyMed=%RU32, dwAspect=%RU32\n", 218 219 pThisFormat->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat), … … 517 518 LogFlowFunc(("Aborting ...\n")); 518 519 mStatus = Aborted; 519 return RTSemEventSignal(m SemEvent);520 return RTSemEventSignal(mEventDropped); 520 521 } 521 522 … … 674 675 const void *pvData, uint32_t cbData) 675 676 { 676 LogFlowFunc(("Signalling ...\n"));677 678 677 int rc; 679 678 680 mStatus = Dropped;681 mstrFormat = strFormat;682 679 if (cbData) 683 680 { … … 695 692 rc = VINF_SUCCESS; 696 693 697 if (RT_FAILURE(rc)) 694 if (RT_SUCCESS(rc)) 695 { 696 mStatus = Dropped; 697 mstrFormat = strFormat; 698 } 699 else 700 { 698 701 mStatus = Aborted; 702 } 699 703 700 704 /* Signal in any case. */ 701 int rc2 = RTSemEventSignal(mSemEvent); 705 LogRel2(("DnD: Signalling drop event\n")); 706 707 int rc2 = RTSemEventSignal(mEventDropped); 702 708 if (RT_SUCCESS(rc)) 703 709 rc = rc2; 704 710 711 LogFunc(("mStatus=%RU32, rc=%Rrc\n", mStatus, rc)); 705 712 return rc; 706 713 }
Note:
See TracChangeset
for help on using the changeset viewer.