From Harald Welte:

[obnox/wireshark/wip.git] / nio-ie5.c

diff --git a/nio-ie5.c b/nio-ie5.c
index 9ad0b7255372df8ac87544fb1101023271cd3518..19267bf9e5d4892d5312effa261f04ef32e8cba8 100644 (file)
--- a/nio-ie5.c
+++ b/nio-ie5.c
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Copyright (c) 2000, Red Hat, Inc.
  *
  *     This program is free software; you can redistribute it and/or modify
@@ -18,60 +20,61 @@
    Internet Explorer version 5 DLLs.  To use this method, the user
    must already have installed and configured IE5.  */
 
-#include "windows.h"\r
-#include <wininet.h>\r
-#include "nio-ie5.h"\r
-\r
-#include "glib.h"\r
+#include "windows.h"
+#include <wininet.h>
+#include "nio-ie5.h"
+
+#include "glib.h"
+
+static HINTERNET internet = 0;
 
-static HINTERNET internet = 0;\r
-\r
 
 
 netio_ie5_t * 
 netio_ie5_connect (char const *url)
 {
   int resend = 0;
-  DWORD type, type_s;\r
-  netio_ie5_t * netio_ie5_conn;\r
-  DWORD dw_ret;\r
-  DWORD flags =\r
- /*    INTERNET_FLAG_DONT_CACHE |*/\r
-    INTERNET_FLAG_KEEP_CONNECTION |\r
- /*   INTERNET_FLAG_PRAGMA_NOCACHE |*/\r
- /*   INTERNET_FLAG_RELOAD |*/\r
-    INTERNET_FLAG_EXISTING_CONNECT | INTERNET_FLAG_PASSIVE;\r
-\r
+  DWORD type, type_s;
+  netio_ie5_t * netio_ie5_conn;
+  DWORD dw_ret;
+  DWORD flags =
+ /*    INTERNET_FLAG_DONT_CACHE |*/
+    INTERNET_FLAG_KEEP_CONNECTION |
+    INTERNET_FLAG_PRAGMA_NOCACHE |
+    INTERNET_FLAG_RELOAD |
+    INTERNET_FLAG_NO_CACHE_WRITE |
+    INTERNET_FLAG_EXISTING_CONNECT | INTERNET_FLAG_PASSIVE;
+
   if (internet == 0)
     {
-      HINSTANCE h = LoadLibrary ("wininet.dll");
+      HINSTANCE h = ws_load_library("wininet.dll");
       if (!h)
-       {\r
+       {
           /* XXX - how to return an error code? */
           g_warning("Failed to load wininet.dll");
          return NULL;
-       }\r
-      /* pop-up dialup dialog box */\r
-      /* XXX - do we need the dialup box or simply don't attempt an update in this case? */\r
+       }
+      /* pop-up dialup dialog box */
+      /* XXX - do we need the dialup box or simply don't attempt an update in this case? */
       dw_ret = InternetAttemptConnect (0);
-      if (dw_ret != ERROR_SUCCESS) {\r
-        g_warning("InternetAttemptConnect failed: %u", dw_ret);\r
-        return NULL;\r
+      if (dw_ret != ERROR_SUCCESS) {
+        g_warning("InternetAttemptConnect failed: %u", dw_ret);
+        return NULL;
       }
       internet = InternetOpen ("Wireshark Update", INTERNET_OPEN_TYPE_PRECONFIG,
-                              NULL, NULL, 0);\r
-      if(internet == NULL) {\r
-        g_warning("InternetOpen failed %u", GetLastError());\r
-        return NULL;\r
+                              NULL, NULL, 0);
+      if(internet == NULL) {
+        g_warning("InternetOpen failed %u", GetLastError());
+        return NULL;
       }
     }
 
-  netio_ie5_conn = g_malloc(sizeof(netio_ie5_t));\r
-\r
+  netio_ie5_conn = g_malloc(sizeof(netio_ie5_t));
+
   netio_ie5_conn->connection = InternetOpenUrl (internet, url, NULL, 0, flags, 0);
 
 try_again:
-\r
+
 #if 0
        /* XXX - implement this option */
   if (net_user && net_passwd)
@@ -80,9 +83,9 @@ try_again:
                         net_user, strlen (net_user));
       InternetSetOption (connection, INTERNET_OPTION_PASSWORD,
                         net_passwd, strlen (net_passwd));
-    }\r
+    }
 #endif
-\r
+
 #if 0
        /* XXX - implement this option */
   if (net_proxy_user && net_proxy_passwd)
@@ -91,7 +94,7 @@ try_again:
                         net_proxy_user, strlen (net_proxy_user));
       InternetSetOption (connection, INTERNET_OPTION_PROXY_PASSWORD,
                         net_proxy_passwd, strlen (net_proxy_passwd));
-    }\r
+    }
 #endif
 
   if (resend)
@@ -99,25 +102,25 @@ try_again:
       netio_ie5_conn->connection = 0;
 
   if (!netio_ie5_conn->connection)
-    {\r
-      switch(GetLastError ()) {\r
-      case ERROR_INTERNET_EXTENDED_ERROR:\r
+    {
+      switch(GetLastError ()) {
+      case ERROR_INTERNET_EXTENDED_ERROR:
           {
          char buf[2000];
          DWORD e, l = sizeof (buf);
          InternetGetLastResponseInfo (&e, buf, &l);
-         MessageBox (0, buf, "Internet Error", 0);\r
-          }\r
+         MessageBox (0, buf, "Internet Error", 0);
+          }
           break;
-      case ERROR_INTERNET_NAME_NOT_RESOLVED:\r
-          g_warning("Internet error: The servername could not be resolved");\r
-          break;\r
-      case ERROR_INTERNET_CANNOT_CONNECT:\r
-          g_warning("Internet error: Could not connect to the server");\r
-          break;\r
-      default:\r
-          g_warning("Internet error: %u", GetLastError ());\r
-      }\r
+      case ERROR_INTERNET_NAME_NOT_RESOLVED:
+          g_warning("Internet error: The servername could not be resolved");
+          break;
+      case ERROR_INTERNET_CANNOT_CONNECT:
+          g_warning("Internet error: Could not connect to the server");
+          break;
+      default:
+          g_warning("Internet error: %u", GetLastError ());
+      }
       return NULL;
     }
 
@@ -136,8 +139,8 @@ try_again:
        {
          if (type == 401)      /* authorization required */
            {
-             netio_ie5_flush_io (netio_ie5_conn);\r
-              /* XXX - query net_user && net_passwd from user\r
+             netio_ie5_flush_io (netio_ie5_conn);
+              /* XXX - query net_user && net_passwd from user
              get_auth (NULL);*/
              resend = 1;
              goto try_again;
@@ -145,14 +148,14 @@ try_again:
          else if (type == 407) /* proxy authorization required */
            {
              netio_ie5_flush_io (netio_ie5_conn);
-              /* XXX - query net_proxy_user && net_proxy_passwd from user\r
+              /* XXX - query net_proxy_user && net_proxy_passwd from user
              get_proxy_auth (NULL);*/
              resend = 1;
              goto try_again;
            }
          else if (type >= 300)
            {
-              g_warning("Failed with HTTP response %u", type);\r
+              g_warning("Failed with HTTP response %u", type);
               g_free(netio_ie5_conn);
              return NULL;
            }
@@ -178,7 +181,7 @@ void
 netio_ie5_disconnect (netio_ie5_t * netio_e5_conn)
 {
   if (netio_e5_conn->connection)
-    InternetCloseHandle (netio_e5_conn->connection);\r
+    InternetCloseHandle (netio_e5_conn->connection);
   g_free(netio_e5_conn);
 }