Mirroring got broken around the merge from branches/2.1, although I'm 
not yet sure how.  This catches up to "authoritative" content across the 
board, while I figure out what broke.



git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8234 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/plugins/MissingBrowserPlugin.html b/plugins/MissingBrowserPlugin.html
index 550f2a2..1ae3dba 100644
--- a/plugins/MissingBrowserPlugin.html
+++ b/plugins/MissingBrowserPlugin.html
@@ -1,11 +1,11 @@
-<html>

-<head>

-<title>Missing GWT Browser Plugin</title>

-</head>

-<body>

-<h1>No GWT Browser Plugin Detected</h1>

-GWT Development Mode needs a browser plugin to operate.  Please <a

-  href="http://gwt-dev-plugin-missing.appspot.com/">install</a> the

-appropriate one for your browser.

-</body>

-</html>

+<html>
+<head>
+<title>Missing GWT Browser Plugin</title>
+</head>
+<body>
+<h1>No GWT Browser Plugin Detected</h1>
+GWT Development Mode needs a browser plugin to operate.  Please <a
+  href="http://gwt-dev-plugin-missing.appspot.com/">install</a> the
+appropriate one for your browser.
+</body>
+</html>
diff --git a/plugins/ie/installer/README.txt b/plugins/ie/installer/README.txt
index 2c8094e..8517837 100644
--- a/plugins/ie/installer/README.txt
+++ b/plugins/ie/installer/README.txt
@@ -1,11 +1,11 @@
-This directory contains the source code for the Windows installer. A new installer should

-be built using the build script every time oophm.dll is replaced.

-

-The build script will only work on a Windows system with WIX installed:

-http://wix.sourceforge.net/

-

-

-Files contained in this directory:

-installer.wxs.xml - the WIX script used to generate the installer

-

+This directory contains the source code for the Windows installer. A new installer should
+be built using the build script every time oophm.dll is replaced.
+
+The build script will only work on a Windows system with WIX installed:
+http://wix.sourceforge.net/
+
+
+Files contained in this directory:
+installer.wxs.xml - the WIX script used to generate the installer
+
 build.xml - the ant build script
\ No newline at end of file
diff --git a/plugins/ie/installer/installer.wxs.xml b/plugins/ie/installer/installer.wxs.xml
index 5785323..03a5357 100644
--- a/plugins/ie/installer/installer.wxs.xml
+++ b/plugins/ie/installer/installer.wxs.xml
@@ -1,166 +1,166 @@
-<?xml version='1.0' encoding='windows-1252'?>

-<Wix

-  xmlns='http://schemas.microsoft.com/wix/2006/wi'>

-

-  <!-- Variables. -->

-  <?define appName = "Google Web Toolkit Developer Plugin for IE" ?>

-  <?define upgradeCode = "9a5e649a-ec63-4c7d-99bf-75adb345e7e5" ?>

-  <?define updateRegKey = "SOFTWARE\Google\Update\Clients\{$(var.upgradeCode)}" ?>

-  <?define gwtRegKey = "SOFTWARE\Google\Google Web Toolkit\Installer" ?>

-

-  <!--

-    The main product to install. We generate a new GUID (*) on each

-    compile to ensure that windows installer completely removes the old

-    version and reinstalls the new version without complaining.

-  -->

-  <Product

-    Name='$(var.appName)'

-    Id='*'

-    UpgradeCode='$(var.upgradeCode)'

-    Language='1033'

-    Codepage='1252'

-    Version='$(var.version)'

-    Manufacturer='Google'>

-

-    <Package

-      Id='*'

-      Keywords='Installer'

-      Description='$(var.appName) Installer'

-      Manufacturer='Google'

-      InstallPrivileges='limited'

-      InstallerVersion='100'

-      Languages='1033'

-      Compressed='yes'

-      SummaryCodepage='1252' />

-    <Media

-      Id='1'

-      Cabinet='product.cab'

-      EmbedCab='yes' />

-

-    <!-- Suppress reboot prompts. -->

-    <Property Id='REBOOT'>ReallySuppress</Property>

-

-    <!-- Install for current user. -->

-    <Property Id="ALLUSERS" Secure="yes" />

-

-    <!-- Remove old version completely when upgrading.  -->

-    <Upgrade

-      Id='$(var.upgradeCode)'>

-      <UpgradeVersion

-        OnlyDetect='no'

-        Property='PREVIOUSFOUND'

-        Minimum='0.0.0.0'

-        IncludeMinimum='yes'

-        RemoveFeatures='all' />

-    </Upgrade>

-    <InstallExecuteSequence>

-      <LaunchConditions

-        After='AppSearch' />

-      <RemoveExistingProducts

-        After='InstallValidate' />

-    </InstallExecuteSequence>

-

-    <!-- Define the install directory. -->

-    <Directory

-      Id='TARGETDIR'

-      Name='SourceDir'>

-      <Directory

-        Id='LocalAppDataFolder'

-        Name='AppData'>

-        <Directory

-          Id='GoogleDir'

-          Name='Google'>

-          <Component Id="RemoveGoogleDir" Guid="*" DiskId="1">

-            <CreateFolder/>

-            <RemoveFolder Id="RemoveGoogleDirFolder" On="uninstall" />

-            <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">

-              <RegistryValue Name="RemoveGoogleDirFolder" Value="" Type="string" KeyPath="yes"/>

-            </RegistryKey>

-          </Component>

-          <Directory

-            Id='GoogleWebToolkitDir'

-            Name='Google Web Toolkit'>

-            <Component Id="RemoveGoogleWebToolkitDir" Guid="*" DiskId="1">

-              <CreateFolder/>

-              <RemoveFolder Id="RemoveGoogleWebToolkitDirFolder" On="uninstall" />

-              <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">

-                <RegistryValue Name="RemoveGoogleWebToolkitDirFolder" Value="" Type="string" KeyPath="yes"/>

-              </RegistryKey>

-            </Component>

-            <Directory

-              Id='DeveloperPluginDir'

-              Name='Developer Plugin'>

-              <Component Id="RemoveDeveloperPluginDir" Guid="*" DiskId="1">

-                <CreateFolder/>

-                <RemoveFolder Id="RemoveDeveloperPluginDirFolder" On="uninstall" />

-                <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">

-                  <RegistryValue Name="RemoveDeveloperPluginDirFolder" Value="" Type="string" KeyPath="yes"/>

-                </RegistryKey>

-              </Component>

-              <Directory

-                Id='INSTALLDIR'

-                Name='IE'>

-                <Component Id="RemoveInstallDir" Guid="*" DiskId="1">

-                  <CreateFolder/>

-                  <RemoveFolder Id="RemoveInstallerDirFolder" On="uninstall" />

-                  <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">

-                    <RegistryValue Name="RemoveInstallerDirFolder" Value="" Type="string" KeyPath="yes"/>

-                  </RegistryKey>

-                </Component>

-              </Directory>

-            </Directory>

-          </Directory>

-        </Directory>

-      </Directory>

-    </Directory>

-

-    <!-- Set some registry values. -->

-    <Component

-      Id='registryValues'

-      Directory='INSTALLDIR'

-      Guid='*'>

-      <RegistryKey

-        Root='HKCU'

-        Action='createAndRemoveOnUninstall'

-        Key='$(var.updateRegKey)'>

-        <RegistryValue

-          Name='pv'

-          Value='$(var.version)'

-          Type='string' />

-        <RegistryValue

-          Name='name'

-          Value='$(var.appName)'

-          Type='string' />

-        <RegistryValue

-          Name='lang'

-          Value='en'

-          Type='string' />

-      </RegistryKey>

-    </Component>

-

-    <!-- Define the features to install. -->

-    <Feature

-      Id='CompleteFeature'

-      Display='expand'

-      Level='1'

-      Absent='disallow'>

-      <!--

-        Loaded from oophm.wxs.xml, which is generated by the build

-        script.

-      -->

-      <ComponentRef

-        Id='RemoveGoogleDir' />

-      <ComponentRef

-        Id='RemoveGoogleWebToolkitDir' />

-      <ComponentRef

-        Id='RemoveDeveloperPluginDir' />

-      <ComponentRef

-        Id='RemoveInstallDir' />

-      <ComponentGroupRef

-        Id='oophmDll' />

-      <ComponentRef

-        Id='registryValues' />

-    </Feature>

-

-  </Product>

-</Wix>

+<?xml version='1.0' encoding='windows-1252'?>
+<Wix
+  xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+  <!-- Variables. -->
+  <?define appName = "Google Web Toolkit Developer Plugin for IE" ?>
+  <?define upgradeCode = "9a5e649a-ec63-4c7d-99bf-75adb345e7e5" ?>
+  <?define updateRegKey = "SOFTWARE\Google\Update\Clients\{$(var.upgradeCode)}" ?>
+  <?define gwtRegKey = "SOFTWARE\Google\Google Web Toolkit\Installer" ?>
+
+  <!--
+    The main product to install. We generate a new GUID (*) on each
+    compile to ensure that windows installer completely removes the old
+    version and reinstalls the new version without complaining.
+  -->
+  <Product
+    Name='$(var.appName)'
+    Id='*'
+    UpgradeCode='$(var.upgradeCode)'
+    Language='1033'
+    Codepage='1252'
+    Version='$(var.version)'
+    Manufacturer='Google'>
+
+    <Package
+      Id='*'
+      Keywords='Installer'
+      Description='$(var.appName) Installer'
+      Manufacturer='Google'
+      InstallPrivileges='limited'
+      InstallerVersion='100'
+      Languages='1033'
+      Compressed='yes'
+      SummaryCodepage='1252' />
+    <Media
+      Id='1'
+      Cabinet='product.cab'
+      EmbedCab='yes' />
+
+    <!-- Suppress reboot prompts. -->
+    <Property Id='REBOOT'>ReallySuppress</Property>
+
+    <!-- Install for current user. -->
+    <Property Id="ALLUSERS" Secure="yes" />
+
+    <!-- Remove old version completely when upgrading.  -->
+    <Upgrade
+      Id='$(var.upgradeCode)'>
+      <UpgradeVersion
+        OnlyDetect='no'
+        Property='PREVIOUSFOUND'
+        Minimum='0.0.0.0'
+        IncludeMinimum='yes'
+        RemoveFeatures='all' />
+    </Upgrade>
+    <InstallExecuteSequence>
+      <LaunchConditions
+        After='AppSearch' />
+      <RemoveExistingProducts
+        After='InstallValidate' />
+    </InstallExecuteSequence>
+
+    <!-- Define the install directory. -->
+    <Directory
+      Id='TARGETDIR'
+      Name='SourceDir'>
+      <Directory
+        Id='LocalAppDataFolder'
+        Name='AppData'>
+        <Directory
+          Id='GoogleDir'
+          Name='Google'>
+          <Component Id="RemoveGoogleDir" Guid="*" DiskId="1">
+            <CreateFolder/>
+            <RemoveFolder Id="RemoveGoogleDirFolder" On="uninstall" />
+            <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">
+              <RegistryValue Name="RemoveGoogleDirFolder" Value="" Type="string" KeyPath="yes"/>
+            </RegistryKey>
+          </Component>
+          <Directory
+            Id='GoogleWebToolkitDir'
+            Name='Google Web Toolkit'>
+            <Component Id="RemoveGoogleWebToolkitDir" Guid="*" DiskId="1">
+              <CreateFolder/>
+              <RemoveFolder Id="RemoveGoogleWebToolkitDirFolder" On="uninstall" />
+              <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">
+                <RegistryValue Name="RemoveGoogleWebToolkitDirFolder" Value="" Type="string" KeyPath="yes"/>
+              </RegistryKey>
+            </Component>
+            <Directory
+              Id='DeveloperPluginDir'
+              Name='Developer Plugin'>
+              <Component Id="RemoveDeveloperPluginDir" Guid="*" DiskId="1">
+                <CreateFolder/>
+                <RemoveFolder Id="RemoveDeveloperPluginDirFolder" On="uninstall" />
+                <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">
+                  <RegistryValue Name="RemoveDeveloperPluginDirFolder" Value="" Type="string" KeyPath="yes"/>
+                </RegistryKey>
+              </Component>
+              <Directory
+                Id='INSTALLDIR'
+                Name='IE'>
+                <Component Id="RemoveInstallDir" Guid="*" DiskId="1">
+                  <CreateFolder/>
+                  <RemoveFolder Id="RemoveInstallerDirFolder" On="uninstall" />
+                  <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall">
+                    <RegistryValue Name="RemoveInstallerDirFolder" Value="" Type="string" KeyPath="yes"/>
+                  </RegistryKey>
+                </Component>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <!-- Set some registry values. -->
+    <Component
+      Id='registryValues'
+      Directory='INSTALLDIR'
+      Guid='*'>
+      <RegistryKey
+        Root='HKCU'
+        Action='createAndRemoveOnUninstall'
+        Key='$(var.updateRegKey)'>
+        <RegistryValue
+          Name='pv'
+          Value='$(var.version)'
+          Type='string' />
+        <RegistryValue
+          Name='name'
+          Value='$(var.appName)'
+          Type='string' />
+        <RegistryValue
+          Name='lang'
+          Value='en'
+          Type='string' />
+      </RegistryKey>
+    </Component>
+
+    <!-- Define the features to install. -->
+    <Feature
+      Id='CompleteFeature'
+      Display='expand'
+      Level='1'
+      Absent='disallow'>
+      <!--
+        Loaded from oophm.wxs.xml, which is generated by the build
+        script.
+      -->
+      <ComponentRef
+        Id='RemoveGoogleDir' />
+      <ComponentRef
+        Id='RemoveGoogleWebToolkitDir' />
+      <ComponentRef
+        Id='RemoveDeveloperPluginDir' />
+      <ComponentRef
+        Id='RemoveInstallDir' />
+      <ComponentGroupRef
+        Id='oophmDll' />
+      <ComponentRef
+        Id='registryValues' />
+    </Feature>
+
+  </Product>
+</Wix>
diff --git a/plugins/ie/oophm/oophm.sln b/plugins/ie/oophm/oophm.sln
index 4291c48..106c6af 100644
--- a/plugins/ie/oophm/oophm.sln
+++ b/plugins/ie/oophm/oophm.sln
@@ -1,26 +1,26 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oophm", "oophm\oophm.vcproj", "{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|Win32.ActiveCfg = Debug|Win32

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|Win32.Build.0 = Debug|Win32

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|x64.ActiveCfg = Debug|x64

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|x64.Build.0 = Debug|x64

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|Win32.ActiveCfg = Release|Win32

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|Win32.Build.0 = Release|Win32

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|x64.ActiveCfg = Release|x64

-		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oophm", "oophm\oophm.vcproj", "{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|Win32.Build.0 = Debug|Win32
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|x64.ActiveCfg = Debug|x64
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Debug|x64.Build.0 = Debug|x64
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|Win32.ActiveCfg = Release|Win32
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|Win32.Build.0 = Release|Win32
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|x64.ActiveCfg = Release|x64
+		{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/plugins/ie/oophm/oophm/ExceptionCatcher.rgs b/plugins/ie/oophm/oophm/ExceptionCatcher.rgs
index a2b759f..ba8960b 100644
--- a/plugins/ie/oophm/oophm/ExceptionCatcher.rgs
+++ b/plugins/ie/oophm/oophm/ExceptionCatcher.rgs
@@ -1,26 +1,26 @@
-HKCR

-{

-	oophm.ExceptionCatcher.1 = s 'ExceptionCatcher Class'

-	{

-		CLSID = s '{1A2A78F4-B5A4-4208-B520-BDDA0A7EC5CB}'

-	}

-	oophm.ExceptionCatcher = s 'ExceptionCatcher Class'

-	{

-		CLSID = s '{1A2A78F4-B5A4-4208-B520-BDDA0A7EC5CB}'

-		CurVer = s 'oophm.ExceptionCatcher.1'

-	}

-	NoRemove CLSID

-	{

-		ForceRemove {1A2A78F4-B5A4-4208-B520-BDDA0A7EC5CB} = s 'ExceptionCatcher Class'

-		{

-			ProgID = s 'oophm.ExceptionCatcher.1'

-			VersionIndependentProgID = s 'oophm.ExceptionCatcher'

-			ForceRemove 'Programmable'

-			InprocServer32 = s '%MODULE%'

-			{

-				val ThreadingModel = s 'Apartment'

-			}

-			'TypeLib' = s '{9259F105-BE55-4BF6-B7CE-D0AA878C1BA6}'

-		}

-	}

-}

+HKCR
+{
+	oophm.ExceptionCatcher.1 = s 'ExceptionCatcher Class'
+	{
+		CLSID = s '{1A2A78F4-B5A4-4208-B520-BDDA0A7EC5CB}'
+	}
+	oophm.ExceptionCatcher = s 'ExceptionCatcher Class'
+	{
+		CLSID = s '{1A2A78F4-B5A4-4208-B520-BDDA0A7EC5CB}'
+		CurVer = s 'oophm.ExceptionCatcher.1'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {1A2A78F4-B5A4-4208-B520-BDDA0A7EC5CB} = s 'ExceptionCatcher Class'
+		{
+			ProgID = s 'oophm.ExceptionCatcher.1'
+			VersionIndependentProgID = s 'oophm.ExceptionCatcher'
+			ForceRemove 'Programmable'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'Apartment'
+			}
+			'TypeLib' = s '{9259F105-BE55-4BF6-B7CE-D0AA878C1BA6}'
+		}
+	}
+}
diff --git a/plugins/ie/oophm/oophm/JavaObject.rgs b/plugins/ie/oophm/oophm/JavaObject.rgs
index 00d6719..f84f142 100644
--- a/plugins/ie/oophm/oophm/JavaObject.rgs
+++ b/plugins/ie/oophm/oophm/JavaObject.rgs
@@ -1,26 +1,26 @@
-HKCR

-{

-	oophm.JavaObject.1 = s 'JavaObject Class'

-	{

-		CLSID = s '{644FD769-8B9D-4AC4-A79E-AAAF5CD751C1}'

-	}

-	oophm.JavaObject = s 'JavaObject Class'

-	{

-		CLSID = s '{644FD769-8B9D-4AC4-A79E-AAAF5CD751C1}'

-		CurVer = s 'oophm.JavaObject.1'

-	}

-	NoRemove CLSID

-	{

-		ForceRemove {644FD769-8B9D-4AC4-A79E-AAAF5CD751C1} = s 'JavaObject Class'

-		{

-			ProgID = s 'oophm.JavaObject.1'

-			VersionIndependentProgID = s 'oophm.JavaObject'

-			ForceRemove 'Programmable'

-			InprocServer32 = s '%MODULE%'

-			{

-				val ThreadingModel = s 'Apartment'

-			}

-			'TypeLib' = s '{9259F105-BE55-4BF6-B7CE-D0AA878C1BA6}'

-		}

-	}

-}

+HKCR
+{
+	oophm.JavaObject.1 = s 'JavaObject Class'
+	{
+		CLSID = s '{644FD769-8B9D-4AC4-A79E-AAAF5CD751C1}'
+	}
+	oophm.JavaObject = s 'JavaObject Class'
+	{
+		CLSID = s '{644FD769-8B9D-4AC4-A79E-AAAF5CD751C1}'
+		CurVer = s 'oophm.JavaObject.1'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {644FD769-8B9D-4AC4-A79E-AAAF5CD751C1} = s 'JavaObject Class'
+		{
+			ProgID = s 'oophm.JavaObject.1'
+			VersionIndependentProgID = s 'oophm.JavaObject'
+			ForceRemove 'Programmable'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'Apartment'
+			}
+			'TypeLib' = s '{9259F105-BE55-4BF6-B7CE-D0AA878C1BA6}'
+		}
+	}
+}
diff --git a/plugins/ie/oophm/oophm/dlldata.c b/plugins/ie/oophm/oophm/dlldata.c
index 5b71905..7b86f60 100644
--- a/plugins/ie/oophm/oophm/dlldata.c
+++ b/plugins/ie/oophm/oophm/dlldata.c
@@ -1,38 +1,38 @@
-/*********************************************************

-   DllData file -- generated by MIDL compiler 

-

-        DO NOT ALTER THIS FILE

-

-   This file is regenerated by MIDL on every IDL file compile.

-

-   To completely reconstruct this file, delete it and rerun MIDL

-   on all the IDL files in this DLL, specifying this file for the

-   /dlldata command line option

-

-*********************************************************/

-

-#define PROXY_DELEGATION

-

-#include <rpcproxy.h>

-

-#ifdef __cplusplus

-extern "C"   {

-#endif

-

-EXTERN_PROXY_FILE( oophm )

-

-

-PROXYFILE_LIST_START

-/* Start of list */

-  REFERENCE_PROXY_FILE( oophm ),

-/* End of list */

-PROXYFILE_LIST_END

-

-

-DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )

-

-#ifdef __cplusplus

-}  /*extern "C" */

-#endif

-

-/* end of generated dlldata file */

+/*********************************************************
+   DllData file -- generated by MIDL compiler 
+
+        DO NOT ALTER THIS FILE
+
+   This file is regenerated by MIDL on every IDL file compile.
+
+   To completely reconstruct this file, delete it and rerun MIDL
+   on all the IDL files in this DLL, specifying this file for the
+   /dlldata command line option
+
+*********************************************************/
+
+#define PROXY_DELEGATION
+
+#include <rpcproxy.h>
+
+#ifdef __cplusplus
+extern "C"   {
+#endif
+
+EXTERN_PROXY_FILE( oophm )
+
+
+PROXYFILE_LIST_START
+/* Start of list */
+  REFERENCE_PROXY_FILE( oophm ),
+/* End of list */
+PROXYFILE_LIST_END
+
+
+DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
+
+#ifdef __cplusplus
+}  /*extern "C" */
+#endif
+
+/* end of generated dlldata file */
diff --git a/plugins/ie/oophm/oophm/oophm.rgs b/plugins/ie/oophm/oophm/oophm.rgs
index 928d936..b106174 100644
--- a/plugins/ie/oophm/oophm/oophm.rgs
+++ b/plugins/ie/oophm/oophm/oophm.rgs
@@ -1,11 +1,11 @@
-HKCR

-{

-	NoRemove AppID

-	{

-		'%APPID%' = s 'oophm'

-		'oophm.DLL'

-		{

-			val AppID = s '%APPID%'

-		}

-	}

-}

+HKCR
+{
+	NoRemove AppID
+	{
+		'%APPID%' = s 'oophm'
+		'oophm.DLL'
+		{
+			val AppID = s '%APPID%'
+		}
+	}
+}
diff --git a/plugins/ie/oophm/oophm/oophm.vcproj b/plugins/ie/oophm/oophm/oophm.vcproj
index 288d48c..54ab6a5 100644
--- a/plugins/ie/oophm/oophm/oophm.vcproj
+++ b/plugins/ie/oophm/oophm/oophm.vcproj
@@ -1,883 +1,883 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="oophm"

-	ProjectGUID="{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}"

-	RootNamespace="oophm"

-	Keyword="AtlProj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)32"

-			IntermediateDirectory="$(ConfigurationName)32"

-			ConfigurationType="2"

-			UseOfMFC="1"

-			UseOfATL="1"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="false"

-				TargetEnvironment="1"

-				GenerateStublessProxies="true"

-				TypeLibraryName="$(IntDir)/oophm.tlb"

-				HeaderFileName="oophm_i.h"

-				DLLDataFileName=""

-				InterfaceIdentifierFileName="oophm_i.c"

-				ProxyFileName="oophm_p.c"

-				ValidateParameters="true"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(IntDir)"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				RegisterOutput="true"

-				IgnoreImportLibrary="true"

-				AdditionalDependencies="comsuppw.lib ws2_32.lib"

-				OutputFile="..\..\prebuilt\$(ProjectName).dll"

-				LinkIncremental="2"

-				ModuleDefinitionFile=".\oophm.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="2"

-			UseOfMFC="1"

-			UseOfATL="1"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="false"

-				TargetEnvironment="3"

-				GenerateStublessProxies="true"

-				TypeLibraryName="$(IntDir)/oophm.tlb"

-				HeaderFileName="oophm_i.h"

-				DLLDataFileName=""

-				InterfaceIdentifierFileName="oophm_i.c"

-				ProxyFileName="oophm_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(IntDir)"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalDependencies="comsuppw.lib ws2_32.lib"

-				OutputFile="..\..\prebuilt\$(ProjectName)64.dll"

-				LinkIncremental="2"

-				ModuleDefinitionFile=".\oophm.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)32"

-			IntermediateDirectory="$(ConfigurationName)32"

-			ConfigurationType="2"

-			UseOfMFC="1"

-			UseOfATL="1"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="false"

-				TargetEnvironment="1"

-				GenerateStublessProxies="true"

-				TypeLibraryName="$(IntDir)/oophm.tlb"

-				HeaderFileName="oophm_i.h"

-				DLLDataFileName=""

-				InterfaceIdentifierFileName="oophm_i.c"

-				ProxyFileName="oophm_p.c"

-				ValidateParameters="true"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"

-				PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(IntDir)"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				RegisterOutput="true"

-				IgnoreImportLibrary="true"

-				AdditionalDependencies="comsuppw.lib ws2_32.lib"

-				OutputFile="..\..\prebuilt\$(ProjectName).dll"

-				LinkIncremental="1"

-				ModuleDefinitionFile=".\oophm.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(ConfigurationName)64"

-			IntermediateDirectory="$(ConfigurationName)64"

-			ConfigurationType="2"

-			UseOfMFC="1"

-			UseOfATL="1"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="false"

-				TargetEnvironment="3"

-				GenerateStublessProxies="true"

-				TypeLibraryName="$(IntDir)/oophm.tlb"

-				HeaderFileName="oophm_i.h"

-				DLLDataFileName=""

-				InterfaceIdentifierFileName="oophm_i.c"

-				ProxyFileName="oophm_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"

-				PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(IntDir)"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalDependencies="comsuppw.lib ws2_32.lib"

-				OutputFile="..\..\prebuilt\$(ProjectName)64.dll"

-				LinkIncremental="1"

-				ModuleDefinitionFile=".\oophm.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\platform\Win\AllowDialog.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\dlldatax.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\dllmain.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\ExceptionCatcher.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\IESessionHandler.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\JavaObject.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\oophm.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\oophm.def"

-				>

-			</File>

-			<File

-				RelativePath=".\oophm.idl"

-				>

-			</File>

-			<File

-				RelativePath=".\plugin.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\platform\Win\Preferences.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\stdafx.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\..\common\AllowedConnections.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\CheckVersionsMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ChooseTransportMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\Debug.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\FatalErrorMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\FreeValueMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\HostChannel.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\InvokeMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\InvokeSpecialMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\LoadJsniMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\LoadModuleMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ProtocolVersionMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ReturnMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ServerMethods.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\Socket.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\SwitchTransportMessage.cpp"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\..\platform\Win\AllowDialog.h"

-				>

-			</File>

-			<File

-				RelativePath=".\dlldatax.h"

-				>

-			</File>

-			<File

-				RelativePath=".\dllmain.h"

-				>

-			</File>

-			<File

-				RelativePath=".\ExceptionCatcher.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\common\FatalErrorMessage.h"

-				>

-			</File>

-			<File

-				RelativePath=".\IESessionHandler.h"

-				>

-			</File>

-			<File

-				RelativePath=".\JavaObject.h"

-				>

-			</File>

-			<File

-				RelativePath=".\plugin.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\platform\Win\Preferences.h"

-				>

-			</File>

-			<File

-				RelativePath=".\Resource.h"

-				>

-			</File>

-			<File

-				RelativePath=".\SessionData.h"

-				>

-			</File>

-			<File

-				RelativePath=".\stdafx.h"

-				>

-			</File>

-			<File

-				RelativePath=".\targetver.h"

-				>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\..\common\AllowedConnections.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\BrowserChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\CheckVersionsMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ChooseTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\Debug.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\DebugLevel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\FreeValueMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\HashMap.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\HostChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\InvokeMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\InvokeSpecialMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\LoadJsniMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\LoadModuleMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\Message.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\Platform.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ProtocolVersionMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\QuitMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ReturnMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\ServerMethods.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\SessionHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\Socket.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\SwitchTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\common\Value.h"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath=".\ExceptionCatcher.rgs"

-				>

-			</File>

-			<File

-				RelativePath=".\JavaObject.rgs"

-				>

-			</File>

-			<File

-				RelativePath=".\oophm.rc"

-				>

-			</File>

-			<File

-				RelativePath=".\oophm.rgs"

-				>

-			</File>

-			<File

-				RelativePath=".\plugin.bmp"

-				>

-			</File>

-			<File

-				RelativePath=".\plugin.rgs"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Generated Files"

-			SourceControlFiles="false"

-			>

-			<File

-				RelativePath=".\oophm_i.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						CompileAsManaged="0"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\oophm_i.h"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath=".\plugin.htm"

-			DeploymentContent="true"

-			>

-		</File>

-		<File

-			RelativePath=".\pluginUI.htm"

-			DeploymentContent="true"

-			>

-		</File>

-		<File

-			RelativePath=".\ReadMe.txt"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="oophm"
+	ProjectGUID="{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}"
+	RootNamespace="oophm"
+	Keyword="AtlProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)32"
+			IntermediateDirectory="$(ConfigurationName)32"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			UseOfATL="1"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="false"
+				TargetEnvironment="1"
+				GenerateStublessProxies="true"
+				TypeLibraryName="$(IntDir)/oophm.tlb"
+				HeaderFileName="oophm_i.h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="oophm_i.c"
+				ProxyFileName="oophm_p.c"
+				ValidateParameters="true"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				RegisterOutput="true"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="comsuppw.lib ws2_32.lib"
+				OutputFile="..\..\prebuilt\$(ProjectName).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile=".\oophm.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			UseOfATL="1"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="false"
+				TargetEnvironment="3"
+				GenerateStublessProxies="true"
+				TypeLibraryName="$(IntDir)/oophm.tlb"
+				HeaderFileName="oophm_i.h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="oophm_i.c"
+				ProxyFileName="oophm_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="comsuppw.lib ws2_32.lib"
+				OutputFile="..\..\prebuilt\$(ProjectName)64.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile=".\oophm.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)32"
+			IntermediateDirectory="$(ConfigurationName)32"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			UseOfATL="1"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="false"
+				TargetEnvironment="1"
+				GenerateStublessProxies="true"
+				TypeLibraryName="$(IntDir)/oophm.tlb"
+				HeaderFileName="oophm_i.h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="oophm_i.c"
+				ProxyFileName="oophm_p.c"
+				ValidateParameters="true"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"
+				PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				RegisterOutput="true"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="comsuppw.lib ws2_32.lib"
+				OutputFile="..\..\prebuilt\$(ProjectName).dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile=".\oophm.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(ConfigurationName)64"
+			IntermediateDirectory="$(ConfigurationName)64"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			UseOfATL="1"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="false"
+				TargetEnvironment="3"
+				GenerateStublessProxies="true"
+				TypeLibraryName="$(IntDir)/oophm.tlb"
+				HeaderFileName="oophm_i.h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="oophm_i.c"
+				ProxyFileName="oophm_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"
+				PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="comsuppw.lib ws2_32.lib"
+				OutputFile="..\..\prebuilt\$(ProjectName)64.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile=".\oophm.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\platform\Win\AllowDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\dlldatax.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\dllmain.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\ExceptionCatcher.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\IESessionHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\JavaObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\oophm.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\oophm.def"
+				>
+			</File>
+			<File
+				RelativePath=".\oophm.idl"
+				>
+			</File>
+			<File
+				RelativePath=".\plugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\platform\Win\Preferences.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\..\common\AllowedConnections.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\CheckVersionsMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ChooseTransportMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\Debug.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\FatalErrorMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\FreeValueMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\HostChannel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\InvokeMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\InvokeSpecialMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\LoadJsniMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\LoadModuleMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ProtocolVersionMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ReturnMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ServerMethods.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\Socket.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\SwitchTransportMessage.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\platform\Win\AllowDialog.h"
+				>
+			</File>
+			<File
+				RelativePath=".\dlldatax.h"
+				>
+			</File>
+			<File
+				RelativePath=".\dllmain.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ExceptionCatcher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\FatalErrorMessage.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IESessionHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\JavaObject.h"
+				>
+			</File>
+			<File
+				RelativePath=".\plugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\platform\Win\Preferences.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\SessionData.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\targetver.h"
+				>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\..\common\AllowedConnections.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\BrowserChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\CheckVersionsMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ChooseTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\Debug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\DebugLevel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\FreeValueMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\HashMap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\HostChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\InvokeMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\InvokeSpecialMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\LoadJsniMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\LoadModuleMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\Message.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\Platform.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ProtocolVersionMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\QuitMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ReturnMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\ServerMethods.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\SessionHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\Socket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\SwitchTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\Value.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\ExceptionCatcher.rgs"
+				>
+			</File>
+			<File
+				RelativePath=".\JavaObject.rgs"
+				>
+			</File>
+			<File
+				RelativePath=".\oophm.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\oophm.rgs"
+				>
+			</File>
+			<File
+				RelativePath=".\plugin.bmp"
+				>
+			</File>
+			<File
+				RelativePath=".\plugin.rgs"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Generated Files"
+			SourceControlFiles="false"
+			>
+			<File
+				RelativePath=".\oophm_i.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						CompileAsManaged="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\oophm_i.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\plugin.htm"
+			DeploymentContent="true"
+			>
+		</File>
+		<File
+			RelativePath=".\pluginUI.htm"
+			DeploymentContent="true"
+			>
+		</File>
+		<File
+			RelativePath=".\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/plugins/ie/oophm/oophm/plugin.rgs b/plugins/ie/oophm/oophm/plugin.rgs
index 33e8062..e6f868e 100644
--- a/plugins/ie/oophm/oophm/plugin.rgs
+++ b/plugins/ie/oophm/oophm/plugin.rgs
@@ -1,34 +1,34 @@
-HKCR

-{

-	oophm.plugin.1 = s 'plugin Class'

-	{

-		CLSID = s '{1D6156B6-002B-49E7-B5CA-C138FB843B4E}'

-	}

-	oophm.plugin = s 'plugin Class'

-	{

-		CLSID = s '{1D6156B6-002B-49E7-B5CA-C138FB843B4E}'

-		CurVer = s 'oophm.plugin.1'

-	}

-	NoRemove CLSID

-	{

-		ForceRemove {1D6156B6-002B-49E7-B5CA-C138FB843B4E} = s 'plugin Class'

-		{

-			ProgID = s 'oophm.plugin.1'

-			VersionIndependentProgID = s 'oophm.plugin'

-			ForceRemove 'Programmable'

-			InprocServer32 = s '%MODULE%'

-			{

-				val ThreadingModel = s 'Apartment'

-			}

-			val AppID = s '%APPID%'

-			ForceRemove 'Control'

-			ForceRemove 'ToolboxBitmap32' = s '%MODULE%, 102'

-			'MiscStatus' = s '0'

-			{

-			    '1' = s '%OLEMISC%'

-			}

-			'TypeLib' = s '{9259F105-BE55-4BF6-B7CE-D0AA878C1BA6}'

-			'Version' = s '1.0'

-		}

-	}

-}

+HKCR
+{
+	oophm.plugin.1 = s 'plugin Class'
+	{
+		CLSID = s '{1D6156B6-002B-49E7-B5CA-C138FB843B4E}'
+	}
+	oophm.plugin = s 'plugin Class'
+	{
+		CLSID = s '{1D6156B6-002B-49E7-B5CA-C138FB843B4E}'
+		CurVer = s 'oophm.plugin.1'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {1D6156B6-002B-49E7-B5CA-C138FB843B4E} = s 'plugin Class'
+		{
+			ProgID = s 'oophm.plugin.1'
+			VersionIndependentProgID = s 'oophm.plugin'
+			ForceRemove 'Programmable'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'Apartment'
+			}
+			val AppID = s '%APPID%'
+			ForceRemove 'Control'
+			ForceRemove 'ToolboxBitmap32' = s '%MODULE%, 102'
+			'MiscStatus' = s '0'
+			{
+			    '1' = s '%OLEMISC%'
+			}
+			'TypeLib' = s '{9259F105-BE55-4BF6-B7CE-D0AA878C1BA6}'
+			'Version' = s '1.0'
+		}
+	}
+}
diff --git a/plugins/npapi/ScriptableInstance.cpp b/plugins/npapi/ScriptableInstance.cpp
index 273fd8a..cad66ef 100644
--- a/plugins/npapi/ScriptableInstance.cpp
+++ b/plugins/npapi/ScriptableInstance.cpp
@@ -1,677 +1,677 @@
-/*

- * Copyright 2008 Google Inc.

- * 

- * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

- * License for the specific language governing permissions and limitations under

- * the License.

- */

-

-#include <cstring>

-

-#include "ScriptableInstance.h"

-#include "InvokeMessage.h"

-#include "ReturnMessage.h"

-#include "ServerMethods.h"

-#include "AllowedConnections.h"

-#include "Preferences.h"

-#include "AllowDialog.h"

-

-#include "mozincludes.h"

-#include "scoped_ptr/scoped_ptr.h"

-#include "NPVariantWrapper.h"

-

-using std::string;

-using std::endl;

-

-static inline string convertToString(const NPString& str) {

-  return string(GetNPStringUTF8Characters(str), GetNPStringUTF8Length(str));

-}

-

-string ScriptableInstance::computeTabIdentity() {

-  return "";

-}

-

-void ScriptableInstance::dumpObjectBytes(NPObject* obj) {

-  char buf[20];

-  Debug::log(Debug::Debugging) << "   object bytes:\n";

-  const unsigned char* ptr = reinterpret_cast<const unsigned char*>(obj);

-  for (int i = 0; i < 24; ++i) {

-    snprintf(buf, sizeof(buf), " %02x", ptr[i]);

-    Debug::log(Debug::Debugging) << buf;

-  }

-  NPVariant objVar;

-  OBJECT_TO_NPVARIANT(obj, objVar);

-  Debug::log(Debug::Debugging) << " obj.toString()="

-      << NPVariantProxy::toString(objVar) << Debug::flush;

-}

-

-ScriptableInstance::ScriptableInstance(NPP npp) : NPObjectWrapper<ScriptableInstance>(npp),

-    plugin(*reinterpret_cast<Plugin*>(npp->pdata)),

-    _channel(new HostChannel()),

-    localObjects(),

-    _connectId(NPN_GetStringIdentifier("connect")),

-    initID(NPN_GetStringIdentifier("init")),

-    toStringID(NPN_GetStringIdentifier("toString")),

-    connectedID(NPN_GetStringIdentifier("connected")),

-    statsID(NPN_GetStringIdentifier("stats")),

-    gwtId(NPN_GetStringIdentifier("__gwt_ObjectId")),

-    jsDisconnectedID(NPN_GetStringIdentifier("__gwt_disconnected")),

-    jsInvokeID(NPN_GetStringIdentifier("__gwt_jsInvoke")),

-    jsResultID(NPN_GetStringIdentifier("__gwt_makeResult")),

-    jsTearOffID(NPN_GetStringIdentifier("__gwt_makeTearOff")),

-    jsValueOfID(NPN_GetStringIdentifier("valueOf")),

-    idx0(NPN_GetIntIdentifier(0)),

-    idx1(NPN_GetIntIdentifier(1)) {

-  savedValueIdx = -1;

-  if (NPN_GetValue(npp, NPNVWindowNPObject, &window) != NPERR_NO_ERROR) {

-    Debug::log(Debug::Error) << "Error getting window object" << Debug::flush;

-  }

-}

-

-ScriptableInstance::~ScriptableInstance() {

-  // TODO(jat): free any remaining Java objects held by JS, then make

-  // the JS wrapper handle that situation gracefully

-  if (window) {

-    NPN_ReleaseObject(window);

-  }

-  for (hash_map<int, JavaObject*>::iterator it = javaObjects.begin(); it != javaObjects.end();

-      ++it) {

-    Debug::log(Debug::Spam) << "  disconnecting Java wrapper " << it->first << Debug::flush;

-    it->second->disconnectPlugin();

-  }

-  if (_channel) {

-    _channel->disconnectFromHost();

-    delete _channel;

-  }

-}

-

-void ScriptableInstance::dumpJSresult(const char* js) {

-  NPString npScript;

-  dupString(js, npScript);

-  NPVariantWrapper wrappedRetVal(*this);

-  if (!NPN_Evaluate(getNPP(), window, &npScript, wrappedRetVal.addressForReturn())) {

-    Debug::log(Debug::Error) << "   *** dumpJSresult failed" << Debug::flush;

-    return;

-  }

-  Debug::log(Debug::Info) << "dumpWindow=" << wrappedRetVal.toString() << Debug::flush;

-}

-

-bool ScriptableInstance::tryGetStringPrimitive(NPObject* obj, NPVariant& result) {

-  if (NPN_HasMethod(getNPP(), obj, jsValueOfID)) {

-    if (NPN_Invoke(getNPP(), obj, jsValueOfID, 0, 0, &result)

-        && NPVariantProxy::isString(result)) {

-      return true;

-    }

-    NPVariantProxy::release(result);

-  }

-  return false;

-}

-

-bool ScriptableInstance::makeResult(bool isException, const Value& value, NPVariant* result) {

-  Debug::log(Debug::Debugging) << "makeResult(" << isException << ", " << value << ")"

-      << Debug::flush;

-  Value temp;

-  if (value.getType() == Value::JAVA_OBJECT) {

-    int javaId = value.getJavaObjectId();

-    // We may have previously released the proxy for the same object id,

-    // but have not yet sent a free message back to the server.

-    javaObjectsToFree.erase(javaId);

-  }

-  NPVariantArray varArgs(*this, 3);

-  varArgs[0] = isException ? 1 : 0;

-  varArgs[1] = value;

-  NPVariantWrapper retVal(*this);

-  return NPN_Invoke(getNPP(), window, jsResultID, varArgs.getArray(), varArgs.getSize(), result);

-}

-

-//=============================================================================

-// NPObject methods

-//=============================================================================

-

-bool ScriptableInstance::hasProperty(NPIdentifier name) {

-  if (!NPN_IdentifierIsString(name)) {

-    // all numeric properties are ok, as we assume only JSNI code is making

-    // the field access via dispatchID

-    return true;

-  }

-  // TODO: special-case toString tear-offs

-  return name == statsID || name == connectedID;

-}

-

-bool ScriptableInstance::getProperty(NPIdentifier name, NPVariant* variant) {

-  Debug::log(Debug::Debugging) << "ScriptableInstance::getProperty(name="

-      << NPN_UTF8FromIdentifier(name) << ")" << Debug::flush;

-  bool retVal = false;

-  VOID_TO_NPVARIANT(*variant);

-  if (name == connectedID) {

-    BOOLEAN_TO_NPVARIANT(_channel->isConnected(), *variant);

-    retVal = true;

-  } else if (name == statsID) {

-    NPVariantProxy::assignFrom(*variant, "<stats data>");

-    retVal = true;

-  }

-  if (retVal) {

-    // TODO: testing

-    Debug::log(Debug::Debugging) << " return value " << *variant

-        << Debug::flush;

-  }

-  return retVal;

-}

-

-bool ScriptableInstance::setProperty(NPIdentifier name, const NPVariant* variant) {

-  Debug::log(Debug::Debugging) << "ScriptableInstance::setProperty(name="

-      << NPN_UTF8FromIdentifier(name) << ", value=" << *variant << ")"

-      << Debug::flush; 

-  return false;

-}

-

-bool ScriptableInstance::hasMethod(NPIdentifier name) {

-  Debug::log(Debug::Debugging) << "ScriptableInstance::hasMethod(name=" << NPN_UTF8FromIdentifier(name) << ")"

-      << Debug::flush; 

-  if (name == _connectId || name == initID || name == toStringID) {

-    return true;

-  }

-  return false;

-}

-

-bool ScriptableInstance::invoke(NPIdentifier name, const NPVariant* args, unsigned argCount,

-    NPVariant* result) {

-  NPUTF8* uname = NPN_UTF8FromIdentifier(name);

-  Debug::log(Debug::Debugging) << "ScriptableInstance::invoke(name=" << uname << ",#args=" << argCount << ")"

-      << Debug::flush;

-  VOID_TO_NPVARIANT(*result);

-  if (name == _connectId) {

-    connect(args, argCount, result);

-  } else if (name == initID) {

-    init(args, argCount, result);

-  } else if (name == toStringID) {

-    // TODO(jat): figure out why this doesn't show in Firebug

-    string val("[GWT OOPHM Plugin: connected=");

-    val += _channel->isConnected() ? 'Y' : 'N';

-    val += ']';

-    NPVariantProxy::assignFrom(*result, val);

-  }

-  return true;

-}

-

-bool ScriptableInstance::invokeDefault(const NPVariant* args, unsigned argCount,

-      NPVariant* result) {

-  Debug::log(Debug::Debugging) << "ScriptableInstance::invokeDefault(#args=" << argCount << ")"

-      << Debug::flush;

-  VOID_TO_NPVARIANT(*result);

-  return true;

-}

-

-bool ScriptableInstance::enumeration(NPIdentifier** propReturn, uint32_t* count) {

-  Debug::log(Debug::Debugging) << "ScriptableInstance::enumeration()" << Debug::flush;

-  int n = 2;

-  NPIdentifier* props = static_cast<NPIdentifier*>(NPN_MemAlloc(sizeof(NPIdentifier) * n));

-  props[0] = connectedID;

-  props[1] = statsID;

-  *propReturn = props;

-  *count = n;

-  return true;

-}

-

-//=============================================================================

-// internal methods

-//=============================================================================

-

-void ScriptableInstance::init(const NPVariant* args, unsigned argCount, NPVariant* result) {

-  if (argCount != 1 || !NPVariantProxy::isObject(args[0])) {

-    // TODO: better failure?

-    Debug::log(Debug::Error) << "ScriptableInstance::init called with incorrect arguments:\n";

-    for (unsigned i = 0; i < argCount; ++i) {

-      Debug::log(Debug::Error) << " " << i << " " << NPVariantProxy::toString(args[i]) << "\n";

-    }

-    Debug::log(Debug::Error) << Debug::flush;

-    result->type = NPVariantType_Void;

-    return;

-  }

-  if (window) {

-    NPN_ReleaseObject(window);

-  }

-  // replace our window object with that passed by the caller

-  window = NPVariantProxy::getAsObject(args[0]);

-  NPN_RetainObject(window);

-  BOOLEAN_TO_NPVARIANT(true, *result);

-  result->type = NPVariantType_Bool;

-}

-

-void ScriptableInstance::connect(const NPVariant* args, unsigned argCount, NPVariant* result) {

-  if (argCount != 5 || !NPVariantProxy::isString(args[0])

-      || !NPVariantProxy::isString(args[1])

-      || !NPVariantProxy::isString(args[2])

-      || !NPVariantProxy::isString(args[3])

-      || !NPVariantProxy::isString(args[4])) {

-    // TODO: better failure?

-    Debug::log(Debug::Error) << "ScriptableInstance::connect called with incorrect arguments:\n";

-    for (unsigned i = 0; i < argCount; ++i) {

-      Debug::log(Debug::Error) << " " << i << " " << NPVariantProxy::toString(args[i]) << "\n";

-    }

-    Debug::log(Debug::Error) << Debug::flush;

-    result->type = NPVariantType_Void;

-    return;

-  }

-  const NPString url = args[0].value.stringValue;

-  const NPString sessionKey = args[1].value.stringValue;

-  const NPString hostAddr = args[2].value.stringValue;

-  const NPString moduleName = args[3].value.stringValue;

-  const NPString hostedHtmlVersion = args[4].value.stringValue;

-  Debug::log(Debug::Info) << "ScriptableInstance::connect(url=" << NPVariantProxy::toString(args[0])

-      << ",sessionKey=" << NPVariantProxy::toString(args[1]) << ",host=" << NPVariantProxy::toString(args[2])

-      << ",module=" << NPVariantProxy::toString(args[3]) << ",hostedHtmlVers=" << NPVariantProxy::toString(args[4])

-      << ")" << Debug::flush;

-  const std::string urlStr = convertToString(url);

-

-  Preferences::loadAccessList();

-  bool allowed = false;

-  if (!AllowedConnections::matchesRule(urlStr, &allowed)) {

-    bool remember = false;

-    allowed = AllowDialog::askUserToAllow(&remember);

-    if (remember) {

-      std::string host = AllowedConnections::getHostFromUrl(urlStr);

-      Preferences::addNewRule(host, !allowed);

-    }

-  }

-  if (!allowed) {

-    BOOLEAN_TO_NPVARIANT(false, *result);

-    result->type = NPVariantType_Bool;

-    return;

-  }

-

-  bool connected = false;

-  unsigned port = 9997;  // TODO(jat): should there be a default?

-  int n = GetNPStringUTF8Length(hostAddr);

-  scoped_ptr<char> host(new char[n + 1]);

-  const char* s = GetNPStringUTF8Characters(hostAddr);

-  char* d = host.get();

-  while (n > 0 && *s != ':') {

-    n--;

-    *d++ = *s++;

-  }

-  *d = 0;

-  if (n > 0) {

-    port = atoi(s + 1);

-  }

-  Debug::log(Debug::Info) << "  host=" << host.get() << ",port=" << port << Debug::flush;

-

-

-  if (!_channel->connectToHost(host.get(), port)) {

-    BOOLEAN_TO_NPVARIANT(false, *result);

-    result->type = NPVariantType_Bool;

-  }

-

-  string hostedHtmlVersionStr = convertToString(hostedHtmlVersion);

-  if (!_channel->init(this, BROWSERCHANNEL_PROTOCOL_VERSION,

-      BROWSERCHANNEL_PROTOCOL_VERSION, hostedHtmlVersionStr)) {

-    BOOLEAN_TO_NPVARIANT(false, *result);

-    result->type = NPVariantType_Bool;

-  }

-

-  string moduleNameStr = convertToString(moduleName);

-  string userAgent(NPN_UserAgent(getNPP()));

-  string tabKeyStr = computeTabIdentity();

-  string sessionKeyStr = convertToString(sessionKey);

-  Debug::log(Debug::Debugging) << "  connected, sending loadModule" << Debug::flush;

-  connected = LoadModuleMessage::send(*_channel, urlStr, tabKeyStr, sessionKeyStr,

-      moduleNameStr, userAgent, this);

-  BOOLEAN_TO_NPVARIANT(connected, *result);

-  result->type = NPVariantType_Bool;

-}

-

-int ScriptableInstance::getLocalObjectRef(NPObject* obj) {

-  NPVariantWrapper wrappedRetVal(*this);

-  int id;

-  if (NPN_GetProperty(getNPP(), obj, gwtId, wrappedRetVal.addressForReturn())

-      && wrappedRetVal.isInt()) {

-    id = wrappedRetVal.getAsInt();

-    localObjects.set(id, obj);

-  } else {

-    id = localObjects.add(obj);

-    wrappedRetVal = id;

-    if (!NPN_SetProperty(getNPP(), obj, gwtId, wrappedRetVal.address())) {

-      Debug::log(Debug::Error) << "Setting GWT id on object failed" << Debug::flush;

-    }

-  }

-  return id;

-}

-

-void ScriptableInstance::fatalError(HostChannel& channel, const std::string& message) {

-  // TODO(jat): better error handling

-  Debug::log(Debug::Error) << "Fatal error: " << message << Debug::flush;

-}

-

-void ScriptableInstance::dupString(const char* str, NPString& npString) {

-  npString.UTF8Length = static_cast<uint32_t>(strlen(str));

-  NPUTF8* chars = static_cast<NPUTF8*>(NPN_MemAlloc(npString.UTF8Length));

-  memcpy(chars, str, npString.UTF8Length);

-  npString.UTF8Characters = chars;

-}

-

-// SessionHandler methods

-void ScriptableInstance::freeValue(HostChannel& channel, int idCount, const int* const ids) {

-  Debug::log(Debug::Debugging) << "freeValue(#ids=" << idCount << ")" << Debug::flush;

-  for (int i = 0; i < idCount; ++i) {

-	  Debug::log(Debug::Spam) << " id=" << ids[i] << Debug::flush;

-    NPObject* obj = localObjects.get(ids[i]);

-    if (!NPN_RemoveProperty(getNPP(), obj, gwtId)) {

-      Debug::log(Debug::Error) << "Unable to remove GWT ID from object " << ids[i] << Debug::flush;

-    } else {

-      localObjects.free(ids[i]);

-    }

-  }

-}

-

-void ScriptableInstance::loadJsni(HostChannel& channel, const std::string& js) {

-  NPString npScript;

-  dupString(js.c_str(), npScript);

-  NPVariantWrapper npResult(*this);

-  Debug::log(Debug::Spam) << "loadJsni - \n" << js << Debug::flush;

-  if (!NPN_Evaluate(getNPP(), window, &npScript, npResult.addressForReturn())) {

-    Debug::log(Debug::Error) << "loadJsni failed\n" << js << Debug::flush;

-  }

-}

-

-Value ScriptableInstance::clientMethod_getProperty(HostChannel& channel, int numArgs, const Value* const args) {

-  if (numArgs != 2 || !args[0].isInt() || (!args[1].isString() && !args[1].isInt())) {

-    Debug::log(Debug::Error) << "Incorrect invocation of getProperty: #args=" << numArgs << ":";

-    for (int i = 0; i < numArgs; ++i) {

-      Debug::log(Debug::Error) << " " << i << "=" << args[i].toString();

-    }

-    Debug::log(Debug::Error) << Debug::flush;

-    return Value();

-  }

-  int id = args[0].getInt();

-  NPObject* obj = localObjects.get(id);

-  NPIdentifier propID;

-  if (args[1].isString()) {

-    std::string propName = args[1].getString();

-    propID = NPN_GetStringIdentifier(propName.c_str());

-  } else {

-    int propNum = args[1].getInt();

-    propID = NPN_GetIntIdentifier(propNum);

-  }

-  NPVariantWrapper npResult(*this);

-  if (!NPN_GetProperty(getNPP(), obj, propID, npResult.addressForReturn())) {

-    Debug::log(Debug::Warning) << "getProperty(id=" << id << ", prop="

-        << NPN_UTF8FromIdentifier(propID) << ") failed" << Debug::flush;

-    return Value();

-  }

-  return npResult.getAsValue(*this);

-}

-

-Value ScriptableInstance::clientMethod_setProperty(HostChannel& channel, int numArgs, const Value* const args) {

-  if (numArgs != 2 || !args[0].isInt() || (!args[1].isString() && !args[1].isInt())) {

-    Debug::log(Debug::Error) << "Incorrect invocation of setProperty: #args="

-        << numArgs << ":";

-    for (int i = 0; i < numArgs; ++i) {

-      Debug::log(Debug::Error) << " " << i << "=" << args[i].toString();

-    }

-    Debug::log(Debug::Error) << Debug::flush;

-    return Value();

-  }

-  int id = args[0].getInt();

-  NPObject* obj = localObjects.get(id);

-  NPIdentifier propID;

-  if (args[1].isString()) {

-    std::string propName = args[1].getString();

-    propID = NPN_GetStringIdentifier(propName.c_str());

-  } else {

-    int propNum = args[1].getInt();

-    propID = NPN_GetIntIdentifier(propNum);

-  }

-  NPVariantWrapper npValue(*this);

-  npValue.operator=(args[2]);

-  if (!NPN_SetProperty(getNPP(), obj, propID, npValue.address())) {

-    Debug::log(Debug::Warning) << "setProperty(id=" << id << ", prop="

-        << NPN_UTF8FromIdentifier(propID) << ", val=" << args[2].toString()

-        << ") failed" << Debug::flush;

-    return Value();

-  }

-  return Value();

-}

-

-/**

- * SessionHandler.invoke - used by LoadModule and reactToMessages* to process server-side

- * requests to invoke methods in Javascript or the plugin.

- */

-bool ScriptableInstance::invokeSpecial(HostChannel& channel, SpecialMethodId dispatchId,

-    int numArgs, const Value* const args, Value* returnValue) {

-  switch (dispatchId) {

-  case SessionHandler::HasMethod:

-  case SessionHandler::HasProperty:

-    break;

-  case SessionHandler::SetProperty:

-    *returnValue = clientMethod_setProperty(channel, numArgs, args);

-    return false;

-  case SessionHandler::GetProperty:

-    *returnValue = clientMethod_getProperty(channel, numArgs, args);

-    return false;

-  default:

-    break;

-  }

-  Debug::log(Debug::Error) << "Unexpected special method " << dispatchId

-      << " called on plugin; #args=" << numArgs << ":";

-  for (int i = 0; i < numArgs; ++i) {

-    Debug::log(Debug::Error) << " " << i << "=" << args[i].toString();

-  }

-  Debug::log(Debug::Error) << Debug::flush;

-  // TODO(jat): should we create a real exception object?

-  std::string buf("unexpected invokeSpecial(");

-  buf += static_cast<int>(dispatchId);

-  buf += ")";

-  returnValue->setString(buf);

-  return true;

-}

-

-bool ScriptableInstance::invoke(HostChannel& channel, const Value& thisRef,

-    const std::string& methodName, int numArgs, const Value* const args,

-    Value* returnValue) {

-  Debug::log(Debug::Debugging) << "invokeJS(" << methodName << ", this=" 

-      << thisRef.toString() << ", numArgs=" << numArgs << ")" << Debug::flush;

-  NPVariantArray varArgs(*this, numArgs + 2);

-  varArgs[0] = thisRef;

-  varArgs[1] = methodName;

-  for (int i = 0; i < numArgs; ++i) {

-    varArgs[i + 2] = args[i];

-  }

-  const NPVariant* argArray = varArgs.getArray();

-  if (Debug::level(Debug::Spam)) {

-    for (int i = 0; i < varArgs.getSize(); ++i) {

-      Debug::log(Debug::Spam) << "  arg " << i << " is "

-          << NPVariantProxy::toString(argArray[i]) << Debug::flush;

-    }

-  }

-  NPVariantWrapper wrappedRetVal(*this);

-  if (!NPN_Invoke(getNPP(), window, jsInvokeID, argArray, varArgs.getSize(),

-      wrappedRetVal.addressForReturn())) {

-    Debug::log(Debug::Error) << "*** invokeJS(" << methodName << ", this="

-        << thisRef.toString() << ", numArgs=" << numArgs << ") failed"

-        << Debug::flush;

-    // TODO(jat): should we create a real exception object?

-    returnValue->setString("invoke of " + methodName + " failed");

-    return true;

-  }

-  Debug::log(Debug::Spam) << "  wrapped return is " << wrappedRetVal.toString() << Debug::flush;

-  NPVariantWrapper exceptFlag(*this);

-  NPVariantWrapper retval(*this);

-  NPObject* wrappedArray = wrappedRetVal.getAsObject();

-  if (!NPN_GetProperty(getNPP(), wrappedArray, idx0, exceptFlag.addressForReturn())) {

-    Debug::log(Debug::Error) << " Error getting element 0 of wrapped return value ("

-        << wrappedRetVal << ") on call to " << methodName << Debug::flush;

-  }

-  if (!NPN_GetProperty(getNPP(), wrappedArray, idx1, retval.addressForReturn())) {

-    Debug::log(Debug::Error) << " Error getting element 1 of wrapped return value ("

-        << wrappedRetVal << ") on call to " << methodName << Debug::flush;

-  }

-  Debug::log(Debug::Debugging) << "  return value " << retval.toString() << Debug::flush;

-  *returnValue = retval.getAsValue(*this);

-  if (exceptFlag.isInt() && exceptFlag.getAsInt() != 0) {

-    Debug::log(Debug::Debugging) << "  exception: " << retval << Debug::flush;

-    return true;

-  }

-  return false;

-}

-

-bool ScriptableInstance::JavaObject_invoke(int objectId, int dispId,

-    const NPVariant* args, uint32_t numArgs, NPVariant* result) {

-  Debug::log(Debug::Debugging) << "JavaObject_invoke(dispId= " << dispId << ", numArgs=" << numArgs << ")" << Debug::flush;

-  if (Debug::level(Debug::Spam)) {

-    for (uint32_t i = 0; i < numArgs; ++i) {

-      Debug::log(Debug::Spam) << "  " << i << " = " << args[i] << Debug::flush;

-    }

-  }

-

-  bool isRawToString = false;

-  if (dispId == -1) {

-    dispId = 0;

-    isRawToString = true;

-  }

-

-  Value javaThis;

-  javaThis.setJavaObject(objectId);

-  scoped_array<Value> vargs(new Value[numArgs]);

-  for (unsigned i = 0; i < numArgs; ++i) {

-    vargs[i] = NPVariantProxy::getAsValue(args[i], *this);

-  }

-  bool isException = false;

-  Value returnValue;

-  if (!InvokeMessage::send(*_channel, javaThis, dispId, numArgs, vargs.get())) {

-    Debug::log(Debug::Error) << "JavaObject_invoke: failed to send invoke message" << Debug::flush;

-  } else {

-    Debug::log(Debug::Debugging) << " return from invoke" << Debug::flush;

-    scoped_ptr<ReturnMessage> retMsg(_channel->reactToMessagesWhileWaitingForReturn(this));

-    if (!retMsg.get()) {

-      Debug::log(Debug::Error) << "JavaObject_invoke: failed to get return value" << Debug::flush;

-    } else {

-      if (isRawToString) {

-        // toString() needs the raw value

-        NPVariantProxy::assignFrom(*this, *result, retMsg->getReturnValue());

-        return !retMsg->isException();

-      }

-      isException = retMsg->isException();

-      returnValue = retMsg->getReturnValue();

-    }

-  }

-  // Wrap the result

-  return makeResult(isException, returnValue, result);

-}

-

-bool ScriptableInstance::JavaObject_getProperty(int objectId, int dispId,

-    NPVariant* result) {

-  Debug::log(Debug::Debugging) << "JavaObject_getProperty(objectid="

-      << objectId << ", dispId=" << dispId << ")" << Debug::flush;

-  VOID_TO_NPVARIANT(*result);

-  Value propertyValue = ServerMethods::getProperty(*_channel, this, objectId, dispId);

-  if (propertyValue.isJsObject()) {

-    // TODO(jat): special-case for testing

-    NPObject* npObj = localObjects.get(propertyValue.getJsObjectId());

-    OBJECT_TO_NPVARIANT(npObj, *result);

-    NPN_RetainObject(npObj);

-  } else {

-    NPVariantProxy::assignFrom(*this, *result, propertyValue);

-  }

-  Debug::log(Debug::Debugging) << " return val=" << propertyValue

-      << ", NPVariant=" << *result << Debug::flush;

-  if (NPVariantProxy::isObject(*result)) {

-    dumpObjectBytes(NPVariantProxy::getAsObject(*result));

-  }

-  if (NPVariantProxy::isObject(*result)) {

-    Debug::log(Debug::Debugging) << "  final return refcount = "

-        << NPVariantProxy::getAsObject(*result)->referenceCount << Debug::flush; 

-  }

-  return true;

-}

-

-bool ScriptableInstance::JavaObject_setProperty(int objectId, int dispId,

-    const NPVariant* npValue) {

-  Debug::log(Debug::Debugging) << "JavaObject_setProperty(objectid="

-      << objectId << ", dispId=" << dispId << ", value=" << *npValue << ")" << Debug::flush;

-  if (NPVariantProxy::isObject(*npValue)) {

-    Debug::log(Debug::Debugging) << "  before localObj: refcount = "

-        << NPVariantProxy::getAsObject(*npValue)->referenceCount << Debug::flush; 

-  }

-  Value value = NPVariantProxy::getAsValue(*npValue, *this, true);

-  if (NPVariantProxy::isObject(*npValue)) {

-    Debug::log(Debug::Debugging) << "  after localObj: refcount = "

-        << NPVariantProxy::getAsObject(*npValue)->referenceCount << Debug::flush; 

-  }

-  if (NPVariantProxy::isObject(*npValue)) {

-    dumpObjectBytes(NPVariantProxy::getAsObject(*npValue));

-  }

-  Debug::log(Debug::Debugging) << "  as value: " << value << Debug::flush;

-  // TODO: no way to set an actual exception object! (Could ClassCastException on server.)

-  return ServerMethods::setProperty(*_channel, this, objectId, dispId, value);

-}

-

-bool ScriptableInstance::JavaObject_getToStringTearOff(NPVariant* result) {

-  Debug::log(Debug::Debugging) << "JavaObject_getToStringTearOff()" << Debug::flush;

-  VOID_TO_NPVARIANT(*result);

-

-  Value temp;

-  NPVariantArray varArgs(*this, 3);

-  temp.setNull();  varArgs[0] = temp; // proxy: no proxy needed

-  temp.setInt(0);  varArgs[1] = temp; // dispId: always 0 for toString()

-  temp.setInt(0);  varArgs[2] = temp; // argCount: always 0 for toString()

-

-  if (!NPN_Invoke(getNPP(), window, jsTearOffID, varArgs.getArray(), 3, result)) {

-    Debug::log(Debug::Error) << "*** JavaObject_getToStringTearOff() failed"

-        << Debug::flush;

-    return true;

-  }

-  return true;

-}

-

-JavaObject* ScriptableInstance::createJavaWrapper(int objectId) {

-  Debug::log(Debug::Debugging) << "createJavaWrapper(objectId=" << objectId <<  ")" << Debug::flush;

-  JavaObject* jObj;

-  hash_map<int, JavaObject*>::iterator it = javaObjects.find(objectId);

-  if (it != javaObjects.end()) {

-    jObj = it->second;

-    NPN_RetainObject(jObj);

-    return jObj;

-  }

-  jObj = JavaObject::create(this, objectId);

-  javaObjects[objectId] = jObj;

-  return jObj;

-}

-

-void ScriptableInstance::destroyJavaWrapper(JavaObject* jObj) {

-  int objectId = jObj->getObjectId();

-  if (!javaObjects.erase(objectId)) {

-    Debug::log(Debug::Error) << "destroyJavaWrapper(id=" << objectId

-        << "): trying to free unknown JavaObject" << Debug::flush;

-  }

-  Debug::log(Debug::Debugging) << "destroyJavaWrapper(id=" << objectId << ")" << Debug::flush;

-  javaObjectsToFree.insert(objectId);

-}

-

-void ScriptableInstance::disconnectDetectedImpl() {

-  NPVariantWrapper result(*this);

-  NPN_Invoke(getNPP(), window, jsDisconnectedID, 0, 0, result.addressForReturn());

-}

-

-void ScriptableInstance::sendFreeValues(HostChannel& channel) {

-  unsigned n = javaObjectsToFree.size();

-  if (n) {

-    scoped_array<int> ids(new int[n]);

-    int i = 0;

-    for (std::set<int>::iterator it = javaObjectsToFree.begin();

-        it != javaObjectsToFree.end(); ++it) {

-      ids[i++] = *it;

-    }

-    if (ServerMethods::freeJava(channel, this, n, ids.get())) {

-      javaObjectsToFree.clear();

-    }

-  }

-}

-

+/*
+ * Copyright 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+#include <cstring>
+
+#include "ScriptableInstance.h"
+#include "InvokeMessage.h"
+#include "ReturnMessage.h"
+#include "ServerMethods.h"
+#include "AllowedConnections.h"
+#include "Preferences.h"
+#include "AllowDialog.h"
+
+#include "mozincludes.h"
+#include "scoped_ptr/scoped_ptr.h"
+#include "NPVariantWrapper.h"
+
+using std::string;
+using std::endl;
+
+static inline string convertToString(const NPString& str) {
+  return string(GetNPStringUTF8Characters(str), GetNPStringUTF8Length(str));
+}
+
+string ScriptableInstance::computeTabIdentity() {
+  return "";
+}
+
+void ScriptableInstance::dumpObjectBytes(NPObject* obj) {
+  char buf[20];
+  Debug::log(Debug::Debugging) << "   object bytes:\n";
+  const unsigned char* ptr = reinterpret_cast<const unsigned char*>(obj);
+  for (int i = 0; i < 24; ++i) {
+    snprintf(buf, sizeof(buf), " %02x", ptr[i]);
+    Debug::log(Debug::Debugging) << buf;
+  }
+  NPVariant objVar;
+  OBJECT_TO_NPVARIANT(obj, objVar);
+  Debug::log(Debug::Debugging) << " obj.toString()="
+      << NPVariantProxy::toString(objVar) << Debug::flush;
+}
+
+ScriptableInstance::ScriptableInstance(NPP npp) : NPObjectWrapper<ScriptableInstance>(npp),
+    plugin(*reinterpret_cast<Plugin*>(npp->pdata)),
+    _channel(new HostChannel()),
+    localObjects(),
+    _connectId(NPN_GetStringIdentifier("connect")),
+    initID(NPN_GetStringIdentifier("init")),
+    toStringID(NPN_GetStringIdentifier("toString")),
+    connectedID(NPN_GetStringIdentifier("connected")),
+    statsID(NPN_GetStringIdentifier("stats")),
+    gwtId(NPN_GetStringIdentifier("__gwt_ObjectId")),
+    jsDisconnectedID(NPN_GetStringIdentifier("__gwt_disconnected")),
+    jsInvokeID(NPN_GetStringIdentifier("__gwt_jsInvoke")),
+    jsResultID(NPN_GetStringIdentifier("__gwt_makeResult")),
+    jsTearOffID(NPN_GetStringIdentifier("__gwt_makeTearOff")),
+    jsValueOfID(NPN_GetStringIdentifier("valueOf")),
+    idx0(NPN_GetIntIdentifier(0)),
+    idx1(NPN_GetIntIdentifier(1)) {
+  savedValueIdx = -1;
+  if (NPN_GetValue(npp, NPNVWindowNPObject, &window) != NPERR_NO_ERROR) {
+    Debug::log(Debug::Error) << "Error getting window object" << Debug::flush;
+  }
+}
+
+ScriptableInstance::~ScriptableInstance() {
+  // TODO(jat): free any remaining Java objects held by JS, then make
+  // the JS wrapper handle that situation gracefully
+  if (window) {
+    NPN_ReleaseObject(window);
+  }
+  for (hash_map<int, JavaObject*>::iterator it = javaObjects.begin(); it != javaObjects.end();
+      ++it) {
+    Debug::log(Debug::Spam) << "  disconnecting Java wrapper " << it->first << Debug::flush;
+    it->second->disconnectPlugin();
+  }
+  if (_channel) {
+    _channel->disconnectFromHost();
+    delete _channel;
+  }
+}
+
+void ScriptableInstance::dumpJSresult(const char* js) {
+  NPString npScript;
+  dupString(js, npScript);
+  NPVariantWrapper wrappedRetVal(*this);
+  if (!NPN_Evaluate(getNPP(), window, &npScript, wrappedRetVal.addressForReturn())) {
+    Debug::log(Debug::Error) << "   *** dumpJSresult failed" << Debug::flush;
+    return;
+  }
+  Debug::log(Debug::Info) << "dumpWindow=" << wrappedRetVal.toString() << Debug::flush;
+}
+
+bool ScriptableInstance::tryGetStringPrimitive(NPObject* obj, NPVariant& result) {
+  if (NPN_HasMethod(getNPP(), obj, jsValueOfID)) {
+    if (NPN_Invoke(getNPP(), obj, jsValueOfID, 0, 0, &result)
+        && NPVariantProxy::isString(result)) {
+      return true;
+    }
+    NPVariantProxy::release(result);
+  }
+  return false;
+}
+
+bool ScriptableInstance::makeResult(bool isException, const Value& value, NPVariant* result) {
+  Debug::log(Debug::Debugging) << "makeResult(" << isException << ", " << value << ")"
+      << Debug::flush;
+  Value temp;
+  if (value.getType() == Value::JAVA_OBJECT) {
+    int javaId = value.getJavaObjectId();
+    // We may have previously released the proxy for the same object id,
+    // but have not yet sent a free message back to the server.
+    javaObjectsToFree.erase(javaId);
+  }
+  NPVariantArray varArgs(*this, 3);
+  varArgs[0] = isException ? 1 : 0;
+  varArgs[1] = value;
+  NPVariantWrapper retVal(*this);
+  return NPN_Invoke(getNPP(), window, jsResultID, varArgs.getArray(), varArgs.getSize(), result);
+}
+
+//=============================================================================
+// NPObject methods
+//=============================================================================
+
+bool ScriptableInstance::hasProperty(NPIdentifier name) {
+  if (!NPN_IdentifierIsString(name)) {
+    // all numeric properties are ok, as we assume only JSNI code is making
+    // the field access via dispatchID
+    return true;
+  }
+  // TODO: special-case toString tear-offs
+  return name == statsID || name == connectedID;
+}
+
+bool ScriptableInstance::getProperty(NPIdentifier name, NPVariant* variant) {
+  Debug::log(Debug::Debugging) << "ScriptableInstance::getProperty(name="
+      << NPN_UTF8FromIdentifier(name) << ")" << Debug::flush;
+  bool retVal = false;
+  VOID_TO_NPVARIANT(*variant);
+  if (name == connectedID) {
+    BOOLEAN_TO_NPVARIANT(_channel->isConnected(), *variant);
+    retVal = true;
+  } else if (name == statsID) {
+    NPVariantProxy::assignFrom(*variant, "<stats data>");
+    retVal = true;
+  }
+  if (retVal) {
+    // TODO: testing
+    Debug::log(Debug::Debugging) << " return value " << *variant
+        << Debug::flush;
+  }
+  return retVal;
+}
+
+bool ScriptableInstance::setProperty(NPIdentifier name, const NPVariant* variant) {
+  Debug::log(Debug::Debugging) << "ScriptableInstance::setProperty(name="
+      << NPN_UTF8FromIdentifier(name) << ", value=" << *variant << ")"
+      << Debug::flush; 
+  return false;
+}
+
+bool ScriptableInstance::hasMethod(NPIdentifier name) {
+  Debug::log(Debug::Debugging) << "ScriptableInstance::hasMethod(name=" << NPN_UTF8FromIdentifier(name) << ")"
+      << Debug::flush; 
+  if (name == _connectId || name == initID || name == toStringID) {
+    return true;
+  }
+  return false;
+}
+
+bool ScriptableInstance::invoke(NPIdentifier name, const NPVariant* args, unsigned argCount,
+    NPVariant* result) {
+  NPUTF8* uname = NPN_UTF8FromIdentifier(name);
+  Debug::log(Debug::Debugging) << "ScriptableInstance::invoke(name=" << uname << ",#args=" << argCount << ")"
+      << Debug::flush;
+  VOID_TO_NPVARIANT(*result);
+  if (name == _connectId) {
+    connect(args, argCount, result);
+  } else if (name == initID) {
+    init(args, argCount, result);
+  } else if (name == toStringID) {
+    // TODO(jat): figure out why this doesn't show in Firebug
+    string val("[GWT OOPHM Plugin: connected=");
+    val += _channel->isConnected() ? 'Y' : 'N';
+    val += ']';
+    NPVariantProxy::assignFrom(*result, val);
+  }
+  return true;
+}
+
+bool ScriptableInstance::invokeDefault(const NPVariant* args, unsigned argCount,
+      NPVariant* result) {
+  Debug::log(Debug::Debugging) << "ScriptableInstance::invokeDefault(#args=" << argCount << ")"
+      << Debug::flush;
+  VOID_TO_NPVARIANT(*result);
+  return true;
+}
+
+bool ScriptableInstance::enumeration(NPIdentifier** propReturn, uint32_t* count) {
+  Debug::log(Debug::Debugging) << "ScriptableInstance::enumeration()" << Debug::flush;
+  int n = 2;
+  NPIdentifier* props = static_cast<NPIdentifier*>(NPN_MemAlloc(sizeof(NPIdentifier) * n));
+  props[0] = connectedID;
+  props[1] = statsID;
+  *propReturn = props;
+  *count = n;
+  return true;
+}
+
+//=============================================================================
+// internal methods
+//=============================================================================
+
+void ScriptableInstance::init(const NPVariant* args, unsigned argCount, NPVariant* result) {
+  if (argCount != 1 || !NPVariantProxy::isObject(args[0])) {
+    // TODO: better failure?
+    Debug::log(Debug::Error) << "ScriptableInstance::init called with incorrect arguments:\n";
+    for (unsigned i = 0; i < argCount; ++i) {
+      Debug::log(Debug::Error) << " " << i << " " << NPVariantProxy::toString(args[i]) << "\n";
+    }
+    Debug::log(Debug::Error) << Debug::flush;
+    result->type = NPVariantType_Void;
+    return;
+  }
+  if (window) {
+    NPN_ReleaseObject(window);
+  }
+  // replace our window object with that passed by the caller
+  window = NPVariantProxy::getAsObject(args[0]);
+  NPN_RetainObject(window);
+  BOOLEAN_TO_NPVARIANT(true, *result);
+  result->type = NPVariantType_Bool;
+}
+
+void ScriptableInstance::connect(const NPVariant* args, unsigned argCount, NPVariant* result) {
+  if (argCount != 5 || !NPVariantProxy::isString(args[0])
+      || !NPVariantProxy::isString(args[1])
+      || !NPVariantProxy::isString(args[2])
+      || !NPVariantProxy::isString(args[3])
+      || !NPVariantProxy::isString(args[4])) {
+    // TODO: better failure?
+    Debug::log(Debug::Error) << "ScriptableInstance::connect called with incorrect arguments:\n";
+    for (unsigned i = 0; i < argCount; ++i) {
+      Debug::log(Debug::Error) << " " << i << " " << NPVariantProxy::toString(args[i]) << "\n";
+    }
+    Debug::log(Debug::Error) << Debug::flush;
+    result->type = NPVariantType_Void;
+    return;
+  }
+  const NPString url = args[0].value.stringValue;
+  const NPString sessionKey = args[1].value.stringValue;
+  const NPString hostAddr = args[2].value.stringValue;
+  const NPString moduleName = args[3].value.stringValue;
+  const NPString hostedHtmlVersion = args[4].value.stringValue;
+  Debug::log(Debug::Info) << "ScriptableInstance::connect(url=" << NPVariantProxy::toString(args[0])
+      << ",sessionKey=" << NPVariantProxy::toString(args[1]) << ",host=" << NPVariantProxy::toString(args[2])
+      << ",module=" << NPVariantProxy::toString(args[3]) << ",hostedHtmlVers=" << NPVariantProxy::toString(args[4])
+      << ")" << Debug::flush;
+  const std::string urlStr = convertToString(url);
+
+  Preferences::loadAccessList();
+  bool allowed = false;
+  if (!AllowedConnections::matchesRule(urlStr, &allowed)) {
+    bool remember = false;
+    allowed = AllowDialog::askUserToAllow(&remember);
+    if (remember) {
+      std::string host = AllowedConnections::getHostFromUrl(urlStr);
+      Preferences::addNewRule(host, !allowed);
+    }
+  }
+  if (!allowed) {
+    BOOLEAN_TO_NPVARIANT(false, *result);
+    result->type = NPVariantType_Bool;
+    return;
+  }
+
+  bool connected = false;
+  unsigned port = 9997;  // TODO(jat): should there be a default?
+  int n = GetNPStringUTF8Length(hostAddr);
+  scoped_ptr<char> host(new char[n + 1]);
+  const char* s = GetNPStringUTF8Characters(hostAddr);
+  char* d = host.get();
+  while (n > 0 && *s != ':') {
+    n--;
+    *d++ = *s++;
+  }
+  *d = 0;
+  if (n > 0) {
+    port = atoi(s + 1);
+  }
+  Debug::log(Debug::Info) << "  host=" << host.get() << ",port=" << port << Debug::flush;
+
+
+  if (!_channel->connectToHost(host.get(), port)) {
+    BOOLEAN_TO_NPVARIANT(false, *result);
+    result->type = NPVariantType_Bool;
+  }
+
+  string hostedHtmlVersionStr = convertToString(hostedHtmlVersion);
+  if (!_channel->init(this, BROWSERCHANNEL_PROTOCOL_VERSION,
+      BROWSERCHANNEL_PROTOCOL_VERSION, hostedHtmlVersionStr)) {
+    BOOLEAN_TO_NPVARIANT(false, *result);
+    result->type = NPVariantType_Bool;
+  }
+
+  string moduleNameStr = convertToString(moduleName);
+  string userAgent(NPN_UserAgent(getNPP()));
+  string tabKeyStr = computeTabIdentity();
+  string sessionKeyStr = convertToString(sessionKey);
+  Debug::log(Debug::Debugging) << "  connected, sending loadModule" << Debug::flush;
+  connected = LoadModuleMessage::send(*_channel, urlStr, tabKeyStr, sessionKeyStr,
+      moduleNameStr, userAgent, this);
+  BOOLEAN_TO_NPVARIANT(connected, *result);
+  result->type = NPVariantType_Bool;
+}
+
+int ScriptableInstance::getLocalObjectRef(NPObject* obj) {
+  NPVariantWrapper wrappedRetVal(*this);
+  int id;
+  if (NPN_GetProperty(getNPP(), obj, gwtId, wrappedRetVal.addressForReturn())
+      && wrappedRetVal.isInt()) {
+    id = wrappedRetVal.getAsInt();
+    localObjects.set(id, obj);
+  } else {
+    id = localObjects.add(obj);
+    wrappedRetVal = id;
+    if (!NPN_SetProperty(getNPP(), obj, gwtId, wrappedRetVal.address())) {
+      Debug::log(Debug::Error) << "Setting GWT id on object failed" << Debug::flush;
+    }
+  }
+  return id;
+}
+
+void ScriptableInstance::fatalError(HostChannel& channel, const std::string& message) {
+  // TODO(jat): better error handling
+  Debug::log(Debug::Error) << "Fatal error: " << message << Debug::flush;
+}
+
+void ScriptableInstance::dupString(const char* str, NPString& npString) {
+  npString.UTF8Length = static_cast<uint32_t>(strlen(str));
+  NPUTF8* chars = static_cast<NPUTF8*>(NPN_MemAlloc(npString.UTF8Length));
+  memcpy(chars, str, npString.UTF8Length);
+  npString.UTF8Characters = chars;
+}
+
+// SessionHandler methods
+void ScriptableInstance::freeValue(HostChannel& channel, int idCount, const int* const ids) {
+  Debug::log(Debug::Debugging) << "freeValue(#ids=" << idCount << ")" << Debug::flush;
+  for (int i = 0; i < idCount; ++i) {
+	  Debug::log(Debug::Spam) << " id=" << ids[i] << Debug::flush;
+    NPObject* obj = localObjects.get(ids[i]);
+    if (!NPN_RemoveProperty(getNPP(), obj, gwtId)) {
+      Debug::log(Debug::Error) << "Unable to remove GWT ID from object " << ids[i] << Debug::flush;
+    } else {
+      localObjects.free(ids[i]);
+    }
+  }
+}
+
+void ScriptableInstance::loadJsni(HostChannel& channel, const std::string& js) {
+  NPString npScript;
+  dupString(js.c_str(), npScript);
+  NPVariantWrapper npResult(*this);
+  Debug::log(Debug::Spam) << "loadJsni - \n" << js << Debug::flush;
+  if (!NPN_Evaluate(getNPP(), window, &npScript, npResult.addressForReturn())) {
+    Debug::log(Debug::Error) << "loadJsni failed\n" << js << Debug::flush;
+  }
+}
+
+Value ScriptableInstance::clientMethod_getProperty(HostChannel& channel, int numArgs, const Value* const args) {
+  if (numArgs != 2 || !args[0].isInt() || (!args[1].isString() && !args[1].isInt())) {
+    Debug::log(Debug::Error) << "Incorrect invocation of getProperty: #args=" << numArgs << ":";
+    for (int i = 0; i < numArgs; ++i) {
+      Debug::log(Debug::Error) << " " << i << "=" << args[i].toString();
+    }
+    Debug::log(Debug::Error) << Debug::flush;
+    return Value();
+  }
+  int id = args[0].getInt();
+  NPObject* obj = localObjects.get(id);
+  NPIdentifier propID;
+  if (args[1].isString()) {
+    std::string propName = args[1].getString();
+    propID = NPN_GetStringIdentifier(propName.c_str());
+  } else {
+    int propNum = args[1].getInt();
+    propID = NPN_GetIntIdentifier(propNum);
+  }
+  NPVariantWrapper npResult(*this);
+  if (!NPN_GetProperty(getNPP(), obj, propID, npResult.addressForReturn())) {
+    Debug::log(Debug::Warning) << "getProperty(id=" << id << ", prop="
+        << NPN_UTF8FromIdentifier(propID) << ") failed" << Debug::flush;
+    return Value();
+  }
+  return npResult.getAsValue(*this);
+}
+
+Value ScriptableInstance::clientMethod_setProperty(HostChannel& channel, int numArgs, const Value* const args) {
+  if (numArgs != 2 || !args[0].isInt() || (!args[1].isString() && !args[1].isInt())) {
+    Debug::log(Debug::Error) << "Incorrect invocation of setProperty: #args="
+        << numArgs << ":";
+    for (int i = 0; i < numArgs; ++i) {
+      Debug::log(Debug::Error) << " " << i << "=" << args[i].toString();
+    }
+    Debug::log(Debug::Error) << Debug::flush;
+    return Value();
+  }
+  int id = args[0].getInt();
+  NPObject* obj = localObjects.get(id);
+  NPIdentifier propID;
+  if (args[1].isString()) {
+    std::string propName = args[1].getString();
+    propID = NPN_GetStringIdentifier(propName.c_str());
+  } else {
+    int propNum = args[1].getInt();
+    propID = NPN_GetIntIdentifier(propNum);
+  }
+  NPVariantWrapper npValue(*this);
+  npValue.operator=(args[2]);
+  if (!NPN_SetProperty(getNPP(), obj, propID, npValue.address())) {
+    Debug::log(Debug::Warning) << "setProperty(id=" << id << ", prop="
+        << NPN_UTF8FromIdentifier(propID) << ", val=" << args[2].toString()
+        << ") failed" << Debug::flush;
+    return Value();
+  }
+  return Value();
+}
+
+/**
+ * SessionHandler.invoke - used by LoadModule and reactToMessages* to process server-side
+ * requests to invoke methods in Javascript or the plugin.
+ */
+bool ScriptableInstance::invokeSpecial(HostChannel& channel, SpecialMethodId dispatchId,
+    int numArgs, const Value* const args, Value* returnValue) {
+  switch (dispatchId) {
+  case SessionHandler::HasMethod:
+  case SessionHandler::HasProperty:
+    break;
+  case SessionHandler::SetProperty:
+    *returnValue = clientMethod_setProperty(channel, numArgs, args);
+    return false;
+  case SessionHandler::GetProperty:
+    *returnValue = clientMethod_getProperty(channel, numArgs, args);
+    return false;
+  default:
+    break;
+  }
+  Debug::log(Debug::Error) << "Unexpected special method " << dispatchId
+      << " called on plugin; #args=" << numArgs << ":";
+  for (int i = 0; i < numArgs; ++i) {
+    Debug::log(Debug::Error) << " " << i << "=" << args[i].toString();
+  }
+  Debug::log(Debug::Error) << Debug::flush;
+  // TODO(jat): should we create a real exception object?
+  std::string buf("unexpected invokeSpecial(");
+  buf += static_cast<int>(dispatchId);
+  buf += ")";
+  returnValue->setString(buf);
+  return true;
+}
+
+bool ScriptableInstance::invoke(HostChannel& channel, const Value& thisRef,
+    const std::string& methodName, int numArgs, const Value* const args,
+    Value* returnValue) {
+  Debug::log(Debug::Debugging) << "invokeJS(" << methodName << ", this=" 
+      << thisRef.toString() << ", numArgs=" << numArgs << ")" << Debug::flush;
+  NPVariantArray varArgs(*this, numArgs + 2);
+  varArgs[0] = thisRef;
+  varArgs[1] = methodName;
+  for (int i = 0; i < numArgs; ++i) {
+    varArgs[i + 2] = args[i];
+  }
+  const NPVariant* argArray = varArgs.getArray();
+  if (Debug::level(Debug::Spam)) {
+    for (int i = 0; i < varArgs.getSize(); ++i) {
+      Debug::log(Debug::Spam) << "  arg " << i << " is "
+          << NPVariantProxy::toString(argArray[i]) << Debug::flush;
+    }
+  }
+  NPVariantWrapper wrappedRetVal(*this);
+  if (!NPN_Invoke(getNPP(), window, jsInvokeID, argArray, varArgs.getSize(),
+      wrappedRetVal.addressForReturn())) {
+    Debug::log(Debug::Error) << "*** invokeJS(" << methodName << ", this="
+        << thisRef.toString() << ", numArgs=" << numArgs << ") failed"
+        << Debug::flush;
+    // TODO(jat): should we create a real exception object?
+    returnValue->setString("invoke of " + methodName + " failed");
+    return true;
+  }
+  Debug::log(Debug::Spam) << "  wrapped return is " << wrappedRetVal.toString() << Debug::flush;
+  NPVariantWrapper exceptFlag(*this);
+  NPVariantWrapper retval(*this);
+  NPObject* wrappedArray = wrappedRetVal.getAsObject();
+  if (!NPN_GetProperty(getNPP(), wrappedArray, idx0, exceptFlag.addressForReturn())) {
+    Debug::log(Debug::Error) << " Error getting element 0 of wrapped return value ("
+        << wrappedRetVal << ") on call to " << methodName << Debug::flush;
+  }
+  if (!NPN_GetProperty(getNPP(), wrappedArray, idx1, retval.addressForReturn())) {
+    Debug::log(Debug::Error) << " Error getting element 1 of wrapped return value ("
+        << wrappedRetVal << ") on call to " << methodName << Debug::flush;
+  }
+  Debug::log(Debug::Debugging) << "  return value " << retval.toString() << Debug::flush;
+  *returnValue = retval.getAsValue(*this);
+  if (exceptFlag.isInt() && exceptFlag.getAsInt() != 0) {
+    Debug::log(Debug::Debugging) << "  exception: " << retval << Debug::flush;
+    return true;
+  }
+  return false;
+}
+
+bool ScriptableInstance::JavaObject_invoke(int objectId, int dispId,
+    const NPVariant* args, uint32_t numArgs, NPVariant* result) {
+  Debug::log(Debug::Debugging) << "JavaObject_invoke(dispId= " << dispId << ", numArgs=" << numArgs << ")" << Debug::flush;
+  if (Debug::level(Debug::Spam)) {
+    for (uint32_t i = 0; i < numArgs; ++i) {
+      Debug::log(Debug::Spam) << "  " << i << " = " << args[i] << Debug::flush;
+    }
+  }
+
+  bool isRawToString = false;
+  if (dispId == -1) {
+    dispId = 0;
+    isRawToString = true;
+  }
+
+  Value javaThis;
+  javaThis.setJavaObject(objectId);
+  scoped_array<Value> vargs(new Value[numArgs]);
+  for (unsigned i = 0; i < numArgs; ++i) {
+    vargs[i] = NPVariantProxy::getAsValue(args[i], *this);
+  }
+  bool isException = false;
+  Value returnValue;
+  if (!InvokeMessage::send(*_channel, javaThis, dispId, numArgs, vargs.get())) {
+    Debug::log(Debug::Error) << "JavaObject_invoke: failed to send invoke message" << Debug::flush;
+  } else {
+    Debug::log(Debug::Debugging) << " return from invoke" << Debug::flush;
+    scoped_ptr<ReturnMessage> retMsg(_channel->reactToMessagesWhileWaitingForReturn(this));
+    if (!retMsg.get()) {
+      Debug::log(Debug::Error) << "JavaObject_invoke: failed to get return value" << Debug::flush;
+    } else {
+      if (isRawToString) {
+        // toString() needs the raw value
+        NPVariantProxy::assignFrom(*this, *result, retMsg->getReturnValue());
+        return !retMsg->isException();
+      }
+      isException = retMsg->isException();
+      returnValue = retMsg->getReturnValue();
+    }
+  }
+  // Wrap the result
+  return makeResult(isException, returnValue, result);
+}
+
+bool ScriptableInstance::JavaObject_getProperty(int objectId, int dispId,
+    NPVariant* result) {
+  Debug::log(Debug::Debugging) << "JavaObject_getProperty(objectid="
+      << objectId << ", dispId=" << dispId << ")" << Debug::flush;
+  VOID_TO_NPVARIANT(*result);
+  Value propertyValue = ServerMethods::getProperty(*_channel, this, objectId, dispId);
+  if (propertyValue.isJsObject()) {
+    // TODO(jat): special-case for testing
+    NPObject* npObj = localObjects.get(propertyValue.getJsObjectId());
+    OBJECT_TO_NPVARIANT(npObj, *result);
+    NPN_RetainObject(npObj);
+  } else {
+    NPVariantProxy::assignFrom(*this, *result, propertyValue);
+  }
+  Debug::log(Debug::Debugging) << " return val=" << propertyValue
+      << ", NPVariant=" << *result << Debug::flush;
+  if (NPVariantProxy::isObject(*result)) {
+    dumpObjectBytes(NPVariantProxy::getAsObject(*result));
+  }
+  if (NPVariantProxy::isObject(*result)) {
+    Debug::log(Debug::Debugging) << "  final return refcount = "
+        << NPVariantProxy::getAsObject(*result)->referenceCount << Debug::flush; 
+  }
+  return true;
+}
+
+bool ScriptableInstance::JavaObject_setProperty(int objectId, int dispId,
+    const NPVariant* npValue) {
+  Debug::log(Debug::Debugging) << "JavaObject_setProperty(objectid="
+      << objectId << ", dispId=" << dispId << ", value=" << *npValue << ")" << Debug::flush;
+  if (NPVariantProxy::isObject(*npValue)) {
+    Debug::log(Debug::Debugging) << "  before localObj: refcount = "
+        << NPVariantProxy::getAsObject(*npValue)->referenceCount << Debug::flush; 
+  }
+  Value value = NPVariantProxy::getAsValue(*npValue, *this, true);
+  if (NPVariantProxy::isObject(*npValue)) {
+    Debug::log(Debug::Debugging) << "  after localObj: refcount = "
+        << NPVariantProxy::getAsObject(*npValue)->referenceCount << Debug::flush; 
+  }
+  if (NPVariantProxy::isObject(*npValue)) {
+    dumpObjectBytes(NPVariantProxy::getAsObject(*npValue));
+  }
+  Debug::log(Debug::Debugging) << "  as value: " << value << Debug::flush;
+  // TODO: no way to set an actual exception object! (Could ClassCastException on server.)
+  return ServerMethods::setProperty(*_channel, this, objectId, dispId, value);
+}
+
+bool ScriptableInstance::JavaObject_getToStringTearOff(NPVariant* result) {
+  Debug::log(Debug::Debugging) << "JavaObject_getToStringTearOff()" << Debug::flush;
+  VOID_TO_NPVARIANT(*result);
+
+  Value temp;
+  NPVariantArray varArgs(*this, 3);
+  temp.setNull();  varArgs[0] = temp; // proxy: no proxy needed
+  temp.setInt(0);  varArgs[1] = temp; // dispId: always 0 for toString()
+  temp.setInt(0);  varArgs[2] = temp; // argCount: always 0 for toString()
+
+  if (!NPN_Invoke(getNPP(), window, jsTearOffID, varArgs.getArray(), 3, result)) {
+    Debug::log(Debug::Error) << "*** JavaObject_getToStringTearOff() failed"
+        << Debug::flush;
+    return true;
+  }
+  return true;
+}
+
+JavaObject* ScriptableInstance::createJavaWrapper(int objectId) {
+  Debug::log(Debug::Debugging) << "createJavaWrapper(objectId=" << objectId <<  ")" << Debug::flush;
+  JavaObject* jObj;
+  hash_map<int, JavaObject*>::iterator it = javaObjects.find(objectId);
+  if (it != javaObjects.end()) {
+    jObj = it->second;
+    NPN_RetainObject(jObj);
+    return jObj;
+  }
+  jObj = JavaObject::create(this, objectId);
+  javaObjects[objectId] = jObj;
+  return jObj;
+}
+
+void ScriptableInstance::destroyJavaWrapper(JavaObject* jObj) {
+  int objectId = jObj->getObjectId();
+  if (!javaObjects.erase(objectId)) {
+    Debug::log(Debug::Error) << "destroyJavaWrapper(id=" << objectId
+        << "): trying to free unknown JavaObject" << Debug::flush;
+  }
+  Debug::log(Debug::Debugging) << "destroyJavaWrapper(id=" << objectId << ")" << Debug::flush;
+  javaObjectsToFree.insert(objectId);
+}
+
+void ScriptableInstance::disconnectDetectedImpl() {
+  NPVariantWrapper result(*this);
+  NPN_Invoke(getNPP(), window, jsDisconnectedID, 0, 0, result.addressForReturn());
+}
+
+void ScriptableInstance::sendFreeValues(HostChannel& channel) {
+  unsigned n = javaObjectsToFree.size();
+  if (n) {
+    scoped_array<int> ids(new int[n]);
+    int i = 0;
+    for (std::set<int>::iterator it = javaObjectsToFree.begin();
+        it != javaObjectsToFree.end(); ++it) {
+      ids[i++] = *it;
+    }
+    if (ServerMethods::freeJava(channel, this, n, ids.get())) {
+      javaObjectsToFree.clear();
+    }
+  }
+}
+
diff --git a/plugins/npapi/VisualStudio/npapi-plugin.sln b/plugins/npapi/VisualStudio/npapi-plugin.sln
index 5604d56..8b8af37 100755
--- a/plugins/npapi/VisualStudio/npapi-plugin.sln
+++ b/plugins/npapi/VisualStudio/npapi-plugin.sln
@@ -1,26 +1,26 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C++ Express 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi-plugin", "npapi-plugin.vcproj", "{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|Win64 = Debug|Win64

-		Release|Win32 = Release|Win32

-		Release|Win64 = Release|Win64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win32.Build.0 = Debug|Win32

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win64.ActiveCfg = Debug|Win32

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win64.Build.0 = Debug|Win32

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win32.ActiveCfg = Release|Win32

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win32.Build.0 = Release|Win32

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win64.ActiveCfg = Release|Win32

-		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win64.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi-plugin", "npapi-plugin.vcproj", "{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|Win64 = Debug|Win64
+		Release|Win32 = Release|Win32
+		Release|Win64 = Release|Win64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win32.Build.0 = Debug|Win32
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win64.ActiveCfg = Debug|Win32
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win64.Build.0 = Debug|Win32
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win32.ActiveCfg = Release|Win32
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win32.Build.0 = Release|Win32
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win64.ActiveCfg = Release|Win32
+		{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win64.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/plugins/npapi/VisualStudio/npapi-plugin.vcproj b/plugins/npapi/VisualStudio/npapi-plugin.vcproj
index defedfc..81c2578 100755
--- a/plugins/npapi/VisualStudio/npapi-plugin.vcproj
+++ b/plugins/npapi/VisualStudio/npapi-plugin.vcproj
@@ -1,485 +1,485 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="npapi-plugin"

-	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}"

-	RootNamespace="npapi-plugin"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\platform\Win&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\..\common&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName="$(IntDir)/$(TargetName).res"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\prebuilt\gwt-dev-plugin\WINNT_x86-msvc\npGwtDevPlugin.dll"

-				LinkIncremental="1"

-				ModuleDefinitionFile="$(ProjectDir)\..\npGwtDevPlugin.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\platform\Win&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\..\common&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS"

-				ExceptionHandling="1"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\prebuilt\gwt-dev-plugin\WINNT_x86-msvc\npGwtDevPlugin.dll"

-				LinkIncremental="0"

-				AdditionalLibraryDirectories=""

-				ModuleDefinitionFile="..\npGwtDevPlugin.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\JavaObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\LocalObjectTable.h"

-				>

-			</File>

-			<File

-				RelativePath="..\mozincludes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\NPObjectWrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\NPVariantWrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\Plugin.h"

-				>

-			</File>

-			<File

-				RelativePath="..\resource.h"

-				>

-			</File>

-			<File

-				RelativePath="..\ScriptableInstance.h"

-				>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\common\AllowedConnections.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\BrowserChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\CheckVersionsMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ChooseTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Debug.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\DebugLevel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FatalErrorMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FreeValueMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HashMap.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HostChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeSpecialMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadJsniMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadModuleMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Message.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Platform.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ProtocolVersionMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\QuitMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ReturnMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ServerMethods.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SessionHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Socket.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SwitchTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Value.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="win"

-				>

-				<File

-					RelativePath="..\..\platform\Win\AllowDialog.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\platform\Win\Preferences.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="npapi"

-				>

-				<File

-					RelativePath="..\npapi\npapi.h"

-					>

-				</File>

-				<File

-					RelativePath="..\npapi\nphostapi.h"

-					>

-				</File>

-				<File

-					RelativePath="..\npapi\npruntime.h"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath="..\npGwtDevPlugin.rc"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\JavaObject.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\LocalObjectTable.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\main.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\npGwtDevPlugin.def"

-				>

-			</File>

-			<File

-				RelativePath="..\npn_bindings.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\Plugin.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\ScriptableInstance.cpp"

-				>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\common\AllowedConnections.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\CheckVersionsMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ChooseTransportMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Debug.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FatalErrorMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FreeValueMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HostChannel.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeSpecialMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadJsniMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadModuleMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ProtocolVersionMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ReturnMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ServerMethods.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Socket.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SwitchTransportMessage.cpp"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="win"

-				>

-				<File

-					RelativePath="..\..\platform\Win\AllowDialog.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\platform\Win\Preferences.cpp"

-					>

-				</File>

-			</Filter>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="npapi-plugin"
+	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}"
+	RootNamespace="npapi-plugin"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\platform\Win&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\..\common&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/$(TargetName).res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\prebuilt\gwt-dev-plugin\WINNT_x86-msvc\npGwtDevPlugin.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="$(ProjectDir)\..\npGwtDevPlugin.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\platform\Win&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\..\common&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\prebuilt\gwt-dev-plugin\WINNT_x86-msvc\npGwtDevPlugin.dll"
+				LinkIncremental="0"
+				AdditionalLibraryDirectories=""
+				ModuleDefinitionFile="..\npGwtDevPlugin.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\JavaObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\LocalObjectTable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mozincludes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\NPObjectWrapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\NPVariantWrapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Plugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ScriptableInstance.h"
+				>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\common\AllowedConnections.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\BrowserChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\CheckVersionsMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ChooseTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Debug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\DebugLevel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FatalErrorMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FreeValueMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HashMap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HostChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeSpecialMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadJsniMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadModuleMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Message.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Platform.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ProtocolVersionMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\QuitMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ReturnMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ServerMethods.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SessionHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Socket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SwitchTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Value.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="win"
+				>
+				<File
+					RelativePath="..\..\platform\Win\AllowDialog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\platform\Win\Preferences.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="npapi"
+				>
+				<File
+					RelativePath="..\npapi\npapi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\npapi\nphostapi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\npapi\npruntime.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\npGwtDevPlugin.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\JavaObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\LocalObjectTable.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\npGwtDevPlugin.def"
+				>
+			</File>
+			<File
+				RelativePath="..\npn_bindings.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\Plugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ScriptableInstance.cpp"
+				>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\common\AllowedConnections.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\CheckVersionsMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ChooseTransportMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Debug.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FatalErrorMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FreeValueMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HostChannel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeSpecialMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadJsniMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadModuleMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ProtocolVersionMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ReturnMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ServerMethods.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Socket.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SwitchTransportMessage.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="win"
+				>
+				<File
+					RelativePath="..\..\platform\Win\AllowDialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\platform\Win\Preferences.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/plugins/npapi/main.cpp b/plugins/npapi/main.cpp
index 5161911..7106a02 100644
--- a/plugins/npapi/main.cpp
+++ b/plugins/npapi/main.cpp
@@ -1,304 +1,304 @@
-/*

- *  main.cpp

- *  gwt-hosted-mode

- *

- *  Created by Kelly Norton on 11/18/07.

- *  Copyright 2007 Google Inc. All rights reserved.

- *

- */

-

-#ifndef _WINDOWS

-#include <unistd.h>

-#endif

-

-#include "Debug.h"

-

-#include "mozincludes.h"

-#include "Plugin.h"

-#include "ScriptableInstance.h"

-#include "scoped_ptr/scoped_ptr.h"

-#include "AllowDialog.h"

-

-#ifdef _WINDOWS

-#include <windows.h>

-

-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall, LPVOID lpReserved) {

-  AllowDialog::setHInstance(hModule);

-  switch (ulReasonForCall) {

-    case DLL_PROCESS_ATTACH:

-    case DLL_THREAD_ATTACH:

-    case DLL_THREAD_DETACH:

-    case DLL_PROCESS_DETACH:

-      break;

-  }

-  return TRUE;

-}

-#endif

-

-extern "C" {

-

-  static const NPNetscapeFuncs* browser;

-

-  NPError	NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode,

-	  int16 argc, char* argn[], char* argv[], NPSavedData* saved);

-  NPError	NPP_Destroy(NPP instance, NPSavedData** save);

-  NPError	NPP_SetWindow(NPP instance, NPWindow* window);

-  NPError	NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,

-	  NPBool seekable, uint16* stype);

-  NPError	NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason);

-  int32		NPP_WriteReady(NPP instance, NPStream* stream);

-  int32		NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len,

-	  void* buffer);

-  void		NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname);

-  void		NPP_Print(NPP instance, NPPrint* platformPrint);

-  int16		NPP_HandleEvent(NPP instance, void* event);

-  void		NPP_URLNotify(NPP instance, const char* URL, NPReason reason,

-	  void* notifyData);

-  NPError NP_GetValue(void*, NPPVariable variable, void *value);

-  NPError	NPP_GetValue(NPP instance, NPPVariable variable, void *value);

-  NPError	NPP_SetValue(NPP instance, NPNVariable variable, void *value);

-

-  // necessary for Mac

-#ifdef __APPLE_CC__

-  #pragma export on

-  int main(NPNetscapeFuncs* browserFuncs, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* shutdownUPP);

-#endif

-  NPError WINAPI NP_Initialize(NPNetscapeFuncs* browserFuncs NPINIT_ARG(pluginFuncs));

-  NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* pluginFuncs);

-  const char *NP_GetMIMEDescription();

-  const char *NPP_GetMIMEDescription();

-  NP_SHUTDOWN_RETURN_TYPE WINAPI NP_Shutdown(void);

-#ifdef __APPLE_CC__

-  #pragma export off

-#endif

-

-  // Function pointer variables:

-

-  NPError WINAPI NP_Initialize(NPNetscapeFuncs* browserFuncs NPINIT_ARG(pluginFuncs)) {

-    Debug::log(Debug::Info) << "NP_Initialize (gwt-hosted-mode/c++)";

-#ifndef _WINDOWS

-    Debug::log(Debug::Info) << ", pid=" << (unsigned) getpid();

-#endif

-    Debug::log(Debug::Info) << Debug::flush;

-    SetNPNFuncs(browserFuncs);

-    browser = &GetNPNFuncs();

-#ifdef NPINIT_GETS_ENTRYPOINTS

-    NP_GetEntryPoints(pluginFuncs);

-#endif

-    return NPERR_NO_ERROR;

-  }

-

-#ifdef __APPLE_CC__

-  int main(NPNetscapeFuncs* browserFuncs, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* shutdownUPP) {

-    printf("main (gwt-hosted-mode/c++)\n");

-    if (shutdownUPP == NULL) {

-      return NPERR_INVALID_FUNCTABLE_ERROR;

-    }

-    *shutdownUPP = NP_Shutdown;//NewNPP_ShutdownProc(NP_Shutdown);

-    NP_Initialize(browserFuncs);

-    NP_GetEntryPoints(pluginFuncs);

-    return NPERR_NO_ERROR;

-  }

-#endif

-

-  NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* pluginFuncs) {

-    Debug::log(Debug::Debugging) << "NP_GetEntryPoints" << Debug::flush;

-#ifdef BROWSER_WEBKIT

-    pluginFuncs->size          = sizeof(NPPluginFuncs);

-#else

-    if (pluginFuncs->size < sizeof(NPPluginFuncs)) {

-      return NPERR_INVALID_FUNCTABLE_ERROR;

-    }

-#endif

-    pluginFuncs->version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;

-#if 1

-    pluginFuncs->newp          = NPP_New;

-    pluginFuncs->destroy       = NPP_Destroy;

-    pluginFuncs->setwindow     = NPP_SetWindow;

-    pluginFuncs->newstream     = NPP_NewStream;

-    pluginFuncs->destroystream = NPP_DestroyStream;

-    pluginFuncs->asfile        = NPP_StreamAsFile;

-    pluginFuncs->writeready    = NPP_WriteReady;

-#ifdef BROWSER_WEBKIT

-    pluginFuncs->write         = reinterpret_cast<NPP_WriteProcPtr>(NPP_Write);

-#else

-    pluginFuncs->write         = NPP_Write;

-#endif

-    pluginFuncs->print         = NPP_Print;

-    pluginFuncs->event         = NPP_HandleEvent;

-    pluginFuncs->urlnotify     = NPP_URLNotify;

-    pluginFuncs->getvalue      = NPP_GetValue;

-    pluginFuncs->setvalue      = NPP_SetValue;

-    pluginFuncs->javaClass     = NULL;

-#else

-    pluginFuncs->newp =          NewNPP_NewProc(NPP_New);

-    pluginFuncs->destroy =       NewNPP_DestroyProc(NPP_Destroy);

-    pluginFuncs->setwindow =     NewNPP_SetWindowProc(NPP_SetWindow);

-    pluginFuncs->newstream =     NewNPP_NewStreamProc(NPP_NewStream);

-    pluginFuncs->destroystream = NewNPP_DestroyStreamProc(NPP_DestroyStream);

-    pluginFuncs->asfile =        NewNPP_StreamAsFileProc(NPP_StreamAsFile);

-    pluginFuncs->writeready =    NewNPP_WriteReadyProc(NPP_WriteReady);

-    pluginFuncs->write =         NewNPP_WriteProc(NPP_Write);

-    pluginFuncs->print =         NewNPP_PrintProc(NPP_Print);

-    pluginFuncs->event =         NewNPP_HandleEventProc(NPP_HandleEvent);

-    pluginFuncs->urlnotify =     NewNPP_URLNotifyProc(NPP_URLNotify);

-    pluginFuncs->getvalue =      NewNPP_GetValueProc(NPP_GetValue);

-    pluginFuncs->setvalue =      NewNPP_SetValueProc(NPP_SetValue);

-#endif

-    return NPERR_NO_ERROR;

-  }

-

-  const char *NP_GetMIMEDescription() {

-    Debug::log(Debug::Info) << "NP_GetMIMEDescription: returned mime description" << Debug::flush;

-    return "application/x-gwt-dev-mode::GWT dev-mode plugin;application/x-gwt-hosted-mode::GWT dev-mode plugin";

-  }

-

-  const char *NPP_GetMIMEDescription() {

-    return NP_GetMIMEDescription();

-  }

-

-  NP_SHUTDOWN_RETURN_TYPE WINAPI NP_Shutdown(void) {

-    Debug::log(Debug::Debugging) << "NP_Shutdown" << Debug::flush;

-    return NP_SHUTDOWN_RETURN(NPERR_NO_ERROR);

-  }

-

-  NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[],

-      char* argv[], NPSavedData* saved) {

-    Debug::log(Debug::Info) << "NPP_New(instance=" << instance << ",mode=" << mode << ",argc="

-        << argc << ",args=[";

-    for (int i = 0; i < argc; ++i) {

-      Debug::log(Debug::Info) << (i ? "," : "") << argn[i] << "=" << argv[i];

-    }

-    Debug::log(Debug::Info) << "],saved=" << saved << "): version=" << browser->version

-        << Debug::flush;

-    // Version 14 provides browser->createobject, which we need for npruntime support.

-    if (browser->version < 14) {

-      return NPERR_INVALID_INSTANCE_ERROR;

-    }

-    if (instance == NULL) {

-      return NPERR_INVALID_INSTANCE_ERROR;

-    }

-    Plugin* obj;

-//    if (saved) {

-//      obj = new Plugin(instance, reinterpret_cast<ScriptableInstance*>(saved));

-//    } else {

-      obj = new Plugin(instance);

-//    }

-    instance->pdata = obj;

-

-    // Make this a windowless plugin.

-    return NPN_SetValue(instance, NPPVpluginWindowBool, NULL);

-  }

-

-  NPError NPP_Destroy(NPP instance, NPSavedData** save) {

-    Debug::log(Debug::Info) << "NPP_Destroy(instance=" << instance << ")" << Debug::flush;

-    if (instance == NULL) {

-      return NPERR_INVALID_INSTANCE_ERROR;

-    }

-    Plugin* plugin = static_cast<Plugin*>(instance->pdata);

-    if (plugin) {

-      delete plugin;

-      instance->pdata = 0;

-    }

-    return NPERR_NO_ERROR;

-  }

-

-  NPError NPP_SetWindow(NPP instance, NPWindow* window) {

-    Debug::log(Debug::Info) << "NPP_SetWindow(instance=" << instance << ",window=" << window

-        << ")" << Debug::flush;

-    return NPERR_NO_ERROR;

-  }

-   

-

-  NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype) {

-    Debug::log(Debug::Info) << "NPP_NewStream(instance=" << instance << ")" << Debug::flush;

-    *stype = NP_ASFILEONLY;

-    return NPERR_NO_ERROR;

-  }

-

-  NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason) {

-    Debug::log(Debug::Info) << "NPP_DestroyStream(instance=" << instance << ")" << Debug::flush;

-    return NPERR_NO_ERROR;

-  }

-

-  int32 NPP_WriteReady(NPP instance, NPStream* stream) {

-    Debug::log(Debug::Info) << "NPP_WriteReady(instance=" << instance << ")" << Debug::flush;

-    return 0;

-  }

-

-  int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer) {

-    Debug::log(Debug::Info) << "NPP_Write(instance=" << instance << ")" << Debug::flush;

-    return 0;

-  }

-

-  void NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname) {

-    Debug::log(Debug::Info) << "NPP_StreamAsFile(instance=" << instance << ")" << Debug::flush;

-  }

-

-  void NPP_Print(NPP instance, NPPrint* platformPrint) {

-    Debug::log(Debug::Info) << "NPP_Print(instance=" << instance << ")" << Debug::flush;

-  }

-

-  int16 NPP_HandleEvent(NPP instance, void* event) {

-    Debug::log(Debug::Info) << "NPP_HandleEvent(instance=" << instance << ")" << Debug::flush;

-    return 1 ;

-  }

-

-  void NPP_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData) {

-    Debug::log(Debug::Info) << "NPP_URLNotify(instance=" << instance << ")" << Debug::flush;

-  }

-

-  NPObject *NPP_GetScriptableInstance(NPP instance) {

-    Debug::log(Debug::Info) << "NPP_GetScriptableInstance(instance=" << instance << ")" << Debug::flush;

-    if (!instance) {

-      return 0;

-    }

-    Plugin* plugin = static_cast<Plugin*>(instance->pdata);

-    ScriptableInstance* scriptableInstance = plugin->getScriptableInstance();

-    NPN_RetainObject(scriptableInstance);  // caller expects it retained.

-    return scriptableInstance;

-  }

-  

-  NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value) {

-    Debug::log(Debug::Info) << "NPP_GetValue(instance=" << instance << ",var=" << variable << ")"

-        << Debug::flush;

-    switch (variable) {

-      case NPPVpluginScriptableNPObject:

-        // here the plugin is asked by Mozilla to tell if it is scriptable

-        // we should return a valid interface id and a pointer to 

-        // nsScriptablePeer interface which we should have implemented

-        // and which should be defined in the corressponding *.xpt file

-        // in the bin/components folder

-        *static_cast<NPObject**>(value) = NPP_GetScriptableInstance(instance);

-        break;

-      default:

-        // pass other ones to the static version of GetValue

-        return NP_GetValue(0, variable, value);

-    }

-    return NPERR_NO_ERROR;

-  }

-

-  NPError NP_GetValue(void*, NPPVariable variable, void *value) {

-    Debug::log(Debug::Info) << "NP_GetValue(var=" << variable << ")" << Debug::flush;

-    switch (variable) {

-      case NPPVpluginNameString:

-        *static_cast<const char **>(value) = "GWT Development-Mode Plugin";

-        break;

-      case NPPVpluginDescriptionString:

-        *static_cast<const char **>(value) = "Plugin to enable debugging of Google Web Toolkit "

-            "applications in development mode.";

-        break;

-      default:

-        Debug::log(Debug::Info) << "NPP_GetValue(var=" << variable

-            << ") -- unexpected variable type" << Debug::flush;

-        return NPERR_GENERIC_ERROR;

-    }

-    return NPERR_NO_ERROR;

-  }

-

-  NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value) {

-    Debug::log(Debug::Info) << "NPP_SetValue(instance=" << instance << ",var=" << variable << ")"

-        << Debug::flush;

-    return NPERR_NO_ERROR;

-  }

-}

+/*
+ *  main.cpp
+ *  gwt-hosted-mode
+ *
+ *  Created by Kelly Norton on 11/18/07.
+ *  Copyright 2007 Google Inc. All rights reserved.
+ *
+ */
+
+#ifndef _WINDOWS
+#include <unistd.h>
+#endif
+
+#include "Debug.h"
+
+#include "mozincludes.h"
+#include "Plugin.h"
+#include "ScriptableInstance.h"
+#include "scoped_ptr/scoped_ptr.h"
+#include "AllowDialog.h"
+
+#ifdef _WINDOWS
+#include <windows.h>
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall, LPVOID lpReserved) {
+  AllowDialog::setHInstance(hModule);
+  switch (ulReasonForCall) {
+    case DLL_PROCESS_ATTACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+      break;
+  }
+  return TRUE;
+}
+#endif
+
+extern "C" {
+
+  static const NPNetscapeFuncs* browser;
+
+  NPError	NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode,
+	  int16 argc, char* argn[], char* argv[], NPSavedData* saved);
+  NPError	NPP_Destroy(NPP instance, NPSavedData** save);
+  NPError	NPP_SetWindow(NPP instance, NPWindow* window);
+  NPError	NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
+	  NPBool seekable, uint16* stype);
+  NPError	NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason);
+  int32		NPP_WriteReady(NPP instance, NPStream* stream);
+  int32		NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
+	  void* buffer);
+  void		NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
+  void		NPP_Print(NPP instance, NPPrint* platformPrint);
+  int16		NPP_HandleEvent(NPP instance, void* event);
+  void		NPP_URLNotify(NPP instance, const char* URL, NPReason reason,
+	  void* notifyData);
+  NPError NP_GetValue(void*, NPPVariable variable, void *value);
+  NPError	NPP_GetValue(NPP instance, NPPVariable variable, void *value);
+  NPError	NPP_SetValue(NPP instance, NPNVariable variable, void *value);
+
+  // necessary for Mac
+#ifdef __APPLE_CC__
+  #pragma export on
+  int main(NPNetscapeFuncs* browserFuncs, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* shutdownUPP);
+#endif
+  NPError WINAPI NP_Initialize(NPNetscapeFuncs* browserFuncs NPINIT_ARG(pluginFuncs));
+  NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* pluginFuncs);
+  const char *NP_GetMIMEDescription();
+  const char *NPP_GetMIMEDescription();
+  NP_SHUTDOWN_RETURN_TYPE WINAPI NP_Shutdown(void);
+#ifdef __APPLE_CC__
+  #pragma export off
+#endif
+
+  // Function pointer variables:
+
+  NPError WINAPI NP_Initialize(NPNetscapeFuncs* browserFuncs NPINIT_ARG(pluginFuncs)) {
+    Debug::log(Debug::Info) << "NP_Initialize (gwt-hosted-mode/c++)";
+#ifndef _WINDOWS
+    Debug::log(Debug::Info) << ", pid=" << (unsigned) getpid();
+#endif
+    Debug::log(Debug::Info) << Debug::flush;
+    SetNPNFuncs(browserFuncs);
+    browser = &GetNPNFuncs();
+#ifdef NPINIT_GETS_ENTRYPOINTS
+    NP_GetEntryPoints(pluginFuncs);
+#endif
+    return NPERR_NO_ERROR;
+  }
+
+#ifdef __APPLE_CC__
+  int main(NPNetscapeFuncs* browserFuncs, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* shutdownUPP) {
+    printf("main (gwt-hosted-mode/c++)\n");
+    if (shutdownUPP == NULL) {
+      return NPERR_INVALID_FUNCTABLE_ERROR;
+    }
+    *shutdownUPP = NP_Shutdown;//NewNPP_ShutdownProc(NP_Shutdown);
+    NP_Initialize(browserFuncs);
+    NP_GetEntryPoints(pluginFuncs);
+    return NPERR_NO_ERROR;
+  }
+#endif
+
+  NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* pluginFuncs) {
+    Debug::log(Debug::Debugging) << "NP_GetEntryPoints" << Debug::flush;
+#ifdef BROWSER_WEBKIT
+    pluginFuncs->size          = sizeof(NPPluginFuncs);
+#else
+    if (pluginFuncs->size < sizeof(NPPluginFuncs)) {
+      return NPERR_INVALID_FUNCTABLE_ERROR;
+    }
+#endif
+    pluginFuncs->version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
+#if 1
+    pluginFuncs->newp          = NPP_New;
+    pluginFuncs->destroy       = NPP_Destroy;
+    pluginFuncs->setwindow     = NPP_SetWindow;
+    pluginFuncs->newstream     = NPP_NewStream;
+    pluginFuncs->destroystream = NPP_DestroyStream;
+    pluginFuncs->asfile        = NPP_StreamAsFile;
+    pluginFuncs->writeready    = NPP_WriteReady;
+#ifdef BROWSER_WEBKIT
+    pluginFuncs->write         = reinterpret_cast<NPP_WriteProcPtr>(NPP_Write);
+#else
+    pluginFuncs->write         = NPP_Write;
+#endif
+    pluginFuncs->print         = NPP_Print;
+    pluginFuncs->event         = NPP_HandleEvent;
+    pluginFuncs->urlnotify     = NPP_URLNotify;
+    pluginFuncs->getvalue      = NPP_GetValue;
+    pluginFuncs->setvalue      = NPP_SetValue;
+    pluginFuncs->javaClass     = NULL;
+#else
+    pluginFuncs->newp =          NewNPP_NewProc(NPP_New);
+    pluginFuncs->destroy =       NewNPP_DestroyProc(NPP_Destroy);
+    pluginFuncs->setwindow =     NewNPP_SetWindowProc(NPP_SetWindow);
+    pluginFuncs->newstream =     NewNPP_NewStreamProc(NPP_NewStream);
+    pluginFuncs->destroystream = NewNPP_DestroyStreamProc(NPP_DestroyStream);
+    pluginFuncs->asfile =        NewNPP_StreamAsFileProc(NPP_StreamAsFile);
+    pluginFuncs->writeready =    NewNPP_WriteReadyProc(NPP_WriteReady);
+    pluginFuncs->write =         NewNPP_WriteProc(NPP_Write);
+    pluginFuncs->print =         NewNPP_PrintProc(NPP_Print);
+    pluginFuncs->event =         NewNPP_HandleEventProc(NPP_HandleEvent);
+    pluginFuncs->urlnotify =     NewNPP_URLNotifyProc(NPP_URLNotify);
+    pluginFuncs->getvalue =      NewNPP_GetValueProc(NPP_GetValue);
+    pluginFuncs->setvalue =      NewNPP_SetValueProc(NPP_SetValue);
+#endif
+    return NPERR_NO_ERROR;
+  }
+
+  const char *NP_GetMIMEDescription() {
+    Debug::log(Debug::Info) << "NP_GetMIMEDescription: returned mime description" << Debug::flush;
+    return "application/x-gwt-dev-mode::GWT dev-mode plugin;application/x-gwt-hosted-mode::GWT dev-mode plugin";
+  }
+
+  const char *NPP_GetMIMEDescription() {
+    return NP_GetMIMEDescription();
+  }
+
+  NP_SHUTDOWN_RETURN_TYPE WINAPI NP_Shutdown(void) {
+    Debug::log(Debug::Debugging) << "NP_Shutdown" << Debug::flush;
+    return NP_SHUTDOWN_RETURN(NPERR_NO_ERROR);
+  }
+
+  NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[],
+      char* argv[], NPSavedData* saved) {
+    Debug::log(Debug::Info) << "NPP_New(instance=" << instance << ",mode=" << mode << ",argc="
+        << argc << ",args=[";
+    for (int i = 0; i < argc; ++i) {
+      Debug::log(Debug::Info) << (i ? "," : "") << argn[i] << "=" << argv[i];
+    }
+    Debug::log(Debug::Info) << "],saved=" << saved << "): version=" << browser->version
+        << Debug::flush;
+    // Version 14 provides browser->createobject, which we need for npruntime support.
+    if (browser->version < 14) {
+      return NPERR_INVALID_INSTANCE_ERROR;
+    }
+    if (instance == NULL) {
+      return NPERR_INVALID_INSTANCE_ERROR;
+    }
+    Plugin* obj;
+//    if (saved) {
+//      obj = new Plugin(instance, reinterpret_cast<ScriptableInstance*>(saved));
+//    } else {
+      obj = new Plugin(instance);
+//    }
+    instance->pdata = obj;
+
+    // Make this a windowless plugin.
+    return NPN_SetValue(instance, NPPVpluginWindowBool, NULL);
+  }
+
+  NPError NPP_Destroy(NPP instance, NPSavedData** save) {
+    Debug::log(Debug::Info) << "NPP_Destroy(instance=" << instance << ")" << Debug::flush;
+    if (instance == NULL) {
+      return NPERR_INVALID_INSTANCE_ERROR;
+    }
+    Plugin* plugin = static_cast<Plugin*>(instance->pdata);
+    if (plugin) {
+      delete plugin;
+      instance->pdata = 0;
+    }
+    return NPERR_NO_ERROR;
+  }
+
+  NPError NPP_SetWindow(NPP instance, NPWindow* window) {
+    Debug::log(Debug::Info) << "NPP_SetWindow(instance=" << instance << ",window=" << window
+        << ")" << Debug::flush;
+    return NPERR_NO_ERROR;
+  }
+   
+
+  NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype) {
+    Debug::log(Debug::Info) << "NPP_NewStream(instance=" << instance << ")" << Debug::flush;
+    *stype = NP_ASFILEONLY;
+    return NPERR_NO_ERROR;
+  }
+
+  NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason) {
+    Debug::log(Debug::Info) << "NPP_DestroyStream(instance=" << instance << ")" << Debug::flush;
+    return NPERR_NO_ERROR;
+  }
+
+  int32 NPP_WriteReady(NPP instance, NPStream* stream) {
+    Debug::log(Debug::Info) << "NPP_WriteReady(instance=" << instance << ")" << Debug::flush;
+    return 0;
+  }
+
+  int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer) {
+    Debug::log(Debug::Info) << "NPP_Write(instance=" << instance << ")" << Debug::flush;
+    return 0;
+  }
+
+  void NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname) {
+    Debug::log(Debug::Info) << "NPP_StreamAsFile(instance=" << instance << ")" << Debug::flush;
+  }
+
+  void NPP_Print(NPP instance, NPPrint* platformPrint) {
+    Debug::log(Debug::Info) << "NPP_Print(instance=" << instance << ")" << Debug::flush;
+  }
+
+  int16 NPP_HandleEvent(NPP instance, void* event) {
+    Debug::log(Debug::Info) << "NPP_HandleEvent(instance=" << instance << ")" << Debug::flush;
+    return 1 ;
+  }
+
+  void NPP_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData) {
+    Debug::log(Debug::Info) << "NPP_URLNotify(instance=" << instance << ")" << Debug::flush;
+  }
+
+  NPObject *NPP_GetScriptableInstance(NPP instance) {
+    Debug::log(Debug::Info) << "NPP_GetScriptableInstance(instance=" << instance << ")" << Debug::flush;
+    if (!instance) {
+      return 0;
+    }
+    Plugin* plugin = static_cast<Plugin*>(instance->pdata);
+    ScriptableInstance* scriptableInstance = plugin->getScriptableInstance();
+    NPN_RetainObject(scriptableInstance);  // caller expects it retained.
+    return scriptableInstance;
+  }
+  
+  NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value) {
+    Debug::log(Debug::Info) << "NPP_GetValue(instance=" << instance << ",var=" << variable << ")"
+        << Debug::flush;
+    switch (variable) {
+      case NPPVpluginScriptableNPObject:
+        // here the plugin is asked by Mozilla to tell if it is scriptable
+        // we should return a valid interface id and a pointer to 
+        // nsScriptablePeer interface which we should have implemented
+        // and which should be defined in the corressponding *.xpt file
+        // in the bin/components folder
+        *static_cast<NPObject**>(value) = NPP_GetScriptableInstance(instance);
+        break;
+      default:
+        // pass other ones to the static version of GetValue
+        return NP_GetValue(0, variable, value);
+    }
+    return NPERR_NO_ERROR;
+  }
+
+  NPError NP_GetValue(void*, NPPVariable variable, void *value) {
+    Debug::log(Debug::Info) << "NP_GetValue(var=" << variable << ")" << Debug::flush;
+    switch (variable) {
+      case NPPVpluginNameString:
+        *static_cast<const char **>(value) = "GWT Development-Mode Plugin";
+        break;
+      case NPPVpluginDescriptionString:
+        *static_cast<const char **>(value) = "Plugin to enable debugging of Google Web Toolkit "
+            "applications in development mode.";
+        break;
+      default:
+        Debug::log(Debug::Info) << "NPP_GetValue(var=" << variable
+            << ") -- unexpected variable type" << Debug::flush;
+        return NPERR_GENERIC_ERROR;
+    }
+    return NPERR_NO_ERROR;
+  }
+
+  NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value) {
+    Debug::log(Debug::Info) << "NPP_SetValue(instance=" << instance << ",var=" << variable << ")"
+        << Debug::flush;
+    return NPERR_NO_ERROR;
+  }
+}
diff --git a/plugins/npapi/npGwtDevPlugin.rc b/plugins/npapi/npGwtDevPlugin.rc
index 28528ef..913b4ea 100644
--- a/plugins/npapi/npGwtDevPlugin.rc
+++ b/plugins/npapi/npGwtDevPlugin.rc
@@ -1,111 +1,111 @@
-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-#include "windows.h"

-#include "winres.h"

-#undef APSTUDIO_READONLY_SYMBOLS

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif

-

-1 VERSIONINFO

-  FILEVERSION 0,9,0,0

-  PRODUCTVERSION 0,9,0,0

-  FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

-  FILEFLAGS 0x1L

-#else

-  FILEFLAGS 0x0L

-#endif

-  FILEOS 0x40004L

-  FILETYPE 0x2L

-  FILESUBTYPE 0x0L

-BEGIN

-  BLOCK "StringFileInfo"

-  BEGIN

-  	BLOCK "040904e4"

-  	BEGIN

-  	  VALUE "CompanyName", 		"Google Inc"

-  	  VALUE "FileDescription",	"GWT Development Mode Plugin"

-#if 0

-  	  VALUE "FileExtents",		""

-#endif

-  	  VALUE "FileOpenName",		"Plugin to allow debugging of GWT applications in hosted mode."

-  	  VALUE "FileVersion",		"0.9.0"

-  	  VALUE "InternalName",		"GWT DMP"

-  	  VALUE "LegalCopyright",	"Copyright © 2009 Google Inc.  All rights reserved."

-  	  VALUE "MIMEType",			"application/x-gwt-hosted-mode"

-  	  VALUE "OriginalFilename",	"npOOPHM.dll"

-  	  VALUE "ProductName",		"GWT DMP Plugin"

-  	  VALUE "ProductVersion",	"0.9.0"

-  	END

-  END

-  BLOCK "VarFileInfo"

-  BEGIN

-    VALUE "Translation", 0x409, 1252

-  END

-END

-

-#ifdef APSTUDIO_INVOKED

-1 TEXTINCLUDE

-BEGIN

-  "resource.h\0"

-END

-

-2 TEXTINCLUDE

-BEGIN

-  "#include ""mfc/afxres.h""\r\n"

-  "\0"

-END

-

-3 TEXTINCLUDE

-BEGIN

-  "\r\n"

-  "\0"

-END

-

-#endif

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_ALLOW_DIALOG DIALOGEX 0, 0, 188, 73

-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION

-EXSTYLE WS_EX_TOPMOST

-CAPTION "GWT Plugin Security Alert"

-FONT 10, "Microsoft Sans Serif", 400, 0, 0x0

-BEGIN

-    CONTROL         "Remember this decision for this server",IDC_REMEMBER_CHECKBOX,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,31,129,10

-    LTEXT           "This web server is trying to initiate a GWT Development\r\nMode Connection -- should it be allowed?",IDC_STATIC,10,7,167,19

-    PUSHBUTTON      "Allow",IDC_ALLOW_BUTTON,37,50,50,14

-    DEFPUSHBUTTON   "Deny",IDCANCEL,100,50,50,14

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

-BEGIN

-    IDD_ALLOW_DIALOG, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 181

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 66

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-#else

-

-#endif

+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "windows.h"
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif
+
+1 VERSIONINFO
+  FILEVERSION 0,9,0,0
+  PRODUCTVERSION 0,9,0,0
+  FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+  FILEFLAGS 0x1L
+#else
+  FILEFLAGS 0x0L
+#endif
+  FILEOS 0x40004L
+  FILETYPE 0x2L
+  FILESUBTYPE 0x0L
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+  	BLOCK "040904e4"
+  	BEGIN
+  	  VALUE "CompanyName", 		"Google Inc"
+  	  VALUE "FileDescription",	"GWT Development Mode Plugin"
+#if 0
+  	  VALUE "FileExtents",		""
+#endif
+  	  VALUE "FileOpenName",		"Plugin to allow debugging of GWT applications in hosted mode."
+  	  VALUE "FileVersion",		"0.9.0"
+  	  VALUE "InternalName",		"GWT DMP"
+  	  VALUE "LegalCopyright",	"Copyright © 2009 Google Inc.  All rights reserved."
+  	  VALUE "MIMEType",			"application/x-gwt-hosted-mode"
+  	  VALUE "OriginalFilename",	"npOOPHM.dll"
+  	  VALUE "ProductName",		"GWT DMP Plugin"
+  	  VALUE "ProductVersion",	"0.9.0"
+  	END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
+END
+
+#ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+  "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+  "#include ""mfc/afxres.h""\r\n"
+  "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+  "\r\n"
+  "\0"
+END
+
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ALLOW_DIALOG DIALOGEX 0, 0, 188, 73
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION
+EXSTYLE WS_EX_TOPMOST
+CAPTION "GWT Plugin Security Alert"
+FONT 10, "Microsoft Sans Serif", 400, 0, 0x0
+BEGIN
+    CONTROL         "Remember this decision for this server",IDC_REMEMBER_CHECKBOX,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,31,129,10
+    LTEXT           "This web server is trying to initiate a GWT Development\r\nMode Connection -- should it be allowed?",IDC_STATIC,10,7,167,19
+    PUSHBUTTON      "Allow",IDC_ALLOW_BUTTON,37,50,50,14
+    DEFPUSHBUTTON   "Deny",IDCANCEL,100,50,50,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_ALLOW_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 181
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 66
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#else
+
+#endif
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/background.html b/plugins/npapi/prebuilt/gwt-dev-plugin/background.html
index be794d4..0bca1a5 100644
--- a/plugins/npapi/prebuilt/gwt-dev-plugin/background.html
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/background.html
@@ -1,10 +1,10 @@
-<html>

-<head>

-<script>

-  chrome.extension.onConnect.addListener(function(port) {

-    // Tell my caller his tabId

-    port.postMessage( { name:"tabId", tabId:port.tab.id } );

-  });

-</script>

-</head>

-</html>

+<html>
+<head>
+<script>
+  chrome.extension.onConnect.addListener(function(port) {
+    // Tell my caller his tabId
+    port.postMessage( { name:"tabId", tabId:port.tab.id } );
+  });
+</script>
+</head>
+</html>
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/record_tab_id.js b/plugins/npapi/prebuilt/gwt-dev-plugin/record_tab_id.js
index df8c075..78c9e73 100644
--- a/plugins/npapi/prebuilt/gwt-dev-plugin/record_tab_id.js
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/record_tab_id.js
@@ -1,13 +1,13 @@
-if (window != top && location.href.indexOf("hosted.html") >= 0) {

-  var port = chrome.extension.connect();

-  port.onMessage.addListener(function(msg) {

-    if (msg.name == "tabId") {

-      var doc = window.document;

-      var div = document.createElement("div");

-      div.id = "$__gwt_tab_id";

-      div.textContent = "" + msg.tabId;

-      doc.body.appendChild(div);

-      // console.log("record_tab_id.js " + msg.tabId);

-    }

-  });

-}

+if (window != top && location.href.indexOf("hosted.html") >= 0) {
+  var port = chrome.extension.connect();
+  port.onMessage.addListener(function(msg) {
+    if (msg.name == "tabId") {
+      var doc = window.document;
+      var div = document.createElement("div");
+      div.id = "$__gwt_tab_id";
+      div.textContent = "" + msg.tabId;
+      doc.body.appendChild(div);
+      // console.log("record_tab_id.js " + msg.tabId);
+    }
+  });
+}
diff --git a/plugins/npapi/resource.h b/plugins/npapi/resource.h
index 645e017..bd2d338 100644
--- a/plugins/npapi/resource.h
+++ b/plugins/npapi/resource.h
@@ -1,23 +1,23 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Visual C++ generated include file.

-// Used by npOOPHM.rc

-//

-#define IDD_MAIN                        101

-#define IDC_BUTTON_GO                   1002

-#define IDC_STATIC_UA                   1003

-#define IDC_BUTTON1                     1005

-#define IDC_BUTTON_DONT                 1005

-#define IDD_ALLOW_DIALOG                103

-#define IDC_REMEMBER_CHECKBOX           201

-#define IDC_ALLOW_BUTTON                202

-

-// Next default values for new objects

-//

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        102

-#define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1006

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by npOOPHM.rc
+//
+#define IDD_MAIN                        101
+#define IDC_BUTTON_GO                   1002
+#define IDC_STATIC_UA                   1003
+#define IDC_BUTTON1                     1005
+#define IDC_BUTTON_DONT                 1005
+#define IDD_ALLOW_DIALOG                103
+#define IDC_REMEMBER_CHECKBOX           201
+#define IDC_ALLOW_BUTTON                202
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1006
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/plugins/webkit/English.lproj/InfoPlist.strings b/plugins/webkit/English.lproj/InfoPlist.strings
index 6260754..92beb1a 100644
--- a/plugins/webkit/English.lproj/InfoPlist.strings
+++ b/plugins/webkit/English.lproj/InfoPlist.strings
Binary files differ
diff --git a/plugins/xpcom/VisualStudio/ff2-xpcom.vcproj b/plugins/xpcom/VisualStudio/ff2-xpcom.vcproj
index 04a9be1..afb9f42 100755
--- a/plugins/xpcom/VisualStudio/ff2-xpcom.vcproj
+++ b/plugins/xpcom/VisualStudio/ff2-xpcom.vcproj
@@ -1,801 +1,801 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ff2-xpcom"

-	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24B}"

-	RootNamespace="ff2-xpcom"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="2"

-			UseOfMFC="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\prebuilt\ff2\incldue&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpconnect&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Debugging;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName="$(IntDir)/$(TargetName).res"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.dll"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\extension\lib\WINNT_x86-msvc\ff2\xpGWTDMP.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\lib&quot;"

-				ModuleDefinitionFile="$(ProjectDir)\..\xpGWTDMP.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;..\..\common&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API"

-				ExceptionHandling="1"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff2\xpGWTDMP.dll"

-				LinkIncremental="0"

-				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\lib"

-				ModuleDefinitionFile="..\xpGWTDMP.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\common\AllowedConnections.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\BrowserChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ByteOrder.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\DebugLevel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\ExternalWrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FatalErrorMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\FFSessionHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FreeValueMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HashMap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\JavaObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsautocfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jscompat.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsconfig.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jslong.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsotypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsproto.tbl"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jspubtd.h"

-				>

-			</File>

-			<File

-				RelativePath="..\JSRunner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jstypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadJsniMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Message.h"

-				>

-			</File>

-			<File

-				RelativePath="..\ModuleOOPHM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\mozilla-config.h"

-				>

-			</File>

-			<File

-				RelativePath="..\mozincludes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\npapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\nphostapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\npruntime.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsAXPCNativeCallContext.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsCOMPtr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nscore.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nscore.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsCycleCollector.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsDebug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsError.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\widget\nsEvent.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsICategoryManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIClassInfo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIClassInfoImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIComponentManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIException.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIExceptionService.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIFactory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIGenericFactory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsIHttpProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIInterfaceInfo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIInterfaceInfoManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsIJSContextStack.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIMemory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIModule.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\caps\nsIPrincipal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIProgrammingLanguage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsIProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsIProxiedProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsIScriptableInterfaces.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\dom\nsIScriptGlobalObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\dom\nsIScriptObjectPrincipal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\caps\nsISecurityCheckedComponent.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISerializable.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIServiceManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISimpleEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISimpleEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISupports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupportsBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISupportsBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupportsImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupportsUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISupportsUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIURI.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIVariant.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsIXPConnect.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsMemory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsNetCID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsrootidl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsrootidl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsServiceManagerUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsStringAPI.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsTraceRefcnt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsXPCOM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsXPCOMCID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsXPCOMStrings.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Platform.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\pratom.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prcpucfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prinrval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prlock.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prlog.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prlong.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\obsolete\protypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prthread.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prtime.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prtypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\QuitMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ReturnMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\RootedObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.h"

-				>

-			</File>

-			<File

-				RelativePath="..\SessionData.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\SessionHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Value.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\xpccomponents.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\xpcexception.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\xpcjsid.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\xpcom-config.h"

-				>

-			</File>

-			<File

-				RelativePath="..\XpcomDebug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\xpt_arena.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\xpt_struct.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\xptinfo.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath="..\xpGWTDMP.rc"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\common\AllowedConnections.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\ExternalWrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FatalErrorMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\FFSessionHandler.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FreeValueMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\JavaObject.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\JSRunner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadJsniMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\ModuleOOPHM.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ReturnMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\XpcomDebug.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\xpGWTDMP.def"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ff2-xpcom"
+	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24B}"
+	RootNamespace="ff2-xpcom"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\prebuilt\ff2\incldue&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpconnect&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Debugging;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/$(TargetName).res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.dll"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\extension\lib\WINNT_x86-msvc\ff2\xpGWTDMP.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\lib&quot;"
+				ModuleDefinitionFile="$(ProjectDir)\..\xpGWTDMP.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;..\..\common&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff2\xpGWTDMP.dll"
+				LinkIncremental="0"
+				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\lib"
+				ModuleDefinitionFile="..\xpGWTDMP.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\common\AllowedConnections.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\BrowserChannel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ByteOrder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\CheckVersionsMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ChooseTransportMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\Debug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\DebugLevel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ExternalWrapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\FatalErrorMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\FFSessionHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\FreeValueMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\HashMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\HostChannel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\InvokeMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\InvokeSpecialMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\JavaObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsapi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsautocfg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jscompat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsconfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jslong.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsotypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsproto.tbl"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jspubtd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\JSRunner.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jstypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\js\jsutil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\LoadJsniMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\LoadModuleMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\Message.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ModuleOOPHM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\mozilla-config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mozincludes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\npapi\npapi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\npapi\nphostapi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\npapi\npruntime.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsAXPCNativeCallContext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsCOMPtr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nscore.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nscore.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsCycleCollector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsDebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsError.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\widget\nsEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsICategoryManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIClassInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIClassInfoImpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIComponentManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsID.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIEnumerator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIExceptionService.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIFactory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIGenericFactory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsIHttpProtocolHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIInterfaceInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIInterfaceInfoManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsIJSContextStack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIMemory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIModule.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\caps\nsIPrincipal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIProgrammingLanguage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsIProtocolHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsIProxiedProtocolHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsIScriptableInterfaces.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\dom\nsIScriptGlobalObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\dom\nsIScriptObjectPrincipal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\caps\nsISecurityCheckedComponent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISerializable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIServiceManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISimpleEnumerator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISimpleEnumerator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISupports.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupports.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupportsBase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISupportsBase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupportsImpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsISupportsUtils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsISupportsUtils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsIURI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsIVariant.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\nsIXPConnect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsMemory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\necko\nsNetCID.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\nsrootidl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsrootidl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsServiceManagerUtils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsStringAPI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsTraceRefcnt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsXPCOM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsXPCOMCID.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\nsXPCOMStrings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\Platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\pratom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prcpucfg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prinrval.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prlock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prlong.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ProtocolVersionMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\obsolete\protypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prthread.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prtime.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\prtypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\QuitMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ReturnMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\RootedObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ServerMethods.h"
+				>
+			</File>
+			<File
+				RelativePath="..\SessionData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\SessionHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\Socket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\SwitchTransportMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\Value.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\xpccomponents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\xpcexception.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpconnect\xpcjsid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\sdk\include\xpcom-config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\XpcomDebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\xpt_arena.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\xpt_struct.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\include\xpcom\xptinfo.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\xpGWTDMP.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\common\AllowedConnections.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\CheckVersionsMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ChooseTransportMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\Debug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ExternalWrapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\FatalErrorMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\FFSessionHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\FreeValueMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\HostChannel.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\InvokeMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\InvokeSpecialMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\JavaObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\JSRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\LoadJsniMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\LoadModuleMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ModuleOOPHM.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ProtocolVersionMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ReturnMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ServerMethods.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\Socket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\SwitchTransportMessage.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\XpcomDebug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\xpGWTDMP.def"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj b/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj
index 6d8f33a..74f7e48 100755
--- a/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj
+++ b/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj
@@ -1,838 +1,838 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ff3-xpcom"

-	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24C}"

-	RootNamespace="ff3-xpcom"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug3"

-			IntermediateDirectory="Debug3"

-			ConfigurationType="2"

-			UseOfMFC="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\prebuilt\ff3\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Debugging;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				TreatWChar_tAsBuiltInType="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName="$(IntDir)/$(TargetName).res"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff3\xpGwtDevPlugin.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\lib"

-				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release3"

-			IntermediateDirectory="Release3"

-			ConfigurationType="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\prebuilt\ff3\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3;BROWSER=ff3"

-				ExceptionHandling="1"

-				RuntimeLibrary="0"

-				TreatWChar_tAsBuiltInType="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName="$(IntDir)/$(TargetName).res"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff3\xpGwtDevPlugin.dll"

-				LinkIncremental="0"

-				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\lib"

-				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\ExternalWrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\FFSessionHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\prebuilt\ff3\include\IOOPHM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\JavaObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\JSRunner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\ModuleOOPHM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\mozincludes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\Preferences.h"

-				>

-			</File>

-			<File

-				RelativePath="..\RootedObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\SessionData.h"

-				>

-			</File>

-			<File

-				RelativePath="..\XpcomDebug.h"

-				>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\common\AllowedConnections.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\BrowserChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ByteOrder.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\CheckVersionsMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ChooseTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Debug.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\DebugLevel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FatalErrorMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FreeValueMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HashMap.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HostChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeSpecialMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadJsniMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadModuleMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Message.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Platform.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ProtocolVersionMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\QuitMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ReturnMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ServerMethods.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SessionHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Socket.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SwitchTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Value.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="gecko"

-				>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsapi.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsautocfg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscompat.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsconfig.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscpucfg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jslong.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsosdep.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsotypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsproto.tbl"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jspubtd.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jstypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\mozilla-config.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsAXPCNativeCallContext.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCOMPtr.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCycleCollector.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsDebug.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsError.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsEvent.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsICategoryManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfo.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfoImpl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIComponentManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsID.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIEnumerator.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIException.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIExceptionService.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIFactory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIGenericFactory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIHttpProtocolHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfo.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfoManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIJSContextStack.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIMemory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIModule.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIPrincipal.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProgrammingLanguage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProtocolHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProxiedProtocolHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptableInterfaces.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptGlobalObject.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptObjectPrincipal.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISecurityCheckedComponent.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISerializable.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIServiceManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsImpl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIURI.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIVariant.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIXPConnect.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsMemory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsNetCID.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsServiceManagerUtils.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsStringAPI.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsTraceRefcnt.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOM.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMCID.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMStrings.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\pratom.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prcpucfg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prinrval.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlock.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlog.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlong.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\obsolete\protypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prthread.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtime.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpccomponents.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcexception.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcjsid.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\xpcom-config.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_arena.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_struct.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xptinfo.h"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath="..\xpGwtDevPlugin.rc"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\ExternalWrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\FFSessionHandler.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\JavaObject.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\JSRunner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\ModuleOOPHM.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						GeneratePreprocessedFile="0"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\Preferences.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\XpcomDebug.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\xpGwtDevPlugin.def"

-				>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\common\AllowedConnections.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\CheckVersionsMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ChooseTransportMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Debug.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FatalErrorMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FreeValueMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HostChannel.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeSpecialMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadJsniMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadModuleMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ProtocolVersionMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ReturnMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ServerMethods.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Socket.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SwitchTransportMessage.cpp"

-					>

-				</File>

-			</Filter>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ff3-xpcom"
+	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24C}"
+	RootNamespace="ff3-xpcom"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug3"
+			IntermediateDirectory="Debug3"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\prebuilt\ff3\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Debugging;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/$(TargetName).res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff3\xpGwtDevPlugin.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\lib"
+				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release3"
+			IntermediateDirectory="Release3"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\prebuilt\ff3\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3;BROWSER=ff3"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/$(TargetName).res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff3\xpGwtDevPlugin.dll"
+				LinkIncremental="0"
+				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\lib"
+				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\ExternalWrapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\FFSessionHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\prebuilt\ff3\include\IOOPHM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\JavaObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\JSRunner.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ModuleOOPHM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mozincludes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Preferences.h"
+				>
+			</File>
+			<File
+				RelativePath="..\RootedObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\SessionData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\XpcomDebug.h"
+				>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\common\AllowedConnections.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\BrowserChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ByteOrder.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\CheckVersionsMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ChooseTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Debug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\DebugLevel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FatalErrorMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FreeValueMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HashMap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HostChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeSpecialMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadJsniMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadModuleMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Message.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Platform.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ProtocolVersionMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\QuitMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ReturnMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ServerMethods.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SessionHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Socket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SwitchTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Value.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="gecko"
+				>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsapi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsautocfg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscompat.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsconfig.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscpucfg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jslong.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsosdep.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsotypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsproto.tbl"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jspubtd.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jstypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\mozilla-config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsAXPCNativeCallContext.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCOMPtr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCycleCollector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsDebug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsError.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsEvent.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsICategoryManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfoImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIComponentManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsID.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIEnumerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIExceptionService.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIGenericFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIHttpProtocolHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfoManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIJSContextStack.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIMemory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIModule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIPrincipal.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProgrammingLanguage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProtocolHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProxiedProtocolHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptableInterfaces.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptGlobalObject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptObjectPrincipal.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISecurityCheckedComponent.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISerializable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIServiceManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIURI.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIVariant.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIXPConnect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsMemory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsNetCID.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsServiceManagerUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsStringAPI.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsTraceRefcnt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOM.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMCID.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMStrings.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\pratom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prcpucfg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prinrval.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlock.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlong.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\obsolete\protypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prthread.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtime.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpccomponents.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcexception.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcjsid.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\xpcom-config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_arena.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_struct.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xptinfo.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\xpGwtDevPlugin.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\ExternalWrapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\FFSessionHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\JavaObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\JSRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ModuleOOPHM.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						GeneratePreprocessedFile="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\Preferences.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\XpcomDebug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\xpGwtDevPlugin.def"
+				>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\common\AllowedConnections.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\CheckVersionsMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ChooseTransportMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Debug.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FatalErrorMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FreeValueMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HostChannel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeSpecialMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadJsniMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadModuleMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ProtocolVersionMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ReturnMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ServerMethods.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Socket.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SwitchTransportMessage.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj b/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj
index d4986a2..8c19799 100755
--- a/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj
+++ b/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj
@@ -1,838 +1,838 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ff35-xpcom"

-	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24D}"

-	RootNamespace="ff35-xpcom"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug35"

-			IntermediateDirectory="Debug35"

-			ConfigurationType="2"

-			UseOfMFC="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff35\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Debugging;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				TreatWChar_tAsBuiltInType="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName="$(IntDir)/$(TargetName).res"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff35\xpGwtDevPlugin.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\lib"

-				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release35"

-			IntermediateDirectory="Release35"

-			ConfigurationType="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff35\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3;BROWSER=ff35"

-				ExceptionHandling="1"

-				RuntimeLibrary="0"

-				TreatWChar_tAsBuiltInType="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName="$(IntDir)/$(TargetName).res"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"

-				ShowProgress="2"

-				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff35\xpGwtDevPlugin.dll"

-				LinkIncremental="0"

-				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\lib"

-				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(IntDir)\$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\ExternalWrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\FFSessionHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\prebuilt\ff35\include\IOOPHM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\JavaObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\JSRunner.h"

-				>

-			</File>

-			<File

-				RelativePath="..\ModuleOOPHM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\mozincludes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\Preferences.h"

-				>

-			</File>

-			<File

-				RelativePath="..\RootedObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\SessionData.h"

-				>

-			</File>

-			<File

-				RelativePath="..\XpcomDebug.h"

-				>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\common\AllowedConnections.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\BrowserChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ByteOrder.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\CheckVersionsMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ChooseTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Debug.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\DebugLevel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FatalErrorMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FreeValueMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HashMap.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HostChannel.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeSpecialMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadJsniMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadModuleMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Message.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Platform.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ProtocolVersionMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\QuitMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ReturnMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ServerMethods.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SessionHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Socket.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SwitchTransportMessage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Value.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="gecko"

-				>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsapi.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsautocfg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jscompat.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsconfig.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jscpucfg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jslong.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jsosdep.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsotypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsproto.tbl"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jspubtd.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jstypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\mozilla-config.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsAXPCNativeCallContext.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCOMPtr.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nscore.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nscore.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCycleCollector.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsDebug.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsError.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget\nsEvent.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsICategoryManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfo.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfoImpl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIComponentManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsID.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIEnumerator.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIException.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIExceptionService.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIFactory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIGenericFactory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIHttpProtocolHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfo.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfoManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIJSContextStack.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIMemory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIModule.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsIPrincipal.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIProgrammingLanguage.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProtocolHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProxiedProtocolHandler.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIScriptableInterfaces.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptGlobalObject.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptObjectPrincipal.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsISecurityCheckedComponent.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISerializable.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIServiceManager.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISimpleEnumerator.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISimpleEnumerator.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupports.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupports.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsBase.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsBase.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsImpl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsUtils.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsUtils.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIURI.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIVariant.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIXPConnect.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsMemory.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsNetCID.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsrootidl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsrootidl.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsServiceManagerUtils.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsStringAPI.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsTraceRefcnt.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOM.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMCID.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMStrings.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\pratom.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prcpucfg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prinrval.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlock.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlog.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlong.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\obsolete\protypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prthread.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtime.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtypes.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpccomponents.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcexception.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcjsid.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\xpcom-config.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_arena.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_struct.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xptinfo.h"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath="..\xpGwtDevPlugin.rc"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\ExternalWrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\FFSessionHandler.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\JavaObject.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\JSRunner.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\ModuleOOPHM.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						GeneratePreprocessedFile="0"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\Preferences.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\XpcomDebug.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\xpGwtDevPlugin.def"

-				>

-			</File>

-			<Filter

-				Name="common"

-				>

-				<File

-					RelativePath="..\..\common\AllowedConnections.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\CheckVersionsMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ChooseTransportMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Debug.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FatalErrorMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\FreeValueMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\HostChannel.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\InvokeSpecialMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadJsniMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\LoadModuleMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ProtocolVersionMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ReturnMessage.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\ServerMethods.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\Socket.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\common\SwitchTransportMessage.cpp"

-					>

-				</File>

-			</Filter>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ff35-xpcom"
+	ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24D}"
+	RootNamespace="ff35-xpcom"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug35"
+			IntermediateDirectory="Debug35"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff35\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Debugging;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/$(TargetName).res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff35\xpGwtDevPlugin.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\lib"
+				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release35"
+			IntermediateDirectory="Release35"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff35\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3;BROWSER=ff35"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/$(TargetName).res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib xpcomglue_s.lib xpcom.lib nspr4.lib js3250.lib"
+				ShowProgress="2"
+				OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff35\xpGwtDevPlugin.dll"
+				LinkIncremental="0"
+				AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\lib"
+				ModuleDefinitionFile="$(ProjectDir)\..\xpGwtDevPlugin.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(IntDir)\$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\ExternalWrapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\FFSessionHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\prebuilt\ff35\include\IOOPHM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\JavaObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\JSRunner.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ModuleOOPHM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mozincludes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Preferences.h"
+				>
+			</File>
+			<File
+				RelativePath="..\RootedObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\SessionData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\XpcomDebug.h"
+				>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\common\AllowedConnections.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\BrowserChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ByteOrder.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\CheckVersionsMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ChooseTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Debug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\DebugLevel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FatalErrorMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FreeValueMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HashMap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HostChannel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeSpecialMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadJsniMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadModuleMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Message.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Platform.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ProtocolVersionMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\QuitMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ReturnMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ServerMethods.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SessionHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Socket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SwitchTransportMessage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Value.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="gecko"
+				>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsapi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsautocfg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jscompat.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsconfig.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jscpucfg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jslong.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jsosdep.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsotypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsproto.tbl"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jspubtd.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jstypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\mozilla-config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsAXPCNativeCallContext.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCOMPtr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nscore.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nscore.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCycleCollector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsDebug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsError.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget\nsEvent.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsICategoryManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfoImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIComponentManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsID.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIEnumerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIExceptionService.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIGenericFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIHttpProtocolHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfoManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIJSContextStack.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIMemory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIModule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsIPrincipal.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIProgrammingLanguage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProtocolHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProxiedProtocolHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIScriptableInterfaces.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptGlobalObject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptObjectPrincipal.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsISecurityCheckedComponent.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISerializable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIServiceManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISimpleEnumerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISimpleEnumerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupports.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupports.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsBase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsBase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIURI.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIVariant.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIXPConnect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsMemory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsNetCID.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsrootidl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsrootidl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsServiceManagerUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsStringAPI.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsTraceRefcnt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOM.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMCID.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMStrings.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\pratom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prcpucfg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prinrval.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlock.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlong.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\obsolete\protypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prthread.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtime.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpccomponents.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcexception.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcjsid.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\xpcom-config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_arena.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_struct.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xptinfo.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\xpGwtDevPlugin.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\ExternalWrapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\FFSessionHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\JavaObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\JSRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ModuleOOPHM.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						GeneratePreprocessedFile="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\Preferences.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\XpcomDebug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\xpGwtDevPlugin.def"
+				>
+			</File>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\common\AllowedConnections.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\CheckVersionsMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ChooseTransportMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Debug.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FatalErrorMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\FreeValueMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\HostChannel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\InvokeSpecialMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadJsniMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\LoadModuleMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ProtocolVersionMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ReturnMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\ServerMethods.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\Socket.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\common\SwitchTransportMessage.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>