- Remove bogus use of nStatCounter and hOleAut32 in CoSetState.
- Remove a comment about protecting per thread data by a critical section.
This commit is contained in:
parent
7d83afbde5
commit
c41d0c9a4b
@ -1962,9 +1962,6 @@ HRESULT WINAPI CoInitializeWOW(DWORD x,DWORD y) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int nStatCounter = 0; /* global */
|
|
||||||
static HMODULE hOleAut32 = 0; /* global */
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* CoGetState [OLE32.@]
|
* CoGetState [OLE32.@]
|
||||||
*
|
*
|
||||||
@ -1990,7 +1987,6 @@ HRESULT WINAPI CoGetState(IUnknown ** ppv)
|
|||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* CoSetState [OLE32.@]
|
* CoSetState [OLE32.@]
|
||||||
*
|
*
|
||||||
* NOTES: FIXME: protect this with a crst
|
|
||||||
*/
|
*/
|
||||||
HRESULT WINAPI CoSetState(IUnknown * pv)
|
HRESULT WINAPI CoSetState(IUnknown * pv)
|
||||||
{
|
{
|
||||||
@ -2002,15 +1998,11 @@ HRESULT WINAPI CoSetState(IUnknown * pv)
|
|||||||
|
|
||||||
if (pv) {
|
if (pv) {
|
||||||
IUnknown_AddRef(pv);
|
IUnknown_AddRef(pv);
|
||||||
nStatCounter++;
|
|
||||||
if (nStatCounter == 1) LoadLibraryA("OLEAUT32.DLL");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (apt->state) {
|
if (apt->state) {
|
||||||
TRACE("-- release %p now\n", apt->state);
|
TRACE("-- release %p now\n", apt->state);
|
||||||
IUnknown_Release(apt->state);
|
IUnknown_Release(apt->state);
|
||||||
nStatCounter--;
|
|
||||||
if (!nStatCounter) FreeLibrary(hOleAut32);
|
|
||||||
}
|
}
|
||||||
apt->state = pv;
|
apt->state = pv;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user