Mercurial > hg > xemacs-beta

comparison src/glyphs-msw.c @ 4976:16112448d484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename xfree(FOO, TYPE) -> xfree(FOO) -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-04 Ben Wing <ben@xemacs.org> * alloc.c (release_breathing_space): * alloc.c (resize_string): * alloc.c (sweep_lcrecords_1): * alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): * alloc.c (ADDITIONAL_FREE_compiled_function): * alloc.c (compact_string_chars): * alloc.c (ADDITIONAL_FREE_string): * alloc.c (sweep_strings): * alloca.c (xemacs_c_alloca): * alsaplay.c (alsa_play_sound_file): * buffer.c (init_initial_directory): * buffer.h: * buffer.h (BUFFER_FREE): * console-stream.c (stream_delete_console): * console-tty.c (free_tty_console_struct): * data.c (Fnumber_to_string): * device-gtk.c (gtk_init_device): * device-gtk.c (free_gtk_device_struct): * device-gtk.c (gtk_delete_device): * device-msw.c (mswindows_delete_device): * device-msw.c (msprinter_delete_device): * device-tty.c (free_tty_device_struct): * device-tty.c (tty_delete_device): * device-x.c (x_init_device): * device-x.c (free_x_device_struct): * device-x.c (x_delete_device): * dialog-msw.c (handle_directory_dialog_box): * dialog-x.c (dbox_descriptor_to_widget_value): * dired-msw.c (Fmswindows_insert_directory): * dired.c (free_user_cache): * dired.c (user_name_completion_unwind): * doc.c (unparesseuxify_doc_string): * doc.c (Fsubstitute_command_keys): * doprnt.c (emacs_doprnt_1): * dumper.c (pdump_load_finish): * dumper.c (pdump_file_free): * dumper.c (pdump_file_unmap): * dynarr.c: * dynarr.c (Dynarr_free): * editfns.c (uncache_home_directory): * editfns.c (Fset_time_zone_rule): * elhash.c: * elhash.c (pdump_reorganize_hash_table): * elhash.c (maphash_unwind): * emacs.c (make_arg_list_1): * emacs.c (free_argc_argv): * emacs.c (sort_args): * emacs.c (Frunning_temacs_p): * emodules.c (attempt_module_delete): * eval.c (free_pointer): * event-Xt.c (unselect_filedesc): * event-Xt.c (emacs_Xt_select_process): * event-gtk.c (unselect_filedesc): * event-gtk.c (dragndrop_data_received): * event-msw.c (winsock_closer): * event-msw.c (mswindows_dde_callback): * event-msw.c (mswindows_wnd_proc): * event-stream.c (finalize_command_builder): * event-stream.c (free_command_builder): * extents.c (free_gap_array): * extents.c (free_extent_list): * extents.c (free_soe): * extents.c (extent_fragment_delete): * extents.c (extent_priority_sort_function): * file-coding.c (make_coding_system_1): * file-coding.c (coding_finalizer): * file-coding.c (set_coding_stream_coding_system): * file-coding.c (chain_finalize_coding_stream_1): * file-coding.c (chain_finalize): * file-coding.c (free_detection_state): * file-coding.c (coding_category_symbol_to_id): * fileio.c: * fileio.c (Ffile_name_directory): * fileio.c (if): * fileio.c (Ffile_symlink_p): * filelock.c (FREE_LOCK_INFO): * filelock.c (current_lock_owner): * font-mgr.c (Ffc_name_unparse): * font-mgr.c (Ffc_pattern_duplicate): * frame-gtk.c (gtk_delete_frame): * frame-msw.c (mswindows_delete_frame): * frame-msw.c (msprinter_delete_frame): * frame-x.c (x_cde_destroy_callback): * frame-x.c (Fcde_start_drag_internal): * frame-x.c (x_cde_transfer_callback): * frame-x.c (x_delete_frame): * frame.c (update_frame_title): * frame.c (Fset_frame_pointer): * gc.c (register_for_finalization): * gccache-gtk.c (free_gc_cache): * gccache-gtk.c (gc_cache_lookup): * gccache-x.c (free_gc_cache): * gccache-x.c (gc_cache_lookup): * glyphs-eimage.c: * glyphs-eimage.c (jpeg_instantiate_unwind): * glyphs-eimage.c (gif_instantiate_unwind): * glyphs-eimage.c (png_instantiate_unwind): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate_unwind): * glyphs-gtk.c (convert_EImage_to_GDKImage): * glyphs-gtk.c (gtk_finalize_image_instance): * glyphs-gtk.c (gtk_init_image_instance_from_eimage): * glyphs-gtk.c (gtk_xpm_instantiate): * glyphs-msw.c (convert_EImage_to_DIBitmap): * glyphs-msw.c (mswindows_init_image_instance_from_eimage): * glyphs-msw.c (mswindows_initialize_image_instance_mask): * glyphs-msw.c (xpm_to_eimage): * glyphs-msw.c (mswindows_xpm_instantiate): * glyphs-msw.c (xbm_create_bitmap_from_data): * glyphs-msw.c (mswindows_finalize_image_instance): * glyphs-x.c (convert_EImage_to_XImage): * glyphs-x.c (x_finalize_image_instance): * glyphs-x.c (x_init_image_instance_from_eimage): * glyphs-x.c (x_xpm_instantiate): * gui-x.c (free_popup_widget_value_tree): * hash.c (free_hash_table): * hash.c (grow_hash_table): * hash.c (pregrow_hash_table_if_necessary): * imgproc.c (build_EImage_quantable): * insdel.c (uninit_buffer_text): * intl-win32.c (convert_multibyte_to_internal_malloc): * intl.c: * intl.c (Fset_current_locale): * keymap.c: * keymap.c (where_is_recursive_mapper): * keymap.c (where_is_internal): * lisp.h: * lisp.h (xfree): * lstream.c (Lstream_close): * lstream.c (resizing_buffer_closer): * mule-coding.c: * mule-coding.c (iso2022_finalize_detection_state): * nt.c: * nt.c (mswindows_get_long_filename): * nt.c (nt_get_resource): * nt.c (init_mswindows_environment): * nt.c (get_cached_volume_information): * nt.c (mswindows_opendir): * nt.c (mswindows_closedir): * nt.c (mswindows_readdir): * nt.c (mswindows_stat): * nt.c (mswindows_getdcwd): * nt.c (Fmswindows_long_file_name): * ntplay.c (nt_play_sound_file): * ntplay.c (play_sound_data_1): * number-gmp.c (gmp_free): * number-gmp.c (init_number_gmp): * number-mp.c (bignum_to_string): * number-mp.c (BIGNUM_TO_TYPE): * number.c (bignum_print): * number.c (bignum_convfree): * number.c (ratio_print): * number.c (bigfloat_print): * number.c (bigfloat_finalize): * objects-gtk.c (gtk_finalize_color_instance): * objects-gtk.c (gtk_finalize_font_instance): * objects-msw.c (mswindows_finalize_color_instance): * objects-msw.c (mswindows_finalize_font_instance): * objects-tty.c (tty_finalize_color_instance): * objects-tty.c (tty_finalize_font_instance): * objects-tty.c (tty_font_list): * objects-x.c (x_finalize_color_instance): * objects-x.c (x_finalize_font_instance): * process.c: * process.c (finalize_process): * realpath.c: * redisplay.c (add_propagation_runes): * regex.c: * regex.c (xfree): * regex.c (REGEX_FREE_STACK): * regex.c (FREE_STACK_RETURN): * regex.c (regex_compile): * regex.c (regexec): * regex.c (regfree): * scrollbar-gtk.c (gtk_free_scrollbar_instance): * scrollbar-gtk.c (gtk_release_scrollbar_instance): * scrollbar-msw.c (mswindows_free_scrollbar_instance): * scrollbar-msw.c (unshow_that_mofo): * scrollbar-x.c (x_free_scrollbar_instance): * scrollbar-x.c (x_release_scrollbar_instance): * select-gtk.c (emacs_gtk_selection_handle): * select-msw.c (mswindows_own_selection): * select-x.c: * select-x.c (x_handle_selection_request): * select-x.c (unexpect_property_change): * select-x.c (x_handle_property_notify): * select-x.c (receive_incremental_selection): * select-x.c (x_get_window_property_as_lisp_data): * select-x.c (Fx_get_cutbuffer_internal): * specifier.c (finalize_specifier): * syntax.c (uninit_buffer_syntax_cache): * sysdep.c (qxe_allocating_getcwd): * sysdep.c (qxe_lstat): * sysdep.c (copy_in_passwd): * sysdep.c (qxe_ctime): * sysdep.c (closedir): * sysdep.c (DIRSIZ): * termcap.c (tgetent): * termcap.c (tprint): * tests.c (Ftest_data_format_conversion): * text.c (new_dfc_convert_copy_data): * text.h (eifree): * text.h (eito_alloca): * text.h (eito_external): * toolbar-msw.c (mswindows_output_toolbar): * ui-gtk.c (CONVERT_RETVAL): * ui-gtk.c (__allocate_object_storage): * unicode.c (free_from_unicode_table): * unicode.c (free_to_unicode_table): * unicode.c (free_charset_unicode_tables): * win32.c (mswindows_read_link_1): Rename: xfree(VAL, TYPE)->xfree(VAL) Command used: gr 'xfree *\((.*),.*\);' 'xfree (\1);' *.[ch] Followed by grepping for 'xfree.*,' and fixing anything left. Rationale: Having to specify the TYPE argument is annoying and error-prone. It was originally put in to work around warnings due to strict aliasing but years and years ago I rewrote it in a way that doesn't use the TYPE argument at all and no one has complained since then. (And anyway, XEmacs is far from ever being in compliance with strict aliasing and would require far-reaching changes to get that way.)
author Ben Wing <ben@xemacs.org>
date Thu, 04 Feb 2010 07:28:14 -0600
parents 19a72041c5ed
children 3c3c1d139863
comparison
equal deleted inserted replaced
4972:c448f4c38d65 4976:16112448d484
200 *bmp_data = xnew_array_and_zero (Binbyte, bpline * height); 200 *bmp_data = xnew_array_and_zero (Binbyte, bpline * height);
201 *bit_count = bpline * height; 201 *bit_count = bpline * height;
202 202
203 if (!bmp_data) 203 if (!bmp_data)
204 { 204 {
205 xfree (bmp_info, BITMAPINFO *); 205 xfree (bmp_info);
206 return NULL; 206 return NULL;
207 } 207 }
208 208
209 ip = pic; 209 ip = pic;
210 for (i = height-1; i >= 0; i--) { 210 for (i = height-1; i >= 0; i--) {
231 ncolors = qtable->num_active_colors; 231 ncolors = qtable->num_active_colors;
232 bmp_info = (BITMAPINFO *)xmalloc_and_zero (sizeof(BITMAPINFOHEADER) + 232 bmp_info = (BITMAPINFO *)xmalloc_and_zero (sizeof(BITMAPINFOHEADER) +
233 sizeof(RGBQUAD) * ncolors); 233 sizeof(RGBQUAD) * ncolors);
234 if (!bmp_info) 234 if (!bmp_info)
235 { 235 {
236 xfree (qtable, quant_table *); 236 xfree (qtable);
237 return NULL; 237 return NULL;
238 } 238 }
239 239
240 colortbl = (RGBQUAD *) (((Binbyte *) bmp_info) + 240 colortbl = (RGBQUAD *) (((Binbyte *) bmp_info) +
241 sizeof (BITMAPINFOHEADER)); 241 sizeof (BITMAPINFOHEADER));
249 *bmp_data = xnew_array_and_zero (Binbyte, bpline * height); 249 *bmp_data = xnew_array_and_zero (Binbyte, bpline * height);
250 *bit_count = bpline * height; 250 *bit_count = bpline * height;
251 251
252 if (!*bmp_data) 252 if (!*bmp_data)
253 { 253 {
254 xfree (qtable, quant_table *); 254 xfree (qtable);
255 xfree (bmp_info, BITMAPINFO *); 255 xfree (bmp_info);
256 return NULL; 256 return NULL;
257 } 257 }
258 258
259 /* build up an RGBQUAD colortable */ 259 /* build up an RGBQUAD colortable */
260 for (i = 0; i < qtable->num_active_colors; i++) 260 for (i = 0; i < qtable->num_active_colors; i++)
277 gr = *ip++; 277 gr = *ip++;
278 bl = *ip++; 278 bl = *ip++;
279 *dp++ = QUANT_GET_COLOR (qtable,rd,gr,bl); 279 *dp++ = QUANT_GET_COLOR (qtable,rd,gr,bl);
280 } 280 }
281 } 281 }
282 xfree (qtable, quant_table *); 282 xfree (qtable);
283 } 283 }
284 /* fix up the standard stuff */ 284 /* fix up the standard stuff */
285 bmp_info->bmiHeader.biWidth = width; 285 bmp_info->bmiHeader.biWidth = width;
286 bmp_info->bmiHeader.biHeight = height; 286 bmp_info->bmiHeader.biHeight = height;
287 bmp_info->bmiHeader.biPlanes = 1; 287 bmp_info->bmiHeader.biPlanes = 1;
472 0, 0, 0); 472 0, 0, 0);
473 else 473 else
474 image_instance_add_dibitmap (ii, bmp_info, bmp_data, bmp_bits, slice, 474 image_instance_add_dibitmap (ii, bmp_info, bmp_data, bmp_bits, slice,
475 instantiator); 475 instantiator);
476 476
477 xfree (bmp_info, BITMAPINFO *); 477 xfree (bmp_info);
478 xfree (bmp_data, Binbyte *); 478 xfree (bmp_data);
479 } 479 }
480 } 480 }
481 481
482 inline static void 482 inline static void
483 set_mono_pixel (Binbyte *bits, 483 set_mono_pixel (Binbyte *bits,
541 not outputting strict-aliasing 541 not outputting strict-aliasing
542 complaints */ 542 complaints */
543 (void **) (void *) &and_bits, 543 (void **) (void *) &and_bits,
544 0,0))) 544 0,0)))
545 { 545 {
546 xfree (bmp_info, BITMAPINFO *); 546 xfree (bmp_info);
547 return; 547 return;
548 } 548 }
549 549
550 old = SelectObject (hcdc, IMAGE_INSTANCE_MSWINDOWS_BITMAP (image)); 550 old = SelectObject (hcdc, IMAGE_INSTANCE_MSWINDOWS_BITMAP (image));
551 /* build up an in-memory set of bits to mess with */ 551 /* build up an in-memory set of bits to mess with */
568 height, 568 height,
569 dibits, 569 dibits,
570 bmp_info, 570 bmp_info,
571 DIB_RGB_COLORS) <= 0) 571 DIB_RGB_COLORS) <= 0)
572 { 572 {
573 xfree (bmp_info, BITMAPINFO *); 573 xfree (bmp_info);
574 return; 574 return;
575 } 575 }
576 576
577 /* now set the colored bits in the mask and transparent ones to 577 /* now set the colored bits in the mask and transparent ones to
578 black in the original */ 578 black in the original */
600 height, 600 height,
601 dibits, 601 dibits,
602 bmp_info, 602 bmp_info,
603 DIB_RGB_COLORS); 603 DIB_RGB_COLORS);
604 604
605 xfree (bmp_info, BITMAPINFO *); 605 xfree (bmp_info);
606 xfree (dibits, Binbyte *); 606 xfree (dibits);
607 607
608 SelectObject(hcdc, old); 608 SelectObject(hcdc, old);
609 609
610 IMAGE_INSTANCE_MSWINDOWS_MASK (image) = mask; 610 IMAGE_INSTANCE_MSWINDOWS_MASK (image) = mask;
611 } 611 }
852 852
853 /* build a color table to speed things up */ 853 /* build a color table to speed things up */
854 colortbl = xnew_array_and_zero (COLORREF, xpmimage.ncolors); 854 colortbl = xnew_array_and_zero (COLORREF, xpmimage.ncolors);
855 if (!colortbl) 855 if (!colortbl)
856 { 856 {
857 xfree (*data, Binbyte *); 857 xfree (*data);
858 XpmFreeXpmImage (&xpmimage); 858 XpmFreeXpmImage (&xpmimage);
859 XpmFreeXpmInfo (&xpminfo); 859 XpmFreeXpmInfo (&xpminfo);
860 return 0; 860 return 0;
861 } 861 }
862 862
908 xpmimage.colorTable[i].c_color); 908 xpmimage.colorTable[i].c_color);
909 goto label_found_color; 909 goto label_found_color;
910 } 910 }
911 911
912 label_no_color: 912 label_no_color:
913 xfree (*data, Binbyte *); 913 xfree (*data);
914 xfree (colortbl, COLORREF *); 914 xfree (colortbl);
915 XpmFreeXpmImage (&xpmimage); 915 XpmFreeXpmImage (&xpmimage);
916 XpmFreeXpmInfo (&xpminfo); 916 XpmFreeXpmInfo (&xpminfo);
917 return 0; 917 return 0;
918 918
919 label_found_color:; 919 label_found_color:;
935 *x_hot = xpminfo.x_hotspot; 935 *x_hot = xpminfo.x_hotspot;
936 *y_hot = xpminfo.y_hotspot; 936 *y_hot = xpminfo.y_hotspot;
937 937
938 XpmFreeXpmImage (&xpmimage); 938 XpmFreeXpmImage (&xpmimage);
939 XpmFreeXpmInfo (&xpminfo); 939 XpmFreeXpmInfo (&xpminfo);
940 xfree (colortbl, COLORREF *); 940 xfree (colortbl);
941 return TRUE; 941 return TRUE;
942 } 942 }
943 943
944 static void 944 static void
945 mswindows_xpm_instantiate (Lisp_Object image_instance, 945 mswindows_xpm_instantiate (Lisp_Object image_instance,
986 986
987 if (color_symbols) 987 if (color_symbols)
988 { 988 {
989 while (nsymbols--) 989 while (nsymbols--)
990 { 990 {
991 xfree (color_symbols[nsymbols].name, Ibyte *); 991 xfree (color_symbols[nsymbols].name);
992 } 992 }
993 xfree(color_symbols, struct color_symbol *); 993 xfree (color_symbols);
994 } 994 }
995 995
996 /* build a bitmap from the eimage */ 996 /* build a bitmap from the eimage */
997 if (!(bmp_info = convert_EImage_to_DIBitmap (device, width, height, eimage, 997 if (!(bmp_info = convert_EImage_to_DIBitmap (device, width, height, eimage,
998 &bmp_bits, &bmp_data))) 998 &bmp_bits, &bmp_data)))
999 { 999 {
1000 signal_image_error ("XPM to EImage conversion failed", 1000 signal_image_error ("XPM to EImage conversion failed",
1001 image_instance); 1001 image_instance);
1002 } 1002 }
1003 xfree (eimage, Binbyte *); 1003 xfree (eimage);
1004 1004
1005 /* Now create the pixmap and set up the image instance */ 1005 /* Now create the pixmap and set up the image instance */
1006 init_image_instance_from_dibitmap (ii, bmp_info, dest_mask, 1006 init_image_instance_from_dibitmap (ii, bmp_info, dest_mask,
1007 bmp_data, bmp_bits, 1, instantiator, 1007 bmp_data, bmp_bits, 1, instantiator,
1008 x_hot, y_hot, transp); 1008 x_hot, y_hot, transp);
1009 1009
1010 xfree (bmp_info, BITMAPINFO *); 1010 xfree (bmp_info);
1011 xfree (bmp_data, Binbyte *); 1011 xfree (bmp_data);
1012 } 1012 }
1013 #endif /* HAVE_XPM */ 1013 #endif /* HAVE_XPM */
1014 1014
1015 /********************************************************************** 1015 /**********************************************************************
1016 * BMP * 1016 * BMP *
1359 1359
1360 new_data = xnew_array_and_zero (Binbyte, height * new_width); 1360 new_data = xnew_array_and_zero (Binbyte, height * new_width);
1361 1361
1362 if (!new_data) 1362 if (!new_data)
1363 { 1363 {
1364 xfree (bmp_info, BITMAPINFO *); 1364 xfree (bmp_info);
1365 return NULL; 1365 return NULL;
1366 } 1366 }
1367 1367
1368 for (i = 0; i < height; i++) 1368 for (i = 0; i < height; i++)
1369 { 1369 {
1410 bmp_info, 1410 bmp_info,
1411 DIB_RGB_COLORS, 1411 DIB_RGB_COLORS,
1412 &bmp_buf, 1412 &bmp_buf,
1413 0,0); 1413 0,0);
1414 1414
1415 xfree (bmp_info, BITMAPINFO *); 1415 xfree (bmp_info);
1416 1416
1417 if (!bitmap || !bmp_buf) 1417 if (!bitmap || !bmp_buf)
1418 { 1418 {
1419 xfree (new_data, Binbyte *); 1419 xfree (new_data);
1420 return NULL; 1420 return NULL;
1421 } 1421 }
1422 1422
1423 /* copy in the actual bitmap */ 1423 /* copy in the actual bitmap */
1424 memcpy (bmp_buf, new_data, height * new_width); 1424 memcpy (bmp_buf, new_data, height * new_width);
1425 xfree (new_data, Binbyte *); 1425 xfree (new_data);
1426 1426
1427 return bitmap; 1427 return bitmap;
1428 } 1428 }
1429 1429
1430 /* Given inline data for a mono pixmap, initialize the given 1430 /* Given inline data for a mono pixmap, initialize the given
1782 { 1782 {
1783 if (IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (p, i)) 1783 if (IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (p, i))
1784 DeleteObject (IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (p, i)); 1784 DeleteObject (IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (p, i));
1785 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (p, i) = 0; 1785 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (p, i) = 0;
1786 } 1786 }
1787 xfree (IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (p), HBITMAP *); 1787 xfree (IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (p));
1788 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (p) = 0; 1788 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (p) = 0;
1789 } 1789 }
1790 if (IMAGE_INSTANCE_MSWINDOWS_MASK (p)) 1790 if (IMAGE_INSTANCE_MSWINDOWS_MASK (p))
1791 DeleteObject (IMAGE_INSTANCE_MSWINDOWS_MASK (p)); 1791 DeleteObject (IMAGE_INSTANCE_MSWINDOWS_MASK (p));
1792 IMAGE_INSTANCE_MSWINDOWS_MASK (p) = 0; 1792 IMAGE_INSTANCE_MSWINDOWS_MASK (p) = 0;
1796 } 1796 }
1797 } 1797 }
1798 1798
1799 if (p->data) 1799 if (p->data)
1800 { 1800 {
1801 xfree (p->data, void *); 1801 xfree (p->data);
1802 p->data = 0; 1802 p->data = 0;
1803 } 1803 }
1804 } 1804 }
1805 1805
1806 /************************************************************************/ 1806 /************************************************************************/