ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Now that the consumer side of the clipboard separated from the main clipboard object, simplify the initialization code.

This commit is contained in:
Huw Davies 2009-04-16 12:16:17 +01:00 committed by Alexandre Julliard
parent df08d463c9
commit d2156f3894
1 changed files with 51 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
dlls/ole32/clipboard.c
View File

@ -813,31 +813,6 @@ static ULONG WINAPI snapshot_AddRef(IDataObject *iface)
return InterlockedIncrement(&This->ref);
}
/***********************************************************************
* destroy_clipbrd_window
* Destroy the clipboard window and unregister its class
*/
static void destroy_clipbrd_window(HWND hwnd)
{
static const WCHAR ole32W[] = {'o','l','e','3','2',0};
HINSTANCE hinst = GetModuleHandleW(ole32W);
DestroyWindow(hwnd);
UnregisterClassW( clipbrd_wndclass, hinst );
}
static void OLEClipbrd_Destroy(ole_clipbrd* This)
{
TRACE("()\n");
if (!This) return;
if ( This->window ) destroy_clipbrd_window(This->window);
IStream_Release(This->marshal_data);
HeapFree(GetProcessHeap(), 0, This);
}
/************************************************************************
* snapshot_Release
*/
@ -1160,35 +1135,8 @@ static snapshot *snapshot_construct(DWORD seq_no)
}
/*********************************************************
* Construct the OLEClipbrd class.
* register_clipboard_formats
*/
static ole_clipbrd* OLEClipbrd_Construct(void)
{
ole_clipbrd* This;
HGLOBAL h;
This = HeapAlloc( GetProcessHeap(), 0, sizeof(*This) );
if (!This) return NULL;
This->latest_snapshot = NULL;
This->window = NULL;
This->src_data = NULL;
This->cached_enum = NULL;
h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, 0);
if(!h) goto error;
if(FAILED(CreateStreamOnHGlobal(h, TRUE, &This->marshal_data)))
goto error;
return This;
error:
if(h) GlobalFree(h);
HeapFree(GetProcessHeap(), 0, This);
return NULL;
}
static void register_clipboard_formats(void)
{
static const WCHAR DataObjectW[] = { 'D','a','t','a','O','b','j','e','c','t',0 };
@ -1213,23 +1161,60 @@ void OLEClipbrd_Initialize(void)
if ( !theOleClipboard )
{
ole_clipbrd* clipbrd;
HGLOBAL h;
TRACE("()\n");
theOleClipboard = OLEClipbrd_Construct();
clipbrd = HeapAlloc( GetProcessHeap(), 0, sizeof(*clipbrd) );
if (!clipbrd) return;
clipbrd->latest_snapshot = NULL;
clipbrd->window = NULL;
clipbrd->src_data = NULL;
clipbrd->cached_enum = NULL;
h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, 0);
if(!h)
{
HeapFree(GetProcessHeap(), 0, clipbrd);
return;
}
if(FAILED(CreateStreamOnHGlobal(h, TRUE, &clipbrd->marshal_data)))
{
GlobalFree(h);
HeapFree(GetProcessHeap(), 0, clipbrd);
return;
}
theOleClipboard = clipbrd;
}
}
/***********************************************************************
* OLEClipbrd_UnInitialize()
* Un-Initializes the OLE clipboard
*/
void OLEClipbrd_UnInitialize(void)
{
ole_clipbrd *clipbrd = theOleClipboard;
TRACE("()\n");
if ( theOleClipboard )
if ( clipbrd )
{
OLEClipbrd_Destroy( theOleClipboard );
static const WCHAR ole32W[] = {'o','l','e','3','2',0};
HINSTANCE hinst = GetModuleHandleW(ole32W);
if ( clipbrd->window )
{
DestroyWindow(clipbrd->window);
UnregisterClassW( clipbrd_wndclass, hinst );
}
IStream_Release(clipbrd->marshal_data);
HeapFree(GetProcessHeap(), 0, clipbrd);
theOleClipboard = NULL;
}
}