Mercurial > hg > xemacs-beta
annotate netinstall/desktop.cc @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 6504113e7c2d |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* The purpose of this file is to manage all the desktop setup, such | |
| 17 as start menu, batch files, desktop icons, and shortcuts. Note | |
| 18 that unlike other do_* functions, this one is called directly from | |
| 19 install.cc */ | |
| 20 | |
| 21 | |
| 22 #include "win32.h" | |
| 23 #include <shlobj.h> | |
| 24 | |
| 25 #include <io.h> | |
| 26 #include <stdio.h> | |
| 27 #include <stdlib.h> | |
| 28 #ifndef WIN32_NATIVE | |
| 29 #include <unistd.h> | |
| 30 #endif | |
| 31 | |
| 32 #include "resource.h" | |
| 33 #include "ini.h" | |
| 34 #include "msg.h" | |
| 35 #include "state.h" | |
| 36 #include "concat.h" | |
| 37 #include "mkdir.h" | |
| 38 #include "dialog.h" | |
| 39 #include "version.h" | |
| 40 #include "reginfo.h" | |
| 41 #include "regedit.h" | |
| 42 #include "port.h" | |
| 657 | 43 #include "log.h" |
| 707 | 44 #include "desktop.h" |
| 448 | 45 |
| 46 extern "C" { | |
| 47 void make_link_2 (char *exepath, char *args, char *icon, char *lname); | |
| 48 }; | |
| 49 | |
| 50 static OSVERSIONINFO verinfo; | |
| 51 | |
| 52 /* Lines starting with '@' are conditionals - include 'N' for NT, | |
| 53 '5' for Win95, '8' for Win98, '*' for all, like this: | |
| 54 echo foo | |
| 55 @N8 | |
| 56 echo NT or 98 | |
| 57 @* | |
| 58 */ | |
| 59 | |
| 60 #define COMMAND9XARGS "/E:4096 /c" | |
| 61 #define COMMAND9XEXE "\\command.com" | |
| 62 | |
| 63 static char *iconname; | |
| 64 static char *batname; | |
| 666 | 65 static char *uninstname; |
| 448 | 66 |
| 67 static void | |
| 666 | 68 make_link (char *linkpath, char *title, char *target, char* args) |
| 448 | 69 { |
| 666 | 70 #if 0 |
| 448 | 71 char argbuf[_MAX_PATH]; |
| 666 | 72 #endif |
| 448 | 73 char *fname = concat (linkpath, "/", title, ".lnk", 0); |
| 74 | |
| 75 if (_access (fname, 0) == 0) | |
| 76 return; /* already exists */ | |
| 77 | |
| 666 | 78 msg ("make_link %s, %s, %s, %s\n", fname, title, target, args); |
| 448 | 79 |
| 80 mkdir_p (0, fname); | |
| 81 | |
| 666 | 82 char *exepath; |
| 83 #if 0 | |
| 448 | 84 /* If we are running Win9x, build a command line. */ |
| 85 if (verinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) | |
| 86 { | |
| 666 | 87 #endif |
| 448 | 88 exepath = target; |
| 666 | 89 #if 0 |
| 448 | 90 } |
| 91 else | |
| 92 { | |
| 93 char windir[MAX_PATH]; | |
| 94 | |
| 95 GetWindowsDirectory (windir, sizeof (windir)); | |
| 96 exepath = concat (windir, COMMAND9XEXE, 0); | |
| 97 sprintf (argbuf, "%s %s", COMMAND9XARGS, target); | |
| 98 args = argbuf; | |
| 99 } | |
| 666 | 100 #endif |
| 448 | 101 msg ("make_link_2 (%s, %s, %s, %s)", exepath, args, iconname, fname); |
| 666 | 102 make_link_2 (backslash (exepath), args, iconname, fname); |
| 448 | 103 } |
| 104 | |
| 105 static char* | |
| 707 | 106 find_xemacs_version () |
| 107 { | |
| 108 char* v = strdup (xemacs_package->info[xemacs_package->trust].version); | |
| 109 char* dash = strrchr (v, '-'); | |
| 110 if (dash) | |
| 111 *dash = 0; | |
| 112 return v; | |
| 113 } | |
| 114 | |
| 115 static char* | |
| 448 | 116 find_xemacs_exe_path () |
| 117 { | |
| 118 if (xemacs_package->type == TY_CYGWIN) | |
| 119 return backslash (concat (root_dir, "/bin/", XEMACS_CYGWIN_ARCH_NAME, 0)); | |
| 120 else | |
| 121 return backslash (concat (root_dir, "\\XEmacs-", | |
| 707 | 122 find_xemacs_version (), |
| 448 | 123 "\\", XEMACS_NATIVE_ARCH_NAME, 0)); |
| 124 } | |
| 125 | |
| 666 | 126 char* |
| 448 | 127 find_xemacs_exe_name () |
| 128 { | |
| 462 | 129 /* Hack to support older versions. */ |
| 130 if (strncmp (xemacs_package->info[xemacs_package->trust].version, | |
| 131 "21.1", 4) == 0) | |
| 132 return strdup ("runemacs.exe"); | |
| 133 else if (xemacs_package->type == TY_CYGWIN) | |
| 448 | 134 return backslash (concat ("xemacs-", |
| 707 | 135 find_xemacs_version (), |
| 448 | 136 ".exe", 0)); |
| 137 else | |
| 138 return strdup ("xemacs.exe"); | |
| 139 } | |
| 140 | |
| 141 static void | |
| 657 | 142 remove_link (char *linkpath, char* title) |
| 143 { | |
| 666 | 144 if (title) |
| 145 { | |
| 146 char *fname = backslash (concat (linkpath, "/", title, ".lnk", 0)); | |
| 147 msg ("remove_link %s, %s\n", fname, title); | |
| 148 if (_access (fname, 0) != 0) | |
| 149 return; /* doesn't exist */ | |
| 150 _unlink (fname); | |
| 151 } | |
| 152 else | |
| 153 { | |
| 154 msg ("remove_link %s\n", linkpath); | |
| 155 if (_access (linkpath, 0) != 0) | |
| 156 return; /* doesn't exist */ | |
| 157 _rmdir (linkpath); | |
| 158 } | |
| 657 | 159 } |
| 160 | |
| 161 static void | |
| 666 | 162 start_menu (char *title, char *target, int rem, char* args) |
| 448 | 163 { |
| 164 char path[_MAX_PATH]; | |
| 165 LPITEMIDLIST id; | |
| 166 int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; | |
| 167 SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, &id); | |
| 168 SHGetPathFromIDList (id, path); | |
| 169 // following lines added because it appears Win95 does not use common programs | |
| 170 // unless it comes into play when multiple users for Win95 is enabled | |
| 171 msg("Program directory for program link: %s",path); | |
| 172 if ( strlen(path) == 0) { | |
| 173 SHGetSpecialFolderLocation (NULL, CSIDL_PROGRAMS, &id); | |
| 174 SHGetPathFromIDList (id, path); | |
| 175 msg("Program directory for program link changed to: %s",path); | |
| 176 } | |
| 177 // end of Win95 addition | |
| 666 | 178 strcat (path, "\\"); |
| 448 | 179 strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME); |
| 666 | 180 if (rem == 0) |
| 181 make_link (path, title, target, args); | |
| 657 | 182 else |
| 183 remove_link (path, title); | |
| 448 | 184 } |
| 185 | |
| 186 static void | |
| 666 | 187 desktop_icon (char *title, char *target, int rem) |
| 448 | 188 { |
| 189 char path[_MAX_PATH]; | |
| 190 LPITEMIDLIST id; | |
| 191 int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; | |
| 192 //SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_DESKTOP : CSIDL_COMMON_DESKTOPDIRECTORY, &id); | |
| 193 SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, &id); | |
| 194 SHGetPathFromIDList (id, path); | |
| 195 // following lines added because it appears Win95 does not use common programs | |
| 196 // unless it comes into play when multiple users for Win95 is enabled | |
| 197 msg("Desktop directory for desktop link: %s",path); | |
| 198 if ( strlen(path) == 0) { | |
| 199 SHGetSpecialFolderLocation (NULL, CSIDL_DESKTOPDIRECTORY, &id); | |
| 200 SHGetPathFromIDList (id, path); | |
| 201 msg("Desktop directory for deskop link changed to: %s",path); | |
| 202 } | |
| 203 // end of Win95 addition | |
| 666 | 204 if (rem == 0) |
| 205 make_link (path, title, target, ""); | |
| 657 | 206 else |
| 207 remove_link (path, title); | |
| 448 | 208 } |
| 209 | |
| 210 static void | |
| 211 save_icon () | |
| 212 { | |
| 213 iconname = backslash (concat (root_dir, XEMACS_RESOURCE_DIR, | |
| 214 "xemacs.ico", 0)); | |
| 215 | |
| 216 HRSRC rsrc = FindResource (NULL, "XEMACS.ICON", "FILE"); | |
| 217 if (rsrc == NULL) | |
| 218 { | |
| 219 fatal ("FindResource failed"); | |
| 220 } | |
| 221 HGLOBAL res = LoadResource (NULL, rsrc); | |
| 222 char *data = (char *) LockResource (res); | |
| 223 int len = SizeofResource (NULL, rsrc); | |
| 224 | |
| 225 FILE *f = fopen (iconname, "wb"); | |
| 226 if (f) | |
| 227 { | |
| 228 fwrite (data, 1, len, f); | |
| 229 fclose (f); | |
| 230 } | |
| 231 } | |
| 232 | |
| 657 | 233 void |
| 707 | 234 remove_xemacs_setup() |
| 657 | 235 { |
| 707 | 236 if (xemacs_package == 0) |
| 237 return; | |
| 238 | |
| 666 | 239 start_menu ("XEmacs", 0, 1, 0); |
| 657 | 240 desktop_icon ("XEmacs", 0, 1); |
| 241 | |
| 666 | 242 #define FROB(exe) remove_app_path (exe) |
| 707 | 243 FROB (find_xemacs_exe_name ()); |
| 244 FROB ("runemacs.exe"); | |
| 245 FROB ("xemacs.exe"); | |
| 657 | 246 #undef FROB |
| 707 | 247 } |
| 248 | |
| 249 void | |
| 250 remove_desktop_setup() | |
| 251 { | |
| 252 remove_xemacs_setup(); | |
| 253 start_menu ("Uninstall XEmacs", 0, 1, 0); | |
| 254 start_menu (0, 0, 1, 0); | |
| 657 | 255 } |
| 256 | |
| 448 | 257 static void |
| 258 do_desktop_setup() | |
| 259 { | |
| 260 save_icon (); | |
| 261 | |
| 262 if (root_menu && batname) { | |
| 666 | 263 start_menu ("XEmacs", batname, 0, ""); |
| 264 start_menu ("Uninstall XEmacs", uninstname, 0, "-u"); | |
| 448 | 265 } |
| 266 | |
| 267 if (root_desktop && batname) { | |
| 657 | 268 desktop_icon ("XEmacs", batname, 0); |
| 448 | 269 } |
| 270 | |
| 271 // set regkeys for the application | |
| 272 if (xemacs_package != 0) | |
| 273 { | |
| 274 int issystem = (root_scope == IDC_ROOT_SYSTEM ? 1 : 0); | |
| 657 | 275 if (xemacs_package->type == TY_NATIVE |
| 276 || xemacs_package->type == TY_CYGWIN) | |
| 448 | 277 { |
| 657 | 278 if (xemacs_package->type == TY_NATIVE) |
| 279 { | |
| 448 | 280 #define FROB(exe) set_app_path ((exe), \ |
| 281 find_xemacs_exe_path (), \ | |
| 282 issystem) | |
| 657 | 283 FROB (find_xemacs_exe_name ()); |
| 284 FROB ("runemacs.exe"); | |
| 285 FROB ("xemacs.exe"); | |
| 448 | 286 #undef FROB |
| 657 | 287 } |
| 288 else if (xemacs_package->type == TY_CYGWIN) | |
| 289 { | |
| 290 int junk; | |
| 291 char* root = find_cygwin_root (&junk); | |
| 448 | 292 #define FROB(exe) set_app_path ((exe), \ |
| 293 concat (find_xemacs_exe_path (), ";", \ | |
| 294 root, "\\bin;", \ | |
| 295 root, "\\usr\\bin", 0), \ | |
| 296 issystem) | |
| 657 | 297 FROB (find_xemacs_exe_name ()); |
| 298 FROB ("runemacs.exe"); | |
| 299 FROB ("xemacs.exe"); | |
| 448 | 300 #undef FROB |
| 657 | 301 } |
| 302 set_install_path (find_xemacs_exe_path(), issystem); | |
| 303 } | |
| 304 // Register file types | |
| 305 if (batname) | |
| 306 { | |
| 307 if (reg_java) | |
| 308 { | |
| 309 log (0, "Registering .java files"); | |
| 310 setup_explorer ("java", "Java Source file", batname); | |
| 311 setup_explorer ("jav", "Java Source file", batname); | |
| 312 } | |
| 313 if (reg_cpp) | |
| 314 { | |
| 315 log (0, "Registering .cpp files"); | |
| 316 setup_explorer ("cpp", "C++ Source file", batname); | |
| 317 setup_explorer ("cc", "C++ Source file", batname); | |
| 819 | 318 setup_explorer ("cxx", "C++ Source file", batname); |
| 657 | 319 setup_explorer ("hh", "C++ Header file", batname); |
| 819 | 320 setup_explorer ("hpp", "C++ Header file", batname); |
| 321 setup_explorer ("hxx", "C++ Header file", batname); | |
| 657 | 322 } |
| 323 if (reg_c) | |
| 324 { | |
| 325 log (0, "Registering .c files"); | |
| 326 setup_explorer ("c", "C Source file", batname); | |
| 327 setup_explorer ("h", "C Header file", batname); | |
| 328 } | |
| 329 if (reg_elisp) | |
| 330 { | |
| 331 log (0, "Registering .el files"); | |
| 332 setup_explorer ("el", "E-Lisp Source file", batname); | |
| 333 } | |
| 334 if (reg_txt) | |
| 335 { | |
| 336 log (0, "Registering .txt files"); | |
| 337 setup_explorer ("txt", "Text file", batname); | |
| 338 } | |
| 672 | 339 if (reg_idl) |
| 340 { | |
| 341 log (0, "Registering .idl files"); | |
| 342 setup_explorer ("idl", "OMG IDL file", batname); | |
| 343 } | |
| 448 | 344 } |
| 345 } | |
| 346 } | |
| 347 | |
| 348 static int da[] = { IDC_ROOT_DESKTOP, 0 }; | |
| 349 static int ma[] = { IDC_ROOT_MENU, 0 }; | |
| 350 | |
| 657 | 351 static int ct[] = { IDC_C_TYPE, 0 }; |
| 352 static int javat[] = { IDC_JAVA_TYPE, 0 }; | |
| 353 static int cppt[] = { IDC_CPP_TYPE, 0 }; | |
| 354 static int elispt[] = { IDC_ELISP_TYPE, 0 }; | |
| 355 static int txtt[] = { IDC_TXT_TYPE, 0 }; | |
| 672 | 356 static int idlt[] = { IDC_IDL_TYPE, 0 }; |
| 657 | 357 |
| 448 | 358 static void |
| 359 check_if_enable_next (HWND h) | |
| 360 { | |
| 361 EnableWindow (GetDlgItem (h, IDOK), 1); | |
| 362 } | |
| 363 | |
| 364 static void | |
| 365 load_dialog (HWND h) | |
| 366 { | |
| 367 rbset (h, da, root_desktop); | |
| 368 rbset (h, ma, root_menu); | |
| 657 | 369 rbset (h, ct, reg_c); |
| 370 rbset (h, javat, reg_java); | |
| 371 rbset (h, cppt, reg_cpp); | |
| 372 rbset (h, elispt, reg_elisp); | |
| 373 rbset (h, txtt, reg_txt); | |
| 672 | 374 rbset (h, idlt, reg_idl); |
| 448 | 375 check_if_enable_next (h); |
| 376 } | |
| 377 | |
| 378 static int check_desktop (char *title, char *target) | |
| 379 { | |
| 380 char path[_MAX_PATH]; | |
| 381 LPITEMIDLIST id; | |
| 382 int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; | |
| 383 SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, &id); | |
| 384 SHGetPathFromIDList (id, path); | |
| 385 // following lines added because it appears Win95 does not use common programs | |
| 386 // unless it comes into play when multiple users for Win95 is enabled | |
| 387 msg ("Desktop directory for desktop link: %s",path); | |
| 388 if (strlen (path) == 0) { | |
| 389 SHGetSpecialFolderLocation (NULL, CSIDL_DESKTOPDIRECTORY, &id); | |
| 390 SHGetPathFromIDList (id, path); | |
| 391 msg ("Desktop directory for deskop link changed to: %s",path); | |
| 392 } | |
| 393 // end of Win95 addition | |
| 394 char *fname = concat (path, "/", title, ".lnk", 0); | |
| 395 | |
| 396 if (_access (fname, 0) == 0) | |
| 397 return 0; /* already exists */ | |
| 398 | |
| 399 fname = concat (path, "/", title, ".pif", 0); /* check for a pif as well */ | |
| 400 | |
| 401 if (_access (fname, 0) == 0) | |
| 402 return 0; /* already exists */ | |
| 403 | |
| 404 return IDC_ROOT_DESKTOP; | |
| 405 } | |
| 406 | |
| 407 static int check_startmenu (char *title, char *target) | |
| 408 { | |
| 409 char path[_MAX_PATH]; | |
| 410 LPITEMIDLIST id; | |
| 411 int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; | |
| 412 SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, &id); | |
| 413 SHGetPathFromIDList (id, path); | |
| 414 // following lines added because it appears Win95 does not use common programs | |
| 415 // unless it comes into play when multiple users for Win95 is enabled | |
| 416 msg ("Program directory for program link: %s",path); | |
| 417 if (strlen (path) == 0) { | |
| 418 SHGetSpecialFolderLocation (NULL, CSIDL_PROGRAMS, &id); | |
| 419 SHGetPathFromIDList (id, path); | |
| 420 msg ("Program directory for program link changed to: %s",path); | |
| 421 } | |
| 422 // end of Win95 addition | |
| 666 | 423 strcat (path, "\\"); |
| 448 | 424 strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME); |
| 666 | 425 char *fname = concat (path, "\\", title, ".lnk", 0); |
| 448 | 426 |
| 427 if (_access (fname, 0) == 0) | |
| 428 return 0; /* already exists */ | |
| 429 | |
| 666 | 430 fname = concat (path, "\\", title, ".pif", 0); /* check for a pif as well */ |
| 448 | 431 |
| 432 if (_access (fname, 0) == 0) | |
| 433 return 0; /* already exists */ | |
| 434 | |
| 435 return IDC_ROOT_MENU; | |
| 436 } | |
| 437 | |
| 438 static void | |
| 439 save_dialog (HWND h) | |
| 440 { | |
| 441 root_desktop= rbget (h, da); | |
| 442 root_menu = rbget (h, ma); | |
| 657 | 443 reg_c = rbget (h, ct); |
| 444 reg_java = rbget (h, javat); | |
| 445 reg_cpp = rbget (h, cppt); | |
| 446 reg_elisp = rbget (h, elispt); | |
| 447 reg_txt = rbget (h, txtt); | |
| 672 | 448 reg_idl = rbget (h, idlt); |
| 448 | 449 } |
| 450 | |
| 451 static BOOL | |
| 452 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 453 { | |
| 454 switch (id) | |
| 455 { | |
| 456 | |
| 457 case IDC_ROOT_DESKTOP: | |
| 458 case IDC_ROOT_MENU: | |
| 459 save_dialog (h); | |
| 460 check_if_enable_next (h); | |
| 461 break; | |
| 462 | |
| 463 case IDOK: | |
| 464 save_dialog (h); | |
| 465 do_desktop_setup(); | |
| 466 NEXT (IDD_S_POSTINSTALL); | |
| 467 break; | |
| 468 | |
| 469 case IDC_BACK: | |
| 470 save_dialog (h); | |
| 471 NEXT (IDD_CHOOSE); | |
| 472 break; | |
| 473 | |
| 474 case IDCANCEL: | |
| 475 NEXT (0); | |
| 476 break; | |
| 477 } | |
| 478 return FALSE; | |
| 479 } | |
| 480 | |
| 481 static BOOL CALLBACK | |
| 482 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 483 { | |
| 484 switch (message) | |
| 485 { | |
| 486 case WM_INITDIALOG: | |
| 487 load_dialog (h); | |
| 488 return FALSE; | |
| 489 case WM_COMMAND: | |
| 490 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 491 } | |
| 492 return FALSE; | |
| 493 } | |
| 494 | |
| 495 void | |
| 496 do_desktop (HINSTANCE h) | |
| 497 { | |
| 498 CoInitialize (NULL); | |
| 499 | |
| 500 verinfo.dwOSVersionInfoSize = sizeof (verinfo); | |
| 501 GetVersionEx (&verinfo); | |
| 502 batname = 0; | |
| 666 | 503 uninstname = 0; |
| 448 | 504 |
| 505 if (xemacs_package != 0 && xemacs_package->type != TY_GENERIC) | |
| 506 { | |
| 507 batname = concat (find_xemacs_exe_path (), "\\", | |
| 452 | 508 find_xemacs_exe_name (), |
| 509 0); | |
| 666 | 510 uninstname = concat (find_xemacs_exe_path (), "\\", "setup.exe", 0); |
| 448 | 511 root_desktop = check_desktop ("XEmacs", batname); |
| 512 root_menu = check_startmenu ("XEmacs", batname); | |
| 657 | 513 reg_c = IDC_C_TYPE; |
| 514 reg_cpp = IDC_CPP_TYPE; | |
| 515 reg_java = IDC_JAVA_TYPE; | |
| 516 reg_elisp = IDC_ELISP_TYPE; | |
| 517 reg_txt = IDC_TXT_TYPE; | |
| 672 | 518 reg_idl = IDC_IDL_TYPE; |
| 448 | 519 } |
| 520 else | |
| 521 { | |
| 522 root_desktop = 0; | |
| 523 root_menu = 0; | |
| 657 | 524 reg_c = 0; |
| 525 reg_cpp = 0; | |
| 526 reg_java = 0; | |
| 527 reg_elisp = 0; | |
| 528 reg_txt = 0; | |
| 672 | 529 reg_idl = 0; |
| 448 | 530 } |
| 531 | |
| 532 int rv = 0; | |
| 533 | |
| 534 rv = DialogBox (h, MAKEINTRESOURCE (IDD_DESKTOP), 0, dialog_proc); | |
| 535 if (rv == -1) | |
| 536 fatal (IDS_DIALOG_FAILED); | |
| 537 } |