moved and redid MSIE proxy stuff into proxy.h

using TCHARs in preparation for unicode support

Makefile.in

@@ -12,14 +12,14 @@ CFLAGS = @CRYPTO_CPPFLAGS@ @CFLAGS@ @CPPFLAGS@
 CFLAGS += -W -Wall -Wno-unused-parameter -pedantic
 
 OBJS = main.o tray.o openvpn.o openvpn_monitor_process.o viewlog.o \
-       service.o options.o passphrase.o proxy.o ieproxy.o registry.o \
+       service.o options.o passphrase.o proxy.o registry.o \
        openvpn_config.o scripts.o localization.o openvpn-gui-res.o
 
 SOURCES = main.c main.h openvpn.c openvpn.h localization.c localization.h \
           openvpn_monitor_process.c openvpn_monitor_process.h \
           tray.c tray.h viewlog.c viewlog.h service.c service.h \
           options.c options.h passphrase.c passphrase.h proxy.c proxy.h \
-          ieproxy.c ieproxy.h registry.c registry.h scripts.c scripts.h \
+          registry.c registry.h scripts.c scripts.h \
           openvpn_config.c openvpn_config.h openvpn-gui.exe.manifest \
           chartable.h openvpn-gui-res.h openvpn-gui-res*.rc
 

ieproxy.c

@@ -1,137 +0,0 @@
-/*
- *  Copyright (C) 2004 Ewan Bhamrah Harley <code@ewan.info>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program (see the file COPYING included with this
- *  distribution); if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <WinInet.h>
-#include <malloc.h>
-
-LPCTSTR getIeHttpProxyError=NULL;
-
-/* getIeHttpProxy fetches the current IE proxy settings for http */
-
-LPCTSTR getIeHttpProxy()
-{
-  DWORD psize=0;
-  INTERNET_PROXY_INFO *pinfo;
-  LPTSTR proxyString;
-  LPTSTR p;
-  LPTSTR q;
-  unsigned int len;
-	
-  /* first see how big a buffer we need for the IPO structure */
-  InternetQueryOption(NULL, INTERNET_OPTION_PROXY, NULL, &psize);
-  if(!psize)
-  {
-    getIeHttpProxyError="InternetQueryOption failed to return buffer size";
-    return(NULL);
-  }
-
-  /* allocate memory for IPO */
-  pinfo =  malloc (psize*sizeof(TCHAR));
-  if (pinfo == NULL)
-  {
-    getIeHttpProxyError="malloc failed (1)";
-    return(NULL);
-  }
-
-  /* now run the real query */
-  if(!InternetQueryOption(NULL, INTERNET_OPTION_PROXY, (LPVOID) pinfo, &psize))
-  {
-    getIeHttpProxyError="InternetQueryOption() failed to find proxy info";
-    free(pinfo);
-    return(NULL);
-  }
-
-
-  /* see what sort of result we got */
-	
-  if(pinfo->dwAccessType == INTERNET_OPEN_TYPE_DIRECT)
-  {
-    /* No proxy configured */
-    free(pinfo);
-    return("");
-  }
-  else if(pinfo->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
-  {
-    /* we have a proxy - now parse result string */
-    /* if result string does NOT contain an '=' sign then */
-    /* there is a single proxy for all protocols          */
-    for (p=(LPTSTR)pinfo->lpszProxy; *p && *p != '='; p++);
-    if(!*p)
-    {
-      /* single proxy */
-      /* allocate a new string to return */
-      len = 1+strlen(pinfo->lpszProxy);
-      proxyString = malloc (len*sizeof(TCHAR));
-      if (proxyString == NULL)
-      {
-        getIeHttpProxyError="malloc failed (2)";
-        free(pinfo);
-        return(NULL);
-      }
-      strncpy(proxyString, pinfo->lpszProxy,len);
-      proxyString[len]=0;
-      free(pinfo);
-      return(proxyString);
-    }
-    else
-    {
-      /* multiple space seperated proxies defined in the form */
-      /* protocol=proxyhost[:port]                            */
-      /* we want the one marked "http=", if any.              */
-      p=(LPTSTR)pinfo->lpszProxy;
-      while(*p && strncmp(p, "http=", 5))
-      {
-        for(; *p && *p != ' '; p++);
-        if(*p) p++;
-      }
-      if(*p)
-      {
-        /* found the proxy */
-        p+=5;
-        for(q=p; *q && *q != ' '; q++);
-        /* allocate a buffer for the proxy information */
-        len=1+(q-p);
-        proxyString=malloc(len*sizeof(TCHAR));
-        if(proxyString==NULL)
-        {
-          getIeHttpProxyError="malloc failed (3)";
-          free(pinfo);
-          return(NULL);
-        }
-        strncpy(proxyString, p, len);
-        proxyString[len]=0;
-        free(pinfo);
-        return(proxyString);
-      }
-      else
-      {
-        /* No http proxy in list */
-        free(pinfo);
-        return("");
-      }
-    }
-  }
-  else
-  {
-    /* InternetQueryOption returned a proxy type we don't know about*/
-    getIeHttpProxyError="Unknown Proxy Type";
-    free(pinfo);
-    return(NULL);
-  }
-}

ieproxy.h

@@ -1,24 +0,0 @@
-/*
- *  Copyright (C) 2004 Ewan Bhamrah Harley <code@ewan.info>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program (see the file COPYING included with this
- *  distribution); if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __GETIEHTTPPROXY__
-#define __GETIEHTTPPROXY__
-extern LPTSTR getIeHttpProxyError;
-LPCTSTR getIeHttpProxy();
-#endif

proxy.c

@@ -23,11 +23,11 @@
 #include <windows.h>
 #include <prsht.h>
 #include <tchar.h>
+#include <WinInet.h>
 #include "main.h"
 #include "options.h"
 #include "registry.h"
 #include "proxy.h"
-#include "ieproxy.h"
 #include "openvpn-gui-res.h"
 #include "localization.h"
 
@@ -148,7 +148,7 @@ int CheckProxySettings(HWND hwndDlg)
       TCHAR text[100];
       BOOL http = (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_HTTP) == BST_CHECKED);
 
-      GetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, text, sizeof(text)/sizeof(*text));
+      GetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, text, _tsizeof(text));
       if (_tcslen(text) == 0)
         {
           /* proxy address not specified */
@@ -156,7 +156,7 @@ int CheckProxySettings(HWND hwndDlg)
           return(0);
         }
 
-      GetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, text, sizeof(text));
+      GetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, text, _tsizeof(text));
       if (_tcslen(text) == 0)
         {
           /* proxy port not specified */
@@ -207,58 +207,58 @@ void SaveProxySettings(HWND hwndDlg)
 {
   HKEY regkey;
   DWORD dwDispos;
-  char proxy_source_string[2]="0";
+  TCHAR proxy_source_string[2] = _T("0");
-  char proxy_type_string[2]="0";
+  TCHAR proxy_type_string[2] = _T("0");
-  char proxy_http_auth_string[2]="0";
+  TCHAR proxy_http_auth_string[2] = _T("0");
 
   /* Save Proxy Settings Source */
   if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_OPENVPN) == BST_CHECKED)
     {
       o.proxy_source = 0;
-      proxy_source_string[0] = '0';
+      proxy_source_string[0] = _T('0');
     }
   if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MSIE) == BST_CHECKED)
     {
       o.proxy_source = 1;
-      proxy_source_string[0] = '1';
+      proxy_source_string[0] = _T('1');
     }
   if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MANUAL) == BST_CHECKED)
     {
       o.proxy_source = 2;
-      proxy_source_string[0] = '2';
+      proxy_source_string[0] = _T('2');
     }
 
   /* Save Proxy type, address and port */
   if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_HTTP) == BST_CHECKED)
     {
       o.proxy_type = 0;
-      proxy_type_string[0] = '0';
+      proxy_type_string[0] = _T('0');
 
       GetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_http_address, 
-                 sizeof(o.proxy_http_address));
+                 _tsizeof(o.proxy_http_address));
       GetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_http_port, 
-                 sizeof(o.proxy_http_port));
+                 _tsizeof(o.proxy_http_port));
 
       BOOL auth = (IsDlgButtonChecked(hwndDlg, ID_CB_PROXY_AUTH) == BST_CHECKED);
       o.proxy_http_auth = (auth ? 1 : 0);
-      proxy_http_auth_string[0] = (auth ? '1' : '0');
+      proxy_http_auth_string[0] = (auth ? _T('1') : _T('0'));
     }
   else
     {
       o.proxy_type = 1;
-      proxy_type_string[0] = '1';
+      proxy_type_string[0] = _T('1');
 
       GetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_socks_address, 
-                 sizeof(o.proxy_socks_address));
+                 _tsizeof(o.proxy_socks_address));
       GetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_socks_port, 
-                 sizeof(o.proxy_socks_port));
+                 _tsizeof(o.proxy_socks_port));
     }
 
   /* Open Registry for writing */
   if (RegCreateKeyEx(HKEY_CURRENT_USER,
                     GUI_REGKEY_HKCU,
                     0,
-                    (LPTSTR) "",
+                    _T(""),
                     REG_OPTION_NON_VOLATILE,
                     KEY_WRITE,
                     NULL,
@@ -271,13 +271,13 @@ void SaveProxySettings(HWND hwndDlg)
     }
 
   /* Save Settings to registry */
-  SetRegistryValue(regkey, "proxy_source", proxy_source_string);
+  SetRegistryValue(regkey, _T("proxy_source"), proxy_source_string);
-  SetRegistryValue(regkey, "proxy_type", proxy_type_string);
+  SetRegistryValue(regkey, _T("proxy_type"), proxy_type_string);
-  SetRegistryValue(regkey, "proxy_http_auth", proxy_http_auth_string);
+  SetRegistryValue(regkey, _T("proxy_http_auth"), proxy_http_auth_string);
-  SetRegistryValue(regkey, "proxy_http_address", o.proxy_http_address);
+  SetRegistryValue(regkey, _T("proxy_http_address"), o.proxy_http_address);
-  SetRegistryValue(regkey, "proxy_http_port", o.proxy_http_port);
+  SetRegistryValue(regkey, _T("proxy_http_port"), o.proxy_http_port);
-  SetRegistryValue(regkey, "proxy_socks_address", o.proxy_socks_address);
+  SetRegistryValue(regkey, _T("proxy_socks_address"), o.proxy_socks_address);
-  SetRegistryValue(regkey, "proxy_socks_port", o.proxy_socks_port);
+  SetRegistryValue(regkey, _T("proxy_socks_port"), o.proxy_socks_port);
 
   RegCloseKey(regkey);
 }
@@ -286,21 +286,21 @@ void GetProxyRegistrySettings()
 {
   LONG status;
   HKEY regkey;
-  char proxy_source_string[2]="0";
+  TCHAR proxy_source_string[2] = _T("0");
-  char proxy_type_string[2]="0";
+  TCHAR proxy_type_string[2] = _T("0");
-  char proxy_http_auth_string[2]="0";
+  TCHAR proxy_http_auth_string[2] = _T("0");
-  char temp_path[100];
+  TCHAR temp_path[100];
 
   /* Construct Authfile path */
-  if (!GetTempPath(sizeof(temp_path) - 1, temp_path))
+  if (!GetTempPath(_tsizeof(temp_path) - 1, temp_path))
     {
       /* Error getting TempPath - using C:\ */
       ShowLocalizedMsg(GUI_NAME, IDS_ERR_GET_TEMP_PATH);
-      strcpy(temp_path, "C:\\");
+      _tcscpy(temp_path, _T("C:\\"));
     }
-  strncat(temp_path, "openvpn_authfile.txt", 
+  _tcsncat(temp_path, _T("openvpn_authfile.txt"), 
-          sizeof(temp_path) - strlen(temp_path) - 1); 
+          _tsizeof(temp_path) - _tcslen(temp_path) - 1); 
-  strncpy(o.proxy_authfile, temp_path, sizeof(o.proxy_authfile));
+  _tcsncpy(o.proxy_authfile, temp_path, _tsizeof(o.proxy_authfile));
 
   /* Open Registry for reading */
   status = RegOpenKeyEx(HKEY_CURRENT_USER,
@@ -314,32 +314,32 @@ void GetProxyRegistrySettings()
       
 
   /* get registry settings */
-  GetRegistryValue(regkey, "proxy_http_address", o.proxy_http_address, 
+  GetRegistryValue(regkey, _T("proxy_http_address"), o.proxy_http_address, 
-                   sizeof(o.proxy_http_address));
+                   _tsizeof(o.proxy_http_address));
-  GetRegistryValue(regkey, "proxy_http_port", o.proxy_http_port, 
+  GetRegistryValue(regkey, _T("proxy_http_port"), o.proxy_http_port, 
-                   sizeof(o.proxy_http_port));
+                   _tsizeof(o.proxy_http_port));
-  GetRegistryValue(regkey, "proxy_socks_address", o.proxy_socks_address, 
+  GetRegistryValue(regkey, _T("proxy_socks_address"), o.proxy_socks_address, 
-                   sizeof(o.proxy_socks_address));
+                   _tsizeof(o.proxy_socks_address));
-  GetRegistryValue(regkey, "proxy_socks_port", o.proxy_socks_port, 
+  GetRegistryValue(regkey, _T("proxy_socks_port"), o.proxy_socks_port, 
-                   sizeof(o.proxy_socks_port));
+                   _tsizeof(o.proxy_socks_port));
-  GetRegistryValue(regkey, "proxy_source", proxy_source_string, 
+  GetRegistryValue(regkey, _T("proxy_source"), proxy_source_string, 
-                   sizeof(proxy_source_string));
+                   _tsizeof(proxy_source_string));
-  GetRegistryValue(regkey, "proxy_type", proxy_type_string, 
+  GetRegistryValue(regkey, _T("proxy_type"), proxy_type_string, 
-                   sizeof(proxy_type_string));
+                   _tsizeof(proxy_type_string));
-  GetRegistryValue(regkey, "proxy_http_auth", proxy_http_auth_string, 
+  GetRegistryValue(regkey, _T("proxy_http_auth"), proxy_http_auth_string, 
-                   sizeof(proxy_http_auth_string));
+                   _tsizeof(proxy_http_auth_string));
 
-  if (proxy_source_string[0] == '1')
+  if (proxy_source_string[0] == _T('1'))
     o.proxy_source=1;
-  if (proxy_source_string[0] == '2')
+  if (proxy_source_string[0] == _T('2'))
     o.proxy_source=2;
-  if (proxy_source_string[0] == '3')
+  if (proxy_source_string[0] == _T('3'))
     o.proxy_source=3;
 
-  if (proxy_type_string[0] == '1')
+  if (proxy_type_string[0] == _T('1'))
     o.proxy_type=1;
 
-  if (proxy_http_auth_string[0] == '1')
+  if (proxy_http_auth_string[0] == _T('1'))
     o.proxy_http_auth=1;
 
   RegCloseKey(regkey);
@@ -347,8 +347,8 @@ void GetProxyRegistrySettings()
 
 BOOL CALLBACK ProxyAuthDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED LPARAM lParam)
 {
-  char username[50];
+  TCHAR username[50];
-  char password[50];
+  TCHAR password[50];
   FILE *fp;
 
   switch (msg) {
@@ -361,18 +361,18 @@ BOOL CALLBACK ProxyAuthDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED
       switch (LOWORD(wParam)) {
 
         case IDOK:
-          GetDlgItemText(hwndDlg, ID_EDT_PROXY_USER, username, sizeof(username) - 1);
+          GetDlgItemText(hwndDlg, ID_EDT_PROXY_USER, username, _tsizeof(username) - 1);
-          GetDlgItemText(hwndDlg, ID_EDT_PROXY_PASS, password, sizeof(password) - 1);
+          GetDlgItemText(hwndDlg, ID_EDT_PROXY_PASS, password, _tsizeof(password) - 1);
-          if (!(fp = fopen(o.proxy_authfile, "w")))
+          if (!(fp = _tfopen(o.proxy_authfile, _T("w"))))
             {
               /* error creating AUTH file */
               ShowLocalizedMsg(GUI_NAME, IDS_ERR_CREATE_AUTH_FILE, o.proxy_authfile);
               EndDialog(hwndDlg, LOWORD(wParam));
             }
-          fputs(username, fp);
+          _fputts(username, fp);
-          fputs("\n", fp);
+          _fputts("\n", fp);
-          fputs(password, fp);
+          _fputts(password, fp);
-          fputs("\n", fp);
+          _fputts("\n", fp);
           fclose(fp);
           EndDialog(hwndDlg, LOWORD(wParam));
           return TRUE;
@@ -386,12 +386,82 @@ BOOL CALLBACK ProxyAuthDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED
   return FALSE;
 }
 
+/*
+ * GetIeHttpProxy() fetches the current IE proxy settings for HTTP.
+ * Coded by Ewan Bhamrah Harley <code@ewan.info>, but refactored.
+ *
+ * If result string does not contain an '=' sign then there is a
+ * single proxy for all protocols. If multiple proxies are defined
+ * they are space seperated and have the form protocol=host[:port]
+ */
+static BOOL
+GetIeHttpProxy(TCHAR *host, size_t *hostlen, TCHAR *port, size_t *portlen)
+{
+  INTERNET_PROXY_INFO pinfo;
+  DWORD psize = sizeof(pinfo);
+  const TCHAR *start, *colon, *space, *end;
+  const size_t _hostlen = *hostlen;
+  const size_t _portlen = *portlen;
+
+  *hostlen = 0;
+  *portlen = 0;
+
+  if (!InternetQueryOption(NULL, INTERNET_OPTION_PROXY, (LPVOID) &pinfo, &psize))
+  {
+    ShowLocalizedMsg(GUI_NAME, IDS_ERR_GET_MSIE_PROXY);
+    return FALSE;
+  }
+
+  /* Check if a proxy is used */
+  if (pinfo.dwAccessType != INTERNET_OPEN_TYPE_PROXY)
+    return TRUE;
+
+  /* Check if a HTTP proxy is defined */
+  start = _tcsstr(pinfo.lpszProxy, _T("http="));
+  if (start == NULL && _tcschr(pinfo.lpszProxy, _T('=')))
+    return TRUE;
+
+  /* Get the pointers needed for string extraction */
+  start = (start ? start + 5 : pinfo.lpszProxy);
+  colon = _tcschr(start, _T(':'));
+  space = _tcschr(start, _T(' '));
+
+  /* Extract hostname */
+  end = (colon ? colon : space);
+  if (end)
+    *hostlen = end - start;
+  else
+    *hostlen = _tcslen(start);
+
+  if (_hostlen < *hostlen)
+    return FALSE;
+
+  _tcsncpy(host, start, *hostlen);
+
+  if (!colon)
+    return TRUE;
+
+  start = colon + 1;
+  end = space;
+  if (end)
+    *portlen = end - start;
+  else
+    *portlen = _tcslen(start);
+
+  if (_portlen < *portlen)
+    return FALSE;
+
+  _tcsncpy(port, start, *portlen);
+
+  return TRUE;
+}
+
 /*
  * Construct the proxy options to append to the cmd-line.
  */
-void ConstructProxyCmdLine(char *proxy_string_ptr, unsigned int size)
+void ConstructProxyCmdLine(TCHAR *proxy_string_ptr, unsigned int size)
 {
-  char proxy_string[100];
+  TCHAR proxy_string[100];
 
   CLEAR(proxy_string);
 
@@ -403,77 +473,49 @@ void ConstructProxyCmdLine(char *proxy_string_ptr, unsigned int size)
             {
               /* Ask for Proxy username/password */
               LocalizedDialogBox(ID_DLG_PROXY_AUTH, ProxyAuthDialogFunc);
-              mysnprintf(proxy_string, "--http-proxy %s %s %s",
+              _sntprintf_0(proxy_string, _T("--http-proxy %s %s %s"),
-                         o.proxy_http_address,
+                           o.proxy_http_address,
-                         o.proxy_http_port,
+                           o.proxy_http_port,
-                         o.proxy_authfile);
+                           o.proxy_authfile);
             }
           else
             {
-              mysnprintf(proxy_string, "--http-proxy %s %s",
+              _sntprintf_0(proxy_string, _T("--http-proxy %s %s"),
-                         o.proxy_http_address,
+                           o.proxy_http_address,
-                         o.proxy_http_port);
+                           o.proxy_http_port);
             }
         }
       if (o.proxy_type == PROXY_TYPE_SOCKS)
         {
-          mysnprintf(proxy_string, "--socks-proxy %s %s",
+          _sntprintf_0(proxy_string, _T("--socks-proxy %s %s"),
-                     o.proxy_socks_address,
+                       o.proxy_socks_address,
-                     o.proxy_socks_port);
+                       o.proxy_socks_port);
         }
     }
 
-  if (o.proxy_source == PROXY_SOURCE_IE)
+  else if (o.proxy_source == PROXY_SOURCE_IE)
     {
-      LPCTSTR ieproxy;
+      TCHAR host[64];
-      char *pos;
+      TCHAR port[6];
+      size_t hostlen = _tsizeof(host);
+      size_t portlen = _tsizeof(port);
 
-      ieproxy = getIeHttpProxy();
+      if (GetIeHttpProxy(host, &hostlen, port, &portlen) && hostlen != 0)
-      if (!ieproxy)
         {
-          /* can't get ie proxy settings */
+          if (o.proxy_http_auth == PROXY_HTTP_ASK_AUTH)
-          ShowLocalizedMsg(GUI_NAME, IDS_ERR_GET_MSIE_SETTINGS, getIeHttpProxyError);
-        }
-      else
-        {
-          /* Don't use a proxy if IE proxy string is empty */
-          if (strlen(ieproxy) > 1)
             {
-              /* Parse the port number from the IE proxy string */
+              /* Ask for Proxy username/password */
-              if ((pos = strchr(ieproxy, ':')))
+              LocalizedDialogBox(ID_DLG_PROXY_AUTH, ProxyAuthDialogFunc);
-                {
+              _sntprintf_0(proxy_string, _T("--http-proxy %s %s %s"),
-                  *pos = '\0';
+                           host, (portlen ? port : _T("80")), o.proxy_authfile);
-                  if (o.proxy_http_auth == PROXY_HTTP_ASK_AUTH)
+            }
-                    {
+          else
-                      /* Ask for Proxy username/password */
+            {
-                      LocalizedDialogBox(ID_DLG_PROXY_AUTH, ProxyAuthDialogFunc);
+              _sntprintf_0(proxy_string, _T("--http-proxy %s %s"),
-                      mysnprintf(proxy_string, "--http-proxy %s %s %s", 
+                           host, (portlen ? port : _T("80")));
-                                 ieproxy, pos+1, o.proxy_authfile)
-                    }
-                  else
-                    {
-                      mysnprintf(proxy_string, "--http-proxy %s %s", ieproxy, pos+1)
-                    }
-                }
-              /* No port is specified, use 80 as default port */
-              else
-                {
-                  if (o.proxy_http_auth == PROXY_HTTP_ASK_AUTH)
-                    {
-                      /* Ask for Proxy username/password */
-                      LocalizedDialogBox(ID_DLG_PROXY_AUTH, ProxyAuthDialogFunc);
-                      mysnprintf(proxy_string, "--http-proxy %s 80 %s", 
-                                 ieproxy, o.proxy_authfile)
-                    }
-                  else
-                    {
-                      mysnprintf(proxy_string, "--http-proxy %s 80", ieproxy)
-                    }
-                }
             }
-          //free (ieproxy);
         }
     }
 
-  strncpy(proxy_string_ptr, proxy_string, size);
+  _tcsncpy(proxy_string_ptr, proxy_string, size);
 }

proxy.h

@@ -33,4 +33,4 @@ void LoadProxySettings(HWND hwndDlg);
 void SaveProxySettings(HWND hwndDlg);
 void GetProxyRegistrySettings();
 BOOL CALLBACK ProxyAuthDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-void ConstructProxyCmdLine(char *proxy_string_ptr, unsigned int size);
+void ConstructProxyCmdLine(TCHAR *proxy_string_ptr, unsigned int size);