June 2020 - Wine-commits - list.winehq.org

Piotr Caban : msi: Add stub support for MSITRANSFORM_ERROR_VIEWTRANSFORM flag in MsiApplyTransform.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 8bc835b4517728fac8ff8a9cfa5e59b843e9a8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc835b4517728fac8ff8a9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:43 2020 +0200 msi: Add stub support for MSITRANSFORM_ERROR_VIEWTRANSFORM flag in MsiApplyTransform. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 +- dlls/msi/patch.c | 2 +- dlls/msi/table.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 161 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc835b4517728fac8ff…

1 0

Piotr Caban : msi: Support UPDATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 6e7303a7006538d3df1a09e13f5a5f469098b35f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7303a7006538d3df1a09e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:48 2020 +0200 msi: Support UPDATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 173 insertions(+), 10 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ff61f2f682..9a839439e6 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2188,6 +2188,38 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) return ERROR_SUCCESS; } +static WCHAR* create_key_string(MSITABLEVIEW *tv, MSIRECORD *rec) +{ + DWORD i, p, len, key_len = 0; + WCHAR *key; + + for (i = 0; i < tv->num_cols; i++) + { + if (!(tv->columns[i].type & MSITYPE_KEY)) + continue; + if (MSI_RecordGetStringW( rec, i+1, NULL, &len ) == ERROR_SUCCESS) + key_len += len; + key_len++; + } + + key = msi_alloc( key_len * sizeof(WCHAR) ); + if(!key) + return NULL; + + p = 0; + for (i = 0; i < tv->num_cols; i++) + { + if (!(tv->columns[i].type & MSITYPE_KEY)) + continue; + if (p) + key[p++] = '\t'; + len = key_len - p; + if (MSI_RecordGetStringW( rec, i+1, key + p, &len ) == ERROR_SUCCESS) + p += len; + } + return key; +} + static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, UINT *len ) { UINT p = 0, l, i, r; @@ -2222,20 +2254,153 @@ static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWS static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_fetch_int( view, row, col, val ); } static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_fetch_stream( view, row, col, stm ); } static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR query_pfx[] = + L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`, `Data`, `Current`) VALUES ('"; + + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + WCHAR buf[256], *query = buf; + MSIRECORD *old_rec; + MSIQUERY *q; + WCHAR *key; + UINT i, p, r, len, qlen; + + if (!wcscmp( tv->name, szColumns )) + { + ERR( "trying to modify existing column\n" ); + return ERROR_INSTALL_TRANSFORM_FAILURE; + } + + if (!wcscmp( tv->name, szTables )) + { + ERR( "trying to modify existing table\n" ); + return ERROR_INSTALL_TRANSFORM_FAILURE; + } + + key = create_key_string( tv, rec ); + if (!key) + return ERROR_OUTOFMEMORY; + + r = msi_view_get_row( tv->db, view, row, &old_rec ); + if (r != ERROR_SUCCESS) + old_rec = NULL; + + for (i = 0; i < tv->num_cols; i++) + { + if (!(mask & (1 << i))) + continue; + if (tv->columns[i].type & MSITYPE_KEY) + continue; + + qlen = p = wcslen( query_pfx ); + qlen += wcslen( tv->name ) + 3; /* strlen("','") */ + qlen += wcslen( tv->columns[i].colname ) + 3; + qlen += wcslen( key ) + 3; + if (MSITYPE_IS_BINARY( tv->columns[i].type )) + r = msi_record_stream_name( tv, rec, NULL, &len ); + else + r = MSI_RecordGetStringW( rec, i + 1, NULL, &len ); + if (r != ERROR_SUCCESS) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + qlen += len + 3; + if (old_rec && (r = MSI_RecordGetStringW( old_rec, i+1, NULL, &len ))) + { + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + qlen += len + 3; /* strlen("')") + 1 */ + + if (qlen > ARRAY_SIZE(buf)) + { + query = msi_alloc( qlen * sizeof(WCHAR) ); + if (!query) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return ERROR_OUTOFMEMORY; + } + } + + memcpy( query, query_pfx, p * sizeof(WCHAR) ); + len = wcslen( tv->name ); + memcpy( query + p, tv->name, len * sizeof(WCHAR) ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + len = wcslen( tv->columns[i].colname ); + memcpy( query + p, tv->columns[i].colname, len * sizeof(WCHAR) ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + len = wcslen( key ); + memcpy( query + p, key, len * sizeof(WCHAR) ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + len = qlen - p; + if (MSITYPE_IS_BINARY( tv->columns[i].type )) + msi_record_stream_name( tv, rec, query + p, &len ); + else + MSI_RecordGetStringW( rec, i + 1, query + p, &len ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + if (old_rec) + { + len = qlen - p; + MSI_RecordGetStringW( old_rec, i + 1, query + p, &len ); + p += len; + } + query[p++] = '\''; + query[p++] = ')'; + query[p++] = 0; + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + if (r != ERROR_SUCCESS) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + } + + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return ERROR_SUCCESS; } static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) @@ -2262,15 +2427,13 @@ static UINT TransformView_close( MSIVIEW *view ) static UINT TransformView_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_get_dimensions( view, rows, cols ); } static UINT TransformView_get_column_info( MSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_get_column_info( view, n, name, type, temporary, table_name ); } static UINT TransformView_delete( MSIVIEW *view )

1 0

Piotr Caban : msi: Support CREATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 7e4077fb6d77810e40e842e7557c03ab3abe0593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e4077fb6d77810e40e842e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:55 2020 +0200 msi: Support CREATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 9a839439e6..6929bf2560 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2254,11 +2254,25 @@ static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWS static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!tv->table) + { + *val = 0; + return ERROR_SUCCESS; + } return TABLE_fetch_int( view, row, col, val ); } static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!tv->table) + { + *stm = NULL; + return ERROR_SUCCESS; + } return TABLE_fetch_stream( view, row, col, stm ); } @@ -2403,8 +2417,48 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT return ERROR_SUCCESS; } +static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) +{ + static const WCHAR query_fmt[] = + L"INSERT INTO `_TransformView` (`Table`, `Column`) VALUES ('%s', 'CREATE')"; + + WCHAR buf[256], *query = buf; + const WCHAR *name; + MSIQUERY *q; + int len; + UINT r; + + name = msi_record_get_string( rec, 1, &len ); + if (!name) + return ERROR_INSTALL_TRANSFORM_FAILURE; + + len = _snwprintf( NULL, 0, query_fmt, name ) + 1; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + return ERROR_OUTOFMEMORY; + } + swprintf( query, len, query_fmt, name ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; +} + static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!wcscmp(tv->name, szTables)) + return TransformView_create_table( tv, rec ); + FIXME("\n"); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -2466,15 +2520,23 @@ static const MSIVIEWOPS transform_view_ops = UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { + UINT r, name_len, size; MSITABLEVIEW *tv; - UINT r; + + name_len = wcslen( name ); r = TABLE_CreateView( db, name, view ); if (r == ERROR_INVALID_PARAMETER) { /* table does not exist */ - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + size = FIELD_OFFSET( MSITABLEVIEW, name[name_len + 1] ); + tv = msi_alloc_zero( size ); + if (!tv) + return ERROR_OUTOFMEMORY; + + tv->db = db; + memcpy( tv->name, name, name_len * sizeof(WCHAR) ); + *view = (MSIVIEW*)tv; } else if (r != ERROR_SUCCESS) { @@ -2912,7 +2974,10 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, if (TRACE_ON(msidb)) dump_record( rec ); - r = msi_table_find_row( tv, rec, &row, NULL ); + if (tv->table) + r = msi_table_find_row( tv, rec, &row, NULL ); + else + r = ERROR_FUNCTION_FAILED; if (r == ERROR_SUCCESS) { if (!mask)

1 0

Piotr Caban : msi: Support ALTER TABLE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: ae6fd7b14792b932832da6f5d5088d500723c386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6fd7b14792b932832da6f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:57 2020 +0200 msi: Support ALTER TABLE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6929bf2560..56d55d32cc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2256,7 +2256,7 @@ static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *va { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - if (!tv->table) + if (!tv->table || col > tv->table->col_count) { *val = 0; return ERROR_SUCCESS; @@ -2268,7 +2268,7 @@ static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStre { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - if (!tv->table) + if (!tv->table || col > tv->table->col_count) { *stm = NULL; return ERROR_SUCCESS; @@ -2452,6 +2452,59 @@ static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) return r; } +static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) +{ + static const WCHAR query_pfx[] = + L"INSERT INTO `_TransformView` (`Table`, `Current`, `Column`, `Data`) VALUES ('"; + + WCHAR buf[256], *query = buf; + UINT i, p, len, r, qlen; + MSIQUERY *q; + + qlen = p = wcslen( query_pfx ); + for (i = 1; i <= 4; i++) + { + r = MSI_RecordGetStringW( rec, i, NULL, &len ); + if (r != ERROR_SUCCESS) + return r; + qlen += len + 3; /* strlen( "','" ) */ + } + + if (qlen > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + qlen = len; + if (!query) + return ERROR_OUTOFMEMORY; + } + + memcpy( query, query_pfx, p * sizeof(WCHAR) ); + for (i = 1; i <= 4; i++) + { + len = qlen - p; + MSI_RecordGetStringW( rec, i, query + p, &len ); + p += len; + query[p++] = '\''; + if (i != 4) + { + query[p++] = ','; + query[p++] = '\''; + } + } + query[p++] = ')'; + query[p++] = 0; + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; +} + static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; @@ -2459,6 +2512,9 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B if (!wcscmp(tv->name, szTables)) return TransformView_create_table( tv, rec ); + if (!wcscmp(tv->name, szColumns)) + return TransformView_add_column( tv, rec ); + FIXME("\n"); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -2492,6 +2548,9 @@ static UINT TransformView_get_column_info( MSIVIEW *view, UINT n, LPCWSTR *name, static UINT TransformView_delete( MSIVIEW *view ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + if (!tv->table || tv->columns != tv->table->colinfo) + msi_free( tv->columns ); return TABLE_delete( view ); } @@ -2520,8 +2579,15 @@ static const MSIVIEWOPS transform_view_ops = UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { - UINT r, name_len, size; + static const WCHAR query_pfx[] = L"SELECT `Column`, `Data`, `Current` FROM `_TransformView` WHERE `Table`='"; + static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL"; + + WCHAR buf[256], *query = buf; + UINT r, len, name_len, size, add_col; + MSICOLUMNINFO *colinfo; MSITABLEVIEW *tv; + MSIRECORD *rec; + MSIQUERY *q; name_len = wcslen( name ); @@ -2548,6 +2614,86 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV } tv->view.ops = &transform_view_ops; + + len = ARRAY_SIZE(query_pfx) + name_len + ARRAY_SIZE(query_sfx) - 1; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + { + msi_free( tv ); + return ERROR_OUTOFMEMORY; + } + } + memcpy( query, query_pfx, ARRAY_SIZE(query_pfx) * sizeof(WCHAR) ); + len = ARRAY_SIZE(query_pfx) - 1; + memcpy( query + len, name, name_len * sizeof(WCHAR) ); + len += name_len; + memcpy( query + len, query_sfx, ARRAY_SIZE(query_sfx) * sizeof(WCHAR) ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + { + msi_free( tv ); + return r; + } + + r = MSI_ViewExecute( q, NULL ); + if (r != ERROR_SUCCESS) + { + msi_free( tv ); + return r; + } + + r = q->view->ops->get_dimensions( q->view, &add_col, NULL ); + if (r != ERROR_SUCCESS) + { + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + msi_free( tv ); + return r; + } + if (!add_col) + { + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + return ERROR_SUCCESS; + } + + colinfo = msi_alloc_zero( (add_col + tv->num_cols) * sizeof(*colinfo) ); + if (!colinfo) + { + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + msi_free( tv ); + return r; + } + + while (MSI_ViewFetch( q, &rec ) == ERROR_SUCCESS) + { + int name_len; + const WCHAR *name = msi_record_get_string( rec, 1, &name_len ); + const WCHAR *type = msi_record_get_string( rec, 2, NULL ); + UINT name_id, idx; + + idx = _wtoi( msi_record_get_string(rec, 3, NULL) ); + colinfo[idx - 1].number = idx; + colinfo[idx - 1].type = _wtoi( type ); + + r = msi_string2id( st, name, name_len, &name_id ); + if (r == ERROR_SUCCESS) + colinfo[idx - 1].colname = msi_string_lookup( st, name_id, NULL ); + else + ERR( "column name %s is not defined in strings table\n", wine_dbgstr_w(name) ); + } + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + + memcpy( colinfo, tv->columns, tv->num_cols * sizeof(*colinfo) ); + tv->columns = colinfo; + tv->num_cols += add_col; return ERROR_SUCCESS; }

1 0

Piotr Caban : msi: Support INSERT INTO when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 9130379710297cb487dbd8891b82f505e754c39d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9130379710297cb487dbd889… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:09:14 2020 +0200 msi: Support INSERT INTO when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 56d55d32cc..e6b5a09375 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2507,7 +2507,15 @@ static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { + static const WCHAR query_fmt[] = + L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`) VALUES ('%s', 'INSERT', '%s')"; + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + WCHAR buf[256], *query = buf; + MSIQUERY *q; + WCHAR *key; + int len; + UINT r; if (!wcscmp(tv->name, szTables)) return TransformView_create_table( tv, rec ); @@ -2515,8 +2523,35 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B if (!wcscmp(tv->name, szColumns)) return TransformView_add_column( tv, rec ); - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + key = create_key_string( tv, rec ); + if (!key) + return ERROR_OUTOFMEMORY; + + len = _snwprintf( NULL, 0, query_fmt, tv->name, key ) + 1; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + { + msi_free( key ); + return ERROR_OUTOFMEMORY; + } + } + swprintf( query, len, query_fmt, tv->name, key ); + msi_free( key ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + if (r != ERROR_SUCCESS) + return r; + + return TransformView_set_row( view, row, rec, ~0 ); } static UINT TransformView_delete_row( MSIVIEW *view, UINT row )

1 0

Piotr Caban : msi: Support DROP when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 6b6e1bd2c73ac23b03db0e656f895896936df5ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6e1bd2c73ac23b03db0e65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:09:22 2020 +0200 msi: Support DROP when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e6b5a09375..95da84a92d 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2554,8 +2554,63 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B return TransformView_set_row( view, row, rec, ~0 ); } +static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) +{ + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column` ) VALUES ( '"; + static const WCHAR query_sfx[] = L"', 'DROP' )"; + + WCHAR buf[256], *query = buf; + UINT r, table_id, len; + const WCHAR *table; + int table_len; + MSIQUERY *q; + + r = TABLE_fetch_int( &tv->view, row, 1, &table_id ); + if (r != ERROR_SUCCESS) + return r; + + table = msi_string_lookup( tv->db->strings, table_id, &table_len ); + if (!table) + return ERROR_INSTALL_TRANSFORM_FAILURE; + + len = ARRAY_SIZE(query_pfx) - 1 + table_len + ARRAY_SIZE(query_sfx); + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + return ERROR_OUTOFMEMORY; + } + + memcpy( query, query_pfx, ARRAY_SIZE(query_pfx) * sizeof(WCHAR) ); + len = ARRAY_SIZE(query_pfx) - 1; + memcpy( query + len, table, table_len * sizeof(WCHAR) ); + len += table_len; + memcpy( query + len, query_sfx, ARRAY_SIZE(query_sfx) * sizeof(WCHAR) ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; +} + static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!wcscmp( tv->name, szColumns )) + { + ERR("trying to remove column\n"); + return ERROR_INSTALL_TRANSFORM_FAILURE; + } + + if (!wcscmp( tv->name, szTables )) + return TransformView_drop_table( tv, row ); + FIXME("\n"); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

Piotr Caban : msi: Support DELETE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: b1f9f4ccee6f7d42dbeaf457e81db462a1b526af URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f9f4ccee6f7d42dbeaf457… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:09:36 2020 +0200 msi: Support DELETE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 95da84a92d..a413808e8a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2600,7 +2600,15 @@ static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) { + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column`, `Row`) VALUES ( '"; + static const WCHAR query_column[] = L"', 'DELETE', '"; + static const WCHAR query_sfx[] = L"')"; + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + WCHAR *key, buf[256], *query = buf; + UINT r, len, name_len, key_len; + MSIRECORD *rec; + MSIQUERY *q; if (!wcscmp( tv->name, szColumns )) { @@ -2611,8 +2619,49 @@ static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) if (!wcscmp( tv->name, szTables )) return TransformView_drop_table( tv, row ); - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + r = msi_view_get_row( tv->db, view, row, &rec ); + if (r != ERROR_SUCCESS) + return r; + + key = create_key_string( tv, rec ); + msiobj_release( &rec->hdr ); + if (!key) + return ERROR_OUTOFMEMORY; + + name_len = wcslen( tv->name ); + key_len = wcslen( key ); + len = ARRAY_SIZE(query_pfx) + name_len + ARRAY_SIZE(query_column) + key_len + ARRAY_SIZE(query_sfx) - 2; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + { + msi_free( tv ); + msi_free( key ); + return ERROR_OUTOFMEMORY; + } + } + + memcpy( query, query_pfx, ARRAY_SIZE(query_pfx) * sizeof(WCHAR) ); + len = ARRAY_SIZE(query_pfx) - 1; + memcpy( query + len, tv->name, name_len * sizeof(WCHAR) ); + len += name_len; + memcpy( query + len, query_column, ARRAY_SIZE(query_column) * sizeof(WCHAR) ); + len += ARRAY_SIZE(query_column) - 1; + memcpy( query + len, key, key_len * sizeof(WCHAR) ); + len += key_len; + memcpy( query + len, query_sfx, ARRAY_SIZE(query_sfx) * sizeof(WCHAR) ); + msi_free( key ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; } static UINT TransformView_execute( MSIVIEW *view, MSIRECORD *record )

1 0

Piotr Caban : msi: Add MsiDatabaseApplyTransformA MSITRANSFORM_ERROR_VIEWTRANSFORM test.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 301dde9838563d33b610c2c09dc69cb07c4c8c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=301dde9838563d33b610c2c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:09:50 2020 +0200 msi: Add MsiDatabaseApplyTransformA MSITRANSFORM_ERROR_VIEWTRANSFORM test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 64edcb98c0..2bf03e1ac6 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3069,11 +3069,40 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle) static void test_try_transform(void) { + static const struct { + const char *table; + const char *column; + const char *row; + const char *data; + const char *current; + } transform_view[] = { + { "MOO", "OOO", "1", "c", "a" }, + { "MOO", "COW", "", "5378", "3" }, + { "MOO", "PIG", "", "5378", "4" }, + { "MOO", "PIG", "1", "5", "" }, + { "MOO", "DELETE", "3", "", "" }, + { "BINARY", "BLOB", "1", "BINARY.1", "" }, + { "BINARY", "INSERT", "1", "", "" }, + { "AAR", "CREATE", "", "", "" }, + { "AAR", "CAR", "", "15871", "1" }, + { "AAR", "BAR", "", "1282", "2" }, + { "AAR", "BAR", "vw", "1", "" }, + { "AAR", "BAR", "bmw", "2", "" }, + { "AAR", "INSERT", "vw", "", "" }, + { "AAR", "INSERT", "bmw", "", "" }, + { "Property", "CREATE", "", "", "" }, + { "Property", "Property", "", "11592", "1" }, + { "Property", "Value", "", "7424", "2" }, + { "Property", "Value", "prop", "val", "" }, + { "Property", "INSERT", "prop", "", "" } + }; + MSIHANDLE hdb, hview, hrec, hpkg = 0; LPCSTR query; UINT r; DWORD sz; char buffer[MAX_PATH]; + int i, matched; DeleteFileA(msifile); DeleteFileA(mstfile); @@ -3135,6 +3164,59 @@ static void test_try_transform(void) r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_DIRECT, &hdb ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); + r = MsiDatabaseApplyTransformA(hdb, mstfile, MSITRANSFORM_ERROR_VIEWTRANSFORM); + ok(r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r); + + query = "select * from `_TransformView`"; + r = MsiDatabaseOpenViewA(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewGetColumnInfo(hview, MSICOLINFO_NAMES, &hrec); + ok(r == ERROR_SUCCESS, "error\n"); + check_record(hrec, 5, "Table", "Column", "Row", "Data", "Current"); + MsiCloseHandle(hrec); + + r = MsiViewGetColumnInfo(hview, MSICOLINFO_TYPES, &hrec); + ok(r == ERROR_SUCCESS, "error\n"); + check_record(hrec, 5, "g0", "g0", "G0", "G0", "G0"); + MsiCloseHandle(hrec); + + matched = 0; + while (MsiViewFetch(hview, &hrec) == ERROR_SUCCESS) + { + char data[5][256]; + + for (i = 1; i <= 5; i++) { + sz = ARRAY_SIZE(data[0]); + r = MsiRecordGetStringA(hrec, i, data[i-1], &sz); + ok(r == ERROR_SUCCESS, "%d) MsiRecordGetStringA failed %d\n", i, r); + } + + for (i = 0; i < ARRAY_SIZE(transform_view); i++) + { + if (strcmp(data[0], transform_view[i].table) || + strcmp(data[1], transform_view[i].column) || + strcmp(data[2], transform_view[i].row)) + continue; + + matched++; + ok(!strcmp(data[3], transform_view[i].data), "%d) data[3] = %s\n", i, data[3]); + ok(!strcmp(data[4], transform_view[i].current), "%d) data[4] = %s\n", i, data[4]); + break; + } + ok(i != ARRAY_SIZE(transform_view), "invalid row: %s, %s, %s\n", + wine_dbgstr_a(data[0]), wine_dbgstr_a(data[1]), wine_dbgstr_a(data[2])); + MsiCloseHandle(hrec); + } + ok(matched == ARRAY_SIZE(transform_view), "matched = %d\n", matched); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r );

1 0

Zebediah Figura : quartz/vmr9: Set the destination rect to the whole client area when connecting.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 90f8a1b876cf0d1dbd820b295239faaef1c6cda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f8a1b876cf0d1dbd820b29… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 25 17:57:39 2020 -0500 quartz/vmr9: Set the destination rect to the whole client area when connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 30 ++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 34 ++++++++++++++++++++++++++++++++-- dlls/quartz/vmr9.c | 3 ++- 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 4422a1f914..adf677535b 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2593,6 +2593,7 @@ static void test_basic_video(void) UINT count; ULONG ref; IPin *pin; + RECT rect; IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -2727,6 +2728,35 @@ static void test_basic_video(void) test_basic_video_source(video); test_basic_video_destination(video); + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + vih.bmiHeader.biWidth = 16; + vih.bmiHeader.biHeight = 16; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); + } + + check_source_position(video, 0, 0, 16, 16); + + SetRect(&rect, 0, 0, 0, 0); + AdjustWindowRectEx(&rect, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW, FALSE, 0); + check_destination_position(video, 0, 0, max(16, GetSystemMetrics(SM_CXMIN) - (rect.right - rect.left)), + max(16, GetSystemMetrics(SM_CYMIN) - (rect.bottom - rect.top))); + out: ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 69065d3576..005b10974f 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3591,6 +3591,7 @@ static void test_basic_video(void) UINT count; ULONG ref; IPin *pin; + RECT rect; IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -3725,6 +3726,35 @@ static void test_basic_video(void) test_basic_video_source(video); test_basic_video_destination(video); + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + vih.bmiHeader.biWidth = 16; + vih.bmiHeader.biHeight = 16; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); + } + + check_source_position(video, 0, 0, 16, 16); + + SetRect(&rect, 0, 0, 0, 0); + AdjustWindowRectEx(&rect, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW, FALSE, 0); + check_destination_position(video, 0, 0, max(16, GetSystemMetrics(SM_CXMIN) - (rect.right - rect.left)), + max(16, GetSystemMetrics(SM_CYMIN) - (rect.bottom - rect.top))); + out: ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -3831,7 +3861,7 @@ static void test_windowless_size(void) hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, NULL, &dst); ok(hr == S_OK, "Got hr %#x.\n", hr); SetRect(&expect, 0, 0, 0, 0); - todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); SetRect(&src, 4, 6, 16, 12); hr = IVMRWindowlessControl9_SetVideoPosition(windowless_control, &src, NULL); @@ -3844,7 +3874,7 @@ static void test_windowless_size(void) SetRect(&expect, 4, 6, 16, 12); ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); SetRect(&expect, 0, 0, 0, 0); - todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); SetRect(&dst, 40, 60, 120, 160); hr = IVMRWindowlessControl9_SetVideoPosition(windowless_control, NULL, &dst); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e4db42223e..b6b55c70c5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -519,12 +519,13 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE filter->VideoWidth = bitmap_header->biWidth; filter->VideoHeight = bitmap_header->biHeight; SetRect(&rect, 0, 0, filter->VideoWidth, filter->VideoHeight); - filter->window.src = filter->window.dst = rect; + filter->window.src = rect; AdjustWindowRectEx(&rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); SetWindowPos(window, NULL, 0, 0, rect.right - rect.left, rect.bottom - rect.top, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); + GetClientRect(window, &filter->window.dst); if (filter->mode || SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, VMR9Mode_Windowed)))

1 0

Gijs Vermeulen : amstream: Use IDirectDraw instead of IDirectDraw7 internally.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 84566a0cc17de361376c75a2ce15578feeff5ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84566a0cc17de361376c75a2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 25 20:56:58 2020 +0200 amstream: Use IDirectDraw instead of IDirectDraw7 internally. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 35 +++++++++++++++++++---------------- dlls/amstream/tests/amstream.c | 12 ++++++------ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index ca6a910f3f..f1b6d37d08 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -39,7 +39,7 @@ struct ddraw_stream IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; - IDirectDraw7 *ddraw; + IDirectDraw *ddraw; CRITICAL_SECTION cs; IMediaStreamFilter *filter; @@ -107,17 +107,17 @@ static ULONG WINAPI ddraw_IAMMediaStream_AddRef(IAMMediaStream *iface) static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("%p decreasing refcount to %u.\n", stream, ref); if (!ref) { - DeleteCriticalSection(&This->cs); - if (This->ddraw) - IDirectDraw7_Release(This->ddraw); - HeapFree(GetProcessHeap(), 0, This); + DeleteCriticalSection(&stream->cs); + if (stream->ddraw) + IDirectDraw_Release(stream->ddraw); + HeapFree(GetProcessHeap(), 0, stream); } return ref; @@ -214,8 +214,8 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn stream->stream_type = stream_type; if (source_object - && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw7, (void **)&stream->ddraw))) - FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw))) + FIXME("Stream object doesn't implement IDirectDraw interface, hr %#x.\n", hr); return S_OK; } @@ -373,23 +373,26 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMediaStream *iface, IDirectDraw **ddraw) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p)->(%p)\n", iface, ddraw); + TRACE("stream %p, ddraw %p.\n", stream, ddraw); if (!ddraw) return E_POINTER; *ddraw = NULL; - if (!This->ddraw) + if (!stream->ddraw) { - HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); + HRESULT hr = DirectDrawCreate(NULL, &stream->ddraw, NULL); if (FAILED(hr)) return hr; - IDirectDraw7_SetCooperativeLevel(This->ddraw, NULL, DDSCL_NORMAL); + IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL); } - return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); + IDirectDraw_AddRef(stream->ddraw); + *ddraw = stream->ddraw; + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 43da41ae89..d19174f12c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4776,7 +4776,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw7, &MSPID_PrimaryVideo, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw, 2); hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4787,19 +4787,19 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw2 == ddraw, "Expected ddraw %p, got %p.\n", ddraw, ddraw2); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); - todo_wine EXPECT_REF(ddraw, 4); + EXPECT_REF(ddraw, 4); IDirectDraw_Release(ddraw3); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); /* The current ddraw is released when SetDirectDraw() is called. */ hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 2); + todo_wine EXPECT_REF(ddraw, 2); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4808,7 +4808,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); if (hr == S_OK) {

1 0