February 2016 - Wine-commits

André Hentschel : wbemprox/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: fa7d4e6015f224e50ea28c5199c9620aae06406b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7d4e6015f224e50ea28c519… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:13 2016 +0100 wbemprox/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/services.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 4c42a50..a6774751 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -168,10 +168,7 @@ static void test_IWbemLocator(void) { resource = SysAllocString( test[i].path ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); - if (test[i].todo) todo_wine - ok( hr == test[i].result || broken(hr == test[i].result_broken), - "%u: expected %08x got %08x\n", i, test[i].result, hr ); - else + todo_wine_if (test[i].todo) ok( hr == test[i].result || broken(hr == test[i].result_broken), "%u: expected %08x got %08x\n", i, test[i].result, hr ); SysFreeString( resource );

1 0

André Hentschel : windowscodecs/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 782666be0d667adf0c4b4ecb0ebd6106a59de7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782666be0d667adf0c4b4ecb0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:19 2016 +0100 windowscodecs/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 5c764d2..00ea483 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -304,9 +304,7 @@ static void test_conversion(const struct bitmap_data *src, const struct bitmap_d CreateTestBitmap(src, &src_obj); hr = WICConvertBitmapSource(dst->format, &src_obj->IWICBitmapSource_iface, &dst_bitmap); - if (todo) - todo_wine ok(SUCCEEDED(hr), "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); - else + todo_wine_if (todo) ok(SUCCEEDED(hr), "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); if (SUCCEEDED(hr))

1 0

Shu Yokoyama : winex11: Fix HRESULT handling in XdndPosition.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 5ccf039fc72e86674794b4441253bce04ceff616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf039fc72e86674794b4441… Author: Shu Yokoyama <yokoyama(a)graco.c.u-tokyo.ac.jp> Date: Tue Feb 23 08:02:25 2016 +0900 winex11: Fix HRESULT handling in XdndPosition. Signed-off-by: Shu Yokoyama <yokoyama(a)graco.c.u-tokyo.ac.jp> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 8b2c582..c83caea 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -328,7 +328,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (dropTarget) { hr = IDropTarget_DragOver(dropTarget, MK_LBUTTON, pointl, &effect); - if (hr != S_OK) + if (hr == S_OK) XDNDDropEffect = effect; else WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr);

1 0

Huw Davies : ole32: Remove curDragTargetHWND since it's never used.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: bf8e8f56f5e58e242aa4c9e8d9abf31a938e5863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8e8f56f5e58e242aa4c9e8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:27 2016 +0000 ole32: Remove curDragTargetHWND since it's never used. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f078fb6..3740968 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -68,7 +68,6 @@ typedef struct tagTrackerWindowInfo BOOL escPressed; HWND curTargetHWND; /* window the mouse is hovering over */ - HWND curDragTargetHWND; /* might be an ancestor of curTargetHWND */ IDropTarget* curDragTarget; POINTL curMousePos; /* current position of the mouse in screen coordinates */ DWORD dwKeyState; /* current state of the shift and ctrl keys and the mouse buttons */ @@ -770,7 +769,6 @@ HRESULT WINAPI DoDragDrop ( trackerInfo.pdwEffect = pdwEffect; trackerInfo.trackingDone = FALSE; trackerInfo.escPressed = FALSE; - trackerInfo.curDragTargetHWND = 0; trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; @@ -2255,7 +2253,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) if (next_target_wnd) hwndNewTarget = next_target_wnd; - trackerInfo->curDragTargetHWND = hwndNewTarget; if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = get_droptarget_pointer(hwndNewTarget); @@ -2274,7 +2271,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) /* failed DragEnter() means invalid target */ if (hr != S_OK) { - trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0; @@ -2286,7 +2282,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) /* * The mouse is not over a window so we don't track anything. */ - trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0;

1 0

Huw Davies : ole32: Move the GiveFeedback handling to a separate function.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: f2530ca18fcf0b93e4ac33617ca4c3d76524faad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2530ca18fcf0b93e4ac33617… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:28 2016 +0000 ole32: Move the GiveFeedback handling to a separate function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 73 +++++++++++++++++++++----------------------------- dlls/ole32/ole32res.rc | 10 ++++--- dlls/ole32/olestd.h | 5 ++++ 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3740968..315f403 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -46,6 +46,7 @@ #include "wine/unicode.h" #include "compobj_private.h" +#include "olestd.h" #include "wine/list.h" #include "wine/debug.h" @@ -2181,6 +2182,35 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( return DefWindowProcW (hwnd, uMsg, wParam, lParam); } +static HRESULT give_feedback( TrackerWindowInfo *info ) +{ + HRESULT hr; + int res; + HCURSOR cur; + + if (info->curDragTarget == NULL) + *info->pdwEffect = DROPEFFECT_NONE; + + hr = IDropSource_GiveFeedback( info->dropSource, *info->pdwEffect ); + + if (hr == DRAGDROP_S_USEDEFAULTCURSORS) + { + if (*info->pdwEffect & DROPEFFECT_MOVE) + res = CURSOR_MOVE; + else if (*info->pdwEffect & DROPEFFECT_COPY) + res = CURSOR_COPY; + else if (*info->pdwEffect & DROPEFFECT_LINK) + res = CURSOR_LINK; + else + res = CURSOR_NODROP; + + cur = LoadCursorW( hProxyDll, MAKEINTRESOURCEW( res ) ); + SetCursor( cur ); + } + + return hr; +} + /*** * OLEDD_TrackStateChange() * @@ -2288,48 +2318,7 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) } } - /* - * Now that we have done that, we have to tell the source to give - * us feedback on the work being done by the target. If we don't - * have a target, simulate no effect. - */ - if (trackerInfo->curDragTarget==0) - { - *trackerInfo->pdwEffect = DROPEFFECT_NONE; - } - - hr = IDropSource_GiveFeedback(trackerInfo->dropSource, - *trackerInfo->pdwEffect); - - /* - * When we ask for feedback from the drop source, sometimes it will - * do all the necessary work and sometimes it will not handle it - * when that's the case, we must display the standard drag and drop - * cursors. - */ - if (hr == DRAGDROP_S_USEDEFAULTCURSORS) - { - HCURSOR hCur; - - if (*trackerInfo->pdwEffect & DROPEFFECT_MOVE) - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(2)); - } - else if (*trackerInfo->pdwEffect & DROPEFFECT_COPY) - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(3)); - } - else if (*trackerInfo->pdwEffect & DROPEFFECT_LINK) - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(4)); - } - else - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(1)); - } - - SetCursor(hCur); - } + give_feedback( trackerInfo ); /* * All the return valued will stop the operation except the S_OK diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc index 11b255a..5190ba6 100644 --- a/dlls/ole32/ole32res.rc +++ b/dlls/ole32/ole32res.rc @@ -23,6 +23,8 @@ #include "winuser.h" #include "winnls.h" +#include "olestd.h" + #define WINE_FILENAME_STR "ole32.dll" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" @@ -37,13 +39,13 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: nodrop.cur */ -1 CURSOR nodrop.cur +CURSOR_NODROP CURSOR nodrop.cur /* @makedep: drag_move.cur */ -2 CURSOR drag_move.cur +CURSOR_MOVE CURSOR drag_move.cur /* @makedep: drag_copy.cur */ -3 CURSOR drag_copy.cur +CURSOR_COPY CURSOR drag_copy.cur /* @makedep: drag_link.cur */ -4 CURSOR drag_link.cur +CURSOR_LINK CURSOR drag_link.cur diff --git a/dlls/ole32/olestd.h b/dlls/ole32/olestd.h index fbc4442..33063c7 100644 --- a/dlls/ole32/olestd.h +++ b/dlls/ole32/olestd.h @@ -49,4 +49,9 @@ #define OleStdCopyMetafilePict(hpictin, phpictout) \ (*(phpictout) = OleDuplicateData(hpictin,CF_METAFILEPICT,GHND|GMEM_SHARE)) +#define CURSOR_NODROP 1 +#define CURSOR_MOVE 2 +#define CURSOR_COPY 3 +#define CURSOR_LINK 4 + #endif /* __WINE_OLESTD_H_ */

1 0

Huw Davies : ole32: Release IDropTarget when the mouse leaves.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 9f6fd0e484cd7502a457ded8d7946bfaadef0e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6fd0e484cd7502a457ded8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:29 2016 +0000 ole32: Release IDropTarget when the mouse leaves. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 315f403..39cb57b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2264,7 +2264,12 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * the new one. */ if (trackerInfo->curDragTarget) + { IDropTarget_DragLeave(trackerInfo->curDragTarget); + IDropTarget_Release(trackerInfo->curDragTarget); + trackerInfo->curDragTarget = NULL; + trackerInfo->curTargetHWND = NULL; + } /* * Make sure we're hovering over a window. @@ -2283,7 +2288,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) if (next_target_wnd) hwndNewTarget = next_target_wnd; - if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = get_droptarget_pointer(hwndNewTarget); /* @@ -2307,15 +2311,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) } } } - else - { - /* - * The mouse is not over a window so we don't track anything. - */ - trackerInfo->curTargetHWND = 0; - if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); - trackerInfo->curDragTarget = 0; - } } give_feedback( trackerInfo );

1 0

Huw Davies : ole32: Move DragEnter handling to a separate function.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 82b140f7b10cc1937f19ea180c2e3e9ddbf1586d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b140f7b10cc1937f19ea180… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:30 2016 +0000 ole32: Move DragEnter handling to a separate function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 77 ++++++++++++++++++++++--------------------------------- 1 file changed, 31 insertions(+), 46 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 39cb57b..fdfe16f 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2182,6 +2182,35 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( return DefWindowProcW (hwnd, uMsg, wParam, lParam); } +static void drag_enter( TrackerWindowInfo *info, HWND new_target ) +{ + HRESULT hr; + + info->curTargetHWND = new_target; + + while (new_target && !is_droptarget( new_target )) + new_target = GetParent( new_target ); + + info->curDragTarget = get_droptarget_pointer( new_target ); + + if (info->curDragTarget) + { + *info->pdwEffect = info->dwOKEffect; + hr = IDropTarget_DragEnter( info->curDragTarget, info->dataObject, + info->dwKeyState, info->curMousePos, + info->pdwEffect ); + *info->pdwEffect &= info->dwOKEffect; + + /* failed DragEnter() means invalid target */ + if (hr != S_OK) + { + IDropTarget_Release( info->curDragTarget ); + info->curDragTarget = NULL; + info->curTargetHWND = NULL; + } + } +} + static HRESULT give_feedback( TrackerWindowInfo *info ) { HRESULT hr; @@ -2237,13 +2266,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) trackerInfo->returnValue = IDropSource_QueryContinueDrag(trackerInfo->dropSource, trackerInfo->escPressed, trackerInfo->dwKeyState); - - /* - * Every time, we re-initialize the effects passed to the - * IDropTarget to the effects allowed by the source. - */ - *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; - /* * If we are hovering over the same target as before, send the * DragOver notification @@ -2251,6 +2273,7 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) if ( (trackerInfo->curDragTarget != 0) && (trackerInfo->curTargetHWND == hwndNewTarget) ) { + *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; IDropTarget_DragOver(trackerInfo->curDragTarget, trackerInfo->dwKeyState, trackerInfo->curMousePos, @@ -2271,46 +2294,8 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) trackerInfo->curTargetHWND = NULL; } - /* - * Make sure we're hovering over a window. - */ if (hwndNewTarget) - { - /* - * Find-out if there is a drag target under the mouse - */ - HWND next_target_wnd = hwndNewTarget; - - trackerInfo->curTargetHWND = hwndNewTarget; - - while (next_target_wnd && !is_droptarget(next_target_wnd)) - next_target_wnd = GetParent(next_target_wnd); - - if (next_target_wnd) hwndNewTarget = next_target_wnd; - - trackerInfo->curDragTarget = get_droptarget_pointer(hwndNewTarget); - - /* - * If there is, notify it that we just dragged-in - */ - if (trackerInfo->curDragTarget) - { - hr = IDropTarget_DragEnter(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; - - /* failed DragEnter() means invalid target */ - if (hr != S_OK) - { - trackerInfo->curTargetHWND = 0; - IDropTarget_Release(trackerInfo->curDragTarget); - trackerInfo->curDragTarget = 0; - } - } - } + drag_enter( trackerInfo, hwndNewTarget ); } give_feedback( trackerInfo );

1 0

Huw Davies : ole32: Move end-of-drag handling to a separate function.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: b8fcc4a20ad2b4c830dadd779d93a79a8ddbe425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fcc4a20ad2b4c830dadd779… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:31 2016 +0000 ole32: Move end-of-drag handling to a separate function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 85 ++++++++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index fdfe16f..07c8e9d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2211,6 +2211,38 @@ static void drag_enter( TrackerWindowInfo *info, HWND new_target ) } } +static void drag_end( TrackerWindowInfo *info ) +{ + HRESULT hr; + + info->trackingDone = TRUE; + ReleaseCapture(); + + if (info->curDragTarget) + { + if (info->returnValue == DRAGDROP_S_DROP && + *info->pdwEffect != DROPEFFECT_NONE) + { + *info->pdwEffect = info->dwOKEffect; + hr = IDropTarget_Drop( info->curDragTarget, info->dataObject, info->dwKeyState, + info->curMousePos, info->pdwEffect ); + *info->pdwEffect &= info->dwOKEffect; + + if (FAILED( hr )) + info->returnValue = hr; + } + else + { + IDropTarget_DragLeave( info->curDragTarget ); + *info->pdwEffect = DROPEFFECT_NONE; + } + IDropTarget_Release( info->curDragTarget ); + info->curDragTarget = NULL; + } + else + *info->pdwEffect = DROPEFFECT_NONE; +} + static HRESULT give_feedback( TrackerWindowInfo *info ) { HRESULT hr; @@ -2253,7 +2285,6 @@ static HRESULT give_feedback( TrackerWindowInfo *info ) static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) { HWND hwndNewTarget = 0; - HRESULT hr = S_OK; POINT pt; /* @@ -2304,56 +2335,8 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * All the return valued will stop the operation except the S_OK * return value. */ - if (trackerInfo->returnValue!=S_OK) - { - /* - * Make sure the message loop in DoDragDrop stops - */ - trackerInfo->trackingDone = TRUE; - - /* - * Release the mouse in case the drop target decides to show a popup - * or a menu or something. - */ - ReleaseCapture(); - - /* - * If we end-up over a target, drop the object in the target or - * inform the target that the operation was cancelled. - */ - if (trackerInfo->curDragTarget) - { - switch (trackerInfo->returnValue) - { - /* - * If the source wants us to complete the operation, we tell - * the drop target that we just dropped the object in it. - */ - case DRAGDROP_S_DROP: - if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) - { - hr = IDropTarget_Drop(trackerInfo->curDragTarget, trackerInfo->dataObject, - trackerInfo->dwKeyState, trackerInfo->curMousePos, trackerInfo->pdwEffect); - if (FAILED(hr)) - trackerInfo->returnValue = hr; - } - else - IDropTarget_DragLeave(trackerInfo->curDragTarget); - break; - - /* - * If the source told us that we should cancel, fool the drop - * target by telling it that the mouse left its window. - * Also set the drop effect to "NONE" in case the application - * ignores the result of DoDragDrop. - */ - case DRAGDROP_S_CANCEL: - IDropTarget_DragLeave(trackerInfo->curDragTarget); - *trackerInfo->pdwEffect = DROPEFFECT_NONE; - break; - } - } - } + if (trackerInfo->returnValue != S_OK) + drag_end( trackerInfo ); } /***

1 0

Huw Davies : ole32: Don't send DragOver if we're about to drop or cancel.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 9194c47ede575a56961ad4ac001de175ac32cee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9194c47ede575a56961ad4ac0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:32 2016 +0000 ole32: Don't send DragOver if we're about to drop or cancel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 07c8e9d..9cffb63 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2297,26 +2297,11 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) trackerInfo->returnValue = IDropSource_QueryContinueDrag(trackerInfo->dropSource, trackerInfo->escPressed, trackerInfo->dwKeyState); - /* - * If we are hovering over the same target as before, send the - * DragOver notification - */ - if ( (trackerInfo->curDragTarget != 0) && - (trackerInfo->curTargetHWND == hwndNewTarget) ) - { - *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; - IDropTarget_DragOver(trackerInfo->curDragTarget, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; - } - else + + if (trackerInfo->curTargetHWND != hwndNewTarget && + (trackerInfo->returnValue == S_OK || + trackerInfo->returnValue == DRAGDROP_S_DROP)) { - /* - * If we changed window, we have to notify our old target and check for - * the new one. - */ if (trackerInfo->curDragTarget) { IDropTarget_DragLeave(trackerInfo->curDragTarget); @@ -2327,15 +2312,25 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) if (hwndNewTarget) drag_enter( trackerInfo, hwndNewTarget ); - } - give_feedback( trackerInfo ); + give_feedback( trackerInfo ); - /* - * All the return valued will stop the operation except the S_OK - * return value. - */ - if (trackerInfo->returnValue != S_OK) + } + + if (trackerInfo->returnValue == S_OK) + { + if (trackerInfo->curDragTarget) + { + *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; + IDropTarget_DragOver(trackerInfo->curDragTarget, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; + } + give_feedback( trackerInfo ); + } + else drag_end( trackerInfo ); }

1 0

Huw Davies : ole32/tests: Move tests to a table driven mechanism.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: b262dad09961d5fd23704275548dac17102ca1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=b262dad09961d5fd237042755… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:33 2016 +0000 ole32/tests: Move tests to a table driven mechanism. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/dragdrop.c | 240 +++++++++++++++++++++++++------------------- 1 file changed, 138 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b262dad09961d5fd23704…

1 0