Mercurial > hg > xemacs-beta
comparison src/glyphs-msw.c @ 851:e7ee5f8bde58
[xemacs-hg @ 2002-05-23 11:46:08 by ben]
fix for raymond toy's crash, alloca crashes, some recover-session improvements
files.el: Recover-session improvements: Only show session files where some
files can actually be recovered, and show in chronological order.
subr.el, menubar-items.el: As promised to rms, the functionality in
truncate-string-with-continuation-dots has been merged into
truncate-string-to-width. Change callers in menubar-items.el.
select.el: Document some of these funs better. Fix problem where we were
doing own-clipboard twice.
Makefile.in.in: Add alloca.o. Ensure that alloca.s doesn't compile into alloca.o,
but allocax.o (not that it's currently used or anything.)
EmacsFrame.c, abbrev.c, alloc.c, alloca.c, callint.c, callproc.c, config.h.in, device-msw.c, device-x.c, dired.c, doc.c, editfns.c, emacs.c, emodules.c, eval.c, event-Xt.c, event-msw.c, event-stream.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-x.c, input-method-xlib.c, intl-win32.c, lisp.h, lread.c, menubar-gtk.c, menubar-msw.c, menubar.c, mule-wnnfns.c, nt.c, objects-msw.c, process-nt.c, realpath.c, redisplay-gtk.c, redisplay-output.c, redisplay-x.c, redisplay.c, search.c, select-msw.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: Fix Raymond Toy's crash. Repeat to self: 2^21 - 1 is NOT the
same as (2 << 21) - 1.
Fix crashes due to excessive alloca(). replace alloca() with
ALLOCA(), which calls the C alloca() [which uses xmalloc()]
when the size is too big. Insert in various places calls to
try to flush the C alloca() stored info if there is any.
Add MALLOC_OR_ALLOCA(), for places that expect to be alloca()ing
large blocks. This xmalloc()s when too large and records an
unwind-protect to free -- relying on the caller to unbind_to()
elsewhere in the function. Use it in concat().
Use MALLOC instead of ALLOCA in select-msw.c.
xemacs.mak: Add alloca.o.
author | ben |
---|---|
date | Thu, 23 May 2002 11:46:46 +0000 |
parents | 6728e641994e |
children | 2b6fa2618f76 |
comparison
equal
deleted
inserted
replaced
850:f915ad7befaf | 851:e7ee5f8bde58 |
---|---|
1672 } | 1672 } |
1673 | 1673 |
1674 if (emsg) | 1674 if (emsg) |
1675 signal_image_error_2 (emsg, data, Qimage); | 1675 signal_image_error_2 (emsg, data, Qimage); |
1676 | 1676 |
1677 bp = bits = (UChar_Binary *) alloca (PIXELS / 8); | 1677 bp = bits = (UChar_Binary *) ALLOCA (PIXELS / 8); |
1678 | 1678 |
1679 /* the compface library exports char F[], which uses a single byte per | 1679 /* the compface library exports char F[], which uses a single byte per |
1680 pixel to represent a 48x48 bitmap. Yuck. */ | 1680 pixel to represent a 48x48 bitmap. Yuck. */ |
1681 for (i = 0, p = F; i < (PIXELS / 8); ++i) | 1681 for (i = 0, p = F; i < (PIXELS / 8); ++i) |
1682 { | 1682 { |
2802 HWND wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii); | 2802 HWND wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii); |
2803 /* get the text from a control */ | 2803 /* get the text from a control */ |
2804 if (EQ (prop, Q_text)) | 2804 if (EQ (prop, Q_text)) |
2805 { | 2805 { |
2806 Charcount tchar_len = qxeSendMessage (wnd, WM_GETTEXTLENGTH, 0, 0); | 2806 Charcount tchar_len = qxeSendMessage (wnd, WM_GETTEXTLENGTH, 0, 0); |
2807 Extbyte *buf = (Extbyte *) alloca (XETCHAR_SIZE * (tchar_len + 1)); | 2807 Extbyte *buf = (Extbyte *) ALLOCA (XETCHAR_SIZE * (tchar_len + 1)); |
2808 | 2808 |
2809 qxeSendMessage (wnd, WM_GETTEXT, (WPARAM)tchar_len + 1, (LPARAM) buf); | 2809 qxeSendMessage (wnd, WM_GETTEXT, (WPARAM)tchar_len + 1, (LPARAM) buf); |
2810 return build_tstr_string (buf); | 2810 return build_tstr_string (buf); |
2811 } | 2811 } |
2812 return Qunbound; | 2812 return Qunbound; |
2839 if (EQ (prop, Q_text)) | 2839 if (EQ (prop, Q_text)) |
2840 { | 2840 { |
2841 long item = qxeSendMessage (wnd, CB_GETCURSEL, 0, 0); | 2841 long item = qxeSendMessage (wnd, CB_GETCURSEL, 0, 0); |
2842 Charcount tchar_len = qxeSendMessage (wnd, CB_GETLBTEXTLEN, | 2842 Charcount tchar_len = qxeSendMessage (wnd, CB_GETLBTEXTLEN, |
2843 (WPARAM)item, 0); | 2843 (WPARAM)item, 0); |
2844 Extbyte *buf = (Extbyte *) alloca (XETCHAR_SIZE * (tchar_len + 1)); | 2844 Extbyte *buf = (Extbyte *) ALLOCA (XETCHAR_SIZE * (tchar_len + 1)); |
2845 qxeSendMessage (wnd, CB_GETLBTEXT, (WPARAM)item, (LPARAM) buf); | 2845 qxeSendMessage (wnd, CB_GETLBTEXT, (WPARAM)item, (LPARAM) buf); |
2846 return build_tstr_string (buf); | 2846 return build_tstr_string (buf); |
2847 } | 2847 } |
2848 return Qunbound; | 2848 return Qunbound; |
2849 } | 2849 } |