January 2019 - Wine-Commits

Zebediah Figura : msi: Use a BOOL to track string persistence.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: a7f455b97fdd0ef07a15b66eea63f82522ff4f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f455b97fdd0ef07a15b66e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 00:07:32 2019 -0600 msi: Use a BOOL to track string persistence. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 8 +------- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 4 ++-- dlls/msi/string.c | 18 +++++++++--------- dlls/msi/table.c | 8 +++----- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index d05ad0e..1cbeae4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -742,13 +742,7 @@ extern UINT msi_commit_streams( MSIDATABASE *db ) DECLSPEC_HIDDEN; /* string table functions */ -enum StringPersistence -{ - StringPersistent = 0, - StringNonPersistent = 1 -}; - -extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) DECLSPEC_HIDDEN; +extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, BOOL persistent ) DECLSPEC_HIDDEN; extern UINT msi_string2id( const string_table *st, const WCHAR *data, int len, UINT *id ) DECLSPEC_HIDDEN; extern VOID msi_destroy_stringtable( string_table *st ) DECLSPEC_HIDDEN; extern const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 9d262b7..4379ae2 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -77,7 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) if (!storage) return NULL; - storage->str_index = msi_add_string(sv->db->strings, name, -1, StringNonPersistent); + storage->str_index = msi_add_string(sv->db->strings, name, -1, FALSE); storage->storage = stg; if (storage->storage) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 37b8cb3..fc9f715 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -127,7 +127,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U const WCHAR *name = MSI_RecordGetString( rec, 1 ); if (!name) return ERROR_INVALID_PARAMETER; - sv->db->streams[row].str_index = msi_add_string( sv->db->strings, name, -1, StringNonPersistent ); + sv->db->streams[row].str_index = msi_add_string( sv->db->strings, name, -1, FALSE ); } if (mask & 2) { @@ -399,7 +399,7 @@ static UINT append_stream( MSIDATABASE *db, const WCHAR *name, IStream *stream ) if (!streams_resize_table( db, db->num_streams + 1 )) return ERROR_OUTOFMEMORY; - db->streams[i].str_index = msi_add_string( db->strings, name, -1, StringNonPersistent ); + db->streams[i].str_index = msi_add_string( db->strings, name, -1, FALSE ); db->streams[i].stream = stream; db->num_streams++; diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 7383fdd..9dec32d 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -209,9 +209,9 @@ static void insert_string_sorted( string_table *st, UINT string_id ) } static void set_st_entry( string_table *st, UINT n, WCHAR *str, int len, USHORT refcount, - enum StringPersistence persistence ) + BOOL persistent ) { - if (persistence == StringPersistent) + if (persistent) { st->strings[n].persistent_refcount = refcount; st->strings[n].nonpersistent_refcount = 0; @@ -257,7 +257,7 @@ static UINT string2id( const string_table *st, const char *buffer, UINT *id ) return r; } -static int add_string( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) +static int add_string( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, BOOL persistent ) { LPWSTR str; int sz; @@ -274,7 +274,7 @@ static int add_string( string_table *st, UINT n, const char *data, UINT len, USH { if (string2id( st, data, &n ) == ERROR_SUCCESS) { - if (persistence == StringPersistent) + if (persistent) st->strings[n].persistent_refcount += refcount; else st->strings[n].nonpersistent_refcount += refcount; @@ -299,11 +299,11 @@ static int add_string( string_table *st, UINT n, const char *data, UINT len, USH MultiByteToWideChar( st->codepage, 0, data, len, str, sz ); str[sz] = 0; - set_st_entry( st, n, str, sz, refcount, persistence ); + set_st_entry( st, n, str, sz, refcount, persistent ); return n; } -int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) +int msi_add_string( string_table *st, const WCHAR *data, int len, BOOL persistent ) { UINT n; LPWSTR str; @@ -318,7 +318,7 @@ int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPer if (msi_string2id( st, data, len, &n) == ERROR_SUCCESS ) { - if (persistence == StringPersistent) + if (persistent) st->strings[n].persistent_refcount++; else st->strings[n].nonpersistent_refcount++; @@ -338,7 +338,7 @@ int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPer memcpy( str, data, len*sizeof(WCHAR) ); str[len] = 0; - set_st_entry( st, n, str, len, 1, persistence ); + set_st_entry( st, n, str, len, 1, persistent ); return n; } @@ -545,7 +545,7 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) break; } - r = add_string( st, n, data+offset, len, refs, StringPersistent ); + r = add_string( st, n, data+offset, len, refs, TRUE ); if( r != n ) ERR("Failed to add string %d\n", n ); n++; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 4a06334..dfa4469 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -716,7 +716,6 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, MSICONDITION persistent ) { - enum StringPersistence string_persistence = (persistent) ? StringPersistent : StringNonPersistent; UINT r, nField; MSIVIEW *tv = NULL; MSIRECORD *rec = NULL; @@ -756,8 +755,8 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, for( i = 0, col = col_info; col; i++, col = col->next ) { - UINT table_id = msi_add_string( db->strings, col->table, -1, string_persistence ); - UINT col_id = msi_add_string( db->strings, col->column, -1, string_persistence ); + UINT table_id = msi_add_string( db->strings, col->table, -1, persistent ); + UINT col_id = msi_add_string( db->strings, col->column, -1, persistent ); table->colinfo[ i ].tablename = msi_string_lookup( db->strings, table_id, NULL ); table->colinfo[ i ].number = i + 1; @@ -1385,8 +1384,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI { int len; const WCHAR *sval = msi_record_get_string( rec, i + 1, &len ); - val = msi_add_string( tv->db->strings, sval, len, - persistent ? StringPersistent : StringNonPersistent ); + val = msi_add_string( tv->db->strings, sval, len, persistent ); } else {

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: b37c1d83e497b71f676b9c481dc374f8c4d6ab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37c1d83e497b71f676b9c48… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Jan 23 05:47:40 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 156 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 75 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b37c1d83e497b71f676b…

1 0

Hans Leidekker : wbemprox: Create one processor object per package.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: cee89865294fc1d419d67cac4052ce0815731ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee89865294fc1d419d67cac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:14 2019 +0100 wbemprox: Create one processor object per package. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 61 ++++++++++++++++++++++++------------------- dlls/wbemprox/tests/query.c | 63 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cee89865294fc1d419d6…

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoReleaseCancelSpinLock().
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: e834d38c77d0c62ac882eadb83b6761f62a205d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e834d38c77d0c62ac882eadb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:21 2019 -0600 ntoskrnl.exe: Implement IoReleaseCancelSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/Makefile.in | 1 + dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ---------- dlls/ntoskrnl.exe/sync.c | 11 +++++++++++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index 8efaf55..cc2620e 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,4 +1,5 @@ MODULE = hal.dll +IMPORTLIB = hal C_SRCS = \ hal.c diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 8cafaad..3861d26 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,6 +1,6 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl -IMPORTS = advapi32 +IMPORTS = advapi32 hal DELAYIMPORTS = setupapi user32 C_SRCS = \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a48b9e3..2a061f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -785,16 +785,6 @@ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) FIXME("(%p): stub\n", irql); } - -/*********************************************************************** - * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI IoReleaseCancelSpinLock(KIRQL irql) -{ - FIXME("(%u): stub\n", irql); -} - - /*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 74e84a6..36282fe 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -413,3 +413,14 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) return 0; } #endif + +static KSPIN_LOCK cancel_lock; + +/*********************************************************************** + * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseCancelSpinLock( KIRQL irql ) +{ + TRACE("irql %u.\n", irql); + KeReleaseSpinLock( &cancel_lock, irql ); +}

1 0

Sven Baars : windowscodecs: Fix a memory leak (Valgrind).
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 1f132865ec21a644071a04558c116e73c3a62a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f132865ec21a644071a0455… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 24 11:59:48 2019 +0100 windowscodecs: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 7050c95..faffeae 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -620,7 +620,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p if (setjmp(jmpbuf)) { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); - HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; goto end; @@ -816,6 +815,9 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p end: LeaveCriticalSection(&This->lock); + if (row_pointers) + HeapFree(GetProcessHeap(), 0, row_pointers); + return hr; }

1 0

Zebediah Figura : msi: Get rid of the find_matching_rows() view operation.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: ced768f2ec163e25b7e1cf54a87f4b01369a846e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced768f2ec163e25b7e1cf54… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 00:07:30 2019 -0600 msi: Get rid of the find_matching_rows() view operation. It was introduced in 9f487ba1d as part of an optimization, but ceased to be used in a52c2bf94. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/alter.c | 9 ------ dlls/msi/create.c | 1 - dlls/msi/delete.c | 10 ------- dlls/msi/distinct.c | 22 --------------- dlls/msi/drop.c | 1 - dlls/msi/insert.c | 10 ------- dlls/msi/msipriv.h | 13 --------- dlls/msi/select.c | 20 -------------- dlls/msi/storages.c | 30 -------------------- dlls/msi/streams.c | 30 -------------------- dlls/msi/table.c | 80 ----------------------------------------------------- dlls/msi/update.c | 9 ------ dlls/msi/where.c | 31 --------------------- 13 files changed, 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ced768f2ec163e25b7e1…

1 0

Zebediah Figura : msi: Get rid of the remove_column() view operation.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: c2810f40a0af6496cfbb7d87685e2e018befd43b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2810f40a0af6496cfbb7d87… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 00:07:31 2019 -0600 msi: Get rid of the remove_column() view operation. It was added to the structure, rather unnecessarily, by ccef56f2c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/alter.c | 1 - dlls/msi/create.c | 1 - dlls/msi/delete.c | 1 - dlls/msi/distinct.c | 1 - dlls/msi/drop.c | 1 - dlls/msi/insert.c | 1 - dlls/msi/msipriv.h | 5 ----- dlls/msi/select.c | 1 - dlls/msi/storages.c | 1 - dlls/msi/streams.c | 1 - dlls/msi/table.c | 1 - dlls/msi/update.c | 1 - dlls/msi/where.c | 1 - 13 files changed, 17 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 8899c44..011a2dc 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -240,7 +240,6 @@ static const MSIVIEWOPS alter_ops = NULL, NULL, NULL, - NULL, }; UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 0a60066..dd4739d 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -141,7 +141,6 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, - NULL, }; static UINT check_columns( const column_info *col_info ) diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 4ed5384..4681151 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -183,7 +183,6 @@ static const MSIVIEWOPS delete_ops = NULL, NULL, NULL, - NULL, }; UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index ff292f1..b1945a1 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -266,7 +266,6 @@ static const MSIVIEWOPS distinct_ops = NULL, NULL, NULL, - NULL, }; UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 41dbc8d..3179f14 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -111,7 +111,6 @@ static const MSIVIEWOPS drop_ops = NULL, NULL, NULL, - NULL, }; UINT DROP_CreateView(MSIDATABASE *db, MSIVIEW **view, LPCWSTR name) diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index 0ae0cdc..a5333c9 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -337,7 +337,6 @@ static const MSIVIEWOPS insert_ops = NULL, NULL, NULL, - NULL, }; static UINT count_column_info( const column_info *ci ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 420fe43..d05ad0e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -317,11 +317,6 @@ typedef struct tagMSIVIEWOPS UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number, LPCWSTR column, UINT type, BOOL hold ); /* - * remove_column - removes the column represented by table name and column number from the table - */ - UINT (*remove_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number ); - - /* * sort - orders the table by columns */ UINT (*sort)( struct tagMSIVIEW *view, column_info *columns ); diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 70d2c32..8bd4509 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -350,7 +350,6 @@ static const MSIVIEWOPS select_ops = NULL, NULL, NULL, - NULL, }; static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name, diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index f0b960d..9d262b7 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -434,7 +434,6 @@ static const MSIVIEWOPS storages_ops = NULL, NULL, NULL, - NULL, }; static INT add_storages_to_table(MSISTORAGESVIEW *sv) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index e542d78..37b8cb3 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -356,7 +356,6 @@ static const MSIVIEWOPS streams_ops = NULL, NULL, NULL, - NULL, }; static HRESULT open_stream( MSIDATABASE *db, const WCHAR *name, IStream **stream ) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e24b0bd..4a06334 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2072,7 +2072,6 @@ static const MSIVIEWOPS table_ops = TABLE_add_ref, TABLE_release, TABLE_add_column, - TABLE_remove_column, NULL, TABLE_drop, }; diff --git a/dlls/msi/update.c b/dlls/msi/update.c index ed81447..ff4e1ab 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -213,7 +213,6 @@ static const MSIVIEWOPS update_ops = NULL, NULL, NULL, - NULL, }; UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, diff --git a/dlls/msi/where.c b/dlls/msi/where.c index b493bda..6c08471 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -1081,7 +1081,6 @@ static const MSIVIEWOPS where_ops = NULL, NULL, NULL, - NULL, WHERE_sort, NULL, };

1 0

Józef Kucia : vkd3d: Avoid passing 0 miplevels to Vulkan.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: vkd3d Branch: master Commit: 2aa7c6b753aa184575da3ca1a0fab009b90d7021 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2aa7c6b753aa184575da3ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 14:52:52 2019 +0100 vkd3d: Avoid passing 0 miplevels to Vulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 75a5201..6eba450 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -623,12 +623,20 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, { static const D3D12_HEAP_PROPERTIES heap_properties = {D3D12_HEAP_TYPE_DEFAULT}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + D3D12_RESOURCE_DESC validated_desc; VkMemoryRequirements requirements; VkImage vk_image; HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); + if (!desc->MipLevels) + { + validated_desc = *desc; + validated_desc.MipLevels = max_miplevel_count(desc); + desc = &validated_desc; + } + /* XXX: We have to create an image to get its memory requirements. */ if (SUCCEEDED(hr = vkd3d_create_image(device, &heap_properties, 0, desc, &vk_image))) {

1 0

Józef Kucia : vkd3d: Return hardcoded GPU virtual address support.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: vkd3d Branch: master Commit: 766361f9c3dd4d56e05da4cc8eb44eff2f466ea6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=766361f9c3dd4d56e05da4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:31 2019 +0100 vkd3d: Return hardcoded GPU virtual address support. The hardcoded value makes a real app happy and it is close to values returned by various Windows drivers (AMD, Intel, Nvidia). In the long term, we might try to derive the values from maxResourceSize and/or sparseAddressSpaceSize. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ libs/vkd3d/device.c | 16 ++++++++++++++++ tests/d3d12.c | 19 +++++++++++++++---- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index c025dbe..754bba3 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1535,6 +1535,12 @@ typedef struct D3D12_FEATURE_DATA_ROOT_SIGNATURE D3D_ROOT_SIGNATURE_VERSION HighestVersion; } D3D12_FEATURE_DATA_ROOT_SIGNATURE; +typedef struct D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT +{ + UINT MaxGPUVirtualAddressBitsPerResource; + UINT MaxGPUVirtualAddressBitsPerProcess; +} D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT; + typedef enum D3D_SHADER_MODEL { D3D_SHADER_MODEL_5_1 = 0x51, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 93af06c..709c61f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1840,6 +1840,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT: + { + D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + FIXME("Returning 40 GPU virtual address bits.\n"); + data->MaxGPUVirtualAddressBitsPerResource = 40; + data->MaxGPUVirtualAddressBitsPerProcess = 40; + return S_OK; + } + case D3D12_FEATURE_SHADER_MODEL: { D3D12_FEATURE_DATA_SHADER_MODEL *data = feature_data; diff --git a/tests/d3d12.c b/tests/d3d12.c index 26a2162..4af52a5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -962,6 +962,7 @@ static void test_node_count(void) static void test_check_feature_support(void) { + D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT gpu_virtual_address; D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; @@ -1038,7 +1039,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); trace("Max supported feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); max_supported_feature_level = feature_levels.MaxSupportedFeatureLevel; @@ -1047,7 +1048,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == max_supported_feature_level, "Got unexpected feature level %#x, expected %#x.\n", feature_levels.MaxSupportedFeatureLevel, max_supported_feature_level); @@ -1065,7 +1066,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == D3D_FEATURE_LEVEL_9_3, "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); @@ -1074,10 +1075,20 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == 0x3000, "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); + /* GPU virtual address */ + memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address)); + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, + &gpu_virtual_address, sizeof(gpu_virtual_address)); + ok(hr == S_OK, "Failed to check GPU virtual address support, hr %#x.\n", hr); + trace("GPU virtual address bits per resource: %u.\n", + gpu_virtual_address.MaxGPUVirtualAddressBitsPerResource); + trace("GPU virtual address bits per process: %u.\n", + gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Józef Kucia : tests: Add test for D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: vkd3d Branch: master Commit: fd4f0b0024218ec8df78bd3090f137a0b33bfec6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd4f0b0024218ec8df78bd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:33 2019 +0100 tests: Add test for D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4af52a5..2121473 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1151,6 +1151,126 @@ static void test_format_support(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_multisample_quality_levels(void) +{ + static const unsigned int sample_counts[] = {1, 2, 4, 8, 16, 32}; + D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS format_support; + ID3D12Device *device; + DXGI_FORMAT format; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + memset(&format_support, 0, sizeof(format_support)); + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + /* 1 sample */ + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + if (format == DXGI_FORMAT_R1_UNORM) + continue; + + vkd3d_test_set_context("format %#x", format); + + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = format; + format_support.SampleCount = 1; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(format_support.NumQualityLevels == 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* DXGI_FORMAT_UNKNOWN */ + for (i = 1; i < ARRAY_SIZE(sample_counts); ++i) + { + vkd3d_test_set_context("samples %#x", sample_counts[i]); + + memset(&format_support, 0, sizeof(format_support)); + format_support.SampleCount = sample_counts[i]; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + format_support.Flags = D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(format_support.Flags == D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE, + "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* invalid sample counts */ + for (i = 1; i <= 32; ++i) + { + BOOL valid_sample_count = FALSE; + for (j = 0; j < ARRAY_SIZE(sample_counts); ++j) + { + if (sample_counts[j] == i) + { + valid_sample_count = TRUE; + break; + } + } + if (valid_sample_count) + continue; + + vkd3d_test_set_context("samples %#x", i); + + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.SampleCount = i; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* DXGI_FORMAT_R8G8B8A8_UNORM */ + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.SampleCount = 4; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(format_support.NumQualityLevels >= 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_command_allocator(void) { ID3D12CommandAllocator *command_allocator; @@ -23902,6 +24022,7 @@ START_TEST(d3d12) run_test(test_node_count); run_test(test_check_feature_support); run_test(test_format_support); + run_test(test_multisample_quality_levels); run_test(test_create_command_allocator); run_test(test_create_command_list); run_test(test_create_command_queue);

1 0