Mercurial > hg > xemacs-beta
annotate netinstall/nio-ie5.cc @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -0600 |
| parents | ce0b3f2eff35 |
| 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 internet downloads using the | |
| 17 Internet Explorer version 5 DLLs. To use this method, the user | |
| 18 must already have installed and configured IE5. This module is | |
| 19 called from netio.cc, which is called from geturl.cc */ | |
| 20 | |
| 21 #include "win32.h" | |
| 22 | |
| 23 #include "resource.h" | |
| 24 #include "state.h" | |
| 25 #include "dialog.h" | |
| 26 #include "msg.h" | |
| 27 #include "netio.h" | |
| 28 #include "nio-ie5.h" | |
| 29 | |
| 30 static HINTERNET internet = 0; | |
| 31 | |
| 32 NetIO_IE5::NetIO_IE5 (char *_url) | |
| 33 : NetIO (_url) | |
| 34 { | |
| 35 int resend = 0; | |
| 36 | |
| 37 if (internet == 0) | |
| 38 { | |
| 39 HINSTANCE h = LoadLibrary ("wininet.dll"); | |
| 40 if (!h) | |
| 41 { | |
| 42 note (IDS_WININET); | |
| 43 connection = 0; | |
| 44 return; | |
| 45 } | |
| 46 InternetAttemptConnect (0); | |
| 47 internet = InternetOpen ("Cygwin Setup", INTERNET_OPEN_TYPE_PRECONFIG, | |
| 48 NULL, NULL, 0); | |
| 49 } | |
| 50 | |
| 51 DWORD flags = | |
| 52 INTERNET_FLAG_DONT_CACHE | | |
| 53 INTERNET_FLAG_KEEP_CONNECTION | | |
| 54 INTERNET_FLAG_PRAGMA_NOCACHE | | |
| 55 INTERNET_FLAG_RELOAD | | |
| 56 INTERNET_FLAG_EXISTING_CONNECT | | |
| 57 INTERNET_FLAG_PASSIVE; | |
| 58 | |
| 59 connection = InternetOpenUrl (internet, url, NULL, 0, flags, 0); | |
| 60 | |
| 61 try_again: | |
| 62 | |
| 63 if (net_user && net_passwd) | |
| 64 { | |
| 65 InternetSetOption (connection, INTERNET_OPTION_USERNAME, | |
| 66 net_user, strlen (net_user)); | |
| 67 InternetSetOption (connection, INTERNET_OPTION_PASSWORD, | |
| 68 net_passwd, strlen (net_passwd)); | |
| 69 } | |
| 70 | |
| 71 if (net_proxy_user && net_proxy_passwd) | |
| 72 { | |
| 73 InternetSetOption (connection, INTERNET_OPTION_PROXY_USERNAME, | |
| 74 net_proxy_user, strlen (net_proxy_user)); | |
| 75 InternetSetOption (connection, INTERNET_OPTION_PROXY_PASSWORD, | |
| 76 net_proxy_passwd, strlen (net_proxy_passwd)); | |
| 77 } | |
| 78 | |
| 79 if (resend) | |
| 80 if (!HttpSendRequest (connection, 0, 0, 0, 0)) | |
| 81 connection = 0; | |
| 82 | |
| 83 if (!connection) | |
| 84 { | |
| 85 if (GetLastError () == ERROR_INTERNET_EXTENDED_ERROR) | |
| 86 { | |
| 87 char buf[2000]; | |
| 88 DWORD e, l=sizeof (buf); | |
| 89 InternetGetLastResponseInfo (&e, buf, &l); | |
| 90 MessageBox (0, buf, "Internet Error", 0); | |
| 91 } | |
| 92 } | |
| 93 | |
| 94 DWORD type, type_s; | |
| 95 type_s = sizeof (type); | |
| 96 InternetQueryOption (connection, INTERNET_OPTION_HANDLE_TYPE, | |
| 97 &type, &type_s); | |
| 98 | |
| 99 switch (type) | |
| 100 { | |
| 101 case INTERNET_HANDLE_TYPE_HTTP_REQUEST: | |
| 102 case INTERNET_HANDLE_TYPE_CONNECT_HTTP: | |
| 103 type_s = sizeof (DWORD); | |
| 104 if (HttpQueryInfo (connection, | |
| 105 HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, | |
| 106 &type, &type_s, NULL)) | |
| 107 { | |
| 108 if (type == 401) /* authorization required */ | |
| 109 { | |
| 110 flush_io(); | |
| 111 get_auth (); | |
| 112 resend = 1; | |
| 113 goto try_again; | |
| 114 } | |
| 115 else if (type == 407) /* proxy authorization required */ | |
| 116 { | |
| 117 flush_io(); | |
| 118 get_proxy_auth (); | |
| 119 resend = 1; | |
| 120 goto try_again; | |
| 121 } | |
| 122 else if (type >= 300) | |
| 123 { | |
| 124 connection = 0; | |
| 125 return; | |
| 126 } | |
| 127 } | |
| 128 } | |
| 129 } | |
| 130 | |
| 131 void | |
| 132 NetIO_IE5::flush_io () | |
| 133 { | |
| 134 DWORD actual = 0; | |
| 135 char buf[1024]; | |
| 136 do { | |
| 137 InternetReadFile (connection, buf, 1024, &actual); | |
| 138 } while (actual > 0); | |
| 139 } | |
| 140 | |
| 141 NetIO_IE5::~NetIO_IE5 () | |
| 142 { | |
| 143 if (connection) | |
| 144 InternetCloseHandle (connection); | |
| 145 } | |
| 146 | |
| 147 int | |
| 148 NetIO_IE5::ok () | |
| 149 { | |
| 150 return (connection == NULL) ? 0 : 1; | |
| 151 } | |
| 152 | |
| 153 int | |
| 154 NetIO_IE5::read (char *buf, int nbytes) | |
| 155 { | |
| 156 DWORD actual; | |
| 157 if (InternetReadFile (connection, buf, nbytes, &actual)) | |
| 158 return actual; | |
| 159 return -1; | |
| 160 } |