Bug 654552 - Remove WinCE code from netwerk/* ; r=cbiesinger
authorEd Morley <bmo@edmorley.co.uk>
Sat, 07 May 2011 10:03:16 +0200
changeset 69110 23c2ddc386c54b6872927ea9b7bf90123621751e
parent 69087 62941612320d3bc12575f03c8df66b0b9c83ed05
child 69111 33d37164fd188731139d126190a8127105f90818
push idunknown
push userunknown
push dateunknown
reviewerscbiesinger
bugs654552
milestone6.0a1
Bug 654552 - Remove WinCE code from netwerk/* ; r=cbiesinger
netwerk/base/public/security-prefs.js
netwerk/base/src/Makefile.in
netwerk/base/src/nsAutodialWinCE.cpp
netwerk/base/src/nsAutodialWinCE.h
netwerk/base/src/nsNativeConnectionHelper.cpp
netwerk/base/src/nsURLHelperWin.cpp
netwerk/build.mk
netwerk/build/Makefile.in
netwerk/protocol/file/nsFileProtocolHandler.cpp
netwerk/protocol/http/nsHttpHandler.cpp
netwerk/system/Makefile.in
netwerk/system/wince/Makefile.in
netwerk/system/wince/nsNotifyAddrListener.cpp
netwerk/system/wince/nsNotifyAddrListener.h
--- a/netwerk/base/public/security-prefs.js
+++ b/netwerk/base/public/security-prefs.js
@@ -21,25 +21,22 @@ pref("security.ssl3.rsa_rc4_128_sha", tr
 pref("security.ssl3.rsa_fips_des_ede3_sha", true);
 pref("security.ssl3.rsa_des_ede3_sha", true);
 pref("security.ssl3.rsa_fips_des_sha", false);
 pref("security.ssl3.rsa_des_sha", false);
 pref("security.ssl3.rsa_1024_rc4_56_sha", false);
 pref("security.ssl3.rsa_1024_des_cbc_sha", false);
 pref("security.ssl3.rsa_rc4_40_md5", false);
 pref("security.ssl3.rsa_rc2_40_md5", false);
-// Camellia is broken on Windows CE for now, see bug 508113
-#ifndef WINCE
 pref("security.ssl3.dhe_rsa_camellia_256_sha", true);
 pref("security.ssl3.dhe_dss_camellia_256_sha", true);
 pref("security.ssl3.rsa_camellia_256_sha", true);
 pref("security.ssl3.dhe_rsa_camellia_128_sha", true);
 pref("security.ssl3.dhe_dss_camellia_128_sha", true);
 pref("security.ssl3.rsa_camellia_128_sha", true);
-#endif
 pref("security.ssl3.dhe_rsa_aes_256_sha", true);
 pref("security.ssl3.dhe_dss_aes_256_sha", true);
 pref("security.ssl3.rsa_aes_256_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_des_ede3_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_null_sha", false);
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -94,22 +94,18 @@ CPPSRCS		= \
 		$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 	CPPSRCS += nsURLHelperOS2.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 	CPPSRCS += nsURLHelperWin.cpp
 	CPPSRCS += nsNativeConnectionHelper.cpp
-ifneq ($(OS_ARCH), WINCE)
 	CPPSRCS += nsAutodialWin.cpp
 else
-	CPPSRCS += nsAutodialWinCE.cpp
-endif
-else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	CPPSRCS += nsURLHelperOSX.cpp
 else
 	CPPSRCS += nsURLHelperUnix.cpp
 endif
 endif
 endif
 
deleted file mode 100644
--- a/netwerk/base/src/nsAutodialWinCE.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Steve Meredith <smeredith@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <objbase.h>
-
-#ifdef WINCE_WINDOWS_MOBILE
-#include <connmgr.h>
-#endif
-
-#include "nsAutodialWinCE.h"
-
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
-#include "nsIServiceManager.h"
-
-// pulled from the header so that we do not get multiple define errors during link
-static const GUID autodial_DestNetInternet =
-        { 0x436ef144, 0xb4fb, 0x4863, { 0xa0, 0x41, 0x8f, 0x90, 0x5a, 0x62, 0xc5, 0x72 } };
-
-nsAutodial::nsAutodial()
-{
-}
-
-nsAutodial::~nsAutodial()
-{
-}
-
-nsresult
-nsAutodial::Init()
-{
-  return NS_OK;
-}
-
-nsresult nsAutodial::DialDefault(const PRUnichar* hostName)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  HANDLE connectionHandle;
-
-  // always use http://
-  nsString theURL;
-  theURL.Append(L"http://");
-  theURL.Append(hostName);
-  
-  GUID networkUID;
-  ConnMgrMapURL(theURL.get(), &networkUID, 0);
-
-  // Make the connection to the new network
-  CONNMGR_CONNECTIONINFO conn_info;
-  memset(&conn_info, 0, sizeof(conn_info));
-  
-  conn_info.cbSize      = sizeof(conn_info);
-  conn_info.dwParams    = CONNMGR_PARAM_GUIDDESTNET;
-  conn_info.dwPriority  = CONNMGR_PRIORITY_USERINTERACTIVE;
-  conn_info.guidDestNet = networkUID;
-  conn_info.bExclusive  = FALSE;
-  conn_info.bDisabled   = FALSE;
-  conn_info.dwFlags     = CONNMGR_FLAG_PROXY_HTTP | CONNMGR_FLAG_PROXY_WAP | 
-                          CONNMGR_FLAG_PROXY_SOCKS4 | CONNMGR_FLAG_PROXY_SOCKS5 |
-                          CONNMGR_FLAG_NO_ERROR_MSGS;
-
-  DWORD status;
-  HRESULT result = ConnMgrEstablishConnectionSync(&conn_info, 
-                                                  &connectionHandle, 
-                                                  60000,
-                                                  &status);
-  
-  if (conn_info.guidDestNet != autodial_DestNetInternet &&
-      (result != S_OK || status != CONNMGR_STATUS_CONNECTED)) {
-    conn_info.guidDestNet = autodial_DestNetInternet;  
-    result = ConnMgrEstablishConnectionSync(&conn_info, 
-                                            &connectionHandle, 
-                                            60000,
-                                            &status);
-  }
-  
-  if (result != S_OK || status != CONNMGR_STATUS_CONNECTED)
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-#else
-  return NS_ERROR_FAILURE;
-#endif
-}
-
-PRBool
-nsAutodial::ShouldDialOnNetworkError()
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  return PR_TRUE;
-#else
-  return PR_FALSE;
-#endif
-}
deleted file mode 100644
--- a/netwerk/base/src/nsAutodialWinCE.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Steve Meredith <smeredith@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsAutodialWin_h__
-#define nsAutodialWin_h__
-
-#include "nspr.h"
-#include "nscore.h"
-
-#include <windows.h>
-
-
-class nsAutodial
-{
-public:
-  
-    // ctor
-    nsAutodial();
-
-    // dtor
-    virtual ~nsAutodial();
-
-    // Get the autodial info from the OS and init this obj with it. Call it any
-    // time to refresh the object's settings from the OS.
-    nsresult Init();
-
-    // Dial the default RAS dialup connection.
-    nsresult DialDefault(const PRUnichar* hostName);
-
-    // Should we try to dial on network error?
-    PRBool ShouldDialOnNetworkError();
-};
-
-
-#endif
--- a/netwerk/base/src/nsNativeConnectionHelper.cpp
+++ b/netwerk/base/src/nsNativeConnectionHelper.cpp
@@ -35,18 +35,16 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsNativeConnectionHelper.h"
 
 #if defined(MOZ_PLATFORM_MAEMO)
 #include "nsAutodialMaemo.h"
-#elif defined(WINCE)
-#include "nsAutodialWinCE.h"
 #else
 #include "nsAutodialWin.h"
 #endif
 
 #include "nsIOService.h"
 
 //-----------------------------------------------------------------------------
 // API typically invoked on the socket transport thread
@@ -54,17 +52,17 @@
 
 PRBool
 nsNativeConnectionHelper::OnConnectionFailed(const PRUnichar* hostName)
 {
   // On mobile platforms, instead of relying on the link service, we
   // should ask the dialer directly.  This allows the dialer to update
   // link status more forcefully rather than passively watching link
   // status changes.
-#if !defined(MOZ_PLATFORM_MAEMO) && !defined(WINCE_WINDOWS_MOBILE)
+#if !defined(MOZ_PLATFORM_MAEMO)
     if (gIOService->IsLinkUp())
         return PR_FALSE;
 #endif
 
     nsAutodial autodial;
     if (autodial.ShouldDialOnNetworkError())
         return NS_SUCCEEDED(autodial.DialDefault(hostName));
 
--- a/netwerk/base/src/nsURLHelperWin.cpp
+++ b/netwerk/base/src/nsURLHelperWin.cpp
@@ -54,23 +54,21 @@ net_GetURLSpecFromActualFile(nsIFile *aF
     rv = aFile->GetPath(path);
     if (NS_FAILED(rv)) return rv;
   
     // Replace \ with / to convert to an url
     path.ReplaceChar(PRUnichar(0x5Cu), PRUnichar(0x2Fu));
 
     nsCAutoString escPath;
 
-    // Windows Desktop paths beging with a drive letter, so need an 'extra'
+    // Windows Desktop paths begin with a drive letter, so need an 'extra'
     // slash at the begining
-#ifdef WINCE  //  /Windows  => file:///Windows
-    NS_NAMED_LITERAL_CSTRING(prefix, "file://");
-#else  // C:\Windows =>  file:///C:/Windows
+    // C:\Windows =>  file:///C:/Windows
     NS_NAMED_LITERAL_CSTRING(prefix, "file:///");
-#endif  
+
     // Escape the path with the directory mask
     NS_ConvertUTF16toUTF8 ePath(path);
     if (NS_EscapeURL(ePath.get(), -1, esc_Directory+esc_Forced, escPath))
         escPath.Insert(prefix, 0);
     else
         escPath.Assign(prefix + ePath);
 
     // esc_Directory does not escape the semicolons, so if a filename 
@@ -123,21 +121,19 @@ net_GetFileFromURLSpec(const nsACString 
         path += '.';
         NS_EscapeURL(fileExtension, esc_FileExtension|esc_AlwaysCopy, path);
     }
     
     NS_UnescapeURL(path);
     if (path.Length() != strlen(path.get()))
         return NS_ERROR_FILE_INVALID_PATH;
 
-#ifndef WINCE
     // remove leading '\'
     if (path.CharAt(0) == '\\')
         path.Cut(0, 1);
-#endif
 
     if (IsUTF8(path))
         rv = localFile->InitWithPath(NS_ConvertUTF8toUTF16(path));
         // XXX In rare cases, a valid UTF-8 string can be valid as a native 
         // encoding (e.g. 0xC5 0x83 is valid both as UTF-8 and Windows-125x).
         // However, the chance is very low that a meaningful word in a legacy
         // encoding is valid as UTF-8.
     else 
--- a/netwerk/build.mk
+++ b/netwerk/build.mk
@@ -57,21 +57,19 @@ endif
 
 # the offline cache uses mozStorage
 ifdef MOZ_STORAGE
 tier_necko_dirs += storage/public
 endif
 
 # these are only in the necko tier because libpref needs it
 
-ifndef WINCE
 ifneq (,$(MOZ_XPINSTALL))
 tier_necko_dirs += modules/libreg
 endif
-endif
 
 tier_necko_dirs += \
 		modules/libpref \
 		intl \
 		netwerk \
 		$(NULL)
 
 ifdef MOZ_AUTH_EXTENSION
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -67,21 +67,16 @@ SHARED_LIBRARY_LIBS = \
   ../ipc/$(LIB_PREFIX)neckoipc_s.$(LIB_SUFFIX) \
   $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
     SHARED_LIBRARY_LIBS += \
         ../system/win32/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-    SHARED_LIBRARY_LIBS += \
-        ../system/wince/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
     SHARED_LIBRARY_LIBS += \
         ../system/mac/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_ENABLE_LIBCONIC
     SHARED_LIBRARY_LIBS += \
         ../system/maemo/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
@@ -109,20 +104,16 @@ LOCAL_INCLUDES = \
   $(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
     -I$(srcdir)/../protocol/$(d)) \
   $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
     LOCAL_INCLUDES += -I$(srcdir)/../system/win32
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-    LOCAL_INCLUDES += -I$(srcdir)/../system/wince
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
     LOCAL_INCLUDES += -I$(srcdir)/../system/mac
 endif
 
 ifdef MOZ_ENABLE_LIBCONIC
     LOCAL_INCLUDES += -I$(srcdir)/../system/maemo
 endif
 
@@ -187,13 +178,9 @@ endif
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-OS_LIBS += $(call EXPAND_LIBNAME,cellcore ws2)
-endif
-
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
@@ -46,23 +46,18 @@
 
 #include "nsIServiceManager.h"
 #include "nsIURL.h"
 
 #include "nsNetUtil.h"
 
 // URL file handling, copied and modified from xpfe/components/bookmarks/src/nsBookmarksService.cpp
 #ifdef XP_WIN
-#ifndef WINCE
-// Windows mobile does not support internet shortcuts including
-// CLSID_InternetShortcut and IUniformResourceLocator used in
-// this file
 #include <shlobj.h>
 #include <intshcut.h>
-#endif
 #include "nsIFileURL.h"
 #ifdef CompareString
 #undef CompareString
 #endif
 #endif
 
 // URL file handling for OS/2
 #ifdef XP_OS2
@@ -97,17 +92,17 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsFileProt
 //-----------------------------------------------------------------------------
 // nsIProtocolHandler methods:
 
 #if defined(XP_WIN)
 NS_IMETHODIMP
 nsFileProtocolHandler::ReadURLFile(nsIFile* aFile, nsIURI** aURI)
 {
 // IUniformResourceLocator isn't supported by VC5 (bless its little heart)
-#if _MSC_VER < 1200 || defined (WINCE)
+#if _MSC_VER < 1200
     return NS_ERROR_NOT_AVAILABLE;
 #else
     nsAutoString path;
     nsresult rv = aFile->GetPath(path);
     if (NS_FAILED(rv))
         return rv;
 
     if (path.Length() < 4)
@@ -140,17 +135,17 @@ nsFileProtocolHandler::ReadURLFile(nsIFi
                 }
             }
             urlFile->Release();
         }
         urlLink->Release();
     }
     return rv;
 
-#endif //_MSC_VER < 1200 || defined (WINCE)
+#endif //_MSC_VER < 1200
 }
 
 #elif defined(XP_OS2)
 NS_IMETHODIMP
 nsFileProtocolHandler::ReadURLFile(nsIFile* aFile, nsIURI** aURI)
 {
     nsresult rv;
 
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -695,23 +695,21 @@ nsHttpHandler::InitUserAgentComponents()
         mOscpu.AssignLiteral("2.11");
     else if (os2ver == 30)
         mOscpu.AssignLiteral("Warp 3");
     else if (os2ver == 40)
         mOscpu.AssignLiteral("Warp 4");
     else if (os2ver == 45)
         mOscpu.AssignLiteral("Warp 4.5");
 
-#elif defined(WINCE) || defined(XP_WIN)
+#elif defined(XP_WIN)
     OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
     if (GetVersionEx(&info)) {
         const char *format;
-#ifdef WINCE
-        format = "WindowsCE %ld.%ld";
-#elif defined _M_IA64
+#if defined _M_IA64
         format = WNT_BASE W64_PREFIX "; IA64";
 #elif defined _M_X64 || defined _M_AMD64
         format = WNT_BASE W64_PREFIX "; x64";
 #else
         BOOL isWow64 = FALSE;
         IsWow64ProcessP fnIsWow64Process = (IsWow64ProcessP)
           GetProcAddress(GetModuleHandleW(L"kernel32"), "IsWow64Process");
         if (fnIsWow64Process &&
--- a/netwerk/system/Makefile.in
+++ b/netwerk/system/Makefile.in
@@ -43,20 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 
 ifeq ($(OS_ARCH),WINNT)
     DIRS += win32
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-    DIRS += wince
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
     DIRS += mac
 endif
 
 ifdef MOZ_ENABLE_LIBCONIC
     DIRS += maemo
 endif
 
deleted file mode 100644
--- a/netwerk/system/wince/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Juan Lang
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE	       = necko
-LIBRARY_NAME   = neckosystem_s
-LIBXUL_LIBRARY = 1
-
-FORCE_STATIC_LIB = 1
-
-CPPSRCS += nsNotifyAddrListener.cpp
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET
deleted file mode 100644
--- a/netwerk/system/wince/nsNotifyAddrListener.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Windows CE Link Monitoring.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Doug Turner <dougt@meer.net>  (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsNotifyAddrListener.h"
-#include "nsServiceManagerUtils.h"
-#include "nsString.h"
-#include "nsIObserverService.h"
-
-#include <objbase.h>
-#ifdef WINCE_WINDOWS_MOBILE
-#include <connmgr.h>
-#endif
-
-// pulled from the header so that we do not get multiple define errors during link
-static const GUID nal_DestNetInternet =
-        { 0x436ef144, 0xb4fb, 0x4863, { 0xa0, 0x41, 0x8f, 0x90, 0x5a, 0x62, 0xc5, 0x72 } };
-
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsNotifyAddrListener,
-                              nsINetworkLinkService)
-
-nsNotifyAddrListener::nsNotifyAddrListener()
-: mConnectionHandle(NULL)
-{
-}
-
-nsNotifyAddrListener::~nsNotifyAddrListener()
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  if (mConnectionHandle)
-    ConnMgrReleaseConnection(mConnectionHandle, 0);
-#endif
-}
-
-nsresult
-nsNotifyAddrListener::Init(void)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  CONNMGR_CONNECTIONINFO conn_info;
-  memset(&conn_info, 0, sizeof(conn_info));
-  
-  conn_info.cbSize      = sizeof(conn_info);
-  conn_info.dwParams    = CONNMGR_PARAM_GUIDDESTNET;
-  conn_info.dwPriority  = CONNMGR_PRIORITY_LOWBKGND;
-  conn_info.guidDestNet = nal_DestNetInternet;
-  conn_info.bExclusive  = FALSE;
-  conn_info.bDisabled   = FALSE;
-  
-  ConnMgrEstablishConnection(&conn_info, 
-                             &mConnectionHandle);
-
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNotifyAddrListener::GetIsLinkUp(PRBool *aIsUp)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  DWORD status;
-  HRESULT result = ConnMgrConnectionStatus(mConnectionHandle, &status);
-  if (FAILED(result)) {
-    *aIsUp = PR_FALSE;
-    return NS_ERROR_FAILURE;
-  }
-  *aIsUp = status == CONNMGR_STATUS_CONNECTED;
-#else
-  *aIsUp = PR_TRUE;
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNotifyAddrListener::GetLinkStatusKnown(PRBool *aIsKnown)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  DWORD status;
-  HRESULT result = ConnMgrConnectionStatus(mConnectionHandle, &status);
-  if (FAILED(result)) {
-    *aIsKnown = PR_FALSE;
-    return NS_ERROR_FAILURE;
-  }
-  *aIsKnown = status != CONNMGR_STATUS_UNKNOWN;
-#else
-  *aIsKnown = PR_TRUE;
-#endif
-  return NS_OK;
-}
deleted file mode 100644
--- a/netwerk/system/wince/nsNotifyAddrListener.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Windows CE Link Monitoring.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Doug Turner <dougt@meer.net>  (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef NSNOTIFYADDRLISTENER_H_
-#define NSNOTIFYADDRLISTENER_H_
-
-#include <windows.h>
-
-#include "nsINetworkLinkService.h"
-#include "nsCOMPtr.h"
-
-
-class nsNotifyAddrListener : public nsINetworkLinkService
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSINETWORKLINKSERVICE
-
-    nsNotifyAddrListener();
-    virtual ~nsNotifyAddrListener();
-
-    nsresult Init(void);
-
-protected:
-    HANDLE mConnectionHandle;
-};
-
-#endif /* NSNOTIFYADDRLISTENER_H_ */