[ros-diffs] [fireball] 57783: [WINENT] - Don't skip rendering clipboard data. ARWINSS-84 #comment This issue is resolved by r57783.

Author: fireball
Date: Thu Nov 29 13:08:29 2012
New Revision: 57783

URL: http://svn.reactos.org/svn/reactos?rev=57783&view=rev
Log:
[WINENT]
- Don't skip rendering clipboard data.

ARWINSS-84 #comment This issue is resolved by r57783.

Modified:
    branches/arwinss/arwinss/client/winent.drv/clipboard.c

Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d…
==============================================================================
--- branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] Thu Nov 29
13:08:29 2012
@@ -107,7 +107,9 @@
 static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA
lpData);
 static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop,
     unsigned char** data, unsigned long* datasize);
-static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData);
+#endif
+static BOOL NTDRV_CLIPBOARD_RenderFormat(LPWINE_CLIPDATA lpData);
+#if 0
 static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDWORD
lpcbytes, BOOL out);
 #endif
 static BOOL NTDRV_CLIPBOARD_SynthesizeData(UINT wFormatID);
@@ -659,11 +661,10 @@
     return bret;
 }
 
-#if 0
 /**************************************************************************
  *			X11DRV_CLIPBOARD_RenderFormat
  */
-static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData)
+static BOOL NTDRV_CLIPBOARD_RenderFormat(LPWINE_CLIPDATA lpData)
 {
     BOOL bret = TRUE;
 
@@ -671,9 +672,9 @@
 
     if (lpData->hData) return bret; /* Already rendered */
 
-    if (lpData->wFlags & CF_FLAG_SYNTHESIZED)
+    /*if (lpData->wFlags & CF_FLAG_SYNTHESIZED)
         bret = X11DRV_CLIPBOARD_RenderSynthesizedFormat(display, lpData);
-    else if (!X11DRV_CLIPBOARD_IsSelectionOwner())
+    else if (!NTDRV_CLIPBOARD_IsSelectionOwner())
     {
         if (!X11DRV_CLIPBOARD_ReadSelectionData(display, lpData))
         {
@@ -682,11 +683,11 @@
             bret = FALSE;
         }
     }
-    else
+    else*/
     {
         CLIPBOARDINFO cbInfo;
 
-        if (X11DRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner)
+        if (NTDRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner)
         {
             /* Send a WM_RENDERFORMAT message to notify the owner to render the
              * data requested into the clipboard.
@@ -706,7 +707,7 @@
     return bret;
 }
 
-
+#if 0
 /**************************************************************************
  *                      CLIPBOARD_ConvertText
  * Returns number of required/converted characters - not bytes!
@@ -2739,8 +2740,8 @@
 
     if ((lpRender = NTDRV_CLIPBOARD_LookupData(wFormat)))
     {
-        //if ( !lpRender->hData )
-        //    NTDRV_CLIPBOARD_RenderFormat(thread_init_display(), lpRender);
+        if ( !lpRender->hData )
+            NTDRV_CLIPBOARD_RenderFormat(lpRender);
 
         TRACE(" returning %p (type %04x)\n", lpRender->hData,
lpRender->wFormatID);
         return lpRender->hData;