Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-05 12:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
* Sync SH{Register,Revoke}DragDrop with Wine 1.5.26.

svn path=/trunk/; revision=58855
This commit is contained in:
Amine Khaldi 2013-04-25 23:04:00 +00:00
parent 472acf6982
commit 6f55066617
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/dll/win32/shell32/shellord.cpp
View file

@ -405,13 +405,14 @@ EXTERN_C int WINAPI ShellMessageBoxA(
} }
/************************************************************************* /*************************************************************************
* SHRegisterDragDrop [SHELL32.86] * SHRegisterDragDrop [SHELL32.86]
* *
* Probably equivalent to RegisterDragDrop but under Windows 95 it could use the * Probably equivalent to RegisterDragDrop but under Windows 95 it could use the
* shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE
* for details. Under Windows 98 this function initializes the true OLE when called * for details. Under Windows 98 this function initializes the true OLE when called
* the first time, on XP always returns E_OUTOFMEMORY and it got removed from Vista. * the first time, on XP always returns E_OUTOFMEMORY and it got removed from Vista.
* *
* We follow Windows 98 behaviour.
* *
* NOTES * NOTES
* exported by ordinal * exported by ordinal
@ -420,20 +421,34 @@ EXTERN_C int WINAPI ShellMessageBoxA(
* RegisterDragDrop, SHLoadOLE * RegisterDragDrop, SHLoadOLE
*/ */
HRESULT WINAPI SHRegisterDragDrop( HRESULT WINAPI SHRegisterDragDrop(
HWND hWnd, HWND hWnd,
LPDROPTARGET pDropTarget) LPDROPTARGET pDropTarget)
{ {
FIXME("(%p,%p):stub.\n", hWnd, pDropTarget); static BOOL ole_initialized = FALSE;
return RegisterDragDrop(hWnd, pDropTarget); HRESULT hr;
TRACE("(%p,%p)\n", hWnd, pDropTarget);
if (!ole_initialized)
{
hr = OleInitialize(NULL);
if (FAILED(hr))
return hr;
ole_initialized = TRUE;
}
return RegisterDragDrop(hWnd, pDropTarget);
} }
/************************************************************************* /*************************************************************************
* SHRevokeDragDrop [SHELL32.87] * SHRevokeDragDrop [SHELL32.87]
* *
* Probably equivalent to RevokeDragDrop but under Windows 9x it could use the * Probably equivalent to RevokeDragDrop but under Windows 95 it could use the
* shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE
* for details. Function removed from Windows Vista. * for details. Function removed from Windows Vista.
* *
* We call ole32 RevokeDragDrop which seems to work even if OleInitialize was
* not called.
*
* NOTES * NOTES
* exported by ordinal * exported by ordinal
* *
@ -442,7 +457,7 @@ HRESULT WINAPI SHRegisterDragDrop(
*/ */
HRESULT WINAPI SHRevokeDragDrop(HWND hWnd) HRESULT WINAPI SHRevokeDragDrop(HWND hWnd)
{ {
FIXME("(%p):stub.\n",hWnd); TRACE("(%p)\n", hWnd);
return RevokeDragDrop(hWnd); return RevokeDragDrop(hWnd);
} }