Re: [ros-dev] [ros-diffs] [sserapion] 38260: Fix EDITSTREAM structure

[Ged]

This will be lost in a Wine update


-----Original Message-----
From: ros-diffs-bounces(a)reactos.org [mailto:[e-mail]] On Behalf Of
sserapion(a)svn.reactos.org
Sent: 22 December 2008 03:22
To: ros-diffs(a)reactos.org
Subject: [ros-diffs] [sserapion] 38260: Fix EDITSTREAM structure

Author: sserapion
Date: Sun Dec 21 21:22:05 2008
New Revision: 38260

URL: http://svn.reactos.org/svn/reactos?rev=38260&view=rev
Log:
Fix EDITSTREAM structure

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c
    branches/ros-amd64-bringup/reactos/include/psdk/richedit.h

Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Dec 21
21:22:05 2008
@@ -1616,7 +1616,7 @@
   data.string = string;
   data.length = strlen(string);
   data.pos = 0;
-  es.dwCookie = (DWORD)&data;
+  es.dwCookie = (DWORD_PTR)&data;
   es.pfnCallback = ME_ReadFromRTFString;
   ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE);
 }
@@ -1998,7 +1998,7 @@
     return FALSE;
   gds.hData = GetClipboardData(cf);
   gds.nLength = 0;
-  es.dwCookie = (DWORD)&gds;
+  es.dwCookie = (DWORD_PTR)&gds;
   es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF :
ME_ReadFromHGLOBALUnicode;
   ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE);
 

Modified: branches/ros-amd64-bringup/reactos/include/psdk/richedit.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/richedit.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/richedit.h [iso-8859-1] Sun Dec 21
21:22:05 2008
@@ -517,7 +517,7 @@
 typedef struct _editstream
 {
     DWORD		dwCookie;
-    DWORD		dwError;
+    DWORD_PTR	dwError;
     EDITSTREAMCALLBACK	pfnCallback;
 } EDITSTREAM;