ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix refcounting, use Interlocked functions.

This commit is contained in:
Mike McCormack 2005-01-20 20:34:29 +00:00 committed by Alexandre Julliard
parent 21842318e9
commit b3a7f37aaf
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/msi/handle.c
View File

@ -157,7 +157,7 @@ void msiobj_addref( MSIOBJECTHDR *info )
return; return;
} }
info->refcount++; InterlockedIncrement(&info->refcount);
} }
void msiobj_lock( MSIOBJECTHDR *info ) void msiobj_lock( MSIOBJECTHDR *info )
@ -185,12 +185,12 @@ int msiobj_release( MSIOBJECTHDR *info )
return -1; return -1;
} }
ret = info->refcount--; ret = InterlockedDecrement( &info->refcount );
if (info->refcount == 0) if( ret==0 )
{ {
if( info->destructor ) if( info->destructor )
info->destructor( info ); info->destructor( info );
HeapFree( GetProcessHeap(), 0, info ); HeapFree( GetProcessHeap(), 0, info );
TRACE("object %p destroyed\n", info); TRACE("object %p destroyed\n", info);
} }

5
dlls/msi/msi.c
View File

@ -228,9 +228,12 @@ BOOL encode_base85_guid( GUID *guid, LPWSTR str )
VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) VOID MSI_CloseDatabase( MSIOBJECTHDR *arg )
{ {
MSIDATABASE *db = (MSIDATABASE *) arg; MSIDATABASE *db = (MSIDATABASE *) arg;
DWORD r;
free_cached_tables( db ); free_cached_tables( db );
IStorage_Release( db->storage ); r = IStorage_Release( db->storage );
if( r )
ERR("database reference count was not zero (%ld)\n", r);
} }
UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb)

2
dlls/msi/msipriv.h
View File

@ -53,7 +53,7 @@ struct tagMSIOBJECTHDR
{ {
UINT magic; UINT magic;
UINT type; UINT type;
UINT refcount; DWORD refcount;
msihandledestructor destructor; msihandledestructor destructor;
struct tagMSIOBJECTHDR *next; struct tagMSIOBJECTHDR *next;
struct tagMSIOBJECTHDR *prev; struct tagMSIOBJECTHDR *prev;

2
dlls/msi/msiquery.c
View File

@ -461,6 +461,8 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb )
/* FIXME: unlock the database */ /* FIXME: unlock the database */
msiobj_release( &db->hdr );
return r; return r;
} }