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

Piotr Caban : msi: Fix table ref count on create.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 405486fbe6853c78744099fa1ebe07995e07a438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=405486fbe6853c78744099fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:20 2020 +0200 msi: Fix table ref count on create. 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/create.c | 2 +- dlls/msi/query.h | 2 +- dlls/msi/table.c | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 6133159dce..94c62ec573 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -68,7 +68,7 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (cv->bIsTemp && !cv->hold) return ERROR_SUCCESS; - return msi_create_table( cv->db, cv->name, cv->col_info, persist ); + return msi_create_table( cv->db, cv->name, cv->col_info, persist, cv->hold ); } static UINT CREATE_close( struct tagMSIVIEW *view ) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index c0144d3054..5e5f3906f4 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -149,7 +149,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip) DECLSPEC_HIDDEN; MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent ) DECLSPEC_HIDDEN; + MSICONDITION persistent, BOOL hold ) DECLSPEC_HIDDEN; UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index db4dd59f95..7fae4ad07a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -713,7 +713,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF } UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent ) + MSICONDITION persistent, BOOL hold ) { UINT r, nField; MSIVIEW *tv = NULL; @@ -733,7 +733,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( !table ) return ERROR_FUNCTION_FAILED; - table->ref_count = 1; + table->ref_count = 0; table->row_count = 0; table->data = NULL; table->data_persistent = NULL; @@ -742,6 +742,9 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->persistent = persistent; lstrcpyW( table->name, name ); + if( hold ) + table->ref_count++; + for( col = col_info; col; col = col->next ) table->col_count++;

1 0

Piotr Caban : msi: Remove ref_count from MSICOLUMNINFO.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 7200257d0428b1e9b4da72e8c4e39f9cf27455e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7200257d0428b1e9b4da72e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:25 2020 +0200 msi: Remove ref_count from MSICOLUMNINFO. 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/alter.c | 6 +++--- dlls/msi/table.c | 50 ++++++++++++++++---------------------------------- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 5c5893c824..7922171ae2 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -147,6 +147,9 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) TRACE("%p %p\n", av, record); + if (av->colinfo) + return alter_add_column(av); + if (av->hold == 1) av->table->ops->add_ref(av->table); else if (av->hold == -1) @@ -156,9 +159,6 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) av->table = NULL; } - if (av->colinfo) - return alter_add_column(av); - return ERROR_SUCCESS; } diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 7fae4ad07a..c617110604 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -54,7 +54,6 @@ typedef struct tagMSICOLUMNINFO LPCWSTR colname; UINT type; UINT offset; - INT ref_count; BOOL temporary; MSICOLUMNHASHENTRY **hash_table; } MSICOLUMNINFO; @@ -80,14 +79,14 @@ static const WCHAR szNumber[] = {'N','u','m','b','e','r',0}; static const WCHAR szType[] = {'T','y','p','e',0}; static const MSICOLUMNINFO _Columns_cols[4] = { - { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, 0, NULL }, - { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, 0, NULL }, - { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, 0, NULL }, - { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, 0, NULL }, + { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, + { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, NULL }, + { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, NULL }, + { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, NULL }, }; static const MSICOLUMNINFO _Tables_cols[1] = { - { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, 0, NULL }, + { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, }; #define MAX_STREAM_NAME 0x1f @@ -694,7 +693,6 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF colinfo[col - 1].type = read_table_int( table->data, i, table->colinfo[3].offset, sizeof(USHORT) ) - (1 << 15); colinfo[col - 1].offset = 0; - colinfo[col - 1].ref_count = 0; colinfo[col - 1].hash_table = NULL; } n++; @@ -765,7 +763,6 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->colinfo[ i ].colname = msi_string_lookup( db->strings, col_id, NULL ); table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; - table->colinfo[ i ].ref_count = 0; table->colinfo[ i ].hash_table = NULL; table->colinfo[ i ].temporary = col->temporary; } @@ -1949,16 +1946,8 @@ static UINT TABLE_delete( struct tagMSIVIEW *view ) static UINT TABLE_add_ref(struct tagMSIVIEW *view) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - UINT i; TRACE("%p %d\n", view, tv->table->ref_count); - - for (i = 0; i < tv->table->col_count; i++) - { - if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) - InterlockedIncrement(&tv->table->colinfo[i].ref_count); - } - return InterlockedIncrement(&tv->table->ref_count); } @@ -2022,25 +2011,25 @@ static UINT TABLE_release(struct tagMSIVIEW *view) TRACE("%p %d\n", view, ref); - for (i = tv->table->col_count - 1; i >= 0; i--) + ref = InterlockedDecrement(&tv->table->ref_count); + if (ref == 0) { - if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) + for (i = tv->table->col_count - 1; i >= 0; i--) { - ref = InterlockedDecrement(&tv->table->colinfo[i].ref_count); - if (ref == 0) + if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) { r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, tv->table->colinfo[i].number); if (r != ERROR_SUCCESS) break; } + else + { + break; + } } - } - ref = InterlockedDecrement(&tv->table->ref_count); - if (ref == 0) - { - if (!tv->table->row_count) + if (!tv->table->col_count) { list_remove(&tv->table->entry); free_table(tv->table); @@ -2057,7 +2046,7 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSITABLE *msitable; MSIRECORD *rec; - UINT r, i; + UINT r; rec = MSI_CreateRecord(4); if (!rec) @@ -2078,14 +2067,7 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number goto done; msitable = find_cached_table(tv->db, table); - for (i = 0; i < msitable->col_count; i++) - { - if (!wcscmp( msitable->colinfo[i].colname, column )) - { - InterlockedIncrement(&msitable->colinfo[i].ref_count); - break; - } - } + InterlockedIncrement(&msitable->ref_count); done: msiobj_release(&rec->hdr);

1 0

Piotr Caban : msi: Test freeing _TransformView table.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: eb5a803bdbb8f602ae1212674a121cadd24642a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5a803bdbb8f602ae121267… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:29 2020 +0200 msi: Test freeing _TransformView table. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2bf03e1ac6..c49b5e6265 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3217,6 +3217,12 @@ static void test_try_transform(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "ALTER TABLE `_TransformView` FREE"; + r = run_query( hdb, 0, query ); + ok( r == ERROR_SUCCESS, "cannot free _TransformView table: %d\n", r ); + r = run_query( hdb, 0, query ); + ok( r == ERROR_BAD_QUERY_SYNTAX, "_TransformView table still exist: %d\n", r ); + r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r );

1 0

Piotr Caban : msi: Add table existance tests for tables with temporary columns.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: cb9cb83cda01fa873667e11038d9bdd01428f059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9cb83cda01fa873667e110… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:35 2020 +0200 msi: Add table existance tests for tables with temporary columns. 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index c49b5e6265..22466548b1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3957,10 +3957,22 @@ static void test_alter(void) hdb = create_db(); ok( hdb, "failed to create db\n"); + query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + query = "SELECT * FROM `T`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); + query = "SELECT * FROM `T`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", r); + cond = MsiDatabaseIsTablePersistentA(hdb, "T"); ok( cond == MSICONDITION_FALSE, "wrong return condition\n");

1 0

Piotr Caban : msi: Fix adding temporary columns.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 15b47513a1926a103492e0774396119f57d2e8d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b47513a1926a103492e077… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:41 2020 +0200 msi: Fix adding temporary columns. 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/alter.c | 82 +--------------------------------------- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 105 +++++++++++++++++++++++++++++++++++++++++----------- dlls/msi/tests/db.c | 10 ++++- 4 files changed, 95 insertions(+), 104 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 7922171ae2..78f1a3930c 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -61,85 +61,6 @@ static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return ERROR_FUNCTION_FAILED; } -static UINT ITERATE_columns(MSIRECORD *row, LPVOID param) -{ - (*(UINT *)param)++; - return ERROR_SUCCESS; -} - -static BOOL check_column_exists(MSIDATABASE *db, LPCWSTR table, LPCWSTR column) -{ - MSIQUERY *view; - MSIRECORD *rec; - UINT r; - - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','_','C','o','l','u','m','n','s','`',' ','W','H','E','R','E',' ', - '`','T','a','b','l','e','`','=','\'','%','s','\'',' ','A','N','D',' ', - '`','N','a','m','e','`','=','\'','%','s','\'',0 - }; - - r = MSI_OpenQuery(db, &view, query, table, column); - if (r != ERROR_SUCCESS) - return FALSE; - - r = MSI_ViewExecute(view, NULL); - if (r != ERROR_SUCCESS) - goto done; - - r = MSI_ViewFetch(view, &rec); - if (r == ERROR_SUCCESS) - msiobj_release(&rec->hdr); - -done: - msiobj_release(&view->hdr); - return (r == ERROR_SUCCESS); -} - -static UINT alter_add_column(MSIALTERVIEW *av) -{ - UINT r, colnum = 1; - MSIQUERY *view; - MSIVIEW *columns; - - static const WCHAR szColumns[] = {'_','C','o','l','u','m','n','s',0}; - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','_','C','o','l','u','m','n','s','`',' ','W','H','E','R','E',' ', - '`','T','a','b','l','e','`','=','\'','%','s','\'',' ','O','R','D','E','R',' ', - 'B','Y',' ','`','N','u','m','b','e','r','`',0 - }; - - r = TABLE_CreateView(av->db, szColumns, &columns); - if (r != ERROR_SUCCESS) - return r; - - if (check_column_exists(av->db, av->colinfo->table, av->colinfo->column)) - { - columns->ops->delete(columns); - return ERROR_BAD_QUERY_SYNTAX; - } - - r = MSI_OpenQuery(av->db, &view, query, av->colinfo->table, av->colinfo->column); - if (r == ERROR_SUCCESS) - { - r = MSI_IterateRecords(view, NULL, ITERATE_columns, &colnum); - msiobj_release(&view->hdr); - if (r != ERROR_SUCCESS) - { - columns->ops->delete(columns); - return r; - } - } - r = columns->ops->add_column(columns, av->colinfo->table, - colnum, av->colinfo->column, - av->colinfo->type, (av->hold == 1)); - - columns->ops->delete(columns); - return r; -} - static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIALTERVIEW *av = (MSIALTERVIEW*)view; @@ -148,7 +69,8 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) TRACE("%p %p\n", av, record); if (av->colinfo) - return alter_add_column(av); + return av->table->ops->add_column(av->table, av->colinfo->column, + av->colinfo->type, av->colinfo->temporary, av->hold == 1); if (av->hold == 1) av->table->ops->add_ref(av->table); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 71c6565080..6797ebe4bc 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -337,7 +337,7 @@ typedef struct tagMSIVIEWOPS /* * add_column - adds a column to the table */ - UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number, LPCWSTR column, UINT type, BOOL hold ); + UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL temporary, BOOL hold ); /* * sort - orders the table by columns diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c617110604..5a1466592f 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2040,38 +2040,99 @@ static UINT TABLE_release(struct tagMSIVIEW *view) return ref; } -static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number, - LPCWSTR column, UINT type, BOOL hold) +static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, + INT type, BOOL temporary, BOOL hold) { + UINT i, r, table_id, col_id, size, offset; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - MSITABLE *msitable; - MSIRECORD *rec; - UINT r; + MSICOLUMNINFO *colinfo; - rec = MSI_CreateRecord(4); - if (!rec) - return ERROR_OUTOFMEMORY; + if (temporary && !hold && !tv->table->ref_count) + return ERROR_SUCCESS; - MSI_RecordSetStringW(rec, 1, table); - MSI_RecordSetInteger(rec, 2, number); - MSI_RecordSetStringW(rec, 3, column); - MSI_RecordSetInteger(rec, 4, type); + if (!temporary && tv->table->col_count && + tv->table->colinfo[tv->table->col_count-1].temporary) + return ERROR_BAD_QUERY_SYNTAX; + + for (i = 0; i < tv->table->col_count; i++) + { + if (!wcscmp(tv->table->colinfo[i].colname, column)) + return ERROR_BAD_QUERY_SYNTAX; + } - r = TABLE_insert_row(&tv->view, rec, -1, FALSE); + colinfo = msi_realloc(tv->table->colinfo, sizeof(*tv->table->colinfo) * (tv->table->col_count + 1)); + if (!colinfo) + return ERROR_OUTOFMEMORY; + tv->table->colinfo = colinfo; + + r = msi_string2id( tv->db->strings, tv->name, -1, &table_id ); if (r != ERROR_SUCCESS) - goto done; + return r; + col_id = msi_add_string( tv->db->strings, column, -1, !temporary ); - msi_update_table_columns(tv->db, table); + colinfo[tv->table->col_count].tablename = msi_string_lookup( tv->db->strings, table_id, NULL ); + colinfo[tv->table->col_count].number = tv->table->col_count + 1; + colinfo[tv->table->col_count].colname = msi_string_lookup( tv->db->strings, col_id, NULL ); + colinfo[tv->table->col_count].type = type; + colinfo[tv->table->col_count].offset = 0; + colinfo[tv->table->col_count].hash_table = NULL; + colinfo[tv->table->col_count].temporary = temporary; + tv->table->col_count++; - if (!hold) - goto done; + table_calc_column_offsets( tv->db, tv->table->colinfo, tv->table->col_count); - msitable = find_cached_table(tv->db, table); - InterlockedIncrement(&msitable->ref_count); + size = msi_table_get_row_size( tv->db, tv->table->colinfo, tv->table->col_count, LONG_STR_BYTES ); + offset = tv->table->colinfo[tv->table->col_count - 1].offset; + for (i = 0; i < tv->table->row_count; i++) + { + BYTE *data = msi_realloc( tv->table->data[i], size ); + if (!data) + { + tv->table->col_count--; + return ERROR_OUTOFMEMORY; + } -done: - msiobj_release(&rec->hdr); - return r; + tv->table->data[i] = data; + memset(data + offset, 0, size - offset); + } + + if (!temporary) + { + MSIVIEW *columns; + MSIRECORD *rec; + + rec = MSI_CreateRecord(4); + if (!rec) + { + tv->table->col_count--; + return ERROR_OUTOFMEMORY; + } + + MSI_RecordSetStringW(rec, 1, tv->name); + MSI_RecordSetInteger(rec, 2, tv->table->col_count); + MSI_RecordSetStringW(rec, 3, column); + MSI_RecordSetInteger(rec, 4, type); + + r = TABLE_CreateView(tv->db, szColumns, &columns); + if (r != ERROR_SUCCESS) + { + tv->table->col_count--; + msiobj_release(&rec->hdr); + return r; + } + + r = TABLE_insert_row(columns, rec, -1, FALSE); + columns->ops->delete(columns); + msiobj_release(&rec->hdr); + if (r != ERROR_SUCCESS) + { + tv->table->col_count--; + return r; + } + } + if (hold) + TABLE_add_ref(view); + return ERROR_SUCCESS; } static UINT TABLE_drop(struct tagMSIVIEW *view) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 22466548b1..3e1c551d38 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3950,7 +3950,7 @@ static void test_temporary_table(void) static void test_alter(void) { MSICONDITION cond; - MSIHANDLE hdb = 0; + MSIHANDLE hdb = 0, rec; const char *query; UINT r; @@ -4020,6 +4020,10 @@ static void test_alter(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "SELECT * FROM `_Columns` WHERE `Table` = 'U' AND `Name` = 'C'"; + r = do_query(hdb, query, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* add column C again */ query = "ALTER TABLE `U` ADD `C` INTEGER"; r = run_query(hdb, 0, query); @@ -4037,6 +4041,10 @@ static void test_alter(void) r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + query = "SELECT * FROM `_Columns` WHERE `Table` = 'U' AND `Name` = 'D'"; + r = do_query(hdb, query, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + query = "INSERT INTO `U` ( `A`, `B`, `C`, `D` ) VALUES ( 5, 6, 7, 8 )"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Piotr Caban : msi: Remove column_info.temporary field.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 76a2077c83048d8eead8ea0cbfafa70406c0cd88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a2077c83048d8eead8ea0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:46 2020 +0200 msi: Remove column_info.temporary field. 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/alter.c | 2 +- dlls/msi/create.c | 2 +- dlls/msi/msipriv.h | 3 +-- dlls/msi/sql.y | 1 - dlls/msi/table.c | 5 +++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 78f1a3930c..7d27211853 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -70,7 +70,7 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (av->colinfo) return av->table->ops->add_column(av->table, av->colinfo->column, - av->colinfo->type, av->colinfo->temporary, av->hold == 1); + av->colinfo->type, av->hold == 1); if (av->hold == 1) av->table->ops->add_ref(av->table); diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 94c62ec573..3d6c5189f2 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -181,7 +181,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, if (!col->table) col->table = table; - if( !col->temporary ) + if( !(col->type & MSITYPE_TEMPORARY) ) temp = FALSE; else if ( col->type & MSITYPE_KEY ) tempprim = TRUE; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 6797ebe4bc..dbe833e613 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -222,7 +222,6 @@ typedef struct _column_info LPCWSTR table; LPCWSTR column; INT type; - BOOL temporary; struct expr *val; struct _column_info *next; } column_info; @@ -337,7 +336,7 @@ typedef struct tagMSIVIEWOPS /* * add_column - adds a column to the table */ - UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL temporary, BOOL hold ); + UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL hold ); /* * sort - orders the table by columns diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 8ffbcd4de5..7bdace7298 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -318,7 +318,6 @@ column_and_type: { $$ = $1; $$->type = ($2 | MSITYPE_VALID); - $$->temporary = $2 & MSITYPE_TEMPORARY ? TRUE : FALSE; } ; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 5a1466592f..3326958d94 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -764,7 +764,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; table->colinfo[ i ].hash_table = NULL; - table->colinfo[ i ].temporary = col->temporary; + table->colinfo[ i ].temporary = (col->type & MSITYPE_TEMPORARY) != 0; } table_calc_column_offsets( db, table->colinfo, table->col_count); @@ -2041,9 +2041,10 @@ static UINT TABLE_release(struct tagMSIVIEW *view) } static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, - INT type, BOOL temporary, BOOL hold) + INT type, BOOL hold) { UINT i, r, table_id, col_id, size, offset; + BOOL temporary = type & MSITYPE_TEMPORARY; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSICOLUMNINFO *colinfo;

1 0

Piotr Caban : msi: Remove MSICOLUMNINFO.temporary field.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: b61455cb81714ff4f4108b70584816adbffbc68a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b61455cb81714ff4f4108b70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:57 2020 +0200 msi: Remove MSICOLUMNINFO.temporary field. 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 | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3326958d94..d4912ab3ae 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -54,7 +54,6 @@ typedef struct tagMSICOLUMNINFO LPCWSTR colname; UINT type; UINT offset; - BOOL temporary; MSICOLUMNHASHENTRY **hash_table; } MSICOLUMNINFO; @@ -79,14 +78,14 @@ static const WCHAR szNumber[] = {'N','u','m','b','e','r',0}; static const WCHAR szType[] = {'T','y','p','e',0}; static const MSICOLUMNINFO _Columns_cols[4] = { - { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, - { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, NULL }, - { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, NULL }, - { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, NULL }, + { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, NULL }, + { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, NULL }, + { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, NULL }, + { szColumns, 4, szType, MSITYPE_VALID | 2, 6, NULL }, }; static const MSICOLUMNINFO _Tables_cols[1] = { - { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, + { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, NULL }, }; #define MAX_STREAM_NAME 0x1f @@ -764,7 +763,6 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; table->colinfo[ i ].hash_table = NULL; - table->colinfo[ i ].temporary = (col->type & MSITYPE_TEMPORARY) != 0; } table_calc_column_offsets( db, table->colinfo, table->col_count); @@ -1613,7 +1611,7 @@ static UINT TABLE_get_column_info( struct tagMSIVIEW *view, *type = tv->columns[n-1].type; if( temporary ) - *temporary = tv->columns[n-1].temporary; + *temporary = (tv->columns[n-1].type & MSITYPE_TEMPORARY) != 0; return ERROR_SUCCESS; } @@ -1961,7 +1959,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num if (tv->table->col_count != number) return ERROR_BAD_QUERY_SYNTAX; - if (tv->table->colinfo[number-1].temporary) + if (tv->table->colinfo[number-1].type & MSITYPE_TEMPORARY) { UINT size = tv->table->colinfo[number-1].offset; tv->table->col_count--; @@ -2052,7 +2050,7 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, return ERROR_SUCCESS; if (!temporary && tv->table->col_count && - tv->table->colinfo[tv->table->col_count-1].temporary) + tv->table->colinfo[tv->table->col_count-1].type & MSITYPE_TEMPORARY) return ERROR_BAD_QUERY_SYNTAX; for (i = 0; i < tv->table->col_count; i++) @@ -2077,7 +2075,6 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, colinfo[tv->table->col_count].type = type; colinfo[tv->table->col_count].offset = 0; colinfo[tv->table->col_count].hash_table = NULL; - colinfo[tv->table->col_count].temporary = temporary; tv->table->col_count++; table_calc_column_offsets( tv->db, tv->table->colinfo, tv->table->col_count);

1 0

Nikolay Sivov : dxva2: Implement locking functionality in device manager.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 431324ba63dc06cbb570d2c2f15913661e704c24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431324ba63dc06cbb570d2c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 30 12:35:59 2020 +0300 dxva2: Implement locking functionality in device manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 94 ++++++++++++++++++++++++++++++++++++++-- dlls/dxva2/tests/dxva2.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=431324ba63dc06cbb570…

1 0

Nikolay Sivov : evr: Add a stub for default presenter.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: f0aefcfce54acd642cf13b4d44326424e13eeb27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0aefcfce54acd642cf13b4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 30 16:34:00 2020 +0300 evr: Add a stub for default presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 3 +- dlls/evr/evr.spec | 2 +- dlls/evr/evr_classes.idl | 7 ++ dlls/evr/evr_private.h | 23 +++++ dlls/evr/main.c | 1 + dlls/evr/presenter.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 35 ++++++++ include/evr.idl | 1 + 8 files changed, 288 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0aefcfce54acd642cf1…

1 0

Nikolay Sivov : evr: Add IMFVideoDeviceID for the presenter.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 50eb5eba6164b48d6e2b2436702070e69389939a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50eb5eba6164b48d6e2b2436… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 30 16:34:01 2020 +0300 evr: Add IMFVideoDeviceID for the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 20 ++++++++++++++++++-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 234c1f076c..34c9a06fcf 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct video_presenter { IMFVideoPresenter IMFVideoPresenter_iface; + IMFVideoDeviceID IMFVideoDeviceID_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -49,6 +50,11 @@ static struct video_presenter *impl_from_IMFVideoPresenter(IMFVideoPresenter *if return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPresenter_iface); } +static struct video_presenter *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoDeviceID_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -64,6 +70,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFVideoPresenter_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoDeviceID)) + { + *obj = &presenter->IMFVideoDeviceID_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -188,6 +198,44 @@ static const IMFVideoPresenterVtbl video_presenter_vtbl = video_presenter_GetCurrentMediaType, }; +static HRESULT WINAPI video_presenter_device_id_QueryInterface(IMFVideoDeviceID *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFVideoDeviceID(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_device_id_AddRef(IMFVideoDeviceID *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoDeviceID(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_device_id_Release(IMFVideoDeviceID *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoDeviceID(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_device_id_GetDeviceID(IMFVideoDeviceID *iface, IID *device_id) +{ + TRACE("%p, %p.\n", iface, device_id); + + if (!device_id) + return E_POINTER; + + memcpy(device_id, &IID_IDirect3DDevice9, sizeof(*device_id)); + + return S_OK; +} + +static const IMFVideoDeviceIDVtbl video_presenter_device_id_vtbl = +{ + video_presenter_device_id_QueryInterface, + video_presenter_device_id_AddRef, + video_presenter_device_id_Release, + video_presenter_device_id_GetDeviceID, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -208,6 +256,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) return E_OUTOFMEMORY; object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; + object->IMFVideoDeviceID_iface.lpVtbl = &video_presenter_device_id_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6805a7ae2b..965b921937 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -869,15 +869,31 @@ done: static void test_default_presenter(void) { IMFVideoPresenter *presenter; + IMFVideoDeviceID *deviceid; HRESULT hr; + GUID iid; hr = MFCreateVideoPresenter(NULL, &IID_IMFVideoPresenter, &IID_IMFVideoPresenter, (void **)&presenter); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFVideoPresenter_Release(presenter); + if (FAILED(hr)) + return; + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualIID(&iid, &IID_IDirect3DDevice9), "Unexpected id %s.\n", wine_dbgstr_guid(&iid)); + + IMFVideoDeviceID_Release(deviceid); + + IMFVideoPresenter_Release(presenter); } START_TEST(evr)

1 0