Rollback 6254:6256, IE plugin fixes that should have
been committed to trunk. Scottb will re-commit them there.
Reviewed by: scottb
git-svn-id: https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt@6260 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/plugins/ie/oophm/oophm/oophm.vcproj b/plugins/ie/oophm/oophm/oophm.vcproj
index 288d48c..a0cae8c 100644
--- a/plugins/ie/oophm/oophm/oophm.vcproj
+++ b/plugins/ie/oophm/oophm/oophm.vcproj
@@ -56,7 +56,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)";../../../platform/Win;../../../common"
+ AdditionalIncludeDirectories="../../../common"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -151,7 +151,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)";../../../platform/Win;../../../common"
+ AdditionalIncludeDirectories="../../../common"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -342,7 +342,7 @@
Name="VCCLCompilerTool"
Optimization="2"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories=""$(ProjectDir)";../../../platform/Win;../../../common"
+ AdditionalIncludeDirectories="../../../platform/Win;../../../common"
PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
diff --git a/plugins/ie/oophm/oophm/plugin.cpp b/plugins/ie/oophm/oophm/plugin.cpp
index d48dc7d..a372cdf 100644
--- a/plugins/ie/oophm/oophm/plugin.cpp
+++ b/plugins/ie/oophm/oophm/plugin.cpp
@@ -92,12 +92,7 @@
return S_OK;
}
- // 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 tabKey = ""; // TODO(jat): add support for tab identity
std::string sessionKey = BSTRToUTF8(bsessionKey);
std::string moduleName = BSTRToUTF8(bmoduleName);
IOmNavigator* navigator;
diff --git a/plugins/ie/prebuilt/oophm.dll b/plugins/ie/prebuilt/oophm.dll
old mode 100755
new mode 100644
index f2aac8a..ca398aa
--- a/plugins/ie/prebuilt/oophm.dll
+++ b/plugins/ie/prebuilt/oophm.dll
Binary files differ
diff --git a/plugins/ie/prebuilt/oophm64.dll b/plugins/ie/prebuilt/oophm64.dll
old mode 100755
new mode 100644
Binary files differ
