kill msi_lock and msi_unlock

4 files changed, 0 insertions, 55 deletions

diff --git a/libmsi/handle.c b/libmsi/handle.c
index 30182ec..50f6553 100644
--- a/libmsi/handle.c
+++ b/libmsi/handle.c
@@ -31,16 +31,6 @@
 #include "msipriv.h"
 
 
-static CRITICAL_SECTION MSI_object_cs;
-static CRITICAL_SECTION_DEBUG MSI_object_cs_debug =
-{
-    0, 0, &MSI_object_cs,
-    { &MSI_object_cs_debug.ProcessLocksList, 
-      &MSI_object_cs_debug.ProcessLocksList },
-      0, 0, { (uintptr_t)(__FILE__ ": MSI_object_cs") }
-};
-static CRITICAL_SECTION MSI_object_cs = { &MSI_object_cs_debug, -1, 0, 0, 0, 0 };
-
 void *msihandle2msiinfo(LibmsiObject *obj, unsigned type)
 {
     if( !obj )
@@ -75,16 +65,6 @@ void msiobj_addref( LibmsiObject *info )
     InterlockedIncrement(&info->refcount);
 }
 
-void msiobj_lock( LibmsiObject *obj )
-{
-    EnterCriticalSection( &MSI_object_cs );
-}
-
-void msiobj_unlock( LibmsiObject *obj )
-{
-    LeaveCriticalSection( &MSI_object_cs );
-}
-
 int msiobj_release( LibmsiObject *obj )
 {
     int ret;
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h
index 14a3453..bd5f776 100644
--- a/libmsi/msipriv.h
+++ b/libmsi/msipriv.h
@@ -301,14 +301,9 @@ unsigned msi_strcpy_to_awstring( const WCHAR *str, awstring *awbuf, unsigned *sz
 
 /* handle functions */
 extern void *msihandle2msiinfo(LibmsiObject *handle, unsigned type);
-extern LibmsiObject *alloc_msihandle( LibmsiObject * );
-extern LibmsiObject *alloc_msi_remote_handle( IUnknown *unk );
 extern void *alloc_msiobject(unsigned type, unsigned size, msihandledestructor destroy );
 extern void msiobj_addref(LibmsiObject *);
 extern int msiobj_release(LibmsiObject *);
-extern void msiobj_lock(LibmsiObject *);
-extern void msiobj_unlock(LibmsiObject *);
-extern void msi_free_handle_table(void);
 
 extern void free_cached_tables( LibmsiDatabase *db );
 extern unsigned MSI_CommitTables( LibmsiDatabase *db );
diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c
index 5144cf1..9264afb 100644
--- a/libmsi/msiquery.c
+++ b/libmsi/msiquery.c
@@ -438,9 +438,7 @@ unsigned MsiViewExecute(LibmsiObject *hView, LibmsiObject *hRec)
         }
     }
 
-    msiobj_lock( &rec->hdr );
     ret = MSI_ViewExecute( query, rec );
-    msiobj_unlock( &rec->hdr );
 
 out:
     msiobj_release( &query->hdr );
diff --git a/libmsi/record.c b/libmsi/record.c
index 7eeb61d..23b6cc2 100644
--- a/libmsi/record.c
+++ b/libmsi/record.c
@@ -115,9 +115,7 @@ unsigned MsiRecordGetFieldCount( LibmsiObject *handle )
     if( !rec )
         return -1;
 
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordGetFieldCount( rec );
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
 
     return ret;
@@ -151,8 +149,6 @@ unsigned MSI_RecordCopyField( LibmsiRecord *in_rec, unsigned in_n,
 {
     unsigned r = ERROR_SUCCESS;
 
-    msiobj_lock( &in_rec->hdr );
-
     if ( in_n > in_rec->count || out_n > out_rec->count )
         r = ERROR_FUNCTION_FAILED;
     else if ( in_rec != out_rec || in_n != out_n )
@@ -191,8 +187,6 @@ unsigned MSI_RecordCopyField( LibmsiRecord *in_rec, unsigned in_n,
             out->type = in->type;
     }
 
-    msiobj_unlock( &in_rec->hdr );
-
     return r;
 }
 
@@ -259,9 +253,7 @@ int MsiRecordGetInteger( LibmsiObject *handle, unsigned iField)
     if( !rec )
         return MSI_NULL_INTEGER;
 
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordGetInteger( rec, iField );
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
 
     return ret;
@@ -278,14 +270,12 @@ unsigned MsiRecordClearData( LibmsiObject *handle )
     if( !rec )
         return ERROR_INVALID_HANDLE;
 
-    msiobj_lock( &rec->hdr );
     for( i=0; i<=rec->count; i++)
     {
         MSI_FreeField( &rec->fields[i] );
         rec->fields[i].type = LIBMSI_FIELD_TYPE_NULL;
         rec->fields[i].u.iVal = 0;
     }
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
 
     return ERROR_SUCCESS;
@@ -330,9 +320,7 @@ unsigned MsiRecordSetInteger( LibmsiObject *handle, unsigned iField, int iVal )
     if( !rec )
         return ERROR_INVALID_HANDLE;
 
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordSetInteger( rec, iField, iVal );
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
     return ret;
 }
@@ -359,9 +347,7 @@ bool MsiRecordIsNull( LibmsiObject *handle, unsigned iField )
     rec = msihandle2msiinfo( handle, LIBMSI_OBJECT_TYPE_RECORD );
     if( !rec )
         return 0;
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordIsNull( rec, iField );
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
     return ret;
 
@@ -431,9 +417,7 @@ unsigned MsiRecordGetString(LibmsiObject *handle, unsigned iField,
     rec = msihandle2msiinfo( handle, LIBMSI_OBJECT_TYPE_RECORD );
     if( !rec )
         return ERROR_INVALID_HANDLE;
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordGetStringA( rec, iField, szValue, pcchValue);
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
     return ret;
 }
@@ -538,9 +522,7 @@ unsigned MsiRecordDataSize(LibmsiObject *handle, unsigned iField)
     rec = msihandle2msiinfo( handle, LIBMSI_OBJECT_TYPE_RECORD );
     if( !rec )
         return 0;
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordDataSize( rec, iField);
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
     return ret;
 }
@@ -580,9 +562,7 @@ unsigned MsiRecordSetString( LibmsiObject *handle, unsigned iField, const char *
     rec = msihandle2msiinfo( handle, LIBMSI_OBJECT_TYPE_RECORD );
     if( !rec )
         return ERROR_INVALID_HANDLE;
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordSetStringA( rec, iField, szValue );
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
     return ret;
 }
@@ -726,9 +706,7 @@ unsigned MsiRecordSetStream(LibmsiObject *handle, unsigned iField, const char *s
     if( !rec )
         return ERROR_INVALID_HANDLE;
 
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordSetStreamFromFile( rec, iField, szFilename );
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
     return ret;
 }
@@ -801,9 +779,7 @@ unsigned MsiRecordReadStream(LibmsiObject *handle, unsigned iField, char *buf, u
     rec = msihandle2msiinfo( handle, LIBMSI_OBJECT_TYPE_RECORD );
     if( !rec )
         return ERROR_INVALID_HANDLE;
-    msiobj_lock( &rec->hdr );
     ret = MSI_RecordReadStream( rec, iField, buf, sz );
-    msiobj_unlock( &rec->hdr );
     msiobj_release( &rec->hdr );
     return ret;
 }
@@ -879,8 +855,6 @@ unsigned MSI_RecordStreamToFile( LibmsiRecord *rec, unsigned iField, const WCHAR
 
     TRACE("%p %u %s\n", rec, iField, debugstr_w(name));
 
-    msiobj_lock( &rec->hdr );
-
     r = MSI_RecordGetIStream( rec, iField, &stm );
     if( r == ERROR_SUCCESS )
     {
@@ -888,8 +862,6 @@ unsigned MSI_RecordStreamToFile( LibmsiRecord *rec, unsigned iField, const WCHAR
         IStream_Release( stm );
     }
 
-    msiobj_unlock( &rec->hdr );
-
     return r;
 }