Module: wine Branch: master Commit: 7d3162e6bed476c937a8d2f3d1b44c8076959e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3162e6bed476c937a8d2f3d1...
Author: James Hawkins truiken@gmail.com Date: Sat Apr 21 06:56:20 2007 -0500
msi: Abstract MSI_RecordSetStream.
---
dlls/msi/msipriv.h | 3 +-- dlls/msi/record.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2a9217c..b160443 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -592,8 +592,7 @@ extern UINT MSI_RecordGetStringA( MSIRECORD *, unsigned int, LPSTR, DWORD *); extern int MSI_RecordGetInteger( MSIRECORD *, unsigned int ); extern UINT MSI_RecordReadStream( MSIRECORD *, unsigned int, char *, DWORD *); extern unsigned int MSI_RecordGetFieldCount( MSIRECORD *rec ); -extern UINT MSI_RecordSetStreamW( MSIRECORD *, unsigned int, LPCWSTR ); -extern UINT MSI_RecordSetStreamA( MSIRECORD *, unsigned int, LPCSTR ); +extern UINT MSI_RecordSetStream( MSIRECORD *, unsigned int, IStream * ); extern UINT MSI_RecordDataSize( MSIRECORD *, unsigned int ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, unsigned int, LPCWSTR ); extern UINT MSI_RecordCopyField( MSIRECORD *, unsigned int, MSIRECORD *, unsigned int ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index bf01b20..fed7bf4 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -649,7 +649,19 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm) return ERROR_SUCCESS; }
-UINT MSI_RecordSetStreamW(MSIRECORD *rec, unsigned int iField, LPCWSTR szFilename) +UINT MSI_RecordSetStream(MSIRECORD *rec, unsigned int iField, IStream *stream) +{ + if ( (iField == 0) || (iField > rec->count) ) + return ERROR_INVALID_PARAMETER; + + MSI_FreeField( &rec->fields[iField] ); + rec->fields[iField].type = MSIFIELD_STREAM; + rec->fields[iField].u.stream = stream; + + return ERROR_SUCCESS; +} + +UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, unsigned int iField, LPCWSTR szFilename) { IStream *stm = NULL; HRESULT r; @@ -683,9 +695,7 @@ UINT MSI_RecordSetStreamW(MSIRECORD *rec, unsigned int iField, LPCWSTR szFilenam return r;
/* if all's good, store it in the record */ - MSI_FreeField( &rec->fields[iField] ); - rec->fields[iField].type = MSIFIELD_STREAM; - rec->fields[iField].u.stream = stm; + MSI_RecordSetStream(rec, iField, stm); }
return ERROR_SUCCESS; @@ -722,7 +732,7 @@ UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, unsigned int iField, LPCWSTR s return ERROR_INVALID_HANDLE;
msiobj_lock( &rec->hdr ); - ret = MSI_RecordSetStreamW( rec, iField, szFilename ); + ret = MSI_RecordSetStreamFromFileW( rec, iField, szFilename ); msiobj_unlock( &rec->hdr ); msiobj_release( &rec->hdr ); return ret;