Changeset 4685 for trunk/src/ole32/oleClip.cpp

Timestamp:

Nov 24, 2000, 11:29:40 AM (25 years ago)

Author:

sandervl

Message:

OB: Merged with latest OLE clip code from Wine

File:

• trunk/src/ole32/oleClip.cpp (modified) (4 diffs)

trunk/src/ole32/oleClip.cpp

@@ -1 @@
-/* $Id: oleClip.cpp,v 1.4 2000-09-17 10:31:05 davidr Exp $ */
+/* $Id: oleClip.cpp,v 1.5 2000-11-24 10:29:40 sandervl Exp $ */
 /* 
  * 
@@ -1234 +1234 @@
 {
   HANDLE      hData = 0;
+  BOOL bClipboardOpen = FALSE;
+  HRESULT hr = S_OK;
+  
   /*
    * Declare "This" pointer 
@@ -1267 +1270 @@
    * Otherwise, delegate to the Windows clipboard function GetClipboardData
    */
+  if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) )
+     HANDLE_ERROR( CLIPBRD_E_CANT_OPEN );
+
   hData = GetClipboardData(pformatetcIn->cfFormat);
 
@@ -1275 +1281 @@
   pmedium->u.hGlobal = (HGLOBAL)hData;
   pmedium->pUnkForRelease = NULL;
-  
+
+  hr = S_OK;
+
+CLEANUP:
+  /*
+   * Close Windows clipboard
+   */
+  if ( bClipboardOpen && !CloseClipboard() )
+     hr = CLIPBRD_E_CANT_CLOSE;
+
+  if ( FAILED(hr) )
+      return hr;
   return (hData == 0) ? DV_E_FORMATETC : S_OK;
 }