Revision: 6262 Author: [email protected] Date: Wed Sep 30 09:53:45 2009 Log: 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/ . http://code.google.com/p/google-web-toolkit/source/detail?r=6262 Modified: /trunk/plugins/ie/oophm/oophm/oophm.vcproj /trunk/plugins/ie/oophm/oophm/plugin.cpp /trunk/plugins/ie/prebuilt/oophm.dll /trunk/plugins/ie/prebuilt/oophm64.dll ======================================= --- /trunk/plugins/ie/oophm/oophm/oophm.vcproj Fri Sep 11 16:24:58 2009 +++ /trunk/plugins/ie/oophm/oophm/oophm.vcproj Wed Sep 30 09:53:45 2009 @@ -56,7 +56,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../common" + AdditionalIncludeDirectories=""$(ProjectDir)";../../../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=""$(ProjectDir)";../../../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=""$(ProjectDir)";../../../platform/Win;../../../common" PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE" RuntimeLibrary="0" UsePrecompiledHeader="0" ======================================= --- /trunk/plugins/ie/oophm/oophm/plugin.cpp Thu Sep 3 15:22:56 2009 +++ /trunk/plugins/ie/oophm/oophm/plugin.cpp Wed Sep 30 09:53:45 2009 @@ -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; ======================================= --- /trunk/plugins/ie/prebuilt/oophm.dll Fri Sep 4 15:16:50 2009 +++ /trunk/plugins/ie/prebuilt/oophm.dll Wed Sep 30 09:53:45 2009 Binary file, no diff available. ======================================= --- /trunk/plugins/ie/prebuilt/oophm64.dll Fri Sep 4 15:16:50 2009 +++ /trunk/plugins/ie/prebuilt/oophm64.dll Wed Sep 30 09:53:45 2009 Binary file, no diff available. --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
