Alexandre Julliard : riched20: Fixed handling of window private data for Win64.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Aug 3 15:58:22 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 344389d6d5c9968018c6f591047a0802e46e9d54
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=344389d6d5c9968018c6f591047a0802e46e9d54

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Aug  3 18:20:01 2006 +0200

riched20: Fixed handling of window private data for Win64.

---

 dlls/riched20/editor.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 5b42584..72a6a78 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -1461,7 +1461,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND 
     CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam;
     TRACE("WM_NCCREATE: style 0x%08lx\n", pcs->style);
     editor = ME_MakeEditor(hWnd);
-    SetWindowLongW(hWnd, 0, (long)editor);
+    SetWindowLongPtrW(hWnd, 0, (LONG_PTR)editor);
     pcs = 0; /* ignore */
     return TRUE;
   }
@@ -2234,7 +2234,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND 
     return 0;
   case WM_DESTROY:
     ME_DestroyEditor(editor);
-    SetWindowLongW(hWnd, 0, 0);
+    SetWindowLongPtrW(hWnd, 0, 0);
     return 0;
   case WM_LBUTTONDOWN:
     SetFocus(hWnd);
@@ -2530,7 +2530,7 @@ LRESULT WINAPI RichEdit10ANSIWndProc(HWN
   result = RichEditANSIWndProc(hWnd, msg, wParam, lParam);
   if (msg == WM_NCCREATE)
   {
-    ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongW(hWnd, 0);
+    ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(hWnd, 0);
     
     editor->bEmulateVersion10 = TRUE;
     editor->pBuffer->pLast->member.para.nCharOfs = 2;
@@ -2639,7 +2639,7 @@ void ME_RegisterEditorClass(HINSTANCE hI
   wcW.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS;
   wcW.lpfnWndProc = RichEditANSIWndProc;
   wcW.cbClsExtra = 0;
-  wcW.cbWndExtra = 4;
+  wcW.cbWndExtra = sizeof(ME_TextEditor *);
   wcW.hInstance = NULL; /* hInstance would register DLL-local class */
   wcW.hIcon = NULL;
   wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM));
@@ -2655,7 +2655,7 @@ void ME_RegisterEditorClass(HINSTANCE hI
   wcA.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS;
   wcA.lpfnWndProc = RichEditANSIWndProc;
   wcA.cbClsExtra = 0;
-  wcA.cbWndExtra = 4;
+  wcA.cbWndExtra = sizeof(ME_TextEditor *);
   wcA.hInstance = NULL; /* hInstance would register DLL-local class */
   wcA.hIcon = NULL;
   wcA.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM));




More information about the wine-cvs mailing list