Merging in plugin changes that should have gone into trunk to begin with.

$ svn merge --ignore-ancestry -r 6253:6256 https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt/ .


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6262 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/ie/oophm/oophm/oophm.vcproj b/ie/oophm/oophm/oophm.vcproj
index a0cae8c..288d48c 100644
--- a/ie/oophm/oophm/oophm.vcproj
+++ b/ie/oophm/oophm/oophm.vcproj
@@ -56,7 +56,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../common"

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

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

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -151,7 +151,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../common"

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

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

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -342,7 +342,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="../../../platform/Win;../../../common"

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

 				PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

diff --git a/ie/oophm/oophm/plugin.cpp b/ie/oophm/oophm/plugin.cpp
index a372cdf..d48dc7d 100644
--- a/ie/oophm/oophm/plugin.cpp
+++ b/ie/oophm/oophm/plugin.cpp
@@ -92,7 +92,12 @@
     return S_OK;
   }
 
-  std::string tabKey = ""; // TODO(jat): add support for tab identity
+  // Use the current thread ID as a proxy for tab ID.
+  DWORD threadId = GetCurrentThreadId();
+  char buf[20];
+  snprintf(buf, sizeof(buf), "%lu", threadId);
+  std::string tabKey = buf;
+
   std::string sessionKey = BSTRToUTF8(bsessionKey);
   std::string moduleName = BSTRToUTF8(bmoduleName);
   IOmNavigator* navigator;
diff --git a/ie/prebuilt/oophm.dll b/ie/prebuilt/oophm.dll
old mode 100644
new mode 100755
index ca398aa..f2aac8a
--- a/ie/prebuilt/oophm.dll
+++ b/ie/prebuilt/oophm.dll
Binary files differ
diff --git a/ie/prebuilt/oophm64.dll b/ie/prebuilt/oophm64.dll
old mode 100644
new mode 100755
Binary files differ