ole32: Check the input hwnd is valid in RevokeDragDrop.
This commit is contained in:
parent
2d8ae2cf83
commit
47432cba45
|
@ -299,7 +299,10 @@ HRESULT WINAPI RegisterDragDrop(
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (!IsWindow(hwnd))
|
if (!IsWindow(hwnd))
|
||||||
|
{
|
||||||
|
ERR("invalid hwnd %p\n", hwnd);
|
||||||
return DRAGDROP_E_INVALIDHWND;
|
return DRAGDROP_E_INVALIDHWND;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* First, check if the window is already registered.
|
* First, check if the window is already registered.
|
||||||
|
@ -341,6 +344,12 @@ HRESULT WINAPI RevokeDragDrop(
|
||||||
|
|
||||||
TRACE("(%p)\n", hwnd);
|
TRACE("(%p)\n", hwnd);
|
||||||
|
|
||||||
|
if (!IsWindow(hwnd))
|
||||||
|
{
|
||||||
|
ERR("invalid hwnd %p\n", hwnd);
|
||||||
|
return DRAGDROP_E_INVALIDHWND;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* First, check if the window is already registered.
|
* First, check if the window is already registered.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -145,6 +145,5 @@ START_TEST(dragdrop)
|
||||||
ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called);
|
ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called);
|
||||||
|
|
||||||
hr = RevokeDragDrop(NULL);
|
hr = RevokeDragDrop(NULL);
|
||||||
todo_wine
|
|
||||||
ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);
|
ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue