DDE fix

Eric Pouech eric.pouech at wanadoo.fr
Sat Feb 23 16:06:27 CST 2002


with the patch on the correct file, that's even better
A+
**************************************************************************************************
Boundless power to create. Anytime. Anywhere. Share Corel's vision.!
Visit http://www.corel.com/draw10.

**************************************************************************************************
-------------- next part --------------
Name: dde_gd
ChangeLog: fixed DdeGetData when called for getting size
GenDate: 2002/02/23 22:05:49 UTC
ModifiedFiles: dlls/user/dde/misc.c
AddedFiles: 
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/dlls/user/dde/misc.c,v
retrieving revision 1.7
diff -u -u -r1.7 misc.c
--- dlls/user/dde/misc.c	18 Jan 2002 19:30:16 -0000	1.7
+++ dlls/user/dde/misc.c	17 Feb 2002 21:46:29 -0000
@@ -1349,13 +1349,17 @@
     DWORD   dwSize, dwRet;
     LPBYTE  pByte;
     
-    TRACE("(%08lx,%p,%ld,%ld)\n",(DWORD)hData,pDst,cbMax,cbOff);
+    TRACE("(%08lx,%p,%ld,%ld)\n",(DWORD)hData, pDst, cbMax, cbOff);
     
     pByte = DdeAccessData(hData, &dwSize);
     
     if (pByte) 
     {
-	if (cbOff + cbMax < dwSize)
+        if (!pDst)
+        {
+            dwRet = dwSize;
+        }
+        else if (cbOff + cbMax < dwSize)
 	{
 	    dwRet = cbMax;
 	}
@@ -1401,7 +1405,7 @@
     {
 	*pcbDataSize = GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD);
     }
-    
+    TRACE("=> %08lx (%lu)\n", (DWORD)(pDdh + 1), GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD));
     return (LPBYTE)(pDdh + 1);
 }
 


More information about the wine-patches mailing list