We are currently indexing your data, so search results may be incomplete until we finish.
fogcreek shellext: fixed TLS-related crash on Windows XP
Changeset 339764f94377…
Parent 0882bf027ed0…
by
Changes to 5 files · Browse files at 339764f94377 Showing diff from parent 0882bf027ed0 Diff from another changeset...
|
@@ -258,6 +258,7 @@ <ClInclude Include="SysInfo.h" />
<ClInclude Include="THgStatus.h" />
<ClInclude Include="THgVersion.h" />
+ <ClInclude Include="TlsPtr.h" />
<ClInclude Include="TortoiseHgCmenu.h" />
<ClInclude Include="TortoiseHgDropHandler.h" />
<ClInclude Include="TortoiseHgKeyboard.h" />
|
||
|
|
@@ -0,0 +1,55 @@ + // Copyright (C) 2011 Fog Creek Software
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+template <class T>
+class CTlsPtr
+{
+private:
+ DWORD m_dwTlsIndex;
+
+public:
+ CTlsPtr()
+ {
+ m_dwTlsIndex = ::TlsAlloc();
+ }
+
+ ~CTlsPtr()
+ {
+ ::TlsFree(m_dwTlsIndex);
+ }
+ T* operator=(T* p)
+ {
+ ::TlsSetValue(m_dwTlsIndex, p);
+ return p;
+ }
+ operator T*()
+ {
+ return (T*)::TlsGetValue(m_dwTlsIndex);
+ }
+ operator const T*() const
+ {
+ return (const T*)::TlsGetValue(m_dwTlsIndex);
+ }
+ T* operator->()
+ {
+ return (T*)::TlsGetValue(m_dwTlsIndex);
+ }
+ const T* operator->() const
+ {
+ return (const T*)::TlsGetValue(m_dwTlsIndex);
+ }
+};
|
|
|
@@ -23,7 +23,7 @@
// Each Windows Explorer window is launched in a separate thread. Therefore, use thread
// local storage so that each thread can have its own hook.
-__declspec(thread) CTortoiseHgKeyboard* CTortoiseHgKeyboard::g_pObject = NULL;
+CTlsPtr<CTortoiseHgKeyboard> CTortoiseHgKeyboard::g_pObject;
STDMETHODIMP CTortoiseHgKeyboard::SetSite(IUnknown* pUnkSite)
{
@@ -34,6 +34,12 @@ m_hHook = ::SetWindowsHookEx(WH_KEYBOARD, HookProc, NULL,
::GetCurrentThreadId());
}
+ else if (pUnkSite == NULL && g_pObject == this)
+ {
+ ::UnhookWindowsHookEx(m_hHook);
+ m_hHook = NULL;
+ g_pObject = NULL;
+ }
return IObjectWithSiteImpl<CTortoiseHgKeyboard>::SetSite(pUnkSite);
}
|
||
|
@@ -14,6 +14,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
+#include "TlsPtr.h"
class CTortoiseHgKeyboard :
public CComObjectRootEx<CComMultiThreadModel>,
@@ -21,7 +22,7 @@ public IObjectWithSiteImpl<CTortoiseHgKeyboard>
{
private:
- static __declspec(thread) CTortoiseHgKeyboard* g_pObject;
+ static CTlsPtr<CTortoiseHgKeyboard> g_pObject;
HHOOK m_hHook;
public:
|
||
Add a tag
Loading...