Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
- Finally give up on that assert. It's not easily fixable
CORE-9839 or CORE-9844 or CORE-9845 or whatever

svn path=/trunk/; revision=68218
This commit is contained in:
Thomas Faber 2015-06-21 05:21:30 +00:00
parent 3d3afdd225
commit c146d77c04
3 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/shell32/folders/CDesktopFolder.cpp
View file

@ -287,7 +287,6 @@ CDesktopFolder::CDesktopFolder() :
CDesktopFolder::~CDesktopFolder()
{
ASSERT(_CreatorClass::IsTerminated());
}
HRESULT WINAPI CDesktopFolder::FinalConstruct()

1
reactos/dll/win32/shell32/folders/CDrivesFolder.cpp
View file

@ -161,7 +161,6 @@ CDrivesFolder::CDrivesFolder()
CDrivesFolder::~CDrivesFolder()
{
TRACE ("-- destroying IShellFolder(%p)\n", this);
ASSERT(_CreatorClass::IsTerminated());
SHFree(pidlRoot);
}

16
reactos/include/reactos/shellutils.h
View file

@ -47,7 +47,6 @@ class CComCreatorCentralInstance
{
private:
static IUnknown *s_pInstance;
static bool s_IsTerminated;
public:
static HRESULT WINAPI CreateInstance(void *pv, REFIID riid, LPVOID *ppv)
@ -59,26 +58,17 @@ public:
{
PVOID pObj;
HRESULT hr;
s_IsTerminated = true;
hr = ATL::CComCreator< T >::CreateInstance(NULL, IID_IUnknown, &pObj);
if (FAILED(hr))
{
s_IsTerminated = false;
return hr;
}
if (InterlockedCompareExchangePointer((PVOID *)&s_pInstance, pObj, NULL))
static_cast<IUnknown *>(pObj)->Release();
s_IsTerminated = false;
}
return s_pInstance->QueryInterface(riid, ppv);
}
static void Term()
{
ULONG ref;
#ifdef ASSERT
ASSERT(!s_IsTerminated);
#endif
s_IsTerminated = true;
if (s_pInstance)
{
ref = s_pInstance->Release();
@ -88,16 +78,12 @@ public:
s_pInstance = NULL;
}
}
static bool IsTerminated() { return s_IsTerminated; }
};
template <typename T>
IUnknown *CComCreatorCentralInstance<T>::s_pInstance = NULL;
template <typename T>
bool CComCreatorCentralInstance<T>::s_IsTerminated = false;
#define DECLARE_CENTRAL_INSTANCE_NOT_AGGREGATABLE(x) \
#define DECLARE_CENTRAL_INSTANCE_NOT_AGGREGATABLE(x) \
public: \
typedef CComCreatorCentralInstance< ATL::CComObject<x> > _CreatorClass;
#endif