October 2012 - Wine-commits

Hans Leidekker : msi: Store string length in the record structure.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 9aa23c6c77766558093df4e28e6070ccfdea236b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa23c6c77766558093df4e28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:13:12 2012 +0100 msi: Store string length in the record structure. --- dlls/msi/msipriv.h | 2 ++ dlls/msi/record.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4757da4..56c9340 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -118,6 +118,7 @@ typedef struct tagMSIFIELD LPWSTR szwVal; IStream *stream; } u; + int len; } MSIFIELD; typedef struct tagMSIRECORD @@ -821,6 +822,7 @@ extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ) DECLSPEC extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) DECLSPEC_HIDDEN; +extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int) DECLSPEC_HIDDEN; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 1dace78..3bf1ee5 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -616,32 +616,47 @@ UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue ) return ret; } -UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue ) +static WCHAR *msi_strdupW( const WCHAR *value, int len ) { - LPWSTR str; + WCHAR *ret; - TRACE("%p %d %s\n", rec, iField, debugstr_w(szValue)); + if (!(ret = msi_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, value, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} - if( iField > rec->count ) +UINT msi_record_set_string( MSIRECORD *rec, UINT field, const WCHAR *value, int len ) +{ + if (field > rec->count) return ERROR_INVALID_FIELD; - MSI_FreeField( &rec->fields[iField] ); + MSI_FreeField( &rec->fields[field] ); - if( szValue && szValue[0] ) + if (value && len < 0) len = strlenW( value ); + + if (value && len) { - str = strdupW( szValue ); - rec->fields[iField].type = MSIFIELD_WSTR; - rec->fields[iField].u.szwVal = str; + rec->fields[field].type = MSIFIELD_WSTR; + rec->fields[field].u.szwVal = msi_strdupW( value, len ); + rec->fields[field].len = len; } else { - rec->fields[iField].type = MSIFIELD_NULL; - rec->fields[iField].u.szwVal = NULL; + rec->fields[field].type = MSIFIELD_NULL; + rec->fields[field].u.szwVal = NULL; + rec->fields[field].len = 0; } - return 0; } +UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue ) +{ + TRACE("%p %d %s\n", rec, iField, debugstr_w(szValue)); + + return msi_record_set_string( rec, iField, szValue, -1 ); +} + UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, LPCWSTR szValue ) { MSIRECORD *rec;

1 0

Hans Leidekker : msi: Get rid of MSI_RecordSetStringA.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 8d28cc0ac7e054311d31a188e158b6adcacbf263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d28cc0ac7e054311d31a188e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:13:29 2012 +0100 msi: Get rid of MSI_RecordSetStringA. --- dlls/msi/record.c | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 3bf1ee5..263ea2c 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -574,45 +574,27 @@ UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, UINT iField) return ret; } -static UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue ) -{ - LPWSTR str; - - TRACE("%p %d %s\n", rec, iField, debugstr_a(szValue)); - - if( iField > rec->count ) - return ERROR_INVALID_FIELD; - - MSI_FreeField( &rec->fields[iField] ); - if( szValue && szValue[0] ) - { - str = strdupAtoW( szValue ); - rec->fields[iField].type = MSIFIELD_WSTR; - rec->fields[iField].u.szwVal = str; - } - else - { - rec->fields[iField].type = MSIFIELD_NULL; - rec->fields[iField].u.szwVal = NULL; - } - - return 0; -} - UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue ) { + WCHAR *valueW = NULL; MSIRECORD *rec; UINT ret; TRACE("%d %d %s\n", handle, iField, debugstr_a(szValue)); + if (szValue && !(valueW = strdupAtoW( szValue ))) return ERROR_OUTOFMEMORY; + rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) + { + msi_free( valueW ); return ERROR_INVALID_HANDLE; + } msiobj_lock( &rec->hdr ); - ret = MSI_RecordSetStringA( rec, iField, szValue ); + ret = MSI_RecordSetStringW( rec, iField, valueW ); msiobj_unlock( &rec->hdr ); msiobj_release( &rec->hdr ); + msi_free( valueW ); return ret; }

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls in the record implementation.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 32aed6078680bc322fd8a9f34d2a5fae7a791d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=32aed6078680bc322fd8a9f34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:13:54 2012 +0100 msi: Preserve strings with embedded nulls in the record implementation. --- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 73 ++++++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 56c9340..897353e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -823,6 +823,7 @@ extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) DECLSPEC_HIDDEN; extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int) DECLSPEC_HIDDEN; +extern const WCHAR *msi_record_get_string(const MSIRECORD *, UINT, int *) DECLSPEC_HIDDEN; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 263ea2c..d42dd81 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -156,6 +156,17 @@ static BOOL string2intW( LPCWSTR str, int *out ) return TRUE; } +static WCHAR *msi_strdupW( const WCHAR *value, int len ) +{ + WCHAR *ret; + + if (!value) return NULL; + if (!(ret = msi_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, value, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} + UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, MSIRECORD *out_rec, UINT out_n ) { @@ -184,11 +195,12 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, out->u.pVal = in->u.pVal; break; case MSIFIELD_WSTR: - str = strdupW( in->u.szwVal ); - if ( !str ) - r = ERROR_OUTOFMEMORY; - else + if ((str = msi_strdupW( in->u.szwVal, in->len ))) + { out->u.szwVal = str; + out->len = in->len; + } + else r = ERROR_OUTOFMEMORY; break; case MSIFIELD_STREAM: IStream_AddRef( in->u.stream ); @@ -202,7 +214,6 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, } msiobj_unlock( &in_rec->hdr ); - return r; } @@ -380,7 +391,7 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField ) UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, LPSTR szValue, LPDWORD pcchValue) { - UINT len=0, ret; + UINT len = 0, ret = ERROR_SUCCESS; CHAR buffer[16]; TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue); @@ -394,7 +405,6 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, return ERROR_SUCCESS; } - ret = ERROR_SUCCESS; switch( rec->fields[iField].type ) { case MSIFIELD_INT: @@ -404,11 +414,11 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, lstrcpynA(szValue, buffer, *pcchValue); break; case MSIFIELD_WSTR: - len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, - NULL, 0 , NULL, NULL); + len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, + rec->fields[iField].len + 1, NULL, 0 , NULL, NULL ); if (szValue) - WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, - szValue, *pcchValue, NULL, NULL); + WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, + rec->fields[iField].len + 1, szValue, *pcchValue, NULL, NULL ); if( szValue && *pcchValue && len>*pcchValue ) szValue[*pcchValue-1] = 0; if( len ) @@ -448,23 +458,30 @@ UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, UINT iField, return ret; } -const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField ) +const WCHAR *msi_record_get_string( const MSIRECORD *rec, UINT field, int *len ) { - if( iField > rec->count ) + if (field > rec->count) return NULL; - if( rec->fields[iField].type != MSIFIELD_WSTR ) + if (rec->fields[field].type != MSIFIELD_WSTR) return NULL; - return rec->fields[iField].u.szwVal; + if (len) *len = rec->fields[field].len; + + return rec->fields[field].u.szwVal; +} + +const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField ) +{ + return msi_record_get_string( rec, iField, NULL ); } UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, LPWSTR szValue, LPDWORD pcchValue) { - UINT len=0, ret; + static const WCHAR szFormat[] = {'%','d',0}; + UINT len = 0, ret = ERROR_SUCCESS; WCHAR buffer[16]; - static const WCHAR szFormat[] = { '%','d',0 }; TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue); @@ -477,7 +494,6 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, return ERROR_SUCCESS; } - ret = ERROR_SUCCESS; switch( rec->fields[iField].type ) { case MSIFIELD_INT: @@ -487,9 +503,9 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, lstrcpynW(szValue, buffer, *pcchValue); break; case MSIFIELD_WSTR: - len = lstrlenW( rec->fields[iField].u.szwVal ); + len = rec->fields[iField].len; if (szValue) - lstrcpynW(szValue, rec->fields[iField].u.szwVal, *pcchValue); + memcpy( szValue, rec->fields[iField].u.szwVal, min(len + 1, *pcchValue) * sizeof(WCHAR) ); break; case MSIFIELD_NULL: if( szValue && *pcchValue > 0 ) @@ -548,7 +564,7 @@ static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField) case MSIFIELD_INT: return sizeof (INT); case MSIFIELD_WSTR: - return lstrlenW( rec->fields[iField].u.szwVal ); + return rec->fields[iField].len; case MSIFIELD_NULL: break; case MSIFIELD_STREAM: @@ -598,16 +614,6 @@ UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue ) return ret; } -static WCHAR *msi_strdupW( const WCHAR *value, int len ) -{ - WCHAR *ret; - - if (!(ret = msi_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; - memcpy( ret, value, len * sizeof(WCHAR) ); - ret[len] = 0; - return ret; -} - UINT msi_record_set_string( MSIRECORD *rec, UINT field, const WCHAR *value, int len ) { if (field > rec->count) @@ -1008,8 +1014,9 @@ BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) break; case MSIFIELD_WSTR: - if (strcmpW(a->fields[field].u.szwVal, b->fields[field].u.szwVal)) - return FALSE; + if (a->fields[field].len != b->fields[field].len) return FALSE; + if (memcmp( a->fields[field].u.szwVal, b->fields[field].u.szwVal, + a->fields[field].len * sizeof(WCHAR) )) return FALSE; break; case MSIFIELD_STREAM:

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls when copying from the string table to a record .
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 9588deb54c08ac1f9a858f700608476ab331afa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9588deb54c08ac1f9a858f700… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:14:19 2012 +0100 msi: Preserve strings with embedded nulls when copying from the string table to a record. --- dlls/msi/msiquery.c | 7 +++---- dlls/msi/package.c | 2 +- dlls/msi/select.c | 5 +++-- dlls/msi/table.c | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 4b826f8..451fddd 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -345,10 +345,9 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if (type & MSITYPE_STRING) { - LPCWSTR sval; - - sval = msi_string_lookup(db->strings, ival, NULL); - MSI_RecordSetStringW(*rec, i, sval); + int len; + const WCHAR *sval = msi_string_lookup( db->strings, ival, &len ); + msi_record_set_string( *rec, i, sval, len ); } else { diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a050b2e..6528b85 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2181,7 +2181,7 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName, } if (rc == ERROR_SUCCESS) - TRACE("returning %s for property %s\n", debugstr_w(szValueBuf), + TRACE("returning %s for property %s\n", debugstr_wn(szValueBuf, *pchValueBuf), debugstr_w(szName)); else if (rc == ERROR_MORE_DATA) TRACE("need %d sized buffer for %s\n", *pchValueBuf, diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 982cf6a..ada4eed 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -276,8 +276,9 @@ static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) } else if (type & MSITYPE_STRING) { - str = MSI_RecordGetString(rec, i + 1); - r = MSI_RecordSetStringW(mod, col, str); + int len; + str = msi_record_get_string( rec, i + 1, &len ); + r = msi_record_set_string( mod, col, str, len ); } else { diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3276259..78c00b1 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2340,12 +2340,13 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string } else if( columns[i].type & MSITYPE_STRING ) { - LPCWSTR sval; + int len; + const WCHAR *sval; val = read_raw_int(rawdata, ofs, bytes_per_strref); - sval = msi_string_lookup( st, val, NULL ); - MSI_RecordSetStringW( rec, i+1, sval ); - TRACE(" field %d [%s]\n", i+1, debugstr_w(sval)); + sval = msi_string_lookup( st, val, &len ); + msi_record_set_string( rec, i+1, sval, len ); + TRACE(" field %d [%s]\n", i+1, debugstr_wn(sval, len)); ofs += bytes_per_strref; } else

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls when copying from a record to the string table .
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a7ff2818feaa33c84c19105b8a0b01f9a66644a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ff2818feaa33c84c19105b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:14:44 2012 +0100 msi: Preserve strings with embedded nulls when copying from a record to the string table. --- dlls/msi/table.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 78c00b1..a7798e5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1273,10 +1273,11 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT } else if ( columninfo.type & MSITYPE_STRING ) { - LPCWSTR sval = MSI_RecordGetString( rec, iField ); + int len; + const WCHAR *sval = msi_record_get_string( rec, iField, &len ); if (sval) { - r = msi_string2id(tv->db->strings, sval, -1, pvalue); + r = msi_string2id( tv->db->strings, sval, len, pvalue ); if (r != ERROR_SUCCESS) return ERROR_NOT_FOUND; } @@ -1360,8 +1361,9 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) { - LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, sval, -1, 1, + int len; + const WCHAR *sval = msi_record_get_string( rec, i + 1, &len ); + val = msi_addstringW( tv->db->strings, sval, len, 1, persistent ? StringPersistent : StringNonPersistent ); } else @@ -1530,10 +1532,10 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column ) TRACE("skipping binary column\n"); else if ( tv->columns[i].type & MSITYPE_STRING ) { - LPCWSTR str; + int len; + const WCHAR *str = msi_record_get_string( rec, i+1, &len ); - str = MSI_RecordGetString( rec, i+1 ); - if (str == NULL || str[0] == 0) + if (!str || (!str[0] && !len)) { if (column) *column = i; return ERROR_INVALID_DATA; @@ -2383,12 +2385,13 @@ static void dump_record( MSIRECORD *rec ) n = MSI_RecordGetFieldCount( rec ); for( i=1; i<=n; i++ ) { - LPCWSTR sval; + int len; + const WCHAR *sval; if( MSI_RecordIsNull( rec, i ) ) TRACE("row -> []\n"); - else if( (sval = MSI_RecordGetString( rec, i )) ) - TRACE("row -> [%s]\n", debugstr_w(sval)); + else if( (sval = msi_record_get_string( rec, i, &len )) ) + TRACE("row -> [%s]\n", debugstr_wn(sval, len)); else TRACE("row -> [0x%08x]\n", MSI_RecordGetInteger( rec, i ) ); } @@ -2407,7 +2410,6 @@ static void dump_table( const string_table *st, const USHORT *rawdata, UINT raws static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) { - LPCWSTR str; UINT i, r, *data; data = msi_alloc( tv->num_cols *sizeof (UINT) ); @@ -2422,10 +2424,11 @@ static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) if ( ( tv->columns[i].type & MSITYPE_STRING ) && ! MSITYPE_IS_BINARY(tv->columns[i].type) ) { - str = MSI_RecordGetString( rec, i+1 ); + int len; + const WCHAR *str = msi_record_get_string( rec, i+1, &len ); if (str) { - r = msi_string2id( tv->db->strings, str, -1, &data[i] ); + r = msi_string2id( tv->db->strings, str, len, &data[i] ); /* if there's no matching string in the string table, these keys can't match any record, so fail now. */

1 0

André Hentschel : ole32: Don' t leak memory allocated by ProgIDFromCLSID (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: fbe682a22a28996f5f9e2c7a892545887a52d3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe682a22a28996f5f9e2c7a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:45 2012 +0100 ole32: Don't leak memory allocated by ProgIDFromCLSID (coverity). --- dlls/ole32/clipboard.c | 1 + dlls/ole32/storage32.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 57b0c46..a7308c2 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -664,6 +664,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL ); STORAGE_CreateOleStream(std.u.pstg, 0); OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName); + CoTaskMemFree(strProgID); } } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 70494a1..d2e9f69 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9075,6 +9075,7 @@ static HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DW if(hRes == S_OK) { *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE); + CoTaskMemFree(wstrProgID); } }

1 0

Francois Gouget : services: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: cbeae4ca3d302b1ddad78712617b9b41b1885445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbeae4ca3d302b1ddad787126… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 19:44:51 2012 +0100 services: Fix compilation on systems that don't support nameless unions. --- programs/services/rpc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 9fe81d1..166e2b7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -118,11 +118,11 @@ static void run_after_timeout(void (*func)(struct service_entry*), struct servic elem->service_entry = service; GetSystemTimeAsFileTime(&elem->time); - time.LowPart = elem->time.dwLowDateTime; - time.HighPart = elem->time.dwHighDateTime; + time.u.LowPart = elem->time.dwLowDateTime; + time.u.HighPart = elem->time.dwHighDateTime; time.QuadPart += timeout*10000000; - elem->time.dwLowDateTime = time.LowPart; - elem->time.dwHighDateTime = time.HighPart; + elem->time.dwLowDateTime = time.u.LowPart; + elem->time.dwHighDateTime = time.u.HighPart; EnterCriticalSection(&timeout_queue_cs); list_add_head(&timeout_queue, &elem->entry); @@ -1640,8 +1640,8 @@ DWORD events_loop(void) ULARGE_INTEGER time; GetSystemTimeAsFileTime(&cur_time); - time.LowPart = cur_time.dwLowDateTime; - time.HighPart = cur_time.dwHighDateTime; + time.u.LowPart = cur_time.dwLowDateTime; + time.u.HighPart = cur_time.dwHighDateTime; EnterCriticalSection(&timeout_queue_cs); timeout = INFINITE; @@ -1661,8 +1661,8 @@ DWORD events_loop(void) { ULARGE_INTEGER time_diff; - time_diff.LowPart = iter->time.dwLowDateTime; - time_diff.HighPart = iter->time.dwHighDateTime; + time_diff.u.LowPart = iter->time.dwLowDateTime; + time_diff.u.HighPart = iter->time.dwHighDateTime; time_diff.QuadPart = (time_diff.QuadPart-time.QuadPart)/10000; if(time_diff.QuadPart < timeout)

1 0

Francois Gouget : cmd: Make WCMD_forf_getinputhandle() static.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 5f86884771b8be83c214a18ffb52ca5008bf5a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f86884771b8be83c214a18ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 19:50:10 2012 +0100 cmd: Make WCMD_forf_getinputhandle() static. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 855040e..e567bb6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1746,7 +1746,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, * * Returns a file handle which can be used to read the input lines from. */ -HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { +static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { WCHAR temp_str[MAX_PATH]; WCHAR temp_file[MAX_PATH]; WCHAR temp_cmd[MAXSTRING];

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DSURFACE9.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 9ec7cdf12b07779d19d26097ba22bf276fda76ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec7cdf12b07779d19d26097b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:50 2012 +0100 d3dx9: Avoid LPDIRECT3DSURFACE9. --- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 108 +++++++++++++++------------------------------------ 2 files changed, 33 insertions(+), 77 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 909d81e..c5dffce 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(ID3DXRenderToSurface, IUnknown) STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDesc)(THIS_ D3DXRTS_DESC *desc) PURE; - STDMETHOD(BeginScene)(THIS_ LPDIRECT3DSURFACE9 surface, CONST D3DVIEWPORT9 *viewport) PURE; + STDMETHOD(BeginScene)(THIS_ struct IDirect3DSurface9 *surface, const D3DVIEWPORT9 *viewport) PURE; STDMETHOD(EndScene)(THIS_ DWORD mipfilter) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index c551e14..3c4d4c5 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -104,88 +104,44 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D /* Surface Loading/Saving */ -HRESULT WINAPI D3DXLoadSurfaceFromFileA( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPCSTR srcfile, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromFileW( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPCWSTR srcfile, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadSurfaceFromFile WINELIB_NAME_AW(D3DXLoadSurfaceFromFile) - -HRESULT WINAPI D3DXLoadSurfaceFromResourceA( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - HMODULE srcmodule, - LPCSTR resource, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromResourceW( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - HMODULE srcmodule, - LPCWSTR resource, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadSurfaceFromResource WINELIB_NAME_AW(D3DXLoadSurfaceFromResource) - -HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT*destrect, - LPCVOID srcdata, - UINT srcdatasize, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromSurface( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey); +HRESULT WINAPI D3DXLoadSurfaceFromFileA(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const char *srcfile, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadSurfaceFromFileW(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const WCHAR *srcfile, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadSurfaceFromFile WINELIB_NAME_AW(D3DXLoadSurfaceFromFile) + +HRESULT WINAPI D3DXLoadSurfaceFromResourceA(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, HMODULE srcmodule, const char *resource, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadSurfaceFromResourceW(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, HMODULE srcmodule, const WCHAR *resource, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadSurfaceFromResource WINELIB_NAME_AW(D3DXLoadSurfaceFromResource) + +HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const void *srcdata, UINT srcdatasize, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); + +HRESULT WINAPI D3DXLoadSurfaceFromSurface(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, struct IDirect3DSurface9 *srcsurface, + const PALETTEENTRY *srcpalette, const RECT *srcrect, DWORD filter, D3DCOLOR colorkey); HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, const void *src_memory, D3DFORMAT src_format, UINT src_pitch, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key); -HRESULT WINAPI D3DXSaveSurfaceToFileInMemory( LPD3DXBUFFER *destbuffer, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); - -HRESULT WINAPI D3DXSaveSurfaceToFileA( LPCSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); - -HRESULT WINAPI D3DXSaveSurfaceToFileW( LPCWSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); -#define D3DXSaveSurfaceToFile WINELIB_NAME_AW(D3DXSaveSurfaceToFile) +HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(struct ID3DXBuffer **destbuffer, + D3DXIMAGE_FILEFORMAT destformat, struct IDirect3DSurface9 *srcsurface, + const PALETTEENTRY *srcpalette, const RECT *srcrect); + +HRESULT WINAPI D3DXSaveSurfaceToFileA(const char *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DSurface9 *srcsurface, const PALETTEENTRY *srcpalette, const RECT *srcrect); +HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DSurface9 *srcsurface, const PALETTEENTRY *srcpalette, const RECT *srcrect); +#define D3DXSaveSurfaceToFile WINELIB_NAME_AW(D3DXSaveSurfaceToFile) /* Volume Loading/Saving */

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVOLUME9.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 6c26a0fa9243c5ed535d1c9496bb407535303fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c26a0fa9243c5ed535d1c949… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:51 2012 +0100 d3dx9: Avoid LPDIRECT3DVOLUME9. --- include/d3dx9tex.h | 117 +++++++++++++++------------------------------------- 1 files changed, 34 insertions(+), 83 deletions(-) diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 3c4d4c5..206d56d 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -145,89 +145,40 @@ HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMA /* Volume Loading/Saving */ -HRESULT WINAPI D3DXLoadVolumeFromFileA( LPDIRECT3DVOLUME9 destvolume, - CONST PALETTEENTRY *destpalette, - CONST D3DBOX *destbox, - LPCSTR srcfile, - CONST D3DBOX *srcbox, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadVolumeFromFileW( LPDIRECT3DVOLUME9 destVolume, - CONST PALETTEENTRY *destpalette, - CONST D3DBOX *destbox, - LPCWSTR srcfile, - CONST D3DBOX *srcbox, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadVolumeFromFile WINELIB_NAME_AW(D3DXLoadVolumeFromFile) - -HRESULT WINAPI D3DXLoadVolumeFromResourceA( LPDIRECT3DVOLUME9 destVolume, - CONST PALETTEENTRY *destpalette, - CONST D3DBOX *destbox, - HMODULE srcmodule, - LPCSTR resource, - CONST D3DBOX *srcbox, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadVolumeFromResourceW( LPDIRECT3DVOLUME9 destVolume, - CONST PALETTEENTRY *destpalette, - CONST D3DBOX *destbox, - HMODULE srcmodule, - LPCWSTR resource, - CONST D3DBOX *srcbox, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadVolumeFromResource WINELIB_NAME_AW(D3DXLoadVolumeFromResource) - -HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(LPDIRECT3DVOLUME9 destvolume, - CONST PALETTEENTRY *destpalette, - CONST D3DBOX *destbox, - LPCVOID srcdata, - UINT srcdatasize, - CONST D3DBOX *srcbox, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadVolumeFromVolume( LPDIRECT3DVOLUME9 destvolume, - CONST PALETTEENTRY *destpalette, - CONST D3DBOX *destbox, - LPDIRECT3DVOLUME9 srcvolume, - CONST PALETTEENTRY *srcpalette, - CONST D3DBOX *srcbox, - DWORD filter, - D3DCOLOR colorkey); - -HRESULT WINAPI D3DXLoadVolumeFromMemory( LPDIRECT3DVOLUME9 destvolume, - CONST PALETTEENTRY *destpalette, - CONST D3DBOX *destbox, - LPCVOID srcmemory, - D3DFORMAT srcformat, - UINT srcrowpitch, - UINT srcslicepitch, - CONST PALETTEENTRY *srcpalette, - CONST D3DBOX *srcbox, - DWORD filter, - D3DCOLOR colorkey); - -HRESULT WINAPI D3DXSaveVolumeToFileA( LPCSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DVOLUME9 srcvolume, - CONST PALETTEENTRY *srcpalette, - CONST D3DBOX *srcbox); - -HRESULT WINAPI D3DXSaveVolumeToFileW( LPCWSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DVOLUME9 srcvolume, - CONST PALETTEENTRY *srcpalette, - CONST D3DBOX *srcbox); -#define D3DXSaveVolumeToFile WINELIB_NAME_AW(D3DXSaveVolumeToFile) +HRESULT WINAPI D3DXLoadVolumeFromFileA(struct IDirect3DVolume9 *destvolume, + const PALETTEENTRY *destpalette, const D3DBOX *destbox, const char *srcfile, + const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadVolumeFromFileW( struct IDirect3DVolume9 *destvolume, + const PALETTEENTRY *destpalette, const D3DBOX *destbox, const WCHAR *srcfile, + const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadVolumeFromFile WINELIB_NAME_AW(D3DXLoadVolumeFromFile) + +HRESULT WINAPI D3DXLoadVolumeFromResourceA(struct IDirect3DVolume9 *destvolume, + const PALETTEENTRY *destpalette, const D3DBOX *destbox, HMODULE srcmodule, const char *resource, + const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadVolumeFromResourceW(struct IDirect3DVolume9 *destvolume, + const PALETTEENTRY *destpalette, const D3DBOX *destbox, HMODULE srcmodule, const WCHAR *resource, + const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadVolumeFromResource WINELIB_NAME_AW(D3DXLoadVolumeFromResource) + +HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(struct IDirect3DVolume9 *destvolume, + const PALETTEENTRY *destpalette, const D3DBOX *destbox, const void *srcdata, UINT srcdatasize, + const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); + +HRESULT WINAPI D3DXLoadVolumeFromVolume(struct IDirect3DVolume9 *destvolume, + const PALETTEENTRY *destpalette, const D3DBOX *destbox, struct IDirect3DVolume9 *srcvolume, + const PALETTEENTRY *srcpalette, const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey); + +HRESULT WINAPI D3DXLoadVolumeFromMemory(struct IDirect3DVolume9 *destvolume, + const PALETTEENTRY *destpalette, const D3DBOX *destbox, const void *srcmemory, + D3DFORMAT srcformat, UINT srcrowpitch, UINT srcslicepitch, const PALETTEENTRY *srcpalette, + const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey); + +HRESULT WINAPI D3DXSaveVolumeToFileA(const char *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DVolume9 *srcvolume, const PALETTEENTRY *srcpalette, const D3DBOX *srcbox); +HRESULT WINAPI D3DXSaveVolumeToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DVolume9 *srcvolume, const PALETTEENTRY *srcpalette, const D3DBOX *srcbox); +#define D3DXSaveVolumeToFile WINELIB_NAME_AW(D3DXSaveVolumeToFile) /* Texture, cube texture and volume texture creation */

1 0