Revision: 6075 Author: [email protected] Date: Wed Sep 2 17:03:17 2009 Log: Convert IE plugin files to VS2005, bring it up to common code changes (still no access list controls yet).
http://code.google.com/p/google-web-toolkit/source/detail?r=6075 Modified: /changes/jat/plugins/plugins/ie/oophm/oophm/IESessionHandler.cpp /changes/jat/plugins/plugins/ie/oophm/oophm/IESessionHandler.h /changes/jat/plugins/plugins/ie/oophm/oophm/dlldata.c /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.aps /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.cpp /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.vcproj /changes/jat/plugins/plugins/ie/oophm/oophm/plugin.cpp /changes/jat/plugins/plugins/ie/oophm/oophm.sln /changes/jat/plugins/plugins/ie/prebuilt/oophm.dll ======================================= --- /changes/jat/plugins/plugins/ie/oophm/oophm/IESessionHandler.cpp Sat Aug 22 16:59:24 2009 +++ /changes/jat/plugins/plugins/ie/oophm/oophm/IESessionHandler.cpp Wed Sep 2 17:03:17 2009 @@ -46,7 +46,7 @@ } void IESessionHandler::fatalError(HostChannel& channel, - const std::string& messsage) { + const std::string& message) { // TODO: better way of reporting error? Debug::log(Debug::Error) << "Fatal error: " << message << Debug::flush; } @@ -59,7 +59,7 @@ javaObjectsToFree.insert(objId); } -void IESessionHandler::freeJavaObjects() { +void IESessionHandler::sendFreeValues(HostChannel& channel) { int idCount = javaObjectsToFree.size(); if (idCount == 0) { return; @@ -73,7 +73,7 @@ ids[i++] = *it; } - if (!ServerMethods::freeJava(*channel, this, idCount, ids.get())) { + if (!ServerMethods::freeJava(channel, this, idCount, ids.get())) { Debug::log(Debug::Error) << "Unable to free Java ids on server" << Debug::flush; } javaObjectsToFree.clear(); @@ -179,9 +179,6 @@ // Success makeValue(*returnValue, retVal); } - - // Free previously-collected Java ids on the server to enable re-use - freeJavaObjects(); return exceptionFlag != 0; } ======================================= --- /changes/jat/plugins/plugins/ie/oophm/oophm/IESessionHandler.h Sat Aug 22 16:59:24 2009 +++ /changes/jat/plugins/plugins/ie/oophm/oophm/IESessionHandler.h Wed Sep 2 17:03:17 2009 @@ -43,6 +43,8 @@ int numArgs, const Value* const args, Value* returnValue); virtual bool invokeSpecial(HostChannel& channel, SpecialMethodId method, int numArgs, const Value* const args, Value* returnValue); + virtual void sendFreeValues(HostChannel& channel); + private: int jsObjectId; @@ -64,17 +66,12 @@ std::map<IUnknown*, int> jsIdsByObject; /* - * Send freed Java ids back to the server. - */ - void IESessionHandler::freeJavaObjects(); - - /* - * Create a JavaScript Error object with the given message. - */ + * Create a JavaScript Error object with the given message. + */ void makeException(_variant_t& value, const char* message); /* - * Create a exception Value that contains the given message. - */ + * Create a exception Value that contains the given message. + */ void makeExceptionValue(Value& value, const char* message); }; ======================================= --- /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.aps Mon Aug 3 08:30:11 2009 +++ /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.aps Wed Sep 2 17:03:17 2009 Binary file, no diff available. ======================================= --- /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.cpp Sat Aug 29 13:11:38 2009 +++ /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.cpp Wed Sep 2 17:03:17 2009 @@ -80,6 +80,8 @@ STDAPI DllInstall(BOOL bInstall, LPCWSTR pszCmdLine) { HRESULT hr = E_FAIL; +#if 0 + // TODO(jat): consider adding this back static const wchar_t szUserSwitch[] = _T("user"); if (pszCmdLine != NULL) @@ -89,6 +91,7 @@ AtlSetPerUserRegistration(true); } } +#endif if (bInstall) { ======================================= --- /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.vcproj Mon Aug 3 08:30:11 2009 +++ /changes/jat/plugins/plugins/ie/oophm/oophm/oophm.vcproj Wed Sep 2 17:03:17 2009 @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="oophm" ProjectGUID="{EB69BDFE-9380-4C51-99E8-C3EB25AE36A2}" RootNamespace="oophm" Keyword="AtlProj" - TargetFrameworkVersion="196613" > <Platforms> <Platform @@ -80,6 +79,7 @@ RegisterOutput="true" IgnoreImportLibrary="true" AdditionalDependencies="comsuppw.lib ws2_32.lib" + OutputFile="..\..\prebuilt\$(ProjectName).dll" LinkIncremental="2" ModuleDefinitionFile=".\oophm.def" GenerateDebugInformation="true" @@ -104,6 +104,9 @@ <Tool Name="VCAppVerifierTool" /> + <Tool + Name="VCWebDeploymentTool" + /> <Tool Name="VCPostBuildEventTool" /> @@ -196,6 +199,9 @@ <Tool Name="VCAppVerifierTool" /> + <Tool + Name="VCWebDeploymentTool" + /> <Tool Name="VCPostBuildEventTool" /> @@ -307,10 +313,22 @@ <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" @@ -335,6 +353,10 @@ <File RelativePath="..\..\..\common\LoadModuleMessage.cpp" > + </File> + <File + RelativePath="..\..\..\common\ProtocolVersionMessage.cpp" + > </File> <File RelativePath="..\..\..\common\ReturnMessage.cpp" @@ -347,6 +369,10 @@ <File RelativePath="..\..\..\common\Socket.cpp" > + </File> + <File + RelativePath="..\..\..\common\SwitchTransportMessage.cpp" + > </File> </Filter> </Filter> @@ -366,6 +392,10 @@ <File RelativePath=".\ExceptionCatcher.h" > + </File> + <File + RelativePath="..\..\..\common\FatalErrorMessage.h" + > </File> <File RelativePath=".\IESessionHandler.h" @@ -405,6 +435,14 @@ <File RelativePath="..\..\..\common\BrowserChannel.h" > + </File> + <File + RelativePath="..\..\..\common\CheckVersionsMessage.h" + > + </File> + <File + RelativePath="..\..\..\common\ChooseTransportMessage.h" + > </File> <File RelativePath="..\..\..\common\Debug.h" @@ -449,6 +487,10 @@ <File RelativePath="..\..\..\common\Platform.h" > + </File> + <File + RelativePath="..\..\..\common\ProtocolVersionMessage.h" + > </File> <File RelativePath="..\..\..\common\QuitMessage.h" @@ -469,6 +511,10 @@ <File RelativePath="..\..\..\common\Socket.h" > + </File> + <File + RelativePath="..\..\..\common\SwitchTransportMessage.h" + > </File> <File RelativePath="..\..\..\common\Value.h" ======================================= --- /changes/jat/plugins/plugins/ie/oophm/oophm/plugin.cpp Sat Aug 29 13:11:38 2009 +++ /changes/jat/plugins/plugins/ie/oophm/oophm/plugin.cpp Wed Sep 2 17:03:17 2009 @@ -28,7 +28,7 @@ // Cplugin -STDMETHODIMP Cplugin::connect(BSTR burl, BSTR sessionKey, BSTR bhostedServer, +STDMETHODIMP Cplugin::connect(BSTR burl, BSTR bsessionKey, BSTR bhostedServer, BSTR bmoduleName, BSTR bhostedHtmlVersion, VARIANT_BOOL* ret) { LPOLECLIENTSITE site; @@ -45,9 +45,14 @@ doc->Release(); std::string url = BSTRToUTF8(burl); + Debug::log(Debug::Debugging) << "OOPHM connect(url=" << url << ")" << Debug::flush; // TODO(jat): load access list from somewhere - if (!AllowedConnections::isAllowed(url)) { + bool allowed = true; + if (!AllowedConnections::matchesRule(url, &allowed)) { // TODO(jat): permit the user to allow the connection, for now just reject it + Debug::log(Debug::Debugging) << "Server not matched" << Debug::flush; + } + if (!allowed) { *ret = false; return S_OK; } @@ -99,7 +104,8 @@ return S_OK; } -STDMETHODIMP CPlugin::init(IDispatch* jsniContext, VARIANT_BOOL* ret) { +STDMETHODIMP Cplugin::init(IDispatch* jsniContext, VARIANT_BOOL* ret) { + Debug::log(Debug::Debugging) << "OOPHM init called" << Debug::flush; *ret = true; return S_OK; } ======================================= --- /changes/jat/plugins/plugins/ie/oophm/oophm.sln Mon Aug 3 08:30:11 2009 +++ /changes/jat/plugins/plugins/ie/oophm/oophm.sln Wed Sep 2 17:03:17 2009 @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +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 ======================================= --- /changes/jat/plugins/plugins/ie/prebuilt/oophm.dll Mon Aug 3 08:30:11 2009 +++ /changes/jat/plugins/plugins/ie/prebuilt/oophm.dll Wed Sep 2 17:03:17 2009 Binary file, no diff available. --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
