Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added |dont_QueryInterface| facility, re-added the NS_ADDREF macros, though conditionally

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@16781 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%netscape.com
1998-12-21 23:26:39 +00:00
parent 2c81f40268
commit e9d8de921a
4 changed files with 288 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
mozilla/xpcom/base/nsCOMPtr.h
View File

@@ -29,26 +29,16 @@
#ifndef nsISupports_h___
#include "nsISupports.h"
// for |nsresult|, |NS_IF_ADDREF|, et al
// for |nsresult|, |NS_ADDREF|, et al
#endif
/*
To do...
+ send updated files to Peter Linss (get his approval)
+ finish `User Manual'
+ put user manual online
+ better comments
*/
/* USER MANUAL
See also:
<http://www.meer.net/ScottCollins/doc/nsCOMPtr.html>, or
<http://www.mozilla.org/...?...> [[get a place for this]]
<http://www.mozilla.org/...?...> [[still looking for the right place to put this on mozilla]]
What is |nsCOMPtr|?
@@ -210,8 +200,6 @@
as soon as it sees the template declarations. Bad compiler. No cookie!
[[Thanks to mjudge, waterson, and pinkerton on this one.]]
[[ others ]]
Why does |getter_AddRefs| have such a funny name? I.e., why doesn't it follow our
naming conventions?
@@ -279,6 +267,14 @@
typedef PRBool NSCAP_BOOL;
#endif
#ifdef NSCAP_FEATURE_DEBUG_MACROS
#define NSCAP_ADDREF(ptr) NS_ADDREF(ptr)
#define NSCAP_RELEASE(ptr) NS_RELEASE(ptr)
#else
#define NSCAP_ADDREF(ptr) (ptr)->AddRef()
#define NSCAP_RELEASE(ptr) (ptr)->Release()
#endif
/*
WARNING:
VC++4.2 is very picky. To compile under VC++4.2, the classes must be defined
@@ -362,6 +358,7 @@ struct nsDontAddRef
};
template <class T>
inline
nsDontAddRef<T>
dont_AddRef( T* aRawPtr )
/*
@@ -378,6 +375,33 @@ dont_AddRef( T* aRawPtr )
template <class T>
struct nsDontQueryInterface
/*
...
*/
{
explicit
nsDontQueryInterface( T* aRawPtr )
: mRawPtr(aRawPtr)
{
// nothing else to do here
}
T* mRawPtr;
};
template <class T>
inline
nsDontQueryInterface<T>
dont_QueryInterface( T* aRawPtr )
{
return nsDontQueryInterface<T>(aRawPtr);
}
template <class T>
class nsCOMPtr
/*
@@ -402,7 +426,6 @@ class nsCOMPtr
// ...and |QueryInterface| does the |AddRef| for us
}
explicit
nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
@@ -410,18 +433,32 @@ class nsCOMPtr
// nothing else to do here
}
nsCOMPtr( const nsDontQueryInterface<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
{
if ( mRawPtr )
{
NSCAP_ADDREF(mRawPtr);
}
}
nsCOMPtr( const nsCOMPtr<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
{
if ( mRawPtr )
mRawPtr->AddRef();
{
NSCAP_ADDREF(mRawPtr);
}
}
~nsCOMPtr()
{
if ( mRawPtr && !mIsAwaitingAddRef )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
}
nsCOMPtr&
@@ -434,7 +471,9 @@ class nsCOMPtr
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
@@ -446,23 +485,50 @@ class nsCOMPtr
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rhs.mRawPtr;
return *this;
}
nsCOMPtr&
operator=( const nsDontQueryInterface<T>& rhs )
{
T* rawPtr = rhs.mRawPtr;
if ( rawPtr )
{
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
}
nsCOMPtr&
operator=( const nsCOMPtr& rhs )
{
T* rawPtr = rhs.mRawPtr;
if ( rawPtr )
rawPtr->AddRef();
{
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
@@ -517,7 +583,9 @@ class nsCOMPtr
StartAssignment( NSCAP_BOOL awaiting_AddRef )
{
if ( mRawPtr && !mIsAwaitingAddRef )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mIsAwaitingAddRef = awaiting_AddRef;
mRawPtr = 0;
return &mRawPtr;
@@ -528,7 +596,7 @@ class nsCOMPtr
{
if ( mIsAwaitingAddRef )
{
mRawPtr->AddRef();
NSCAP_ADDREF(mRawPtr);
mIsAwaitingAddRef = 0;
}
}

114
mozilla/xpcom/glue/nsCOMPtr.h
View File

@@ -29,26 +29,16 @@
#ifndef nsISupports_h___
#include "nsISupports.h"
// for |nsresult|, |NS_IF_ADDREF|, et al
// for |nsresult|, |NS_ADDREF|, et al
#endif
/*
To do...
+ send updated files to Peter Linss (get his approval)
+ finish `User Manual'
+ put user manual online
+ better comments
*/
/* USER MANUAL
See also:
<http://www.meer.net/ScottCollins/doc/nsCOMPtr.html>, or
<http://www.mozilla.org/...?...> [[get a place for this]]
<http://www.mozilla.org/...?...> [[still looking for the right place to put this on mozilla]]
What is |nsCOMPtr|?
@@ -210,8 +200,6 @@
as soon as it sees the template declarations. Bad compiler. No cookie!
[[Thanks to mjudge, waterson, and pinkerton on this one.]]
[[ others ]]
Why does |getter_AddRefs| have such a funny name? I.e., why doesn't it follow our
naming conventions?
@@ -279,6 +267,14 @@
typedef PRBool NSCAP_BOOL;
#endif
#ifdef NSCAP_FEATURE_DEBUG_MACROS
#define NSCAP_ADDREF(ptr) NS_ADDREF(ptr)
#define NSCAP_RELEASE(ptr) NS_RELEASE(ptr)
#else
#define NSCAP_ADDREF(ptr) (ptr)->AddRef()
#define NSCAP_RELEASE(ptr) (ptr)->Release()
#endif
/*
WARNING:
VC++4.2 is very picky. To compile under VC++4.2, the classes must be defined
@@ -362,6 +358,7 @@ struct nsDontAddRef
};
template <class T>
inline
nsDontAddRef<T>
dont_AddRef( T* aRawPtr )
/*
@@ -378,6 +375,33 @@ dont_AddRef( T* aRawPtr )
template <class T>
struct nsDontQueryInterface
/*
...
*/
{
explicit
nsDontQueryInterface( T* aRawPtr )
: mRawPtr(aRawPtr)
{
// nothing else to do here
}
T* mRawPtr;
};
template <class T>
inline
nsDontQueryInterface<T>
dont_QueryInterface( T* aRawPtr )
{
return nsDontQueryInterface<T>(aRawPtr);
}
template <class T>
class nsCOMPtr
/*
@@ -402,7 +426,6 @@ class nsCOMPtr
// ...and |QueryInterface| does the |AddRef| for us
}
explicit
nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
@@ -410,18 +433,32 @@ class nsCOMPtr
// nothing else to do here
}
nsCOMPtr( const nsDontQueryInterface<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
{
if ( mRawPtr )
{
NSCAP_ADDREF(mRawPtr);
}
}
nsCOMPtr( const nsCOMPtr<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
{
if ( mRawPtr )
mRawPtr->AddRef();
{
NSCAP_ADDREF(mRawPtr);
}
}
~nsCOMPtr()
{
if ( mRawPtr && !mIsAwaitingAddRef )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
}
nsCOMPtr&
@@ -434,7 +471,9 @@ class nsCOMPtr
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
@@ -446,23 +485,50 @@ class nsCOMPtr
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rhs.mRawPtr;
return *this;
}
nsCOMPtr&
operator=( const nsDontQueryInterface<T>& rhs )
{
T* rawPtr = rhs.mRawPtr;
if ( rawPtr )
{
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
}
nsCOMPtr&
operator=( const nsCOMPtr& rhs )
{
T* rawPtr = rhs.mRawPtr;
if ( rawPtr )
rawPtr->AddRef();
{
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
@@ -517,7 +583,9 @@ class nsCOMPtr
StartAssignment( NSCAP_BOOL awaiting_AddRef )
{
if ( mRawPtr && !mIsAwaitingAddRef )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mIsAwaitingAddRef = awaiting_AddRef;
mRawPtr = 0;
return &mRawPtr;
@@ -528,7 +596,7 @@ class nsCOMPtr
{
if ( mIsAwaitingAddRef )
{
mRawPtr->AddRef();
NSCAP_ADDREF(mRawPtr);
mIsAwaitingAddRef = 0;
}
}

114
mozilla/xpcom/public/nsCOMPtr.h
View File

@@ -29,26 +29,16 @@
#ifndef nsISupports_h___
#include "nsISupports.h"
// for |nsresult|, |NS_IF_ADDREF|, et al
// for |nsresult|, |NS_ADDREF|, et al
#endif
/*
To do...
+ send updated files to Peter Linss (get his approval)
+ finish `User Manual'
+ put user manual online
+ better comments
*/
/* USER MANUAL
See also:
<http://www.meer.net/ScottCollins/doc/nsCOMPtr.html>, or
<http://www.mozilla.org/...?...> [[get a place for this]]
<http://www.mozilla.org/...?...> [[still looking for the right place to put this on mozilla]]
What is |nsCOMPtr|?
@@ -210,8 +200,6 @@
as soon as it sees the template declarations. Bad compiler. No cookie!
[[Thanks to mjudge, waterson, and pinkerton on this one.]]
[[ others ]]
Why does |getter_AddRefs| have such a funny name? I.e., why doesn't it follow our
naming conventions?
@@ -279,6 +267,14 @@
typedef PRBool NSCAP_BOOL;
#endif
#ifdef NSCAP_FEATURE_DEBUG_MACROS
#define NSCAP_ADDREF(ptr) NS_ADDREF(ptr)
#define NSCAP_RELEASE(ptr) NS_RELEASE(ptr)
#else
#define NSCAP_ADDREF(ptr) (ptr)->AddRef()
#define NSCAP_RELEASE(ptr) (ptr)->Release()
#endif
/*
WARNING:
VC++4.2 is very picky. To compile under VC++4.2, the classes must be defined
@@ -362,6 +358,7 @@ struct nsDontAddRef
};
template <class T>
inline
nsDontAddRef<T>
dont_AddRef( T* aRawPtr )
/*
@@ -378,6 +375,33 @@ dont_AddRef( T* aRawPtr )
template <class T>
struct nsDontQueryInterface
/*
...
*/
{
explicit
nsDontQueryInterface( T* aRawPtr )
: mRawPtr(aRawPtr)
{
// nothing else to do here
}
T* mRawPtr;
};
template <class T>
inline
nsDontQueryInterface<T>
dont_QueryInterface( T* aRawPtr )
{
return nsDontQueryInterface<T>(aRawPtr);
}
template <class T>
class nsCOMPtr
/*
@@ -402,7 +426,6 @@ class nsCOMPtr
// ...and |QueryInterface| does the |AddRef| for us
}
explicit
nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
@@ -410,18 +433,32 @@ class nsCOMPtr
// nothing else to do here
}
nsCOMPtr( const nsDontQueryInterface<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
{
if ( mRawPtr )
{
NSCAP_ADDREF(mRawPtr);
}
}
nsCOMPtr( const nsCOMPtr<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
{
if ( mRawPtr )
mRawPtr->AddRef();
{
NSCAP_ADDREF(mRawPtr);
}
}
~nsCOMPtr()
{
if ( mRawPtr && !mIsAwaitingAddRef )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
}
nsCOMPtr&
@@ -434,7 +471,9 @@ class nsCOMPtr
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
@@ -446,23 +485,50 @@ class nsCOMPtr
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rhs.mRawPtr;
return *this;
}
nsCOMPtr&
operator=( const nsDontQueryInterface<T>& rhs )
{
T* rawPtr = rhs.mRawPtr;
if ( rawPtr )
{
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
}
nsCOMPtr&
operator=( const nsCOMPtr& rhs )
{
T* rawPtr = rhs.mRawPtr;
if ( rawPtr )
rawPtr->AddRef();
{
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
return *this;
@@ -517,7 +583,9 @@ class nsCOMPtr
StartAssignment( NSCAP_BOOL awaiting_AddRef )
{
if ( mRawPtr && !mIsAwaitingAddRef )
mRawPtr->Release();
{
NSCAP_RELEASE(mRawPtr);
}
mIsAwaitingAddRef = awaiting_AddRef;
mRawPtr = 0;
return &mRawPtr;
@@ -528,7 +596,7 @@ class nsCOMPtr
{
if ( mIsAwaitingAddRef )
{
mRawPtr->AddRef();
NSCAP_ADDREF(mRawPtr);
mIsAwaitingAddRef = 0;
}
}

16
mozilla/xpcom/tests/TestCOMPtr.cpp
View File

@@ -289,6 +289,7 @@ AVoidPtrPtrContext( void** )
nsCOMPtr<IFoo> gFoop;
int
@@ -467,7 +468,20 @@ main()
cout << "### End Test 23" << endl;
cout << endl << "### Test 24: will a static |nsCOMPtr| |Release| before program termination?" << endl;
{
cout << endl << "### setup for Test 24" << endl;
nsCOMPtr<IFoo> fooP;
IFoo* rawFooP = new IFoo;
cout << "### Test 24: is |QueryInterface| _not_ called when explicitly barred?" << endl;
fooP = dont_QueryInterface(rawFooP);
cout << "### cleanup for Test 24" << endl;
}
cout << "### End Test 24" << endl;
cout << endl << "### Test 25: will a static |nsCOMPtr| |Release| before program termination?" << endl;
gFoop = new IFoo;
cout << "<<main()" << endl;