Commit 18aacf15 authored by Sylvain St.Germain's avatar Sylvain St.Germain Committed by Alexandre Julliard

DoDragDrop and OleIsCurrentClipboard stub implementation.

parent 4f85ca44
...@@ -154,6 +154,10 @@ extern int WIN32_LastError; ...@@ -154,6 +154,10 @@ extern int WIN32_LastError;
#define DISP_E_TYPEMISMATCH 0x80020005L #define DISP_E_TYPEMISMATCH 0x80020005L
/* Drag and Drop */
#define DRAGDROP_S_DROP 0x00040100L
#define DRAGDROP_S_CANCEL 0x00040101L
#define E_UNEXPECTED 0x8000FFFF #define E_UNEXPECTED 0x8000FFFF
#define E_NOTIMPL 0x80004001 #define E_NOTIMPL 0x80004001
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "ole2.h" #include "ole2.h"
#include "process.h" #include "process.h"
#include "debug.h" #include "debug.h"
#include "objidl.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "wine/obj_clientserver.h" #include "wine/obj_clientserver.h"
#include "wine/obj_storage.h" #include "wine/obj_storage.h"
...@@ -170,3 +171,17 @@ HRESULT WINAPI CreateBindCtx32 (DWORD reserved, LPVOID *ppbc) ...@@ -170,3 +171,17 @@ HRESULT WINAPI CreateBindCtx32 (DWORD reserved, LPVOID *ppbc)
/* return S_OK; */ /* return S_OK; */
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
/***********************************************************************
* DoDragDrop32 [OLE32.65]
*/
HRESULT WINAPI DoDragDrop32 (
IDataObject *pDataObject, /* ptr to the data obj */
IDataObject *pDropSource, /* ptr to the source obj */
DWORD dwOKEffect, /* effects allowed by the source */
DWORD *pdwEffect) /* ptr to effects of the source */
{
FIXME(ole,"(DataObject %p, DropSource %p): stub!\n", pDataObject, pDropSource);
return DRAGDROP_S_DROP;
}
...@@ -8,9 +8,13 @@ ...@@ -8,9 +8,13 @@
*/ */
#include "windows.h" #include "windows.h"
#include "winerror.h"
#include "ole.h" #include "ole.h"
#include "gdi.h" #include "gdi.h"
#include "debug.h" #include "debug.h"
#include "ole2.h"
#include "objidl.h"
extern LONG OLE_current_handle; extern LONG OLE_current_handle;
...@@ -160,3 +164,14 @@ OLESTATUS WINAPI OleCreateFromClip32( ...@@ -160,3 +164,14 @@ OLESTATUS WINAPI OleCreateFromClip32(
/* clipb type, object kreieren entsprechend etc. */ /* clipb type, object kreieren entsprechend etc. */
return OLE_OK; return OLE_OK;
} }
/***********************************************************************
* OleIsCurrentClipboard32 [OLE32.110]
*/
HRESULT WINAPI OleIsCurrentClipboard32 (
IDataObject *pDataObject) /* ptr to the data obj previously copied or cut */
{
FIXME(ole,"(DataObject %p): stub!\n", pDataObject);
return S_FALSE;
}
...@@ -65,7 +65,7 @@ type win32 ...@@ -65,7 +65,7 @@ type win32
62 stub DllDebugObjectRPCHook 62 stub DllDebugObjectRPCHook
63 stub DllGetClassObject 63 stub DllGetClassObject
64 stub DllGetClassObjectWOW 64 stub DllGetClassObjectWOW
65 stub DoDragDrop 65 stdcall DoDragDrop(ptr ptr long ptr) DoDragDrop32
66 stub EnableHookObject 66 stub EnableHookObject
67 stub GetClassFile 67 stub GetClassFile
68 stub GetConvertStg 68 stub GetConvertStg
...@@ -110,7 +110,7 @@ type win32 ...@@ -110,7 +110,7 @@ type win32
107 stub OleGetIconOfFile 107 stub OleGetIconOfFile
108 stdcall OleInitialize(ptr) OleInitialize 108 stdcall OleInitialize(ptr) OleInitialize
109 stdcall OleInitializeWOW(long) OleInitializeWOW 109 stdcall OleInitializeWOW(long) OleInitializeWOW
110 stub OleIsCurrentClipboard 110 stdcall OleIsCurrentClipboard(ptr) OleIsCurrentClipboard32
111 stub OleIsRunning 111 stub OleIsRunning
112 stub OleLoad 112 stub OleLoad
113 stub OleLoadFromStream 113 stub OleLoadFromStream
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment