March 2019 - Wine-Commits - list.winehq.org

Erich E. Hoover : msi: Add support for exporting binary streams (Binary/ Icon tables).
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: f1d8218169715fcb64d4c6d81be7ead9d8bbf6ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d8218169715fcb64d4c6d8… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Mar 15 10:03:59 2019 +0100 msi: Add support for exporting binary streams (Binary/Icon tables). The Binary and Icon tables store their data in a different format from other tables, one column of the data is stored as a "stream" instead of a normal text field. With this patch those tables can now be exported properly by the MSI export functionality. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index f302610..4537ed5 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -961,8 +961,68 @@ static UINT msi_export_field( HANDLE handle, MSIRECORD *row, UINT field ) return ret ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; } -static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) +static UINT msi_export_stream( const WCHAR *folder, const WCHAR *table, MSIRECORD *row, UINT field, UINT start ) { + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + WCHAR stream[MAX_STREAM_NAME_LEN + 1], *path; + DWORD sz, read_size, write_size; + char buffer[1024]; + HANDLE file; + UINT len, r; + + sz = ARRAY_SIZE( stream ); + r = MSI_RecordGetStringW( row, start, stream, &sz ); + if (r != ERROR_SUCCESS) + return r; + + len = (sz + strlenW( folder ) + strlenW( table ) + ARRAY_SIZE( fmt ) + 1) * sizeof(WCHAR); + if (!(path = msi_alloc( len ))) + return ERROR_OUTOFMEMORY; + + len = sprintfW( path, fmt, folder, table ); + if (!CreateDirectoryW( path, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) + { + msi_free( path ); + return ERROR_FUNCTION_FAILED; + } + + path[len++] = '\\'; + strcpyW( path + len, stream ); + file = CreateFileW( path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + msi_free( path ); + if (file == INVALID_HANDLE_VALUE) + return ERROR_FUNCTION_FAILED; + + read_size = sizeof(buffer); + while (read_size == sizeof(buffer)) + { + r = MSI_RecordReadStream( row, field, buffer, &read_size ); + if (r != ERROR_SUCCESS) + { + CloseHandle( file ); + return r; + } + if (!WriteFile( file, buffer, read_size, &write_size, NULL ) || read_size != write_size) + { + CloseHandle( file ); + return ERROR_WRITE_FAULT; + } + } + CloseHandle( file ); + return r; +} + +struct row_export_info +{ + HANDLE handle; + const WCHAR *folder; + const WCHAR *table; +}; + +static UINT msi_export_record( struct row_export_info *row_export_info, MSIRECORD *row, UINT start ) +{ + HANDLE handle = row_export_info->handle; UINT i, count, r = ERROR_SUCCESS; const char *sep; DWORD sz; @@ -971,7 +1031,18 @@ static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) for (i = start; i <= count; i++) { r = msi_export_field( handle, row, i ); - if (r != ERROR_SUCCESS) + if (r == ERROR_INVALID_PARAMETER) + { + r = msi_export_stream( row_export_info->folder, row_export_info->table, row, i, start ); + if (r != ERROR_SUCCESS) + return r; + + /* exporting a binary stream, repeat the "Name" field */ + r = msi_export_field( handle, row, start ); + if (r != ERROR_SUCCESS) + return r; + } + else if (r != ERROR_SUCCESS) return r; sep = (i < count) ? "\t" : "\r\n"; @@ -1062,11 +1133,13 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, r = MSI_OpenQuery( db, &view, query, table ); if (r == ERROR_SUCCESS) { + struct row_export_info row_export_info = { handle, folder, table }; + /* write out row 1, the column names */ r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); if (r == ERROR_SUCCESS) { - msi_export_record( handle, rec, 1 ); + msi_export_record( &row_export_info, rec, 1 ); msiobj_release( &rec->hdr ); } @@ -1074,7 +1147,7 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, r = MSI_ViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); if (r == ERROR_SUCCESS) { - msi_export_record( handle, rec, 1 ); + msi_export_record( &row_export_info, rec, 1 ); msiobj_release( &rec->hdr ); } @@ -1083,12 +1156,12 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, if (r == ERROR_SUCCESS) { MSI_RecordSetStringW( rec, 0, table ); - msi_export_record( handle, rec, 0 ); + msi_export_record( &row_export_info, rec, 0 ); msiobj_release( &rec->hdr ); } /* write out row 4 onwards, the data */ - r = MSI_IterateRecords( view, 0, msi_export_row, handle ); + r = MSI_IterateRecords( view, 0, msi_export_row, &row_export_info ); msiobj_release( &view->hdr ); }

1 0

Erich E. Hoover : msidb: Add support for removing stream/ cabinet files from MSI databases.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: 0cf6cd00ce15b3a8dc5ef08aa79cdbe61e2b996d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cf6cd00ce15b3a8dc5ef08a… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Mar 15 10:04:00 2019 +0100 msidb: Add support for removing stream/cabinet files from MSI databases. msidb allows developers to remove "streams" (cabinet files) from a database with the "-k" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -k cabinet.cab Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 76 insertions(+), 6 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index d837299..e2e4e77 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -43,9 +43,11 @@ struct msidb_state WCHAR *table_folder; MSIHANDLE database_handle; BOOL add_streams; + BOOL kill_streams; BOOL create_database; BOOL import_tables; struct list add_stream_list; + struct list kill_stream_list; struct list table_list; }; @@ -85,6 +87,7 @@ static void show_usage( void ) " -d package.msi Path to the database file.\n" " -f folder Folder in which to open/save the tables.\n" " -i Import tables into database.\n" + " -k file.cab Kill (remove) stream/cabinet file from _Streams table.\n" ); } @@ -95,19 +98,20 @@ static int valid_state( struct msidb_state *state ) FIXME( "GUI operation is not currently supported.\n" ); return 0; } - if (state->table_folder == NULL && !state->add_streams) + if (state->table_folder == NULL && !state->add_streams && !state->kill_streams) { ERR( "No table folder specified (-f option).\n" ); show_usage(); return 0; } - if (!state->create_database && !state->import_tables && !state->add_streams) + if (!state->create_database && !state->import_tables && !state->add_streams + && !state->kill_streams) { - ERR( "No mode flag specified (-a, -c, -i).\n" ); + ERR( "No mode flag specified (-a, -c, -i, -k).\n" ); show_usage(); return 0; } - if (list_empty( &state->table_list ) && !state->add_streams) + if (list_empty( &state->table_list ) && !state->add_streams && !state->kill_streams) { ERR( "No tables specified.\n" ); return 0; @@ -144,6 +148,11 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * case 'i': state->import_tables = TRUE; return 1; + case 'k': + if (i + 1 >= argc) return 0; + state->kill_streams = TRUE; + list_append( &state->kill_stream_list, argv[i + 1] ); + return 2; default: break; } @@ -199,11 +208,13 @@ static const WCHAR *basenameW( const WCHAR *filename ) static int add_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const char insert_command[] = "INSERT INTO _Streams (Name, Data) VALUES (?, ?)"; + static const WCHAR insert_command[] = + {'I','N','S','E','R','T',' ','I','N','T','O',' ','_','S','t','r','e','a','m','s',' ', + '(','N','a','m','e',',',' ','D','a','t','a',')',' ','V','A','L','U','E','S',' ','(','?',',',' ','?',')',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewA( state->database_handle, insert_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, insert_command, &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -256,6 +267,61 @@ static int add_streams( struct msidb_state *state ) return 1; } +static int kill_stream( struct msidb_state *state, const WCHAR *stream_filename ) +{ + static const WCHAR delete_command[] = + {'D','E','L','E','T','E',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', + 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; + MSIHANDLE view = 0, record = 0; + UINT ret; + + ret = MsiDatabaseOpenViewW( state->database_handle, delete_command, &view ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to open _Streams table.\n" ); + goto cleanup; + } + record = MsiCreateRecord( 1 ); + if (record == 0) + { + ERR( "Failed to create MSI record.\n" ); + ret = ERROR_OUTOFMEMORY; + goto cleanup; + } + ret = MsiRecordSetStringW( record, 1, stream_filename ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to add stream filename to MSI record.\n" ); + goto cleanup; + } + ret = MsiViewExecute( view, record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to delete stream from _Streams table.\n" ); + goto cleanup; + } + +cleanup: + if (record) + MsiCloseHandle( record ); + if (view) + MsiViewClose( view ); + + return (ret == ERROR_SUCCESS); +} + +static int kill_streams( struct msidb_state *state ) +{ + struct msidb_listentry *data; + + LIST_FOR_EACH_ENTRY( data, &state->kill_stream_list, struct msidb_listentry, entry ) + { + if (!kill_stream( state, data->name )) + return 0; /* failed, do not commit changes */ + } + return 1; +} + static int import_table( struct msidb_state *state, const WCHAR *table_name ) { const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ @@ -292,6 +358,7 @@ int wmain( int argc, WCHAR *argv[] ) memset( &state, 0x0, sizeof(state) ); list_init( &state.add_stream_list ); + list_init( &state.kill_stream_list ); list_init( &state.table_list ); /* process and validate all the command line flags */ for (i = 1; n && i < argc; i += n) @@ -312,11 +379,14 @@ int wmain( int argc, WCHAR *argv[] ) goto cleanup; /* failed, do not commit changes */ if (state.import_tables && !import_tables( &state )) goto cleanup; /* failed, do not commit changes */ + if (state.kill_streams && !kill_streams( &state )) + goto cleanup; /* failed, do not commit changes */ ret = 0; cleanup: close_database( &state, ret == 0 ); list_free( &state.add_stream_list ); + list_free( &state.kill_stream_list ); list_free( &state.table_list ); return ret; }

1 0

Erich E. Hoover : msidb: Add support for extracting stream/ cabinet files from MSI databases.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: d4a362dda718543df6cf3d6c24b2a3b0f81928e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4a362dda718543df6cf3d6c… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Mar 15 10:04:01 2019 +0100 msidb: Add support for extracting stream/cabinet files from MSI databases. msidb allows developers to extract "streams" (cabinet files) from a database with the "-x" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -x cabinet.cab Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 109 insertions(+), 4 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index e2e4e77..ee79b5c 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -43,10 +43,12 @@ struct msidb_state WCHAR *table_folder; MSIHANDLE database_handle; BOOL add_streams; + BOOL extract_streams; BOOL kill_streams; BOOL create_database; BOOL import_tables; struct list add_stream_list; + struct list extract_stream_list; struct list kill_stream_list; struct list table_list; }; @@ -88,6 +90,7 @@ static void show_usage( void ) " -f folder Folder in which to open/save the tables.\n" " -i Import tables into database.\n" " -k file.cab Kill (remove) stream/cabinet file from _Streams table.\n" + " -x file.cab Extract stream/cabinet file from _Streams table.\n" ); } @@ -98,20 +101,22 @@ static int valid_state( struct msidb_state *state ) FIXME( "GUI operation is not currently supported.\n" ); return 0; } - if (state->table_folder == NULL && !state->add_streams && !state->kill_streams) + if (state->table_folder == NULL && !state->add_streams && !state->kill_streams + && !state->extract_streams) { ERR( "No table folder specified (-f option).\n" ); show_usage(); return 0; } if (!state->create_database && !state->import_tables && !state->add_streams - && !state->kill_streams) + && !state->kill_streams && !state->extract_streams) { - ERR( "No mode flag specified (-a, -c, -i, -k).\n" ); + ERR( "No mode flag specified (-a, -c, -i, -k, -x).\n" ); show_usage(); return 0; } - if (list_empty( &state->table_list ) && !state->add_streams && !state->kill_streams) + if (list_empty( &state->table_list ) && !state->add_streams && !state->kill_streams + && !state->extract_streams) { ERR( "No tables specified.\n" ); return 0; @@ -153,6 +158,11 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * state->kill_streams = TRUE; list_append( &state->kill_stream_list, argv[i + 1] ); return 2; + case 'x': + if (i + 1 >= argc) return 0; + state->extract_streams = TRUE; + list_append( &state->extract_stream_list, argv[i + 1] ); + return 2; default: break; } @@ -322,6 +332,97 @@ static int kill_streams( struct msidb_state *state ) return 1; } +static int extract_stream( struct msidb_state *state, const WCHAR *stream_filename ) +{ + static const WCHAR select_command[] = + {'S','E','L','E','C','T',' ','D','a','t','a',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', + 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; + HANDLE file = INVALID_HANDLE_VALUE; + MSIHANDLE view = 0, record = 0; + DWORD read_size, write_size; + char buffer[1024]; + UINT ret; + + file = CreateFileW( stream_filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + if (file == INVALID_HANDLE_VALUE) + { + ret = ERROR_FILE_NOT_FOUND; + ERR( "Failed to open destination file %s.\n", wine_dbgstr_w(stream_filename) ); + goto cleanup; + } + ret = MsiDatabaseOpenViewW( state->database_handle, select_command, &view ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to open _Streams table.\n" ); + goto cleanup; + } + record = MsiCreateRecord( 1 ); + if (record == 0) + { + ERR( "Failed to create MSI record.\n" ); + ret = ERROR_OUTOFMEMORY; + goto cleanup; + } + ret = MsiRecordSetStringW( record, 1, stream_filename ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to add stream filename to MSI record.\n" ); + goto cleanup; + } + ret = MsiViewExecute( view, record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query stream from _Streams table.\n" ); + goto cleanup; + } + MsiCloseHandle( record ); + record = 0; + ret = MsiViewFetch( view, &record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query row from _Streams table.\n" ); + goto cleanup; + } + read_size = sizeof(buffer); + while (read_size == sizeof(buffer)) + { + ret = MsiRecordReadStream( record, 1, buffer, &read_size ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to read stream from _Streams table.\n" ); + goto cleanup; + } + if (!WriteFile( file, buffer, read_size, &write_size, NULL ) || read_size != write_size) + { + ret = ERROR_WRITE_FAULT; + ERR( "Failed to write stream to destination file.\n" ); + goto cleanup; + } + } + +cleanup: + if (record) + MsiCloseHandle( record ); + if (view) + MsiViewClose( view ); + if (file != INVALID_HANDLE_VALUE) + CloseHandle( file ); + return (ret == ERROR_SUCCESS); +} + +static int extract_streams( struct msidb_state *state ) +{ + struct msidb_listentry *data; + + LIST_FOR_EACH_ENTRY( data, &state->extract_stream_list, struct msidb_listentry, entry ) + { + if (!extract_stream( state, data->name )) + return 0; /* failed, do not commit changes */ + } + return 1; +} + static int import_table( struct msidb_state *state, const WCHAR *table_name ) { const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ @@ -358,6 +459,7 @@ int wmain( int argc, WCHAR *argv[] ) memset( &state, 0x0, sizeof(state) ); list_init( &state.add_stream_list ); + list_init( &state.extract_stream_list ); list_init( &state.kill_stream_list ); list_init( &state.table_list ); /* process and validate all the command line flags */ @@ -377,6 +479,8 @@ int wmain( int argc, WCHAR *argv[] ) } if (state.add_streams && !add_streams( &state )) goto cleanup; /* failed, do not commit changes */ + if (state.extract_streams && !extract_streams( &state )) + goto cleanup; /* failed, do not commit changes */ if (state.import_tables && !import_tables( &state )) goto cleanup; /* failed, do not commit changes */ if (state.kill_streams && !kill_streams( &state )) @@ -386,6 +490,7 @@ int wmain( int argc, WCHAR *argv[] ) cleanup: close_database( &state, ret == 0 ); list_free( &state.add_stream_list ); + list_free( &state.extract_stream_list ); list_free( &state.kill_stream_list ); list_free( &state.table_list ); return ret;

1 0

Erich E. Hoover : msidb: Add support for exporting database tables.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: e7cc147f9e05543cecf9af01a62559e7c0d2c443 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7cc147f9e05543cecf9af01… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Mar 15 10:04:02 2019 +0100 msidb: Add support for exporting database tables. msidb allows developers to export tables from a database with the "-e" mode flag followed by a list of tables. For example, this call would export three tables to the current directory: msidb -d package.msi -f . -e ActionText Component InstallExecuteSequence Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index ee79b5c..1cb16df 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -47,6 +47,7 @@ struct msidb_state BOOL kill_streams; BOOL create_database; BOOL import_tables; + BOOL export_tables; struct list add_stream_list; struct list extract_stream_list; struct list kill_stream_list; @@ -87,6 +88,7 @@ static void show_usage( void ) " -a file.cab Add stream/cabinet file to _Streams table.\n" " -c Create database file (instead of opening existing file).\n" " -d package.msi Path to the database file.\n" + " -e Export tables from database.\n" " -f folder Folder in which to open/save the tables.\n" " -i Import tables into database.\n" " -k file.cab Kill (remove) stream/cabinet file from _Streams table.\n" @@ -108,10 +110,10 @@ static int valid_state( struct msidb_state *state ) show_usage(); return 0; } - if (!state->create_database && !state->import_tables && !state->add_streams - && !state->kill_streams && !state->extract_streams) + if (!state->create_database && !state->import_tables && !state->export_tables + && !state->add_streams&& !state->kill_streams && !state->extract_streams) { - ERR( "No mode flag specified (-a, -c, -i, -k, -x).\n" ); + ERR( "No mode flag specified (-a, -c, -e, -i, -k, -x).\n" ); show_usage(); return 0; } @@ -146,6 +148,9 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * if (i + 1 >= argc) return 0; state->database_file = argv[i + 1]; return 2; + case 'e': + state->export_tables = TRUE; + return 1; case 'f': if (i + 1 >= argc) return 0; state->table_folder = argv[i + 1]; @@ -451,6 +456,34 @@ static int import_tables( struct msidb_state *state ) return 1; } +static int export_table( struct msidb_state *state, const WCHAR *table_name ) +{ + const WCHAR format[] = { '%','s','.','i','d','t',0 }; + WCHAR table_path[MAX_PATH]; + UINT ret; + + snprintfW( table_path, sizeof(table_path)/sizeof(WCHAR), format, table_name ); + ret = MsiDatabaseExportW( state->database_handle, table_name, state->table_folder, table_path ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to export table '%s', error %d.\n", wine_dbgstr_w(table_name), ret ); + return 0; + } + return 1; +} + +static int export_tables( struct msidb_state *state ) +{ + struct msidb_listentry *data; + + LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) + { + if (!export_table( state, data->name )) + return 0; /* failed, do not commit changes */ + } + return 1; +} + int wmain( int argc, WCHAR *argv[] ) { struct msidb_state state; @@ -479,6 +512,8 @@ int wmain( int argc, WCHAR *argv[] ) } if (state.add_streams && !add_streams( &state )) goto cleanup; /* failed, do not commit changes */ + if (state.export_tables && !export_tables( &state )) + goto cleanup; /* failed, do not commit changes */ if (state.extract_streams && !extract_streams( &state )) goto cleanup; /* failed, do not commit changes */ if (state.import_tables && !import_tables( &state ))

1 0

Erich E. Hoover : msidb: Add support for wildcard (full database) export.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: 63e03de9c7f093a536b48f999768b861aa5a60d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63e03de9c7f093a536b48f99… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Mar 15 10:04:04 2019 +0100 msidb: Add support for wildcard (full database) export. msidb allows a full database export with the special "*" database name. Note: It does not support true wildcards, just this special indication that you wish to export all the tables in the database. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 3916e0d..4bd065a 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -439,7 +439,7 @@ static int import_table( struct msidb_state *state, const WCHAR *table_name ) WCHAR table_path[MAX_PATH]; UINT ret; - snprintfW( table_path, sizeof(table_path)/sizeof(WCHAR), format, table_name ); + snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); ret = MsiDatabaseImportW( state->database_handle, state->table_folder, table_path ); if (ret != ERROR_SUCCESS) { @@ -469,7 +469,7 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) WCHAR table_path[MAX_PATH]; UINT ret; - snprintfW( table_path, sizeof(table_path)/sizeof(WCHAR), format, table_name ); + snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); ret = MsiDatabaseExportW( state->database_handle, table_name, state->table_folder, table_path ); if (ret != ERROR_SUCCESS) { @@ -479,12 +479,90 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) return 1; } +static int export_all_tables( struct msidb_state *state ) +{ + static const WCHAR summary_information[] = + {'_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; + static const WCHAR query_command[] = + {'S','E','L','E','C','T',' ','N','a','m','e',' ','F','R','O','M',' ','_','T','a','b','l','e','s',0}; + MSIHANDLE view = 0; + UINT ret; + + ret = MsiDatabaseOpenViewW( state->database_handle, query_command, &view ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to open _Tables table.\n" ); + goto cleanup; + } + ret = MsiViewExecute( view, 0 ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query list from _Tables table.\n" ); + goto cleanup; + } + while( 1 ) + { + MSIHANDLE record = 0; + WCHAR table[256]; + DWORD size; + + ret = MsiViewFetch( view, &record ); + if (ret == ERROR_NO_MORE_ITEMS) + break; + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query row from _Tables table.\n" ); + goto cleanup; + } + size = ARRAY_SIZE(table); + ret = MsiRecordGetStringW( record, 1, table, &size ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to retrieve name string.\n" ); + goto cleanup; + } + if (!export_table( state, table )) + { + ret = ERROR_FUNCTION_FAILED; + goto cleanup; + } + ret = MsiCloseHandle( record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to close record handle.\n" ); + goto cleanup; + } + } + ret = ERROR_SUCCESS; + /* the _SummaryInformation table is not listed in _Tables */ + if (!export_table( state, summary_information )) + { + ret = ERROR_FUNCTION_FAILED; + goto cleanup; + } + +cleanup: + if (view && MsiViewClose( view ) != ERROR_SUCCESS) + { + ERR( "Failed to close _Streams table.\n" ); + return 0; + } + return (ret == ERROR_SUCCESS); +} + static int export_tables( struct msidb_state *state ) { + const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { + if (strcmpW( data->name, wildcard ) == 0) + { + if (!export_all_tables( state )) + return 0; /* failed, do not commit changes */ + continue; + } if (!export_table( state, data->name )) return 0; /* failed, do not commit changes */ }

1 0

Nikolay Sivov : mfplat: Add descriptor attributes GUIDs.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: 0f36ace0049c024fdac05ac55df9f0c7bb82954d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f36ace0049c024fdac05ac5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 15 13:56:44 2019 +0300 mfplat: Add descriptor attributes GUIDs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 18 ++++++++++++++++++ include/mfidl.idl | 20 ++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5a37eba..3f50d71 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -558,28 +558,46 @@ static const char *debugstr_attr(const GUID *guid) X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_MT_AVG_BITRATE), + X(MF_PD_PMPHOST_CONTEXT), + X(MF_PD_APP_CONTEXT), + X(MF_PD_TOTAL_FILE_SIZE), + X(MF_PD_AUDIO_ENCODING_BITRATE), + X(MF_PD_VIDEO_ENCODING_BITRATE), + X(MF_PD_MIME_TYPE), + X(MF_PD_LAST_MODIFIED_TIME), + X(MF_PD_PLAYBACK_ELEMENT_ID), X(MF_MT_ALL_SAMPLES_INDEPENDENT), + X(MF_PD_PREFERRED_LANGUAGE), + X(MF_PD_PLAYBACK_BOUNDARY_TIME), X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_MT_FRAME_RATE_RANGE_MAX), X(MF_MT_USER_DATA), X(MF_READWRITE_DISABLE_CONVERTERS), + X(MF_PD_SAMI_STYLELIST), + X(MF_SD_LANGUAGE), + X(MF_SD_PROTECTED), X(MF_READWRITE_MMCSS_PRIORITY_AUDIO), X(MF_BYTESTREAM_ORIGIN_NAME), X(MF_BYTESTREAM_CONTENT_TYPE), X(MF_BYTESTREAM_DURATION), + X(MF_SD_SAMI_LANGUAGE), X(MF_BYTESTREAM_LAST_MODIFIED_TIME), X(MF_MT_FRAME_RATE_RANGE_MIN), X(MF_BYTESTREAM_IFO_FILE_URI), X(MF_BYTESTREAM_DLNA_PROFILE_ID), X(MF_MT_MAJOR_TYPE), + X(MF_PD_ADAPTIVE_STREAMING), X(MF_MT_SUBTYPE), + X(MF_SD_MUTUALLY_EXCLUSIVE), + X(MF_SD_STREAM_NAME), X(MF_SINK_WRITER_D3D_MANAGER), X(MF_MT_INTERLACE_MODE), X(MF_READWRITE_MMCSS_PRIORITY), X(MF_SINK_WRITER_DISABLE_THROTTLING), X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), + X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_MT_FRAME_RATE), #undef X }; diff --git a/include/mfidl.idl b/include/mfidl.idl index 630dc61..6a958a9 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -536,3 +536,23 @@ cpp_quote("{") cpp_quote(" return attributes->SetUINT64(key, ((UINT64)numerator << 32) | denominator);") cpp_quote("}") cpp_quote("#endif") + +cpp_quote("EXTERN_GUID(MF_SD_LANGUAGE, 0x00af2180, 0xbdc2, 0x423c, 0xab, 0xca, 0xf5, 0x03, 0x59, 0x3b, 0xc1, 0x21);") +cpp_quote("EXTERN_GUID(MF_SD_MUTUALLY_EXCLUSIVE, 0x023ef79c, 0x388d, 0x487f, 0xac, 0x17, 0x69, 0x6c, 0xd6, 0xe3, 0xc6, 0xf5);") +cpp_quote("EXTERN_GUID(MF_SD_PROTECTED, 0x00af2181, 0xbdc2, 0x423c, 0xab, 0xca, 0xf5, 0x03, 0x59, 0x3b, 0xc1, 0x21);") +cpp_quote("EXTERN_GUID(MF_SD_STREAM_NAME, 0x4f1b099d, 0xd314, 0x41e5, 0xa7, 0x81, 0x7f, 0xef, 0xaa, 0x4c, 0x50, 0x1f);") +cpp_quote("EXTERN_GUID(MF_SD_SAMI_LANGUAGE, 0x36fcb98a, 0x6cd0, 0x44cb, 0xac, 0xb9, 0xa8, 0xf5, 0x60, 0x0d, 0xd0, 0xbb);") + +cpp_quote("EXTERN_GUID(MF_PD_PMPHOST_CONTEXT, 0x6c990d31, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_APP_CONTEXT, 0x6c990d32, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_TOTAL_FILE_SIZE, 0x6c990d34, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_AUDIO_ENCODING_BITRATE, 0x6c990d35, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_VIDEO_ENCODING_BITRATE, 0x6c990d36, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_MIME_TYPE, 0x6c990d37, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_LAST_MODIFIED_TIME, 0x6c990d38, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_PLAYBACK_ELEMENT_ID, 0x6c990d39, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_PREFERRED_LANGUAGE, 0x6c990d3a, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_PLAYBACK_BOUNDARY_TIME, 0x6c990d3b, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_AUDIO_ISVARIABLEBITRATE, 0x33026ee0, 0xe387, 0x4582, 0xae, 0x0a, 0x34, 0xa2, 0xad, 0x3b, 0xaa, 0x18);") +cpp_quote("DEFINE_GUID(MF_PD_ADAPTIVE_STREAMING, 0xea0d5d97, 0x29f9, 0x488b, 0xae, 0x6b, 0x7d, 0x6b, 0x41, 0x36, 0x11, 0x2b);") +cpp_quote("EXTERN_GUID(MF_PD_SAMI_STYLELIST, 0xe0b73c7f, 0x486d, 0x484e, 0x98, 0x72, 0x4d, 0xe5, 0x19, 0x2a, 0x7b, 0xf8);")

1 0

Jactry Zeng : mfplat: Add support for blob attribute values.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: 706d4d8eb4df6b7784cf41343240e80107df2687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=706d4d8eb4df6b7784cf4134… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Mar 15 13:56:48 2019 +0300 mfplat: Add support for blob attribute values. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 82 +++++++++++++++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 38 ++++++++++++++++++++- 2 files changed, 111 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 30bb808..2ef4077 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -872,24 +872,84 @@ static HRESULT WINAPI mfattributes_GetAllocatedString(IMFAttributes *iface, REFG static HRESULT WINAPI mfattributes_GetBlobSize(IMFAttributes *iface, REFGUID key, UINT32 *size) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), size); + struct attributes *attributes = impl_from_IMFAttributes(iface); + struct attribute *attribute; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), size); + + EnterCriticalSection(&attributes->cs); + + attribute = attributes_find_item(attributes, key, NULL); + if (attribute) + { + if (attribute->value.vt == MF_ATTRIBUTE_BLOB) + *size = attribute->value.u.caub.cElems; + else + hr = MF_E_INVALIDTYPE; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); + + return hr; } static HRESULT WINAPI mfattributes_GetBlob(IMFAttributes *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) { - FIXME("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); + struct attributes *attributes = impl_from_IMFAttributes(iface); + struct attribute *attribute; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); + + EnterCriticalSection(&attributes->cs); + + attribute = attributes_find_item(attributes, key, NULL); + if (attribute) + { + if (attribute->value.vt == MF_ATTRIBUTE_BLOB) + { + UINT32 size = attribute->value.u.caub.cElems; + + if (bufsize >= size) + hr = PropVariantToBuffer(&attribute->value, buf, size); + else + hr = E_NOT_SUFFICIENT_BUFFER; + + if (blobsize) + *blobsize = size; + } + else + hr = MF_E_INVALIDTYPE; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); + + return hr; } static HRESULT WINAPI mfattributes_GetAllocatedBlob(IMFAttributes *iface, REFGUID key, UINT8 **buf, UINT32 *size) { - FIXME("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); + + attrval.vt = VT_VECTOR | VT_UI1; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr)) + { + *buf = attrval.u.caub.pElems; + *size = attrval.u.caub.cElems; + } + + return hr; } static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) @@ -1070,9 +1130,15 @@ static HRESULT WINAPI mfattributes_SetString(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_SetBlob(IMFAttributes *iface, REFGUID key, const UINT8 *buf, UINT32 size) { - FIXME("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - return E_NOTIMPL; + TRACE("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); + + attrval.vt = VT_VECTOR | VT_UI1; + attrval.u.caub.cElems = size; + attrval.u.caub.pElems = (UINT8 *)buf; + return attributes_set_item(attributes, key, &attrval); } static HRESULT WINAPI mfattributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 73367b6..edf3c6e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -501,9 +501,11 @@ static void check_attr_count(IMFAttributes* obj, UINT32 expected, int line) static void test_MFCreateAttributes(void) { static const WCHAR stringW[] = {'W','i','n','e',0}; + static const UINT8 blob[] = {0,1,2,3,4,5}; IMFAttributes *attributes, *attributes1; + UINT8 blob_value[256], *blob_buf = NULL; + UINT32 value, string_length, size; PROPVARIANT propvar, ret_propvar; - UINT32 value, string_length; double double_value; IUnknown *unk_value; WCHAR bufferW[256]; @@ -724,6 +726,40 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "Failed to copy items, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 0); + /* Blob */ + hr = IMFAttributes_SetBlob(attributes, &DUMMY_GUID1, blob, sizeof(blob)); + ok(hr == S_OK, "Failed to set blob attribute, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 1); + hr = IMFAttributes_GetBlobSize(attributes, &DUMMY_GUID1, &size); + ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); + ok(size == sizeof(blob), "Unexpected blob size %u.\n", size); + + hr = IMFAttributes_GetBlobSize(attributes, &DUMMY_GUID2, &size); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + size = 0; + hr = IMFAttributes_GetBlob(attributes, &DUMMY_GUID1, blob_value, sizeof(blob_value), &size); + ok(hr == S_OK, "Failed to get blob, hr %#x.\n", hr); + ok(size == sizeof(blob), "Unexpected blob size %u.\n", size); + ok(!memcmp(blob_value, blob, size), "Unexpected blob.\n"); + + hr = IMFAttributes_GetBlob(attributes, &DUMMY_GUID2, blob_value, sizeof(blob_value), &size); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + memset(blob_value, 0, sizeof(blob_value)); + size = 0; + hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID1, &blob_buf, &size); + ok(hr == S_OK, "Failed to get allocated blob, hr %#x.\n", hr); + ok(size == sizeof(blob), "Unexpected blob size %u.\n", size); + ok(!memcmp(blob_buf, blob, size), "Unexpected blob.\n"); + CoTaskMemFree(blob_buf); + + hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID2, &blob_buf, &size); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_GetBlob(attributes, &DUMMY_GUID1, blob_value, sizeof(blob) - 1, NULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + IMFAttributes_Release(attributes); IMFAttributes_Release(attributes1); }

1 0

Jactry Zeng : mfplat: Implement CompareItem() for attributes.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: c9027a8d03fda1beaa34f75cd130f46b848db2d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9027a8d03fda1beaa34f75c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Mar 15 13:56:49 2019 +0300 mfplat: Implement CompareItem() for attributes. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 16 ++++++++++++++-- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++++---- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2ef4077..88945f6 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -731,9 +731,21 @@ static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) { - FIXME("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); + struct attributes *attributes = impl_from_IMFAttributes(iface); + struct attribute *attribute; - return E_NOTIMPL; + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); + + *result = FALSE; + + EnterCriticalSection(&attributes->cs); + + if ((attribute = attributes_find_item(attributes, key, NULL))) + *result = !PropVariantCompareEx(&attribute->value, value, PVCU_DEFAULT, PVCF_DEFAULT); + + LeaveCriticalSection(&attributes->cs); + + return S_OK; } static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index edf3c6e..38151d9 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -406,21 +406,19 @@ todo_wine flags = 0; hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), "Unexpected flags %#x.\n", flags); -} + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); ok(hr == S_OK, "Failed to set subtype, hr %#x.\n", hr); flags = 0; hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); -todo_wine { ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), "Unexpected flags %#x.\n", flags); -} + IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); } @@ -511,6 +509,7 @@ static void test_MFCreateAttributes(void) WCHAR bufferW[256]; UINT64 value64; WCHAR *string; + BOOL result; HRESULT hr; GUID key; @@ -650,6 +649,18 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "Failed to get double value, hr %#x.\n", hr); ok(double_value == 22.0, "Unexpected value: %f, expected: 22.0.\n", double_value); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 22; + hr = IMFAttributes_CompareItem(attributes, &GUID_NULL, &propvar, &result); + ok(hr == S_OK, "Failed to compare items, hr %#x.\n", hr); + ok(!result, "Unexpected result.\n"); + + propvar.vt = MF_ATTRIBUTE_DOUBLE; + U(propvar).dblVal = 22.0; + hr = IMFAttributes_CompareItem(attributes, &GUID_NULL, &propvar, &result); + ok(hr == S_OK, "Failed to compare items, hr %#x.\n", hr); + ok(result, "Unexpected result.\n"); + hr = IMFAttributes_SetString(attributes, &DUMMY_GUID1, stringW); ok(hr == S_OK, "Failed to set string attribute, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 3); @@ -722,6 +733,12 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "Failed to delete items, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes1, 0); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 22; + hr = IMFAttributes_CompareItem(attributes, &GUID_NULL, &propvar, &result); + ok(hr == S_OK, "Failed to compare items, hr %#x.\n", hr); + ok(!result, "Unexpected result.\n"); + hr = IMFAttributes_CopyAllItems(attributes1, attributes); ok(hr == S_OK, "Failed to copy items, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 0);

1 0

Alexandre Julliard : Release 4.4.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: 05994cd6179626438ef26c13ee45323a6a1f66eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=05994cd6179626438ef26c13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 21:18:31 2019 +0100 Release 4.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1037 ++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 596 insertions(+), 462 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05994cd6179626438ef2…

1 0

Tag wine-4.4 : Alexandre Julliard : Release 4.4
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: refs/tags/wine-4.4 Tag: a795839eb205db4374c28502c8da2183b8bfe2c9 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a795839eb205db4374c28502c8d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 21:18:31 2019 +0100 Release 4.4

1 0