procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add debugging code to w32fns.c.

Browse source 
src/w32fns.c (w32_wnd_proc) [ENABLE_CHECKING]: Add code to help
 identify the reasons for assertion violations in bug#14062 and
 similar ones.
This commit is contained in:
Eli Zaretskii 2013-03-28 11:18:16 +02:00
parent 121ab1cdc4
commit ef454cf704
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2013-03-28 Eli Zaretskii <eliz@gnu.org>
* w32fns.c (w32_wnd_proc) [ENABLE_CHECKING]: Add code to help
identify the reasons for assertion violations in bug#14062 and
similar ones.
* image.c (g_error_free) [WINDOWSNT]: Add DEF_IMGLIB_FN.
Reported by <rzl24ozi@gmail.com>.

18
src/w32fns.c
View file

@ -3155,8 +3155,26 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
form.ptCurrentPos.y = w32_system_caret_y;
form.rcArea.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, 0);
#ifdef ENABLE_CHECKING
/* Temporary code to catch crashes in computing form.rcArea.top. */
{
int wmbp = WINDOW_MENU_BAR_P (w);
int wtbp = WINDOW_TOOL_BAR_P (w);
struct frame *wf = WINDOW_XFRAME (w);
int fibw = FRAME_INTERNAL_BORDER_WIDTH (wf);
int wtel = WINDOW_TOP_EDGE_LINE (w);
int wflh = FRAME_LINE_HEIGHT (wf);
int wwhlp= WINDOW_WANTS_HEADER_LINE_P (w);
int chlh = CURRENT_HEADER_LINE_HEIGHT (w);
int whlh = (wwhlp ? chlh : 0);
form.rcArea.top = ((wmbp || wtbp) ? 0 : fibw) + wtel * wflh + whlh;
}
#else
form.rcArea.top = (WINDOW_TOP_EDGE_Y (w)
+ WINDOW_HEADER_LINE_HEIGHT (w));
#endif
form.rcArea.right = (WINDOW_BOX_RIGHT_EDGE_X (w)
- WINDOW_RIGHT_MARGIN_WIDTH (w)
- WINDOW_RIGHT_FRINGE_WIDTH (w));