Side by Side Diff: src/plugin/PluginClass.h
Issue 5113230347206656:
Issue #1356 - Improve detection of the issuer of the request (Closed)
Patch Set: Fix the deadlock
Created Oct. 7, 2014, 11:22 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
src/plugin/PluginClass.cpp » ('j')
|
src/plugin/PluginClass.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * http://msdn.microsoft.com/en-us/library/bb250436.aspx | 2 * http://msdn.microsoft.com/en-us/library/bb250436.aspx |
| 3 */ | 3 */ |
| 4 | 4 |
| 5 #ifndef _PLUGIN_CLASS_H_ | 5 #ifndef _PLUGIN_CLASS_H_ |
| 6 #define _PLUGIN_CLASS_H_ | 6 #define _PLUGIN_CLASS_H_ |
| 7 | 7 |
| 8 | 8 |
| 9 #include "PluginTypedef.h" | 9 #include "PluginTypedef.h" |
| 10 #include "Plugin.h" | 10 #include "Plugin.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 | 73 |
| 74 STDMETHOD(QueryStatus)(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT* pCmdText); | 74 STDMETHOD(QueryStatus)(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT* pCmdText); |
| 75 STDMETHOD(Exec)(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG* pva Out); | 75 STDMETHOD(Exec)(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG* pva Out); |
| 76 | 76 |
| 77 // IDispatch | 77 // IDispatch |
| 78 | 78 |
| 79 STDMETHOD(Invoke)(DISPID dispidMember,REFIID riid, LCID lcid, WORD wFlags, | 79 STDMETHOD(Invoke)(DISPID dispidMember,REFIID riid, LCID lcid, WORD wFlags, |
| 80 DISPPARAMS * pdispparams, VARIANT * pvarResult,EXCEPINFO * pexcepinfo, UINT * puArgErr); | 80 DISPPARAMS * pdispparams, VARIANT * pvarResult,EXCEPINFO * pexcepinfo, UINT * puArgErr); |
| 81 | 81 |
| 82 static CPluginTab* GetTab(DWORD dwThreadId); | 82 static CPluginTab* GetTab(DWORD dwThreadId); |
| 83 static CPluginTab* GetTab(const std::wstring& url); | |
| 83 CPluginTab* GetTab(); | 84 CPluginTab* GetTab(); |
| 84 | 85 |
| 85 void UpdateStatusBar(); | 86 void UpdateStatusBar(); |
| 86 static DWORD WINAPI MainThreadProc(LPVOID pParam); | 87 static DWORD WINAPI MainThreadProc(LPVOID pParam); |
| 87 | 88 |
| 88 private: | 89 private: |
| 89 | 90 |
| 90 bool SetMenuBar(HMENU hMenu, const CString& url); | 91 bool SetMenuBar(HMENU hMenu, const CString& url); |
| 91 HMENU CreatePluginMenu(const CString& url); | 92 HMENU CreatePluginMenu(const CString& url); |
| 92 | 93 |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 185 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2; | 186 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2; |
| 186 | 187 |
| 187 static CComQIPtr<IWebBrowser2> GetAsyncBrowser(); | 188 static CComQIPtr<IWebBrowser2> GetAsyncBrowser(); |
| 188 | 189 |
| 189 }; | 190 }; |
| 190 | 191 |
| 191 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass) | 192 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass) |
| 192 | 193 |
| 193 | 194 |
| 194 #endif // _PLUGIN_CLASS_H_ | 195 #endif // _PLUGIN_CLASS_H_ |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
src/plugin/PluginClass.cpp » ('j')
|
src/plugin/PluginClass.cpp » ('J')
