January 2022 - Wine-commits

Giovanni Mascellani : mfmediaengine: Add a IMFMediaEngineEx stub.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 598325385b393c43cffc35fe14bf39191d684d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=598325385b393c43cffc35fe… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 21 10:30:35 2022 +0300 mfmediaengine: Add a IMFMediaEngineEx stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 496 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 398 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=598325385b393c43cffc…

1 0

Alistair Leslie-Hughes : msdasql: Connect to DSN in IDBInitialize Initialize.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 9d1e3b3a76ab794193267279cafe47a30df2923b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1e3b3a76ab794193267279… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 21 14:33:19 2022 +1100 msdasql: Connect to DSN in IDBInitialize Initialize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index ee8fa672623..0f5453131f6 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid ole32 oleaut32 +IMPORTS = uuid ole32 oleaut32 odbc32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index bc208a74cc5..cf69195baf7 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,9 @@ #include "initguid.h" #include "msdasql.h" +#include "odbcinst.h" +#include "sqlext.h" +#include "sqlucode.h" #include "msdasql_private.h" @@ -40,6 +43,22 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) +{ + SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH]; + SQLINTEGER native; + SQLSMALLINT i = 1, len; + + if (!TRACE_ON(msdasql)) + return; + + while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) != SQL_SUCCESS) + { + WARN("%d: %s: %s\n", i, state, msg); + i++; + } +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -210,6 +229,10 @@ struct msdasql LONG ref; struct msdasql_prop properties[14]; + + /* ODBC Support */ + HENV henv; + HDBC hdbc; }; static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) @@ -294,6 +317,10 @@ static ULONG WINAPI msdsql_Release(IUnknown *iface) if (!ref) { + SQLDisconnect(provider->hdbc); + + SQLFreeHandle(SQL_HANDLE_DBC, provider->hdbc); + SQLFreeHandle(SQL_HANDLE_ENV, provider->henv); free(provider); } @@ -502,8 +529,33 @@ static ULONG WINAPI dbinit_Release(IDBInitialize *iface) static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) { struct msdasql *provider = impl_from_IDBInitialize(iface); + int i; + SQLRETURN ret; - FIXME("%p stub\n", provider); + FIXME("%p semi-stub\n", provider); + + for(i=0; i < sizeof(provider->properties); i++) + { + if (provider->properties[i].id == DBPROP_INIT_DATASOURCE) + break; + } + + if (i >= sizeof(provider->properties)) + { + ERR("Datasource not found\n"); + return E_FAIL; + } + + ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), + SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS ); + TRACE("SQLConnectW ret %d\n", ret); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_DBC, provider->hdbc); + + if (ret != SQL_SUCCESS_WITH_INFO) + return E_FAIL; + } return S_OK; } @@ -653,6 +705,15 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) } } + SQLAllocHandle(SQL_HANDLE_ENV, NULL, &provider->henv ); + if (SQLSetEnvAttr(provider->henv, SQL_ATTR_ODBC_VERSION, (void *)SQL_OV_ODBC3_80, 0) == SQL_ERROR) + { + WARN("Falling back to SQL_OV_ODBC3\n"); + SQLSetEnvAttr(provider->henv, SQL_ATTR_ODBC_VERSION, (void *)SQL_OV_ODBC3, 0); + } + + SQLAllocHandle(SQL_HANDLE_DBC, provider->henv, &provider->hdbc); + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); IUnknown_Release(&provider->MSDASQL_iface); return hr;

1 0

Alexandre Julliard : makefiles: Add helper functions to open generated include files.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 9da1813651fb1b4061104fb0bd0eabff517a703f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da1813651fb1b4061104fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:49:00 2022 +0100 makefiles: Add helper functions to open generated include files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 99 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index ff89bae3ccf..a4557785f3a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1227,6 +1227,27 @@ static struct file *open_local_file( const struct makefile *make, const char *pa } +/******************************************************************* + * open_local_generated_file + * + * Open a generated file in the directory of the makefile. + */ +static struct file *open_local_generated_file( const struct makefile *make, struct incl_file *file, + const char *ext, const char *src_ext ) +{ + char *filename; + struct file *ret = NULL; + + if (strendswith( file->name, ext ) && + (ret = open_local_file( make, replace_extension( file->name, ext, src_ext ), &filename ))) + { + file->sourcename = filename; + file->filename = obj_dir_path( make, file->name ); + } + return ret; +} + + /******************************************************************* * open_global_file * @@ -1254,6 +1275,27 @@ static struct file *open_global_header( const struct makefile *make, const char } +/******************************************************************* + * open_global_generated_file + * + * Open a generated file in the top-level source directory. + */ +static struct file *open_global_generated_file( const struct makefile *make, struct incl_file *file, + const char *ext, const char *src_ext ) +{ + char *filename; + struct file *ret = NULL; + + if (strendswith( file->name, ext ) && + (ret = open_global_header( make, replace_extension( file->name, ext, src_ext ), &filename ))) + { + file->sourcename = filename; + file->filename = strmake( "include/%s", file->name ); + } + return ret; +} + + /******************************************************************* * open_src_file */ @@ -1306,30 +1348,13 @@ static int has_external_import( const struct makefile *make ) static struct file *open_include_file( const struct makefile *make, struct incl_file *pFile ) { struct file *file = NULL; - char *filename; unsigned int i, len; errno = ENOENT; - /* check for generated bison header */ - - if (strendswith( pFile->name, ".tab.h" ) && - (file = open_local_file( make, replace_extension( pFile->name, ".tab.h", ".y" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = obj_dir_path( make, pFile->name ); - return file; - } - - /* check for corresponding idl file in source dir */ - - if (strendswith( pFile->name, ".h" ) && - (file = open_local_file( make, replace_extension( pFile->name, ".h", ".idl" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = obj_dir_path( make, pFile->name ); - return file; - } + /* check for generated files */ + if ((file = open_local_generated_file( make, pFile, ".tab.h", ".y" ))) return file; + if ((file = open_local_generated_file( make, pFile, ".h", ".idl" ))) return file; /* check for extra targets */ if (strarray_exists( &make->extra_targets, pFile->name )) @@ -1343,45 +1368,19 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if ((file = open_local_file( make, pFile->name, &pFile->filename ))) return file; /* check for global importlib (module dependency) */ - if (pFile->type == INCL_IMPORTLIB && find_importlib_module( pFile->name )) { pFile->filename = pFile->name; return NULL; } - /* check for corresponding idl file in global includes */ - - if (strendswith( pFile->name, ".h" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".h", ".idl" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } - - /* check for corresponding .in file in global includes (for config.h.in) */ - - if (strendswith( pFile->name, ".h" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".h", ".h.in" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } - - /* check for corresponding .x file in global includes */ - + /* check for generated files in global includes */ + if ((file = open_global_generated_file( make, pFile, ".h", ".idl" ))) return file; + if ((file = open_global_generated_file( make, pFile, ".h", ".h.in" ))) return file; if (strendswith( pFile->name, "tmpl.h" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".h", ".x" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } + (file = open_global_generated_file( make, pFile, ".h", ".x" ))) return file; /* check in global includes source dir */ - if ((file = open_global_header( make, pFile->name, &pFile->filename ))) return file; /* check in global msvcrt includes */

1 0

Alexandre Julliard : makefiles: Also look for generated includes in the source file directory.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 5d4ca2225e8edecbaab25545d6a08d40e54cfca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4ca2225e8edecbaab25545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:49:19 2022 +0100 makefiles: Also look for generated includes in the source file directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index a4557785f3a..04cb14504b5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1203,6 +1203,28 @@ static struct file *open_file_same_dir( const struct incl_file *parent, const ch } +/******************************************************************* + * open_same_dir_generated_file + * + * Open a generated_file in the same directory as the parent. + */ +static struct file *open_same_dir_generated_file( const struct makefile *make, + const struct incl_file *parent, struct incl_file *file, + const char *ext, const char *src_ext ) +{ + char *filename; + struct file *ret = NULL; + + if (strendswith( file->name, ext ) && + (ret = open_file_same_dir( parent, replace_extension( file->name, ext, src_ext ), &filename ))) + { + file->sourcename = filename; + file->filename = obj_dir_path( make, replace_filename( parent->name, file->name )); + } + return ret; +} + + /******************************************************************* * open_local_file * @@ -1426,7 +1448,9 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ - if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) + if ((file = open_same_dir_generated_file( make, pFile->included_by, pFile, ".tab.h", ".y" )) || + (file = open_same_dir_generated_file( make, pFile->included_by, pFile, ".h", ".idl" )) || + (file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) { pFile->is_external = pFile->included_by->is_external; return file;

1 0

Alexandre Julliard : makefiles: Compare the full path when looking for generated include files.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 4c7a2b4cbbba5a76008d4c836f601d7da3642110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c7a2b4cbbba5a76008d4c83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:50:12 2022 +0100 makefiles: Compare the full path when looking for generated include files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 04cb14504b5..e7a71cb85d2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -756,7 +756,16 @@ static struct incl_file *find_include_file( const struct makefile *make, const c struct incl_file *file; LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) - if (!strcmp( name, file->name )) return file; + { + const char *filename = file->filename; + if (!filename) continue; + if (make->obj_dir && strlen(make->obj_dir) < strlen(filename)) + { + filename += strlen(make->obj_dir); + while (*filename == '/') filename++; + } + if (!strcmp( name, filename )) return file; + } return NULL; }

1 0

Alexandre Julliard : makefiles: Add dependencies for files generated in maintainer mode.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 3c0a2fa5a6e9eaef5aebbbd0080cf7f478a49864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0a2fa5a6e9eaef5aebbbd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:50:45 2022 +0100 makefiles: Add dependencies for files generated in maintainer mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index e7a71cb85d2..03181c7d60b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1386,6 +1386,13 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ /* check for generated files */ if ((file = open_local_generated_file( make, pFile, ".tab.h", ".y" ))) return file; if ((file = open_local_generated_file( make, pFile, ".h", ".idl" ))) return file; + if (fontforge && (file = open_local_generated_file( make, pFile, ".ttf", ".sfd" ))) return file; + if (convert && rsvg && icotool) + { + if ((file = open_local_generated_file( make, pFile, ".bmp", ".svg" ))) return file; + if ((file = open_local_generated_file( make, pFile, ".cur", ".svg" ))) return file; + if ((file = open_local_generated_file( make, pFile, ".ico", ".svg" ))) return file; + } /* check for extra targets */ if (strarray_exists( &make->extra_targets, pFile->name ))

1 0

Alexandre Julliard : makefiles: Add a maintainer-clean target.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 363d078f46d87696ed6024bc8e2c22f457623771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=363d078f46d87696ed6024bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 11:48:20 2022 +0100 makefiles: Add a maintainer-clean target. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +++- configure.ac | 4 +++- tools/makedep.c | 19 ++++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 9a7a24b1f69..b6d22f896ea 100755 --- a/configure +++ b/configure @@ -22832,7 +22832,9 @@ fi wine_fn_append_rule "distclean:: clean - rm -rf autom4te.cache" + rm -rf autom4te.cache +maintainer-clean:: + rm -f configure include/config.h.in" wine_fn_append_rule "dlls/ntdll/unix/version.c: dummy diff --git a/configure.ac b/configure.ac index 275fba3771c..0b1a53f3ff9 100644 --- a/configure.ac +++ b/configure.ac @@ -3796,7 +3796,9 @@ dnl Rules for cleaning WINE_APPEND_RULE( [distclean:: clean - rm -rf autom4te.cache]) + rm -rf autom4te.cache +maintainer-clean:: + rm -f configure include/config.h.in]) dnl Rules for generated source files diff --git a/tools/makedep.c b/tools/makedep.c index 03181c7d60b..5a286c3c343 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -208,6 +208,7 @@ struct makefile struct strarray test_files; struct strarray clean_files; struct strarray distclean_files; + struct strarray maintainerclean_files; struct strarray uninstall_files; struct strarray object_files; struct strarray crossobj_files; @@ -2583,7 +2584,7 @@ static void output_uninstall_rules( struct makefile *make ) /******************************************************************* * output_po_files */ -static void output_po_files( const struct makefile *make ) +static void output_po_files( struct makefile *make ) { const char *po_dir = src_dir_path( make, "po" ); unsigned int i; @@ -2595,7 +2596,7 @@ static void output_po_files( const struct makefile *make ) output( ": %s/wine.pot\n", po_dir ); output( "\t%smsgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", cmd_prefix( "MSG" ), po_dir ); - output( "po:" ); + output( "po/all:" ); for (i = 0; i < linguas.count; i++) output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); output( "\n" ); @@ -2606,6 +2607,7 @@ static void output_po_files( const struct makefile *make ) output( "\t%smsgcat -o $@", cmd_prefix( "MSG" )); output_filenames( make->pot_files ); output( "\n" ); + strarray_add( &make->maintainerclean_files, strmake( "%s/wine.pot", po_dir )); } @@ -2817,6 +2819,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, output( "\t%s%s -script %s %s $@\n", cmd_prefix( "GEN" ), fontforge, root_src_dir_path( "fonts/genttf.ff" ), source->filename ); if (!(source->file->flags & FLAG_SFD_FONTS)) strarray_add( &make->font_files, ttf_obj ); + strarray_add( &make->maintainerclean_files, ttf_obj ); } if (source->file->flags & FLAG_INSTALL) { @@ -2852,7 +2855,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, static const char * const images[] = { "bmp", "cur", "ico", NULL }; unsigned int i; - if (convert && rsvg && icotool && !make->src_dir) + if (convert && rsvg && icotool) { for (i = 0; images[i]; i++) if (find_include_file( make, strmake( "%s.%s", obj, images[i] ))) break; @@ -2863,6 +2866,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, output( "\t%sCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", cmd_prefix( "GEN" ), convert, icotool, rsvg, root_src_dir_path( "tools/buildimage" ), source->filename ); + strarray_add( &make->maintainerclean_files, strmake( "%s.%s", obj, images[i] )); } } } @@ -3566,12 +3570,14 @@ static void output_subdirs( struct makefile *make ) strarray_addall_uniq( &dependencies, submakes[i]->dependencies ); strarray_addall_path( &clean_files, submakes[i]->obj_dir, submakes[i]->clean_files ); strarray_addall_path( &distclean_files, submakes[i]->obj_dir, submakes[i]->distclean_files ); + strarray_addall_path( &make->maintainerclean_files, submakes[i]->obj_dir, submakes[i]->maintainerclean_files ); strarray_addall_path( &testclean_files, submakes[i]->obj_dir, submakes[i]->ok_files ); strarray_addall_path( &make->pot_files, submakes[i]->obj_dir, submakes[i]->pot_files ); if (submakes[i]->disabled) continue; strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->all_targets ); + strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->font_files ); if (!strcmp( submakes[i]->obj_dir, "tools" ) || !strncmp( submakes[i]->obj_dir, "tools/", 6 )) strarray_add( &tooldeps_deps, obj_dir_path( submakes[i], "all" )); if (submakes[i]->testdll) @@ -3620,14 +3626,19 @@ static void output_subdirs( struct makefile *make ) strarray_add_uniq( &make->phony_targets, "check" ); strarray_add_uniq( &make->phony_targets, "test" ); + if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); + output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n"); output_rm_filenames( testclean_files ); output( "distclean::\n"); output_rm_filenames( distclean_files ); + output( "maintainer-clean::\n"); + output_rm_filenames( make->maintainerclean_files ); strarray_add_uniq( &make->phony_targets, "distclean" ); strarray_add_uniq( &make->phony_targets, "testclean" ); + strarray_add_uniq( &make->phony_targets, "maintainer-clean" ); if (tooldeps_deps.count) { @@ -3637,8 +3648,6 @@ static void output_subdirs( struct makefile *make ) strarray_add_uniq( &make->phony_targets, "__tooldeps__" ); } - if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); - if (make->phony_targets.count) { output( ".PHONY:" );

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_CopyTextureRegion().
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: vkd3d Branch: master Commit: 8e30a7750e36a294a0693f5121769f1350e2109c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e30a7750e36a294a0693f5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 21 22:45:28 2022 +1000 vkd3d: Use the resource's stored format in d3d12_command_list_CopyTextureRegion(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 73ba226..2cf1eba 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3562,18 +3562,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic assert(d3d12_resource_is_texture(dst_resource)); assert(d3d12_resource_is_texture(src_resource)); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &src_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", src_resource->desc.Format); - return; - } + dst_format = dst_resource->format; + src_format = src_resource->format; if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT))

1 0

Conor McCarthy : vkd3d: Handle plane slice for texture views.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: vkd3d Branch: master Commit: 5d627d6c64aace9e084cb359d0d2171ba45b7953 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d627d6c64aace9e084cb35… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 21 22:45:29 2022 +1000 vkd3d: Handle plane slice for texture views. vk_image_aspect_flags_from_d3d12_plane_slice() is based on a vkd3d-proton implementation by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(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 | 42 +++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 9905015..19a163b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2454,6 +2454,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->miplevel_count = 1; desc->layer_idx = 0; desc->layer_count = d3d12_resource_desc_get_layer_count(&resource->desc); + desc->vk_image_aspect = desc->format->vk_aspect_mask; switch (resource->desc.Dimension) { @@ -2537,7 +2538,7 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); if (desc->allowed_swizzle) vk_component_mapping_compose(&view_desc.components, &desc->components); - view_desc.subresourceRange.aspectMask = format->vk_aspect_mask; + view_desc.subresourceRange.aspectMask = desc->vk_image_aspect; view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; view_desc.subresourceRange.levelCount = desc->miplevel_count; view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; @@ -2705,6 +2706,27 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, descriptor->u.view = view; } +static VkImageAspectFlags vk_image_aspect_flags_from_d3d12_plane_slice(const struct vkd3d_format *format, + unsigned int plane_slice) +{ + VkImageAspectFlags aspect_flags = format->vk_aspect_mask; + unsigned int i; + + /* For all formats we currently handle, the n-th aspect bit in Vulkan, if the lowest bit set is + * n = 0, corresponds to the n-th plane in D3D12, so clear the lowest bit for each slice skipped. */ + for (i = 0; i < plane_slice; i++) + aspect_flags &= aspect_flags - 1; + + if (!aspect_flags) + { + WARN("Invalid plane slice %u for format %#x.\n", plane_slice, format->vk_format); + aspect_flags = format->vk_aspect_mask; + } + + /* The selected slice is now the lowest bit in the aspect flags, so clear the others. */ + return aspect_flags & -aspect_flags; +} + void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) @@ -2747,7 +2769,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_idx = desc->u.Texture2D.MostDetailedMip; vkd3d_desc.miplevel_count = desc->u.Texture2D.MipLevels; if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2D.PlaneSlice); if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; @@ -2758,7 +2781,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2DArray.PlaneSlice); if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); @@ -2955,7 +2979,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, case D3D12_UAV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2D.PlaneSlice); break; case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -2963,7 +2988,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2DArray.PlaneSlice); vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_UAV_DIMENSION_TEXTURE3D: @@ -3206,7 +3232,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev case D3D12_RTV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2D.PlaneSlice); break; case D3D12_RTV_DIMENSION_TEXTURE2DARRAY: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -3214,7 +3241,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2DArray.PlaneSlice); vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE2DMS: diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b630b6d..136b020 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -536,6 +536,7 @@ struct vkd3d_texture_view_desc unsigned int miplevel_count; unsigned int layer_idx; unsigned int layer_count; + VkImageAspectFlags vk_image_aspect; VkComponentMapping components; bool allowed_swizzle; };

1 0

Gabriel Ivăncescu : ddraw: Remove topmost style when going from exclusive mode to normal.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: e44afcd8bf17eb628fcb1ea0b012970b6e611da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44afcd8bf17eb628fcb1ea0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 18 18:50:27 2022 +0200 ddraw: Remove topmost style when going from exclusive mode to normal. Unless DDSCL_NOWINDOWCHANGES was specified. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 6 ++++++ dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ff78dae6792..4e17d44f66c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -970,6 +970,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!(cooplevel & DDSCL_EXCLUSIVE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { + /* When going from exclusive mode to normal, ddraw removes the + topmost bit unless the DDSCL_NOWINDOWCHANGES flag is set in + this call that sets it to normal, not in the old coop level. */ + if (!(cooplevel & DDSCL_NOWINDOWCHANGES)) + SetWindowPos(window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + if (restore_mode_on_normal && FAILED(ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface))) ERR("RestoreDisplayMode failed\n"); ClipCursor(NULL); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 95904ab8c91..c5afeff2343 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2701,7 +2701,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); ret = SetForegroundWindow(GetDesktopWindow()); @@ -2763,7 +2763,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 60925284892..f80d4fe3ab8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2779,7 +2779,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); ret = SetForegroundWindow(GetDesktopWindow()); @@ -2841,7 +2841,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 50ea812d2d2..4447c5675ea 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3015,7 +3015,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); ret = SetForegroundWindow(GetDesktopWindow()); @@ -3077,7 +3077,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 67f6893e3b7..e5324cfe8bd 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2680,7 +2680,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); ret = SetForegroundWindow(GetDesktopWindow()); @@ -2742,7 +2742,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);

1 0