1 diff -pudN e:\wine\dlls\ole32/clipboard.c e:\reactos\dll\win32\ole32/clipboard.c 2 --- e:\wine\dlls\ole32/clipboard.c 2016-11-16 17:29:23 +0100 3 +++ e:\reactos\dll\win32\ole32/clipboard.c 2016-11-16 23:37:23 +0100 4 @@ -2001,6 +2001,10 @@ static LRESULT CALLBACK clipbrd_wndproc( 5 ole_clipbrd *clipbrd; 6 7 get_ole_clipbrd(&clipbrd); 8 +#ifdef __REACTOS__ 9 + if(clipbrd == NULL) 10 + return DefWindowProcW(hwnd, message, wparam, lparam); 11 +#endif 12 13 switch (message) 14 { 15 diff -pudN e:\wine\dlls\ole32/compobj.c e:\reactos\dll\win32\ole32/compobj.c 16 --- e:\wine\dlls\ole32/compobj.c 2016-11-16 17:29:23 +0100 17 +++ e:\reactos\dll\win32\ole32/compobj.c 2016-11-17 15:23:00 +0100 18 @@ -43,6 +43,7 @@ 19 20 WINE_DEFAULT_DEBUG_CHANNEL(ole); 21 22 +#undef ARRAYSIZE 23 #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) 24 25 /**************************************************************************** 26 @@ -303,9 +304,13 @@ static NTSTATUS create_key( HKEY *retkey 27 return status; 28 } 29 30 +#ifdef __REACTOS__ 31 +static const WCHAR classes_rootW[] = L"\\REGISTRY\\Machine\\Software\\Classes"; 32 +#else 33 static const WCHAR classes_rootW[] = 34 {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e', 35 '\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; 36 +#endif 37 38 static HKEY classes_root_hkey; 39 40 diff -pudN e:\wine\dlls\ole32/stg_prop.c e:\reactos\dll\win32\ole32/stg_prop.c 41 --- e:\wine\dlls\ole32/stg_prop.c 2016-11-16 17:29:23 +0100 42 +++ e:\reactos\dll\win32\ole32/stg_prop.c 2016-08-15 16:49:04 +0100 43 @@ -1013,7 +1017,13 @@ static HRESULT PropertyStorage_ReadDicti 44 return hr; 45 } 46 47 -static void* WINAPI Allocate_CoTaskMemAlloc(void *this, ULONG size) 48 +#ifdef __i386__ 49 +#define __thiscall_wrapper __stdcall 50 +#else 51 +#define __thiscall_wrapper __cdecl 52 +#endif 53 + 54 +static void* __thiscall_wrapper Allocate_CoTaskMemAlloc(void *this, ULONG size) 55 { 56 return CoTaskMemAlloc(size); 57 } 58 @@ -1022,7 +1032,7 @@ static void* WINAPI Allocate_CoTaskMemAl 59 * end of the buffer. 60 */ 61 static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, 62 - UINT codepage, void* (WINAPI *allocate)(void *this, ULONG size), void *allocate_data) 63 + UINT codepage, void* (__thiscall_wrapper *allocate)(void *this, ULONG size), void *allocate_data) 64 { 65 HRESULT hr = S_OK; 66 67 @@ -2711,13 +2721,13 @@ end: 68 "jmp *(4*(" #num "))(%eax)" ) 69 70 DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8) 71 -extern void* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize); 72 +extern void* __stdcall Allocate_PMemoryAllocator(void *this, ULONG cbSize); 73 74 #else 75 76 -static void* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize) 77 +static void* __cdecl Allocate_PMemoryAllocator(void *this, ULONG cbSize) 78 { 79 - void* (WINAPI *fn)(void*,ULONG) = **(void***)this; 80 + void* (__cdecl *fn)(void*,ULONG) = **(void***)this; 81 return fn(this, cbSize); 82 } 83 diff -pudN e:\wine\dlls\ole32/drag_copy.cur e:\reactos\dll\win32\ole32/drag_copy.cur 84 diff -pudN e:\wine\dlls\ole32/drag_link.cur e:\reactos\dll\win32\ole32/drag_link.cur 85 diff -pudN e:\wine\dlls\ole32/drag_move.cur e:\reactos\dll\win32\ole32/drag_move.cur 86 diff -pudN e:\wine\dlls\ole32/nodrop.cur e:\reactos\dll\win32\ole32/nodrop.cur 87 #4 cur files kept at older state of ros SVN r75889 to avoid CORE-14608 88