Base import of Tycho code (warning: huge commit)

29 files changed, 1487 insertions, 174 deletions

diff --git a/other-licenses/7zstub/firefox/7zSD.sfx b/other-licenses/7zstub/firefox/7zSD.sfx
index 027c81e4c..0243a84c8 100644
--- a/other-licenses/7zstub/firefox/7zSD.sfx
+++ b/other-licenses/7zstub/firefox/7zSD.sfx
diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
index 8f2727426..4f739c886 100644
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
+++ b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
@@ -242,10 +242,16 @@ int APIENTRY WinMain(
 

   /* BEGIN Mozilla customizations */

   bool showProgress = true;

+  bool extractOnly = false;

   if (switches.Left(3).CompareNoCase(UString(L"-ms")) == 0 ||

-	  switches.Left(4).CompareNoCase(UString(L"/INI")) == 0 ||

-	  switches.Left(2).CompareNoCase(UString(L"/S")) == 0)

+      switches.Left(4).CompareNoCase(UString(L"/ini")) == 0 ||

+      switches.Left(2).CompareNoCase(UString(L"/s")) == 0) {

     showProgress = false;

+  } else if (switches.Left(12).CompareNoCase(UString(L"/extractdir=")) == 0) {

+    assumeYes = true;

+    showProgress = false;

+    extractOnly = true;

+  }

   /* END Mozilla customizations */

 

   AString config;

@@ -290,16 +296,20 @@ int APIENTRY WinMain(
   }

 

   NFile::NDirectory::CTempDirectory tempDir;

-  if (!tempDir.Create(kTempDirPrefix))

+  /* Mozilla customizations - Added !extractOnly */

+  if (!extractOnly && !tempDir.Create(kTempDirPrefix))

   {

     if (!assumeYes)

       MyMessageBox(L"Can not create temp folder archive");

     return 1;

   }

 

+  /* BEGIN Mozilla customizations */

+  UString tempDirPath = (extractOnly ? switches.Mid(12) : GetUnicodeString(tempDir.GetPath()));

+  /* END Mozilla customizations */

+

   COpenCallbackGUI openCallback;

 

-  UString tempDirPath = GetUnicodeString(tempDir.GetPath());

   bool isCorrupt = false;

   UString errorMessage;

   HRESULT result = ExtractArchive(fullPath, tempDirPath, &openCallback, showProgress, 

@@ -320,6 +330,13 @@ int APIENTRY WinMain(
     return 1;

   }

 

+  /* BEGIN Mozilla customizations */

+  // The code immediately above handles the error case for extraction.

+  if (extractOnly) {

+    return 0;

+  }

+  /* END Mozilla customizations */

+

   CCurrentDirRestorer currentDirRestorer;

 

   if (!SetCurrentDirectory(tempDir.GetPath()))

diff --git a/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/ProgressDialog.cpp b/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/ProgressDialog.cpp
index 67d7b49b9..b421e8cce 100644
--- a/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/ProgressDialog.cpp
+++ b/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/ProgressDialog.cpp
@@ -164,9 +164,9 @@ bool CProgressDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
       ProgressSynch.SetPaused(true);

       int res = ::MessageBoxW(HWND(*this), 

           L"Are you sure you want to cancel?", 

-          _title, MB_YESNOCANCEL);

+          _title, MB_YESNO);

       ProgressSynch.SetPaused(paused);

-      if (res == IDCANCEL || res == IDNO)

+      if (res == IDNO)

         return true;

       break;

     }

diff --git a/other-licenses/android/Makefile.in b/other-licenses/android/Makefile.in
deleted file mode 100644
index f21bd530b..000000000
--- a/other-licenses/android/Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-FORCE_STATIC_LIB = 1
-
-CSRCS = \
-  ev_streams.c \
-  ev_timers.c \
-  getaddrinfo.c \
-  ns_name.c \
-  ns_netint.c \
-  ns_parse.c \
-  ns_print.c \
-  ns_samedomain.c \
-  ns_ttl.c \
-  res_comp.c \
-  res_data.c \
-  res_debug.c \
-  res_init.c \
-  res_mkquery.c \
-  res_send.c \
-  res_state.c \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/android/moz.build b/other-licenses/android/moz.build
index 4a7bec51b..5dbda97c1 100644
--- a/other-licenses/android/moz.build
+++ b/other-licenses/android/moz.build
@@ -4,7 +4,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'android'
+UNIFIED_SOURCES += [
+    'ev_streams.c',
+    'ev_timers.c',
+    'getaddrinfo.c',
+    'ns_name.c',
+    'ns_netint.c',
+    'ns_parse.c',
+    'ns_samedomain.c',
+    'ns_ttl.c',
+    'res_comp.c',
+    'res_data.c',
+    'res_init.c',
+    'res_send.c',
+]
 
-LIBRARY_NAME = 'android'
+# These files can't be unified because of conflicting global variable names.
+SOURCES += [
+    'ns_print.c',
+    'res_debug.c',
+    'res_mkquery.c',
+    'res_state.c',
+]
 
+FINAL_LIBRARY = 'mozglue'
diff --git a/other-licenses/atk-1.0/atk/atkobject.h b/other-licenses/atk-1.0/atk/atkobject.h
index e3380170b..88a5ba6bb 100644
--- a/other-licenses/atk-1.0/atk/atkobject.h
+++ b/other-licenses/atk-1.0/atk/atkobject.h
@@ -42,7 +42,7 @@ extern "C" {
  *AtkRole:
  *@ATK_ROLE_INVALID: Invalid role
  *@ATK_ROLE_ACCEL_LABEL: A label which represents an accelerator
- *@ATK_ROLE_ALERT: An object which is an alert to the user
+ *@ATK_ROLE_ALERT: An object which is an alert to the user. Assistive Technologies typically respond to ATK_ROLE_ALERT by reading the entire onscreen contents of containers advertising this role.  Should be used for warning dialogs, etc.
  *@ATK_ROLE_ANIMATION: An object which is an animated image
  *@ATK_ROLE_ARROW: An arrow in one of the four cardinal directions
  *@ATK_ROLE_CALENDAR:  An object that displays a calendar and allows the user to select a date
@@ -51,7 +51,7 @@ extern "C" {
  *@ATK_ROLE_CHECK_MENU_ITEM: A menu item with a check box
  *@ATK_ROLE_COLOR_CHOOSER: A specialized dialog that lets the user choose a color
  *@ATK_ROLE_COLUMN_HEADER: The header for a column of data
- *@ATK_ROLE_COMBO_BOX: A list of choices the user can select from
+ *@ATK_ROLE_COMBO_BOX: A collapsible list of choices the user can select from
  *@ATK_ROLE_DATE_EDITOR: An object whose purpose is to allow a user to edit a date
  *@ATK_ROLE_DESKTOP_ICON: An inconifed internal frame within a DESKTOP_PANE
  *@ATK_ROLE_DESKTOP_FRAME: A pane that supports internal frames and iconified versions of those internal frames
@@ -99,46 +99,109 @@ extern "C" {
  *@ATK_ROLE_TABLE_COLUMN_HEADER: The header for a column of a table
  *@ATK_ROLE_TABLE_ROW_HEADER: The header for a row of a table
  *@ATK_ROLE_TEAR_OFF_MENU_ITEM: A menu item used to tear off and reattach its menu
- *@ATK_ROLE_TERMINAL: An object that represents an accessible terminal
+ *@ATK_ROLE_TERMINAL: An object that represents an accessible terminal.  @Since: ATK-0.6
  *@ATK_ROLE_TEXT: An object that presents text to the user
  *@ATK_ROLE_TOGGLE_BUTTON: A specialized push button that can be checked or unchecked, but does not provide a separate indicator for the current state
  *@ATK_ROLE_TOOL_BAR: A bar or palette usually composed of push buttons or toggle buttons
  *@ATK_ROLE_TOOL_TIP: An object that provides information about another object
  *@ATK_ROLE_TREE: An object used to represent hierarchical information to the user
- *@ATK_ROLE_TREE_TABLE: An object capable of expanding and collapsing rows as well as showing multiple columns of data
+ *@ATK_ROLE_TREE_TABLE: An object capable of expanding and collapsing rows as well as showing multiple columns of data.   @Since: ATK-0.7
  *@ATK_ROLE_UNKNOWN: The object contains some Accessible information, but its role is not known
  *@ATK_ROLE_VIEWPORT: An object usually used in a scroll pane
  *@ATK_ROLE_WINDOW: A top level window with no title or border.
- *@ATK_ROLE_HEADER: An object that serves as a document header.
- *@ATK_ROLE_FOOTER: An object that serves as a document footer.
- *@ATK_ROLE_PARAGRAPH: An object which is contains a paragraph of text content.
- *@ATK_ROLE_RULER: An object which describes margins and tab stops, etc. for text objects which it controls (should have CONTROLLER_FOR relation to such).
- *@ATK_ROLE_APPLICATION: The object is an application object, which may contain @ATK_ROLE_FRAME objects or other types of accessibles.
- *@ATK_ROLE_AUTOCOMPLETE: The object is a dialog or list containing items for insertion into an entry widget, for instance a list of words for completion of a text entry.
- *@ATK_ROLE_EDITBAR: The object is an editable text object in a toolbar
- *@ATK_ROLE_EMBEDDED: The object is an embedded container within a document or panel.  This role is a grouping "hint" indicating that the contained objects share a context.
- *@ATK_ROLE_ENTRY: The object is a component whose textual content may be entered or modified by the user, provided @ATK_STATE_EDITABLE is present.
- *@ATK_ROLE_CHART: The object is a graphical depiction of quantitative data. It may contain multiple subelements whose attributes and/or description may be queried to obtain both the quantitative data and information about how the data is being presented. The LABELLED_BY relation is particularly important in interpreting objects of this type, as is the accessible-description property.
- *@ATK_ROLE_CAPTION: The object contains descriptive information, usually textual, about another user interface element such as a table, chart, or image.
- *@ATK_ROLE_DOCUMENT_FRAME: The object is a visual frame or container which contains a view of document content. Document frames may occur within another Document instance, in which case the second document may be said to be embedded in the containing instance. HTML frames are often ROLE_DOCUMENT_FRAME. Either this object, or a singleton descendant, should implement the Document interface.
+ *@ATK_ROLE_HEADER: An object that serves as a document header. @Since: ATK-1.1.1
+ *@ATK_ROLE_FOOTER: An object that serves as a document footer.  @Since: ATK-1.1.1
+ *@ATK_ROLE_PARAGRAPH: An object which is contains a paragraph of text content.   @Since: ATK-1.1.1
+ *@ATK_ROLE_RULER: An object which describes margins and tab stops, etc. for text objects which it controls (should have CONTROLLER_FOR relation to such).   @Since: ATK-1.1.1
+ *@ATK_ROLE_APPLICATION: The object is an application object, which may contain @ATK_ROLE_FRAME objects or other types of accessibles.  The root accessible of any application's ATK hierarchy should have ATK_ROLE_APPLICATION.   @Since: ATK-1.1.4
+ *@ATK_ROLE_AUTOCOMPLETE: The object is a dialog or list containing items for insertion into an entry widget, for instance a list of words for completion of a text entry.   @Since: ATK-1.3
+ *@ATK_ROLE_EDITBAR: The object is an editable text object in a toolbar.  @Since: ATK-1.5
+ *@ATK_ROLE_EMBEDDED: The object is an embedded container within a document or panel.  This role is a grouping "hint" indicating that the contained objects share a context.  @Since: ATK-1.7.2
+ *@ATK_ROLE_ENTRY: The object is a component whose textual content may be entered or modified by the user, provided @ATK_STATE_EDITABLE is present.   @Since: ATK-1.11
+ *@ATK_ROLE_CHART: The object is a graphical depiction of quantitative data. It may contain multiple subelements whose attributes and/or description may be queried to obtain both the quantitative data and information about how the data is being presented. The LABELLED_BY relation is particularly important in interpreting objects of this type, as is the accessible-description property.  @Since: ATK-1.11
+ *@ATK_ROLE_CAPTION: The object contains descriptive information, usually textual, about another user interface element such as a table, chart, or image.  @Since: ATK-1.11
+ *@ATK_ROLE_DOCUMENT_FRAME: The object is a visual frame or container which contains a view of document content. Document frames may occur within another Document instance, in which case the second document may be said to be embedded in the containing instance. HTML frames are often ROLE_DOCUMENT_FRAME. Either this object, or a singleton descendant, should implement the Document interface.  @Since: ATK-1.11
  *@ATK_ROLE_HEADING: The object serves as a heading for content which follows it in a document. The 'heading level' of the heading, if availabe, may be obtained by querying the object's attributes.
- *@ATK_ROLE_PAGE: The object is a containing instance which encapsulates a page of information. @ATK_ROLE_PAGE is used in documents and content which support a paginated navigation model.
- *@ATK_ROLE_SECTION: The object is a containing instance of document content which constitutes a particular 'logical' section of the document. The type of content within a section, and the nature of the section division itself, may be obtained by querying the object's attributes. Sections may be nested.
- *@ATK_ROLE_REDUNDANT_OBJECT: The object is redundant with another object in the hierarchy, and is exposed for purely technical reasons.  Objects of this role should normally be ignored by clients. 
+ *@ATK_ROLE_PAGE: The object is a containing instance which encapsulates a page of information. @ATK_ROLE_PAGE is used in documents and content which support a paginated navigation model.  @Since: ATK-1.11
+ *@ATK_ROLE_SECTION: The object is a containing instance of document content which constitutes a particular 'logical' section of the document. The type of content within a section, and the nature of the section division itself, may be obtained by querying the object's attributes. Sections may be nested. @Since: ATK-1.11
+ *@ATK_ROLE_REDUNDANT_OBJECT: The object is redundant with another object in the hierarchy, and is exposed for purely technical reasons.  Objects of this role should normally be ignored by clients. @Since: ATK-1.11
  *@ATK_ROLE_FORM: The object is a container for form controls, for instance as part of a 
  * web form or user-input form within a document.  This role is primarily a tag/convenience for 
  * clients when navigating complex documents, it is not expected that ordinary GUI containers will 
- * always have ATK_ROLE_FORM.
+ * always have ATK_ROLE_FORM. @Since: ATK-1.12.0
  *@ATK_ROLE_LINK: The object is a hypertext anchor, i.e. a "link" in a
  * hypertext document.  Such objects are distinct from 'inline'
  * content which may also use the Hypertext/Hyperlink interfaces
  * to indicate the range/location within a text object where
- * an inline or embedded object lies.
+ * an inline or embedded object lies.  @Since: ATK-1.12.1
  *@ATK_ROLE_INPUT_METHOD_WINDOW: The object is a window or similar viewport 
  * which is used to allow composition or input of a 'complex character',
- * in other words it is an "input method window."
+ * in other words it is an "input method window." @Since: ATK-1.12.1
+ *@ATK_ROLE_TABLE_ROW: A row in a table.  @Since: ATK-2.1.0
+ *@ATK_ROLE_TREE_ITEM: An object that represents an element of a tree.  @Since: ATK-2.1.0
+ *@ATK_ROLE_DOCUMENT_SPREADSHEET: A document frame which contains a spreadsheet.  @Since: ATK-2.1.0
+ *@ATK_ROLE_DOCUMENT_PRESENTATION: A document frame which contains a presentation or slide content.  @Since: ATK-2.1.0
+ *@ATK_ROLE_DOCUMENT_TEXT: A document frame which contains textual content, such as found in a word processing application.  @Since: ATK-2.1.0
+ *@ATK_ROLE_DOCUMENT_WEB: A document frame which contains HTML or other markup suitable for display in a web browser.  @Since: ATK-2.1.0
+ *@ATK_ROLE_DOCUMENT_EMAIL: A document frame which contains email content to be displayed or composed either in plain text or HTML.  @Since: ATK-2.1.0
+ *@ATK_ROLE_COMMENT: An object found within a document and designed to present a comment, note, or other annotation. In some cases, this object might not be visible until activated.  @Since: ATK-2.1.0
+ *@ATK_ROLE_LIST_BOX: A non-collapsible list of choices the user can select from. @Since: ATK-2.1.0
+ *@ATK_ROLE_GROUPING: A group of related widgets. This group typically has a label. @Since: ATK-2.1.0
+ *@ATK_ROLE_IMAGE_MAP: An image map object. Usually a graphic with multiple hotspots, where each hotspot can be activated resulting in the loading of another document or section of a document. @Since: ATK-2.1.0
+ *@ATK_ROLE_NOTIFICATION: A transitory object designed to present a message to the user, typically at the desktop level rather than inside a particular application.  @Since: ATK-2.1.0
+ *@ATK_ROLE_INFO_BAR: An object designed to present a message to the user within an existing window. @Since: ATK-2.1.0
+ *@ATK_ROLE_LEVEL_BAR: A bar that serves as a level indicator to, for instance, show the strength of a password or the state of a battery.  @Since: ATK-2.7.3
+ *@ATK_ROLE_TITLE_BAR: A bar that serves as the title of a window or a
+ * dialog. @Since: ATK-2.12
+ *@ATK_ROLE_BLOCK_QUOTE: An object which contains a text section
+ * that is quoted from another source. @Since: ATK-2.12
+ *@ATK_ROLE_AUDIO: An object which represents an audio element. @Since: ATK-2.12
+ *@ATK_ROLE_VIDEO: An object which represents a video element. @Since: ATK-2.12
+ *@ATK_ROLE_DEFINITION: A definition of a term or concept. @Since: ATK-2.12
+ *@ATK_ROLE_ARTICLE: A section of a page that consists of a
+ * composition that forms an independent part of a document, page, or
+ * site. Examples: A blog entry, a news story, a forum post. @Since:
+ * ATK-2.12
+ *@ATK_ROLE_LANDMARK: A region of a web page intended as a
+ * navigational landmark. This is designed to allow Assistive
+ * Technologies to provide quick navigation among key regions within a
+ * document. @Since: ATK-2.12
+ *@ATK_ROLE_LOG: A text widget or container holding log content, such
+ * as chat history and error logs. In this role there is a
+ * relationship between the arrival of new items in the log and the
+ * reading order. The log contains a meaningful sequence and new
+ * information is added only to the end of the log, not at arbitrary
+ * points. @Since: ATK-2.12
+ *@ATK_ROLE_MARQUEE: A container where non-essential information
+ * changes frequently. Common usages of marquee include stock tickers
+ * and ad banners. The primary difference between a marquee and a log
+ * is that logs usually have a meaningful order or sequence of
+ * important content changes. @Since: ATK-2.12
+ *@ATK_ROLE_MATH: A text widget or container that holds a mathematical
+ * expression. @Since: ATK-2.12
+ *@ATK_ROLE_RATING: A widget whose purpose is to display a rating,
+ * such as the number of stars associated with a song in a media
+ * player. Objects of this role should also implement
+ * AtkValue. @Since: ATK-2.12
+ *@ATK_ROLE_TIMER: An object containing a numerical counter which
+ * indicates an amount of elapsed time from a start point, or the time
+ * remaining until an end point. @Since: ATK-2.12
+ *@ATK_ROLE_DESCRIPTION_LIST: An object that represents a list of
+ * term-value groups. A term-value group represents a individual
+ * description and consist of one or more names
+ * (ATK_ROLE_DESCRIPTION_TERM) followed by one or more values
+ * (ATK_ROLE_DESCRIPTION_VALUE). For each list, there should not be
+ * more than one group with the same term name. @Since: ATK-2.12
+ *@ATK_ROLE_DESCRIPTION_TERM: An object that represents the term, or
+ * name, part of a term-description group in a description
+ * list. @Since: ATK-2.12
+ *@ATK_ROLE_DESCRIPTION_VALUE: An object that represents the
+ * description, definition or value of a term-description group in a
+ * description list. The values within a group are alternatives,
+ * meaning that you can have several ATK_ROLE_DESCRIPTION_VALUE for a
+ * given ATK_ROLE_DESCRIPTION_TERM. @Since: ATK-2.12
  *@ATK_ROLE_LAST_DEFINED: not a valid role, used for finding end of the enumeration
- * 
+ *
  * Describes the role of an object
  *
  * These are the built-in enumerated roles that UI components can have in
@@ -147,8 +210,8 @@ extern "C" {
  **/
 typedef enum
 {
-  ATK_ROLE_INVALID = 0, 
-  ATK_ROLE_ACCEL_LABEL,
+  ATK_ROLE_INVALID = 0,
+  ATK_ROLE_ACCEL_LABEL,      /*<nick=accelerator-label>*/
   ATK_ROLE_ALERT,
   ATK_ROLE_ANIMATION,
   ATK_ROLE_ARROW,
@@ -235,6 +298,35 @@ typedef enum
   ATK_ROLE_FORM,
   ATK_ROLE_LINK,
   ATK_ROLE_INPUT_METHOD_WINDOW,
+  ATK_ROLE_TABLE_ROW,
+  ATK_ROLE_TREE_ITEM,
+  ATK_ROLE_DOCUMENT_SPREADSHEET,
+  ATK_ROLE_DOCUMENT_PRESENTATION,
+  ATK_ROLE_DOCUMENT_TEXT,
+  ATK_ROLE_DOCUMENT_WEB,
+  ATK_ROLE_DOCUMENT_EMAIL,
+  ATK_ROLE_COMMENT,
+  ATK_ROLE_LIST_BOX,
+  ATK_ROLE_GROUPING,
+  ATK_ROLE_IMAGE_MAP,
+  ATK_ROLE_NOTIFICATION,
+  ATK_ROLE_INFO_BAR,
+  ATK_ROLE_LEVEL_BAR,
+  ATK_ROLE_TITLE_BAR,
+  ATK_ROLE_BLOCK_QUOTE,
+  ATK_ROLE_AUDIO,
+  ATK_ROLE_VIDEO,
+  ATK_ROLE_DEFINITION,
+  ATK_ROLE_ARTICLE,
+  ATK_ROLE_LANDMARK,
+  ATK_ROLE_LOG,
+  ATK_ROLE_MARQUEE,
+  ATK_ROLE_MATH,
+  ATK_ROLE_RATING,
+  ATK_ROLE_TIMER,
+  ATK_ROLE_DESCRIPTION_LIST,
+  ATK_ROLE_DESCRIPTION_TERM,
+  ATK_ROLE_DESCRIPTION_VALUE,
   ATK_ROLE_LAST_DEFINED
 } AtkRole;
 
@@ -501,8 +593,10 @@ void                      (* initialize)                         (AtkObject
    * Since ATK 1.12
    */
   AtkAttributeSet* 	  (*get_attributes)            (AtkObject                  *accessible);
+
+  const gchar*            (*get_object_locale)         (AtkObject                  *accessible);
+
   AtkFunction             pad1;
-  AtkFunction             pad2;
 };
 
 GType            atk_object_get_type   (void);
diff --git a/other-licenses/atk-1.0/atk/atkrelationtype.h b/other-licenses/atk-1.0/atk/atkrelationtype.h
index bbce6349e..c932e5641 100644
--- a/other-licenses/atk-1.0/atk/atkrelationtype.h
+++ b/other-licenses/atk-1.0/atk/atkrelationtype.h
@@ -17,12 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_RELATION_TYPE_H__
 #define __ATK_RELATION_TYPE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <glib.h>
+
+G_BEGIN_DECLS
 
 /**
  *AtkRelationType:
@@ -37,7 +41,7 @@ extern "C" {
  *  AtkObject in a sequential way, (for instance text-flow).
  *@ATK_RELATION_FLOWS_FROM: Indicates that the object has content that flows logically from
  *  another AtkObject in a sequential way, (for instance text-flow).
- *@ATK_RELATION_SUBWINDOW_OF: Indicates a subwindow attached to a component but otherwise has no connection in  the UI hierarchy to that component.
+ *@ATK_RELATION_SUBWINDOW_OF: Indicates a subwindow attached to a component but otherwise has no connection in  the UI heirarchy to that component.
  *@ATK_RELATION_EMBEDS: Indicates that the object visually embeds 
  *  another object's content, i.e. this object's content flows around 
  *  another's content.
@@ -47,6 +51,7 @@ extern "C" {
  *@ATK_RELATION_PARENT_WINDOW_OF: Indicates that an object is a parent window of another object.
  *@ATK_RELATION_DESCRIBED_BY: Indicates that another object provides descriptive information about this object; more verbose than ATK_RELATION_LABELLED_BY.
  *@ATK_RELATION_DESCRIPTION_FOR: Indicates that an object provides descriptive information about another object; more verbose than ATK_RELATION_LABEL_FOR.
+ *@ATK_RELATION_NODE_PARENT_OF: Indicates an object is a cell in a treetable and is expanded to display other cells in the same column.
  *@ATK_RELATION_LAST_DEFINED: Not used, this value indicates the end of the enumeration.
  * 
  *Describes the type of the relation
@@ -69,11 +74,10 @@ typedef enum
   ATK_RELATION_PARENT_WINDOW_OF, 
   ATK_RELATION_DESCRIBED_BY,
   ATK_RELATION_DESCRIPTION_FOR,
+  ATK_RELATION_NODE_PARENT_OF,
   ATK_RELATION_LAST_DEFINED
 } AtkRelationType;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __ATK_RELATION_TYPE_H__ */
diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in
index 89611336c..7d748e918 100644
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -22,29 +22,9 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This program is output to dist/host/bin because it is only needed by the
 # build system and is not intended to be included in Mozilla distributions.
-HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
-
-ifdef MOZ_NATIVE_BZ2
-HOST_LIBS += $(MOZ_BZ2_LIBS)
-else
-HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
-endif
-
-ifeq ($(HOST_OS_ARCH),WINNT)
-HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
-endif
-
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/updater
 
 include $(topsrcdir)/config/rules.mk
 
-HOST_CXXFLAGS += $(MOZ_BZ2_CFLAGS)</textarea>
+HOST_CXXFLAGS += $(MOZ_BZ2_CFLAGS)
diff --git a/other-licenses/bsdiff/moz.build b/other-licenses/bsdiff/moz.build
index 34d51348f..e12a40f88 100644
--- a/other-licenses/bsdiff/moz.build
+++ b/other-licenses/bsdiff/moz.build
@@ -4,6 +4,25 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-HOST_CSRCS += [
+HOST_SOURCES += [
     'bsdiff.c',
 ]
+
+HostProgram('mbsdiff')
+
+if CONFIG['MOZ_NATIVE_BZ2']:
+    HOST_OS_LIBS += CONFIG['MOZ_BZ2_LIBS']
+else:
+    HOST_USE_LIBS += [
+        'hostbz2',
+    ]
+
+if CONFIG['HOST_OS_ARCH'] == 'WINNT':
+    HOST_OS_LIBS += [
+        'ws2_32',
+    ]
+
+LOCAL_INCLUDES += [
+    '/toolkit/mozapps/update/updater',
+]
+
diff --git a/other-licenses/nsis/Contrib/liteFirewall/License.txt b/other-licenses/nsis/Contrib/liteFirewall/License.txt
new file mode 100644
index 000000000..5e9673682
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/License.txt
@@ -0,0 +1,17 @@
+liteFirewall is based on nsisFirewall.

+

+nsisFirewall -- Small NSIS plugin for simple tasks with Windows Firewall

+Web site: http://wiz0u.free.fr/prog/nsisFirewall

+

+Copyright (c) 2007-2009 Olivier Marcoux

+

+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

+

+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:

+

+    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.

+

+    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.

+

+    3. This notice may not be removed or altered from any source distribution.

+

diff --git a/other-licenses/nsis/Contrib/liteFirewall/ReadMe.txt b/other-licenses/nsis/Contrib/liteFirewall/ReadMe.txt
new file mode 100644
index 000000000..42560ae0c
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/ReadMe.txt
@@ -0,0 +1,39 @@
+liteFirewall 1.0 -- based on nsisFirewall 1.2

+

+http://liangsun.info/portfolio/nsis-plugin-litefirewall/

+http://nsis.sourceforge.net/LiteFirewall_Plugin

+

+---------------------------------------------------------

+liteFirewall resolved the issue nsisFirewall exists on Vista/Windows 7 platforms. 

+It support the profiles (private, domain, public) of firewall rules.

+It support Unicode NSIS, while another firewall plugin SimpleFC not.

+------------------------------------------------------------

+

+Usage

+----------------------------------------------------------

+liteFirewall::AddRule "<application path>" "<rule name>"

+liteFirewall::RemoveRule "<application path>" "<rule name>"

+

+<application path> is the full path to the application you want to be authorized to

+	access the network (or accept incoming connections)

+

+<rule name> is the title that will be given to this exception entry in the firewall

+	control panel list

+

+

+Notes

+-----

+1) Your installer must be run with administrator rights for liteFirewall to work

+2) When compiling with more recent compiler than VC60, you need to choose the compilation

+option to use static MFC library.

+

+Sample scripts

+--------------

+

+	; Add NOTEPAD to the authorized list

+	liteFirewall::AddRule "$WINDIR\Notepad.exe" "liteFirewall Test"

+	Pop $0

+

+	; Remove NOTEPAD from the authorized list

+	liteFirewall::RemoveRule "$WINDIR\Notepad.exe" "liteFirewall Test"

+	Pop $0
\ No newline at end of file
diff --git a/other-licenses/nsis/Contrib/liteFirewall/Sample.nsi b/other-licenses/nsis/Contrib/liteFirewall/Sample.nsi
new file mode 100644
index 000000000..20b0be47c
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/Sample.nsi
@@ -0,0 +1,25 @@
+; liteFirewall - Sample script

+

+!ifdef TARGETDIR

+!addplugindir "${TARGETDIR}"

+!else

+!addplugindir "..\bin"

+!endif

+

+Name "Sample liteFirewall"

+OutFile "Sample.exe"

+ShowInstDetails show	

+

+Section "Main program"

+	; Add NOTEPAD to the authorized list

+	liteFirewallW::AddRule "$WINDIR\Notepad.exe" "liteFirewall Test"

+	Pop $0

+	Exec "rundll32.exe shell32.dll,Control_RunDLL firewall.cpl"

+	MessageBox MB_OK "Program added to Firewall exception list.$\r$\n(close the control panel before clicking OK)"

+

+	; Remove NOTEPAD from the authorized list

+	liteFirewallW::RemoveRule "$WINDIR\Notepad.exe" "liteFirewall Test"

+	Pop $0

+	Exec "rundll32.exe shell32.dll,Control_RunDLL firewall.cpl"

+	MessageBox MB_OK "Program removed to Firewall exception list"

+SectionEnd

diff --git a/other-licenses/nsis/Contrib/liteFirewall/exdll.h b/other-licenses/nsis/Contrib/liteFirewall/exdll.h
new file mode 100644
index 000000000..feca246b5
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/exdll.h
@@ -0,0 +1,97 @@
+#ifndef _EXDLL_H_

+#define _EXDLL_H_

+

+// only include this file from one place in your DLL.

+// (it is all static, if you use it in two places it will fail)

+

+#define EXDLL_INIT()           {  \

+        g_stringsize=string_size; \

+        g_stacktop=stacktop;      \

+        g_variables=variables; }

+

+// For page showing plug-ins

+#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)

+#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)

+#define NOTIFY_BYE_BYE 'x'

+

+typedef struct _stack_t {

+  struct _stack_t *next;

+  TCHAR text[1]; // this should be the length of string_size

+} stack_t;

+

+

+static unsigned int g_stringsize;

+static stack_t **g_stacktop;

+static TCHAR *g_variables;

+

+static int __stdcall popstring(TCHAR *str); // 0 on success, 1 on empty stack

+static void __stdcall pushstring(const TCHAR *str);

+

+enum

+{

+INST_0,         // $0

+INST_1,         // $1

+INST_2,         // $2

+INST_3,         // $3

+INST_4,         // $4

+INST_5,         // $5

+INST_6,         // $6

+INST_7,         // $7

+INST_8,         // $8

+INST_9,         // $9

+INST_R0,        // $R0

+INST_R1,        // $R1

+INST_R2,        // $R2

+INST_R3,        // $R3

+INST_R4,        // $R4

+INST_R5,        // $R5

+INST_R6,        // $R6

+INST_R7,        // $R7

+INST_R8,        // $R8

+INST_R9,        // $R9

+INST_CMDLINE,   // $CMDLINE

+INST_INSTDIR,   // $INSTDIR

+INST_OUTDIR,    // $OUTDIR

+INST_EXEDIR,    // $EXEDIR

+INST_LANG,      // $LANGUAGE

+__INST_LAST

+};

+

+

+// utility functions (not required but often useful)

+static int __stdcall popstring(TCHAR *str)

+{

+  stack_t *th;

+  if (!g_stacktop || !*g_stacktop) return 1;

+  th=(*g_stacktop);

+  lstrcpy(str,th->text);

+  *g_stacktop = th->next;

+  GlobalFree((HGLOBAL)th);

+  return 0;

+}

+

+static void __stdcall pushstring(const TCHAR *str)

+{

+  stack_t *th;

+  if (!g_stacktop) return;

+  th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize*sizeof(TCHAR));

+  lstrcpyn(th->text,str,g_stringsize);

+  th->next=*g_stacktop;

+  *g_stacktop=th;

+}

+

+static TCHAR * __stdcall getuservariable(int varnum)

+{

+  if (varnum < 0 || varnum >= __INST_LAST) return NULL;

+  return g_variables+varnum*g_stringsize;

+}

+

+static void __stdcall setuservariable(int varnum, const TCHAR *var)

+{

+	if (var != NULL && varnum >= 0 && varnum < __INST_LAST) 

+		lstrcpy(g_variables + varnum*g_stringsize, var);

+}

+

+

+

+#endif//_EXDLL_H_
\ No newline at end of file
diff --git a/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.cpp b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.cpp
new file mode 100644
index 000000000..5319938a0
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.cpp
@@ -0,0 +1,408 @@
+/*

+liteFirewall is based on nsisFirewall.

+Modified by Liang Sun on 19, July, 2011

+http://liangsun.info/portfolio/nsis-plugin-litefirewall/

+http://nsis.sourceforge.net/LiteFirewall_Plugin

+http://www.msnlite.org

+*/

+

+/*

+nsisFirewall -- Small NSIS plugin for simple tasks with Windows Firewall

+Web site: http://wiz0u.free.fr/prog/nsisFirewall

+

+Copyright (c) 2007-2009 Olivier Marcoux

+

+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

+

+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:

+

+    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.

+

+    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.

+

+    3. This notice may not be removed or altered from any source distribution.

+*/

+#include <windows.h>

+#include <tchar.h>

+#include <shlwapi.h>

+//#include <stdio.h>

+

+#ifdef NSIS

+#include "exdll.h"

+#endif

+

+//#import "libid:58FBCF7C-E7A9-467C-80B3-FC65E8FCCA08"

+#import "netfw.tlb"

+#include <netfw.h>

+using namespace NetFwTypeLib;

+

+

+#pragma comment( lib, "ole32.lib" )

+#pragma comment( lib, "oleaut32.lib" )

+// Forward declarations

+

+#ifdef NSIS

+HINSTANCE g_hInstance;

+#endif

+

+HRESULT     WFCOMInitialize(INetFwPolicy2** ppNetFwPolicy2);

+

+HRESULT AddRule(LPCTSTR ExceptionName, LPCTSTR ProcessPath)

+{

+	HRESULT result = CoInitialize(NULL);

+	if (FAILED(result))

+		return result;

+	result = REGDB_E_CLASSNOTREG;

+

+	HRESULT hrComInit = S_OK;

+	HRESULT hr = S_OK;

+

+	INetFwPolicy2 *pNetFwPolicy2 = NULL;

+	INetFwRules *pFwRules = NULL;

+	INetFwRule *pFwRule = NULL;

+/* Start Mozilla modification */

+	INetFwRule *pFwRuleExisting = NULL;

+

+//	long CurrentProfilesBitMask = 0;

+/* End Mozilla modification */

+

+	BSTR bstrRuleName = SysAllocString(ExceptionName);

+	BSTR bstrApplicationName = SysAllocString(ProcessPath);

+	BSTR bstrRuleInterfaceType = SysAllocString(L"All");

+

+	// Initialize COM.

+	hrComInit = CoInitializeEx(

+		0,

+		COINIT_APARTMENTTHREADED

+		);

+

+	// Ignore RPC_E_CHANGED_MODE; this just means that COM has already been

+	// initialized with a different mode. Since we don't care what the mode is,

+	// we'll just use the existing mode.

+	if (hrComInit != RPC_E_CHANGED_MODE)

+	{

+		if (FAILED(hrComInit))

+		{

+			printf("CoInitializeEx failed: 0x%08lx\n", hrComInit);

+			goto Cleanup;

+		}

+	}

+

+	// Retrieve INetFwPolicy2

+	hr = WFCOMInitialize(&pNetFwPolicy2);

+	if (FAILED(hr))

+	{

+		try

+		{

+			INetFwMgrPtr fwMgr(L"HNetCfg.FwMgr");

+			if (fwMgr)

+			{

+				INetFwAuthorizedApplicationPtr app(L"HNetCfg.FwAuthorizedApplication");

+				if (app)

+				{

+					app->ProcessImageFileName = ProcessPath;

+					app->Name = ExceptionName;

+					app->Scope = NetFwTypeLib::NET_FW_SCOPE_ALL;

+					app->IpVersion = NetFwTypeLib::NET_FW_IP_VERSION_ANY;

+					app->Enabled = VARIANT_TRUE;

+					fwMgr->LocalPolicy->CurrentProfile->AuthorizedApplications->Add(app);

+				}

+			}

+		}

+		catch (_com_error& e)

+		{

+			printf("%s", e.Error());

+		}

+		goto Cleanup;

+	}

+

+	// Retrieve INetFwRules

+	hr = pNetFwPolicy2->get_Rules(&pFwRules);

+	if (FAILED(hr))

+	{

+		printf("get_Rules failed: 0x%08lx\n", hr);

+		goto Cleanup;

+	}

+

+/* Start Mozilla modification */

+	// Don't add a new rule if there is an existing rule with the same name.

+	hr = pFwRules->Item(bstrRuleName, &pFwRuleExisting);

+	// Release the INetFwRule object

+	if (pFwRuleExisting != NULL)

+	{

+		pFwRuleExisting->Release();

+	}

+	if (SUCCEEDED(hr))

+	{

+		printf("Firewall profile already exists\n");

+		goto Cleanup;

+	}

+

+	// Retrieve Current Profiles bitmask

+//	hr = pNetFwPolicy2->get_CurrentProfileTypes(&CurrentProfilesBitMask);

+//	if (FAILED(hr))

+//	{

+//		printf("get_CurrentProfileTypes failed: 0x%08lx\n", hr);

+//		goto Cleanup;

+//	}

+

+	// When possible we avoid adding firewall rules to the \ profile.

+	// If Public is currently active and it is not the only active profile, we remove it from the bitmask

+//	if ((CurrentProfilesBitMask & NET_FW_PROFILE2_PUBLIC) &&

+//		(CurrentProfilesBitMask != NET_FW_PROFILE2_PUBLIC))

+//	{

+//		CurrentProfilesBitMask ^= NET_FW_PROFILE2_PUBLIC;

+//	}

+

+	// Create a new Firewall Rule object.

+	hr = CoCreateInstance(

+		__uuidof(NetFwRule),

+		NULL,

+		CLSCTX_INPROC_SERVER,

+		__uuidof(INetFwRule),

+		(void**)&pFwRule);

+	if (FAILED(hr))

+	{

+		printf("CoCreateInstance for Firewall Rule failed: 0x%08lx\n", hr);

+		goto Cleanup;

+	}

+

+    // Populate the Firewall Rule object

+	pFwRule->put_Name(bstrRuleName);

+	pFwRule->put_Protocol(NetFwTypeLib::NET_FW_IP_PROTOCOL_TCP);

+	pFwRule->put_InterfaceTypes(bstrRuleInterfaceType);

+	pFwRule->put_Profiles(NET_FW_PROFILE2_PRIVATE);

+	pFwRule->put_Action(NET_FW_ACTION_ALLOW);

+	pFwRule->put_Enabled(VARIANT_TRUE);

+

+	pFwRule->put_ApplicationName(bstrApplicationName);

+	// Add the Firewall Rule

+	hr = pFwRules->Add(pFwRule);

+	if (FAILED(hr))

+	{

+		printf("Firewall Rule Add failed: 0x%08lx\n", hr);

+		goto Cleanup;

+	}

+

+	pFwRule->Release();

+/* End Mozilla modification */

+

+	// Create a new Firewall Rule object.

+	hr = CoCreateInstance(

+		__uuidof(NetFwRule),

+		NULL,

+		CLSCTX_INPROC_SERVER,

+		__uuidof(INetFwRule),

+		(void**)&pFwRule);

+	if (FAILED(hr))

+	{

+		printf("CoCreateInstance for Firewall Rule failed: 0x%08lx\n", hr);

+		goto Cleanup;

+	}

+

+	// Populate the Firewall Rule object

+	pFwRule->put_Name(bstrRuleName);

+/* Start Mozilla modification */

+//	pFwRule->put_Protocol(NET_FW_IP_PROTOCOL_ANY);

+	pFwRule->put_Protocol(NetFwTypeLib::NET_FW_IP_PROTOCOL_UDP);

+/* End Mozilla modification */

+	pFwRule->put_InterfaceTypes(bstrRuleInterfaceType);

+/* Start Mozilla modification */

+//	pFwRule->put_Profiles(CurrentProfilesBitMask);

+	pFwRule->put_Profiles(NET_FW_PROFILE2_PRIVATE);

+/* End Mozilla modification */

+	pFwRule->put_Action(NET_FW_ACTION_ALLOW);

+	pFwRule->put_Enabled(VARIANT_TRUE);

+

+	pFwRule->put_ApplicationName(bstrApplicationName);

+	// Add the Firewall Rule

+	hr = pFwRules->Add(pFwRule);

+	if (FAILED(hr))

+	{

+		printf("Firewall Rule Add failed: 0x%08lx\n", hr);

+		goto Cleanup;

+	}

+

+Cleanup:

+

+	// Free BSTR's

+	SysFreeString(bstrRuleName);

+	SysFreeString(bstrApplicationName);

+	SysFreeString(bstrRuleInterfaceType);

+

+	// Release the INetFwRule object

+	if (pFwRule != NULL)

+	{

+		pFwRule->Release();

+	}

+

+	// Release the INetFwRules object

+	if (pFwRules != NULL)

+	{

+		pFwRules->Release();

+	}

+

+	// Release the INetFwPolicy2 object

+	if (pNetFwPolicy2 != NULL)

+	{

+		pNetFwPolicy2->Release();

+	}

+

+	CoUninitialize();

+    return 0;

+}

+

+HRESULT RemoveRule(LPCTSTR ExceptionName, LPCTSTR ProcessPath)

+{

+    HRESULT result = CoInitialize(NULL);

+	if (FAILED(result))

+        return result;

+	try

+	{

+		INetFwMgrPtr fwMgr(L"HNetCfg.FwMgr");

+        if (fwMgr)

+        {

+		    fwMgr->LocalPolicy->CurrentProfile->AuthorizedApplications->Remove(ProcessPath);

+            result = S_OK;

+        }

+	}

+	catch (_com_error& e)

+	{

+		e;

+	}

+	HRESULT hrComInit = S_OK;

+	HRESULT hr = S_OK;

+

+	INetFwPolicy2 *pNetFwPolicy2 = NULL;

+	INetFwRules *pFwRules = NULL;

+

+/* Start Mozilla modification */

+//	long CurrentProfilesBitMask = 0;

+/* End Mozilla modification */

+

+	BSTR bstrRuleName = SysAllocString(ExceptionName);

+

+	// Retrieve INetFwPolicy2

+	hr = WFCOMInitialize(&pNetFwPolicy2);

+	if (FAILED(hr))

+	{

+		goto Cleanup;

+	}

+

+	// Retrieve INetFwRules

+	hr = pNetFwPolicy2->get_Rules(&pFwRules);

+	if (FAILED(hr))

+	{

+		printf("get_Rules failed: 0x%08lx\n", hr);

+		goto Cleanup;

+	}

+

+/* Start Mozilla modification */

+	// Retrieve Current Profiles bitmask

+//	hr = pNetFwPolicy2->get_CurrentProfileTypes(&CurrentProfilesBitMask);

+//	if (FAILED(hr))

+//	{

+//		printf("get_CurrentProfileTypes failed: 0x%08lx\n", hr);

+//		goto Cleanup;

+//	}

+

+	// When possible we avoid adding firewall rules to the Public profile.

+	// If Public is currently active and it is not the only active profile, we remove it from the bitmask

+//	if ((CurrentProfilesBitMask & NET_FW_PROFILE2_PUBLIC) &&

+//		(CurrentProfilesBitMask != NET_FW_PROFILE2_PUBLIC))

+//	{

+//		CurrentProfilesBitMask ^= NET_FW_PROFILE2_PUBLIC;

+//	}

+/* End Mozilla modification */

+

+	// Remove the Firewall Rule

+	hr = pFwRules->Remove(bstrRuleName);

+	if (FAILED(hr))

+	{

+		printf("Firewall Rule Remove failed: 0x%08lx\n", hr);

+		goto Cleanup;

+	}

+

+Cleanup:

+

+	// Free BSTR's

+	SysFreeString(bstrRuleName);

+

+	// Release the INetFwRules object

+	if (pFwRules != NULL)

+	{

+		pFwRules->Release();

+	}

+

+	// Release the INetFwPolicy2 object

+	if (pNetFwPolicy2 != NULL)

+	{

+		pNetFwPolicy2->Release();

+	}

+

+	CoUninitialize();

+	return 0;

+}

+

+

+#ifdef NSIS

+extern "C" void __declspec(dllexport) AddRule(HWND hwndParent, int string_size, 

+                                      TCHAR *variables, stack_t **stacktop)

+{

+	EXDLL_INIT();

+	

+	TCHAR ExceptionName[256], ProcessPath[MAX_PATH];

+    popstring(ProcessPath);

+    popstring(ExceptionName);

+    HRESULT result = AddRule(ExceptionName, ProcessPath);

+	// push the result back to NSIS

+    TCHAR intBuffer[16];

+	wsprintf(intBuffer, _T("%d"), result);

+	pushstring(intBuffer);

+}

+

+extern "C" void __declspec(dllexport) RemoveRule(HWND hwndParent, int string_size, 

+                                      TCHAR *variables, stack_t **stacktop)

+{

+	EXDLL_INIT();

+	

+	TCHAR ExceptionName[256], ProcessPath[MAX_PATH];

+    popstring(ProcessPath);

+	popstring(ExceptionName);

+    HRESULT result = RemoveRule(ExceptionName, ProcessPath);

+	// push the result back to NSIS

+    TCHAR intBuffer[16];

+	wsprintf(intBuffer, _T("%d"), result);

+	pushstring(intBuffer);

+}

+

+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD, LPVOID)

+{

+	g_hInstance = hInstance;

+	return TRUE;

+}

+#endif

+

+

+// Instantiate INetFwPolicy2

+

+HRESULT WFCOMInitialize(INetFwPolicy2** ppNetFwPolicy2)

+{

+	HRESULT hr = S_OK;

+

+	hr = CoCreateInstance(

+		__uuidof(NetFwPolicy2), 

+		NULL, 

+		CLSCTX_INPROC_SERVER, 

+		__uuidof(INetFwPolicy2), 

+		(void**)ppNetFwPolicy2);

+

+	if (FAILED(hr))

+	{

+		printf("CoCreateInstance for INetFwPolicy2 failed: 0x%08lx\n", hr);

+		goto Cleanup;        

+	}

+

+Cleanup:

+	return hr;

+}

diff --git a/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.dsp b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.dsp
new file mode 100644
index 000000000..cae606b4c
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.dsp
@@ -0,0 +1,204 @@
+# Microsoft Developer Studio Project File - Name="liteFirewall" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=liteFirewall - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "liteFirewall.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "liteFirewall.mak" CFG="liteFirewall - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "liteFirewall - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "liteFirewall - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "liteFirewall - Win32 Release UNICODE" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "liteFirewall - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NSIS" /FR /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

+# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../bin/liteFirewall.dll" /OPT:REF /OPT:NOWIN98

+# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

+# Begin Special Build Tool

+IntDir=.\Release

+ProjDir=.

+TargetDir=\Prog\shared\bin

+SOURCE="$(InputPath)"

+PostBuild_Desc=Building Sample Installer...

+PostBuild_Cmds="%ProgramFiles%\NSIS\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"

+# End Special Build Tool

+

+!ELSEIF  "$(CFG)" == "liteFirewall - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "NSIS" /FR /YX /FD /GZ /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# SUBTRACT LINK32 /nodefaultlib

+# Begin Special Build Tool

+IntDir=.\Debug

+ProjDir=.

+TargetDir=.\Debug

+SOURCE="$(InputPath)"

+PostBuild_Desc=Building Sample Installer...

+PostBuild_Cmds="%ProgramFiles%\NSIS\makensis" /V4 /DTARGETDIR=$(TargetDir) /DINTDIR=$(IntDir) $(ProjDir)\Sample.nsi

+# End Special Build Tool

+

+!ELSEIF  "$(CFG)" == "liteFirewall - Win32 Release UNICODE"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release_UNICODE"

+# PROP BASE Intermediate_Dir "Release_UNICODE"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release_UNICODE"

+# PROP Intermediate_Dir "Release_UNICODE"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NSIS" /FR /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "NSIS" /FR /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../bin/liteFirewall.dll" /OPT:REF /OPT:NOWIN98

+# SUBTRACT BASE LINK32 /pdb:none /debug /nodefaultlib

+# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../bin/liteFirewallW.dll" /OPT:REF /OPT:NOWIN98

+# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

+# Begin Special Build Tool

+IntDir=.\Release_UNICODE

+ProjDir=.

+TargetDir=\Prog\shared\bin

+SOURCE="$(InputPath)"

+PostBuild_Desc=Building Sample Installer...

+PostBuild_Cmds="%ProgramFiles%\NSIS\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"

+# End Special Build Tool

+

+!ENDIF 

+

+# Begin Target

+

+# Name "liteFirewall - Win32 Release"

+# Name "liteFirewall - Win32 Debug"

+# Name "liteFirewall - Win32 Release UNICODE"

+# Begin Source File

+

+SOURCE=.\exdll.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\License.txt

+# End Source File

+# Begin Source File

+

+SOURCE=.\liteFirewall.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReadMe.txt

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sample.nsi

+

+!IF  "$(CFG)" == "liteFirewall - Win32 Release"

+

+# Begin Custom Build

+ProjDir=.

+InputPath=.\Sample.nsi

+

+"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	rem Force Post-Build Step

+

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "liteFirewall - Win32 Debug"

+

+# Begin Custom Build

+ProjDir=.

+InputPath=.\Sample.nsi

+

+"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	rem Force Post-Build Step

+

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "liteFirewall - Win32 Release UNICODE"

+

+# Begin Custom Build

+ProjDir=.

+InputPath=.\Sample.nsi

+

+"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	rem Force Post-Build Step

+

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.dsw b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.dsw
new file mode 100644
index 000000000..d4ca962de
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "liteFirewall"=.\liteFirewall.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.sln b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.sln
new file mode 100644
index 000000000..e62a48e34
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.sln
@@ -0,0 +1,23 @@
+

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liteFirewall", "liteFirewall.vcproj", "{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release UNICODE|Win32 = Release UNICODE|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}.Debug|Win32.Build.0 = Debug|Win32

+		{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}.Release UNICODE|Win32.ActiveCfg = Release UNICODE|Win32

+		{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}.Release UNICODE|Win32.Build.0 = Release UNICODE|Win32

+		{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}.Release|Win32.ActiveCfg = Release|Win32

+		{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.vcproj b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.vcproj
new file mode 100644
index 000000000..e1832b7ce
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/liteFirewall.vcproj
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="gb2312"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="liteFirewall"

+	ProjectGUID="{F7462DF9-A430-4185-9AFC-8FAEA0FB98EA}"

+	TargetFrameworkVersion="0"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Debug/liteFirewall.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;UNICODE;NSIS"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile=".\Debug/liteFirewall.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="shlwapi.lib"

+				OutputFile=".\Debug/liteFirewall.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\Debug/liteFirewall.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				ImportLibrary=".\Debug/liteFirewall.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\Debug/liteFirewall.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Building Sample Installer..."

+				CommandLine="&quot;E:\Program Files (x86)\NSIS\Unicode\makensis&quot; /V4 /DTARGETDIR=$(TargetDir) /DINTDIR=$(IntDir) $(ProjectDir)Sample.nsi"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release UNICODE|Win32"

+			OutputDirectory=".\Release_UNICODE"

+			IntermediateDirectory=".\Release_UNICODE"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release_UNICODE/liteFirewall.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="1"

+				InlineFunctionExpansion="1"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;UNICODE;NSIS"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=".\Release_UNICODE/liteFirewall.pch"

+				AssemblerListingLocation=".\Release_UNICODE/"

+				ObjectFile=".\Release_UNICODE/"

+				ProgramDataBaseFileName=".\Release_UNICODE/"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="shlwapi.lib"

+				OutputFile="../bin/liteFirewallW.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\Release_UNICODE/liteFirewallW.pdb"

+				OptimizeReferences="2"

+				OptimizeForWindows98="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				ImportLibrary=".\Release_UNICODE/liteFirewallW.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\Release_UNICODE/liteFirewall.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Building Sample Installer..."

+				CommandLine="&quot;E:\Program Files (x86)\NSIS\Unicode\makensis&quot; /V2 /DTARGETDIR=$(TargetDir) /DINTDIR=$(IntDir) $(ProjectDir)Sample.nsi"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/liteFirewall.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="1"

+				InlineFunctionExpansion="1"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;NSIS"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=".\Release/liteFirewall.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="shlwapi.lib"

+				OutputFile="../bin/liteFirewall.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\Release/liteFirewall.pdb"

+				OptimizeReferences="2"

+				OptimizeForWindows98="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				ImportLibrary=".\Release/liteFirewall.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\Release/liteFirewall.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Building Sample Installer..."

+				CommandLine="&quot;E:\Program Files (x86)\NSIS\Unicode\makensis&quot; /V2 /DTARGETDIR=$(TargetDir) /DINTDIR=$(IntDir) $(ProjectDir)Sample.nsi"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath="exdll.h"

+			>

+		</File>

+		<File

+			RelativePath="License.txt"

+			>

+		</File>

+		<File

+			RelativePath="liteFirewall.cpp"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release UNICODE|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+		</File>

+		<File

+			RelativePath="ReadMe.txt"

+			>

+		</File>

+		<File

+			RelativePath="Sample.nsi"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					CommandLine="rem Force Post-Build Step&#x0D;&#x0A;"

+					Outputs="$(ProjectDir)Sample.exe"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release UNICODE|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					CommandLine="rem Force Post-Build Step&#x0D;&#x0A;"

+					Outputs="$(ProjectDir)Sample.exe"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					CommandLine="rem Force Post-Build Step&#x0D;&#x0A;"

+					Outputs="$(ProjectDir)Sample.exe"

+				/>

+			</FileConfiguration>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/other-licenses/nsis/Contrib/liteFirewall/netfw.tlb b/other-licenses/nsis/Contrib/liteFirewall/netfw.tlb
new file mode 100644
index 000000000..18ff3481a
--- /dev/null
+++ b/other-licenses/nsis/Contrib/liteFirewall/netfw.tlb
diff --git a/other-licenses/nsis/Plugins/liteFirewallW.dll b/other-licenses/nsis/Plugins/liteFirewallW.dll
new file mode 100644
index 000000000..f82a3ff90
--- /dev/null
+++ b/other-licenses/nsis/Plugins/liteFirewallW.dll
diff --git a/other-licenses/nsis/nsisui.exe b/other-licenses/nsis/nsisui.exe
index 3890f4ba8..bba5adec0 100644
--- a/other-licenses/nsis/nsisui.exe
+++ b/other-licenses/nsis/nsisui.exe
diff --git a/other-licenses/skia-npapi/ANPCanvas.cpp b/other-licenses/skia-npapi/ANPCanvas.cpp
index f3f3dfbfd..0b842c558 100644
--- a/other-licenses/skia-npapi/ANPCanvas.cpp
+++ b/other-licenses/skia-npapi/ANPCanvas.cpp
@@ -25,6 +25,7 @@
 
 // must include config.h first for webkit to fiddle with new/delete
 #include "SkANP.h"
+#include "SkRect.h"
 
 static ANPCanvas* anp_newCanvas(const ANPBitmap* bitmap) {
     SkBitmap bm;
@@ -87,9 +88,9 @@ static bool anp_getLocalClipBounds(ANPCanvas* canvas, ANPRectF* r,
 }
 
 static bool anp_getDeviceClipBounds(ANPCanvas* canvas, ANPRectI* r) {
-    const SkRegion& clip = canvas->skcanvas->getTotalClip();
-    if (!clip.isEmpty()) {
-        SkANP::SetRect(r, clip.getBounds());
+    SkIRect bounds;
+    if (canvas->skcanvas->getClipDeviceBounds(&bounds)) {
+        SkANP::SetRect(r, bounds);
         return true;
     }
     return false;
diff --git a/other-licenses/skia-npapi/ANPTypeface.cpp b/other-licenses/skia-npapi/ANPTypeface.cpp
index e095de982..26251bc99 100644
--- a/other-licenses/skia-npapi/ANPTypeface.cpp
+++ b/other-licenses/skia-npapi/ANPTypeface.cpp
@@ -26,6 +26,7 @@
 // must include config.h first for webkit to fiddle with new/delete
 #include "SkANP.h"
 #include "SkFontHost.h"
+#include "SkStream.h"
 
 static ANPTypeface* anp_createFromName(const char name[], ANPTypefaceStyle s) {
     SkTypeface* tf = SkTypeface::CreateFromName(name,
@@ -59,9 +60,18 @@ static ANPTypefaceStyle anp_getStyle(const ANPTypeface* tf) {
 
 static int32_t anp_getFontPath(const ANPTypeface* tf, char fileName[],
                                int32_t length, int32_t* index) {
-    size_t size = SkFontHost::GetFileName(SkTypeface::UniqueID(tf), fileName,
-                                          length, index);
-    return static_cast<int32_t>(size);
+    SkStream* stream = tf->openStream(index);
+
+    return 0;
+    /*
+    if (stream->getFileName()) {
+      strcpy(fileName, stream->getFileName());
+    } else {
+      return 0;
+    }
+
+    return strlen(fileName);
+    */
 }
 
 static const char* gFontDir;
diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in
deleted file mode 100644
index c73f17248..000000000
--- a/other-licenses/skia-npapi/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY   = 1
-EXPORT_LIBRARY   = 1
-
-DEFINES += \
-  -DSK_BUILD_FOR_ANDROID_NDK \
-  $(NULL)
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/plugins/base \
-  -I$(topsrcdir)/dom/plugins/base/android \
-  -I$(topsrcdir)/gfx/skia/include/core \
-  -I$(topsrcdir)/gfx/skia/include/config \
-  -I$(topsrcdir)/gfx/gl \
-  $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/skia-npapi/SkANP.cpp b/other-licenses/skia-npapi/SkANP.cpp
index ca02de9ff..db9302bcd 100644
--- a/other-licenses/skia-npapi/SkANP.cpp
+++ b/other-licenses/skia-npapi/SkANP.cpp
@@ -56,20 +56,23 @@ ANPRectF* SkANP::SetRect(ANPRectF* dst, const SkRect& src) {
 }
 
 SkBitmap* SkANP::SetBitmap(SkBitmap* dst, const ANPBitmap& src) {
-    SkBitmap::Config config = SkBitmap::kNo_Config;
-    
+    SkColorType colorType = kUnknown_SkColorType;
+
     switch (src.format) {
         case kRGBA_8888_ANPBitmapFormat:
-            config = SkBitmap::kARGB_8888_Config;
+            // Let Skia choose the correct colour type for us based on its
+            // endianness. This should be correct.
+            colorType = kN32_SkColorType;
             break;
         case kRGB_565_ANPBitmapFormat:
-            config = SkBitmap::kRGB_565_Config;
+            colorType = kRGB_565_SkColorType;
             break;
         default:
             break;
     }
-    
-    dst->setConfig(config, src.width, src.height, src.rowBytes);
+
+    SkImageInfo info = SkImageInfo::Make(src.width, src.height, colorType, kPremul_SkAlphaType);
+    dst->setInfo(info, src.rowBytes);
     dst->setPixels(src.baseAddr);
     return dst;
 }
@@ -80,18 +83,18 @@ bool SkANP::SetBitmap(ANPBitmap* dst, const SkBitmap& src) {
         return false;
     }
 
-    switch (src.config()) {
-        case SkBitmap::kARGB_8888_Config:
+    switch (src.colorType()) {
+        case SkColorType::kRGBA_8888_SkColorType:
             dst->format = kRGBA_8888_ANPBitmapFormat;
             break;
-        case SkBitmap::kRGB_565_Config:
+        case SkColorType::kRGB_565_SkColorType:
             dst->format = kRGB_565_ANPBitmapFormat;
             break;
         default:
-            SkDebugf("SkANP::SetBitmap - unsupported src.config %d\n", src.config());
+            SkDebugf("SkANP::SetBitmap - unsupported src.colorType %d\n", src.colorType());
             return false;
     }
-    
+
     dst->width    = src.width();
     dst->height   = src.height();
     dst->rowBytes = src.rowBytes();
diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build
index 099a39361..01673f7da 100644
--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -4,13 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'skia_npapi'
-
 EXPORTS += [
     'SkANP.h',
 ]
 
-CPP_SOURCES += [
+UNIFIED_SOURCES += [
     'ANPCanvas.cpp',
     'ANPPaint.cpp',
     'ANPPath.cpp',
@@ -18,5 +16,15 @@ CPP_SOURCES += [
     'SkANP.cpp',
 ]
 
-LIBRARY_NAME = 'skia_npapi'
+FINAL_LIBRARY = 'xul'
+
+DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
+
+LOCAL_INCLUDES += [
+    '/dom/plugins/base',
+    '/dom/plugins/base/android',
+    '/gfx/gl',
+    '/gfx/skia/trunk/include/config',
+    '/gfx/skia/trunk/include/core',
+]
 
diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in
deleted file mode 100644
index 50e93756e..000000000
--- a/other-licenses/snappy/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-
-VPATH = \
-  @srcdir@ \
-  $(topsrcdir)/other-licenses/snappy/src
-  $(NULL)
-
-include $(DEPTH)/config/autoconf.mk
-
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-EXPORT_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/snappy/moz.build b/other-licenses/snappy/moz.build
index 424bf138e..a28d9aa1d 100644
--- a/other-licenses/snappy/moz.build
+++ b/other-licenses/snappy/moz.build
@@ -5,17 +5,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.snappy += [
-    'snappy-c.h',
     'snappy-stubs-public.h',
-    'snappy.h',
+    'src/snappy-c.h',
+    'src/snappy.h',
 ]
 
-CPP_SOURCES += [
-    'snappy-c.cc',
-    'snappy-sinksource.cc',
-    'snappy-stubs-internal.cc',
-    'snappy.cc',
+UNIFIED_SOURCES += [
+    'src/snappy-c.cc',
+    'src/snappy-sinksource.cc',
+    'src/snappy-stubs-internal.cc',
+    'src/snappy.cc',
 ]
 
-LIBRARY_NAME = 'snappy_s'
+FINAL_LIBRARY = 'xul'
 
+# Suppress warnings in third-party code.
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += [
+        '-Wno-sign-compare',
+        '-Wno-unused-function'
+    ]
diff --git a/other-licenses/snappy/snappy-stubs-public.h b/other-licenses/snappy/snappy-stubs-public.h
index 0499ba554..f5fda29fb 100644
--- a/other-licenses/snappy/snappy-stubs-public.h
+++ b/other-licenses/snappy/snappy-stubs-public.h
@@ -36,7 +36,7 @@
 #ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 #define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #if defined IS_BIG_ENDIAN || defined __BIG_ENDIAN__
 #define WORDS_BIGENDIAN