Mercurial > hg > xemacs-beta

diff src/event-msw.c @ 5920:0f2338afbabf cygwin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minimum necessary to get started: sufficient to compile OK, run -nw, but not with window
author Henry Thompson <ht@markup.co.uk>
date Mon, 21 Apr 2014 11:42:50 +0100
parents 56144c8593a8
children 68639fb08af8
line wrap: on
line diff
--- a/src/event-msw.c	Thu Dec 16 11:20:17 2021 +0000
+++ b/src/event-msw.c	Mon Apr 21 11:42:50 2014 +0100
@@ -1830,7 +1830,7 @@
 				  LISP_STRING_TO_TSTR (name),
 				  XEUNICODE_P ? CP_WINUNICODE : CP_WINANSI);
 
-  Fput(token, QHSZ, make_float ((int)hsz));
+  Fput(token, QHSZ, make_float ((intptr_t)hsz));
   Vdde_advise_items = Fcons (token, Vdde_advise_items);
 
   RETURN_UNGCPRO (token);
@@ -1855,7 +1855,7 @@
   val = Fget (item, QHSZ, Qnil);
   if (!FLOATP (val))
     return Qnil;
-  hsz = (HSZ)(int)XFLOAT_DATA (val);
+  hsz = (HSZ)(intptr_t)XFLOAT_DATA (val);
   DdeFreeStringHandle (mswindows_dde_mlid, hsz);
   Vdde_advise_items = delq_no_quit (item, Vdde_advise_items);
   return Qnil;
@@ -1879,7 +1879,7 @@
   val = Fget (item, QHSZ, Qnil);
   if (!FLOATP (val))
     return Qnil;
-  hsz = (HSZ)(int)XFLOAT_DATA (val);
+  hsz = (HSZ)(intptr_t)XFLOAT_DATA (val);
 
   Fset (item, data);
   DdePostAdvise (mswindows_dde_mlid, mswindows_dde_topic_eval, hsz);
@@ -1941,7 +1941,7 @@
 		val = Fget (elt, QHSZ, Qnil);
 		if (!FLOATP (val))
 		  continue;
-		hsz = (HSZ) (int) XFLOAT_DATA (val);
+		hsz = (HSZ)(intptr_t) XFLOAT_DATA (val);
 		if (!DdeCmpStringHandles (hszItem, hsz))
 		  return (HDDEDATA) TRUE;
 	      }
@@ -2005,7 +2005,7 @@
 		val = Fget (elt, QHSZ, Qnil);
 		if (!FLOATP (val))
 		  continue;
-		hsz = (HSZ) (int) XFLOAT_DATA (val);
+		hsz = (HSZ)(intptr_t) XFLOAT_DATA (val);
 		if (!DdeCmpStringHandles (hszItem, hsz))
 		  args[1] = Fsymbol_value (elt);
 	      }
@@ -2502,7 +2502,7 @@
     debug_output_mswin_message (hwnd, message_, wParam, lParam);
 #endif /* DEBUG_XEMACS */
 
-  assert (!qxeGetWindowLong (hwnd, GWL_USERDATA));
+  assert (!qxeGetWindowLongPtr (hwnd, GWLP_USERDATA));
   switch (message_)
     {
     case WM_DESTROYCLIPBOARD:
@@ -3619,7 +3619,7 @@
 	/* if we get an opportunity to paint a widget then do so if
 	   there is an appropriate face */
 	HWND crtlwnd = (HWND) lParam;
-	LONG ii = qxeGetWindowLong (crtlwnd, GWL_USERDATA);
+	LONG_PTR ii = qxeGetWindowLongPtr (crtlwnd, GWLP_USERDATA);
 	if (ii)
 	  {
 	    Lisp_Object image_instance;
@@ -4139,7 +4139,7 @@
 Lisp_Object
 mswindows_find_frame (HWND hwnd)
 {
-  LONG l = qxeGetWindowLong (hwnd, XWL_FRAMEOBJ);
+  LONG_PTR l = qxeGetWindowLongPtr (hwnd, XWL_FRAMEOBJ);
   Lisp_Object f;
   if (l == 0)
     {
@@ -4149,7 +4149,7 @@
       assert (!NILP (Vmswindows_frame_being_created));
       return Vmswindows_frame_being_created;
     }
-  f = GET_LISP_FROM_VOID ((void *) l);
+  f = GET_LISP_FROM_VOID ((intptr_t) l);
   return f;
 }
 
@@ -4179,7 +4179,7 @@
 {
   if (XEVENT_TYPE (ev) == timeout_event)
     {
-      if ((int) data == XEVENT_TIMEOUT_INTERVAL_ID (ev))
+      if ((intptr_t) data == XEVENT_TIMEOUT_INTERVAL_ID (ev))
 	return 1;
     }
 
@@ -4965,8 +4965,8 @@
 
   if (debug_mswindows_events > 1)
     {
-      stderr_out (" wparam=%d lparam=%d hwnd=%x frame: ",
-		  wParam, (int) lParam, (unsigned int) hwnd);
+      stderr_out (" wparam=%d lparam=%d hwnd=%p frame: ",
+		  (int)wParam, (int) lParam, hwnd);
       debug_print (frame);
       if (message_ == WM_WINDOWPOSCHANGED ||
           message_ == WM_WINDOWPOSCHANGING)