Mercurial > hg > xemacs-beta
annotate netinstall/nio-ie5.cc @ 4932:8b63e21b0436
fix compile issues with gcc 4
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF):
Use -export-all-symbols instead of -export-dynamic on PE targets
(Cygwin and MinGW).
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
Create variable XEMACS_CC_GPP to check whether we're running g++.
Don't just check for an executable called `g++' -- it might be
called g++-4 or whatever. Instead, check for either named `g++*'
or claiming to be g++ when called with --version. Rewrite code do
use the variable.
Add -fno-strict-aliasing to optimization flags when GCC and
optimized, and in all cases with g++, since under these circumstances
strict aliasing is otherwise assumed, and XEmacs can't easily be
made to respect its restrictions.
* configure: Regenerate.
lib-src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* fakemail.c (args_size):
* fakemail.c (parse_header):
* ootags.c (C_entries):
Fix warnings about possible use of uninitialized vars.
lwlib/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* xlwgauge.c (GaugeResize):
* xlwgauge.c (GaugeSize):
Fix warnings about possible use of uninitialized vars.
modules/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_exec):
* postgresql/postgresql.c (Fpq_get_result):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* chartab.c (decode_char_table_range):
* extents.c (extent_fragment_update):
* objects-msw.c (initialize_font_instance):
* process.c (Fgetenv):
* redisplay-output.c (get_next_display_block):
Fix warnings about possible use of uninitialized vars.
* compiler.h:
* compiler.h (REGISTER):
* event-stream.c (is_scrollbar_event):
* window.c (window_scrollbar_width):
* window.c (window_scrollbar_height):
* window.c (window_left_window_gutter_width):
* window.c (window_right_window_gutter_width):
Add USED_IF_SCROLLBARS. Use it to fix warnings about unused
vars when --with-scrollbars=no.
* config.h.in:
Change comment to explain better why DECLARE_INLINE_HEADER
is needed.
* dialog-msw.c:
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
* emacs.c (main_1):
* event-msw.c (struct mswin_message_debug):
* event-msw.c (debug_output_mswin_message):
* font-mgr.c:
* font-mgr.c (Ffc_config_filename):
* glyphs-msw.c (struct):
* glyphs-msw.c (bitmap_table):
* glyphs-x.c (update_widget_face):
* intl-win32.c (struct lang_to_string):
* intl-win32.c (lang_to_string_table):
* nas.c:
* objects-xlike-inc.c:
* objects-xlike-inc.c (xft_find_charset_font):
* syswindows.h:
* win32.c (mswindows_output_last_error):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
* lisp.h:
G++ 4.3 needs #include <limits> to avoid errors about min/max.
* lisp.h (disabled_assert_with_message):
Use disabled_assert* whenever asserts are disabled. Rewrite
disabled_assert* to avoid complaints about unused vars by
pretending to use the vars but casting them to (void).
Remove code that defined assert() weirdly if DEBUG_XEMACS but
not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically
when DEBUG_XEMACS, and if the user has forced it off, then
so be it.
* lisp.h (SYMBOL_KEYWORD):
Put some of the combined `extern Lisp_Object's back under
the file they are declared in. Cosmetic fix.
* number.h:
Remove `extern Lisp_Object' decls that duplicate lisp.h,
since they have different C vs. C++ linkage.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 24 Jan 2010 22:04:58 -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 } |