August 2023 - Wine-commits - list.winehq.org

Mohamad Al-Jaf : hvsimanagementapi: Add IIsolatedWindowsEnvironmentHostStatics stub interface.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: f3aa576aad75a4a6870e85ea24709fa00bdd5265 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3aa576aad75a4a6870e85ea24709f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 2 00:50:38 2023 -0400 hvsimanagementapi: Add IIsolatedWindowsEnvironmentHostStatics stub interface. --- dlls/hvsimanagementapi/host.c | 38 ++++++++++++++++++++++++++++++++ dlls/hvsimanagementapi/private.h | 38 ++++++++++++++++++++++++++++++++ dlls/hvsimanagementapi/tests/isolation.c | 6 +++++ 3 files changed, 82 insertions(+) diff --git a/dlls/hvsimanagementapi/host.c b/dlls/hvsimanagementapi/host.c index e41e2ef7e99..37120d9ee94 100644 --- a/dlls/hvsimanagementapi/host.c +++ b/dlls/hvsimanagementapi/host.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hvsi); struct isolated_host_statics { IActivationFactory IActivationFactory_iface; + IIsolatedWindowsEnvironmentHostStatics IIsolatedWindowsEnvironmentHostStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IIsolatedWindowsEnvironmentHostStatics )) + { + *out = &impl->IIsolatedWindowsEnvironmentHostStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,39 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( isolated_host_statics, IIsolatedWindowsEnvironmentHostStatics, struct isolated_host_statics, IActivationFactory_iface ) + +static HRESULT WINAPI isolated_host_statics_get_IsReady( IIsolatedWindowsEnvironmentHostStatics *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI isolated_host_statics_get_HostErrors( IIsolatedWindowsEnvironmentHostStatics *iface, + IVectorView_IsolatedWindowsEnvironmentHostError **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IIsolatedWindowsEnvironmentHostStaticsVtbl isolated_host_statics_vtbl = +{ + isolated_host_statics_QueryInterface, + isolated_host_statics_AddRef, + isolated_host_statics_Release, + /* IInspectable methods */ + isolated_host_statics_GetIids, + isolated_host_statics_GetRuntimeClassName, + isolated_host_statics_GetTrustLevel, + /* IIsolatedWindowsEnvironmentHostStatics methods */ + isolated_host_statics_get_IsReady, + isolated_host_statics_get_HostErrors, +}; + static struct isolated_host_statics isolated_host_statics = { {&factory_vtbl}, + {&isolated_host_statics_vtbl}, 1, }; diff --git a/dlls/hvsimanagementapi/private.h b/dlls/hvsimanagementapi/private.h index af18f54c077..4799a654176 100644 --- a/dlls/hvsimanagementapi/private.h +++ b/dlls/hvsimanagementapi/private.h @@ -37,4 +37,42 @@ extern IActivationFactory *isolated_host_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/hvsimanagementapi/tests/isolation.c b/dlls/hvsimanagementapi/tests/isolation.c index d08f6ecb645..8e0dc75c005 100644 --- a/dlls/hvsimanagementapi/tests/isolation.c +++ b/dlls/hvsimanagementapi/tests/isolation.c @@ -49,6 +49,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_IsolatedWindowsEnvironmentHostStatics(void) { static const WCHAR *isolated_host_statics_name = L"Windows.Security.Isolation.IsolatedWindowsEnvironmentHost"; + IIsolatedWindowsEnvironmentHostStatics *isolated_host_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -70,6 +71,11 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IIsolatedWindowsEnvironmentHostStatics, (void **)&isolated_host_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IIsolatedWindowsEnvironmentHostStatics_Release( isolated_host_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : hvsimanagementapi/tests: Add IIsolatedWindowsEnvironmentHostStatics::get_IsReady() tests.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 3d12331476588eb572ec62eb7c9d864739b7169e URL: https://gitlab.winehq.org/wine/wine/-/commit/3d12331476588eb572ec62eb7c9d86… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 2 01:04:45 2023 -0400 hvsimanagementapi/tests: Add IIsolatedWindowsEnvironmentHostStatics::get_IsReady() tests. --- dlls/hvsimanagementapi/tests/isolation.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/hvsimanagementapi/tests/isolation.c b/dlls/hvsimanagementapi/tests/isolation.c index 8e0dc75c005..7554ea74873 100644 --- a/dlls/hvsimanagementapi/tests/isolation.c +++ b/dlls/hvsimanagementapi/tests/isolation.c @@ -51,6 +51,7 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) static const WCHAR *isolated_host_statics_name = L"Windows.Security.Isolation.IsolatedWindowsEnvironmentHost"; IIsolatedWindowsEnvironmentHostStatics *isolated_host_statics; IActivationFactory *factory; + BOOLEAN value = 0; HSTRING str; HRESULT hr; LONG ref; @@ -74,6 +75,10 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IIsolatedWindowsEnvironmentHostStatics, (void **)&isolated_host_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IIsolatedWindowsEnvironmentHostStatics_get_IsReady( isolated_host_statics, &value ); + todo_wine ok( hr == S_OK || broken( hr == E_NOTIMPL /* Win10 2004 */ ), "got hr %#lx.\n", hr ); + todo_wine ok( !value, "got %d.\n", value ); + ref = IIsolatedWindowsEnvironmentHostStatics_Release( isolated_host_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Mohamad Al-Jaf : hvsimanagementapi: Implement IIsolatedWindowsEnvironmentHostStatics::get_IsReady().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 6b8ecfd2898f7bab3b931d8873267a29b75b07cf URL: https://gitlab.winehq.org/wine/wine/-/commit/6b8ecfd2898f7bab3b931d8873267a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 2 01:07:57 2023 -0400 hvsimanagementapi: Implement IIsolatedWindowsEnvironmentHostStatics::get_IsReady(). Needed for MS Office 365. --- dlls/hvsimanagementapi/host.c | 6 ++++-- dlls/hvsimanagementapi/tests/isolation.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/hvsimanagementapi/host.c b/dlls/hvsimanagementapi/host.c index 37120d9ee94..c4d8b5b34db 100644 --- a/dlls/hvsimanagementapi/host.c +++ b/dlls/hvsimanagementapi/host.c @@ -119,8 +119,10 @@ DEFINE_IINSPECTABLE( isolated_host_statics, IIsolatedWindowsEnvironmentHostStati static HRESULT WINAPI isolated_host_statics_get_IsReady( IIsolatedWindowsEnvironmentHostStatics *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + return S_OK; } static HRESULT WINAPI isolated_host_statics_get_HostErrors( IIsolatedWindowsEnvironmentHostStatics *iface, diff --git a/dlls/hvsimanagementapi/tests/isolation.c b/dlls/hvsimanagementapi/tests/isolation.c index 7554ea74873..4df8ce33004 100644 --- a/dlls/hvsimanagementapi/tests/isolation.c +++ b/dlls/hvsimanagementapi/tests/isolation.c @@ -76,8 +76,8 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IIsolatedWindowsEnvironmentHostStatics_get_IsReady( isolated_host_statics, &value ); - todo_wine ok( hr == S_OK || broken( hr == E_NOTIMPL /* Win10 2004 */ ), "got hr %#lx.\n", hr ); - todo_wine ok( !value, "got %d.\n", value ); + ok( hr == S_OK || broken( hr == E_NOTIMPL /* Win10 2004 */ ), "got hr %#lx.\n", hr ); + ok( !value, "got %d.\n", value ); ref = IIsolatedWindowsEnvironmentHostStatics_Release( isolated_host_statics ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Henri Verbeet : vkd3d-dxbc: Introduce a program to inspect and modify DXBC blobs.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: vkd3d Branch: master Commit: 6bfb94c440ea6a925c6157b83073855eac061041 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6bfb94c440ea6a925c6157b830738… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 3 12:00:00 2023 +0200 vkd3d-dxbc: Introduce a program to inspect and modify DXBC blobs. --- .gitignore | 1 + Makefile.am | 6 ++- programs/vkd3d-dxbc/main.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b6d29d19..841220ee 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ Makefile Makefile.in test-suite.log /vkd3d-compiler +/vkd3d-dxbc vkd3d-*.tar.xz diff --git a/Makefile.am b/Makefile.am index ecb7c7e2..45f1dd54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -353,11 +353,15 @@ EXTRA_DIST += \ libs/vkd3d-shader/libvkd3d-shader.pc.in \ libs/vkd3d-utils/libvkd3d-utils.pc.in -bin_PROGRAMS = vkd3d-compiler +bin_PROGRAMS = vkd3d-compiler vkd3d-dxbc + vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@ vkd3d_compiler_LDADD = libvkd3d-shader.la @NCURSES_LIBS@ +vkd3d_dxbc_SOURCES = programs/vkd3d-dxbc/main.c +vkd3d_dxbc_LDADD = libvkd3d-shader.la + LDADD = libvkd3d.la libvkd3d-shader.la libvkd3d-utils.la AM_DEFAULT_SOURCE_EXT = .c diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c new file mode 100644 index 00000000..f75f9542 --- /dev/null +++ b/programs/vkd3d-dxbc/main.c @@ -0,0 +1,120 @@ +/* + * Copyright 2023 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include <stdio.h> +#include <string.h> +#include <limits.h> +#include <stdbool.h> +#include <unistd.h> +#include <getopt.h> + +#include "vkd3d_common.h" +#include "vkd3d_shader.h" + +enum +{ + OPTION_HELP = CHAR_MAX + 1, + OPTION_VERSION, +}; + +struct options +{ + bool print_help; + bool print_version; +}; + +static bool parse_command_line(int argc, char **argv, struct options *options) +{ + int option; + + static struct option long_options[] = + { + {"help", no_argument, NULL, OPTION_HELP}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, + }; + + memset(options, 0, sizeof(*options)); + + for (;;) + { + if ((option = getopt_long(argc, argv, "hV", long_options, NULL)) == -1) + break; + + switch (option) + { + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + + case 'V': + case OPTION_VERSION: + options->print_version = true; + return true; + + default: + return false; + } + } + + return true; +} + +static void print_usage(const char *program_name) +{ + static const char usage[] = + "[options...]\n" + "Options:\n" + " -h, --help Display this information and exit.\n" + " -V, --version Display version information and exit.\n" + " -- Stop option processing. Any subsequent argument is\n" + " interpreted as a filename.\n"; + + fprintf(stderr, "Usage: %s %s", program_name, usage); +} + +int main(int argc, char **argv) +{ + struct options options; + + if (!parse_command_line(argc, argv, &options)) + { + print_usage(argv[0]); + return 1; + } + + if (options.print_help || (argc < 2 && isatty(fileno(stdin)))) + { + print_usage(argv[0]); + return 0; + } + + if (options.print_version) + { + const char *version = vkd3d_shader_get_version(NULL, NULL); + + fprintf(stdout, "vkd3d-dxbc version " PACKAGE_VERSION " using %s\n", version); + return 0; + } + + return 0; +}

1 0

Henri Verbeet : vkd3d-dxbc: Implement listing DXBC contents.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: vkd3d Branch: master Commit: fbb5e59a03026696178cc555b0e4158f2e51d184 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fbb5e59a03026696178cc555b0e41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 3 12:00:01 2023 +0200 vkd3d-dxbc: Implement listing DXBC contents. --- Makefile.am | 3 +- README | 4 +- programs/vkd3d-dxbc/main.c | 241 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 240 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 45f1dd54..27738f3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -360,7 +360,8 @@ vkd3d_compiler_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@ vkd3d_compiler_LDADD = libvkd3d-shader.la @NCURSES_LIBS@ vkd3d_dxbc_SOURCES = programs/vkd3d-dxbc/main.c -vkd3d_dxbc_LDADD = libvkd3d-shader.la +vkd3d_dxbc_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@ +vkd3d_dxbc_LDADD = libvkd3d-shader.la @NCURSES_LIBS@ LDADD = libvkd3d.la libvkd3d-shader.la libvkd3d-utils.la AM_DEFAULT_SOURCE_EXT = .c diff --git a/README b/README index 465d5f91..cac0d6dd 100644 --- a/README +++ b/README @@ -47,8 +47,8 @@ commas or semicolons. * NO_COLOR - this is an alias of NO_COLOUR. - * NO_COLOUR - when set, vkd3d-compiler will default to monochrome output, - even when the output supports colour. + * NO_COLOUR - when set, vkd3d-compiler and vkd3d-dxbc will default to + monochrome output, even when the output supports colour. * VKD3D_CONFIG - a list of options that change the behavior of libvkd3d. * virtual_heaps - Create descriptors for each D3D12 root signature diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index f75f9542..6766016d 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -25,47 +25,117 @@ #include <stdbool.h> #include <unistd.h> #include <getopt.h> +#include <sys/stat.h> #include "vkd3d_common.h" #include "vkd3d_shader.h" +#ifdef HAVE_NCURSES +#include <term.h> +#endif enum { - OPTION_HELP = CHAR_MAX + 1, + OPTION_COLOUR = CHAR_MAX + 1, + OPTION_HELP, + OPTION_LIST, + OPTION_NO_COLOUR, OPTION_VERSION, }; struct options { + const char *input_filename; bool print_help; + bool list; bool print_version; + + struct colours + { + const char *reset; + const char *index; + const char *label; + } colours; }; +static bool has_colour(void) +{ +#ifdef HAVE_NCURSES + bool supported; + int ret; + + if (!isatty(fileno(stdout))) + return false; + setupterm(NULL, fileno(stdout), &ret); + if (ret != 1) + return false; + supported = !!tigetstr("setaf"); + del_curterm(cur_term); + + return supported; +#else + return false; +#endif +} + static bool parse_command_line(int argc, char **argv, struct options *options) { int option; static struct option long_options[] = { + {"colour", no_argument, NULL, OPTION_COLOUR}, {"help", no_argument, NULL, OPTION_HELP}, + {"list", no_argument, NULL, OPTION_LIST}, + {"no-colour", no_argument, NULL, OPTION_NO_COLOUR}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, }; + static const struct colours colours = + { + .reset = "\x1b[m", + .index = "\x1b[92m", + .label = "\x1b[93m", + }; + + static const struct colours no_colours = + { + .reset = "", + .index = "", + .label = "", + }; + memset(options, 0, sizeof(*options)); + if (!getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour()) + options->colours = colours; + else + options->colours = no_colours; for (;;) { - if ((option = getopt_long(argc, argv, "hV", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "htV", long_options, NULL)) == -1) break; switch (option) { + case OPTION_COLOUR: + options->colours = colours; + break; + case 'h': case OPTION_HELP: options->print_help = true; return true; + case 't': + case OPTION_LIST: + options->list = true; + break; + + case OPTION_NO_COLOUR: + options->colours = no_colours; + break; + case 'V': case OPTION_VERSION: options->print_version = true; @@ -76,25 +146,161 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (optind < argc) + options->input_filename = argv[argc - 1]; + return true; } static void print_usage(const char *program_name) { static const char usage[] = - "[options...]\n" + "[options...] [file]\n" "Options:\n" + " --colour Enable colour, even when not supported by the output.\n" " -h, --help Display this information and exit.\n" + " -t, --list List the contents of the DXBC blob.\n" + " --no-colour Disable colour, even when supported by the output.\n" " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" - " interpreted as a filename.\n"; + " interpreted as a filename.\n" + "\n" + "If the input file is '-' or not specified, input will be read from standard\n" + "input.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } +static FILE *open_input(const char *filename, bool *close) +{ + FILE *f; + + *close = false; + + if (!filename || !strcmp(filename, "-")) + return stdin; + + if (!(f = fopen(filename, "rb"))) + { + fprintf(stderr, "Unable to open '%s' for reading.\n", filename); + return NULL; + } + + *close = true; + return f; +} + +static bool read_input(FILE *f, struct vkd3d_shader_code *dxbc) +{ + size_t size = 4096; + struct stat st; + size_t pos = 0; + uint8_t *data; + size_t ret; + + memset(dxbc, 0, sizeof(*dxbc)); + + if (fstat(fileno(f), &st) == -1) + { + fprintf(stderr, "Could not stat input.\n"); + return false; + } + + if (S_ISREG(st.st_mode)) + size = st.st_size; + + if (!(data = malloc(size))) + { + fprintf(stderr, "Out of memory.\n"); + return false; + } + + for (;;) + { + if (pos >= size) + { + if (size > SIZE_MAX / 2 || !(data = realloc(data, size * 2))) + { + fprintf(stderr, "Out of memory.\n"); + free(data); + return false; + } + size *= 2; + } + + if (!(ret = fread(&data[pos], 1, size - pos, f))) + break; + pos += ret; + } + + if (!feof(f)) + { + free(data); + return false; + } + + dxbc->code = data; + dxbc->size = pos; + + return true; +} + +static const char *dump_tag(char *out, uint32_t tag) +{ + unsigned int i; + + memcpy(out, &tag, sizeof(tag)); + for (i = 0; i < sizeof(tag); ++i) + { + if (!isprint(out[i])) + out[i] = '.'; + } + + return out; +} + +static void dump_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct options *options) +{ + const struct colours *colours = &options->colours; + struct vkd3d_shader_dxbc_section_desc *section; + char tag[4]; + size_t i; + + printf(" %stag%s: %08x (%.4s)\n", + colours->label, colours->reset, + dxbc_desc->tag, dump_tag(tag, dxbc_desc->tag)); + printf(" %schecksum%s: %08x %08x %08x %08x\n", + colours->label, colours->reset, + dxbc_desc->checksum[0], dxbc_desc->checksum[1], + dxbc_desc->checksum[2], dxbc_desc->checksum[3]); + printf(" %sversion%s: %u\n", colours->label, colours->reset, dxbc_desc->version); + printf(" %ssize%s: %#zx (%zu) bytes\n", colours->label, colours->reset, dxbc_desc->size, dxbc_desc->size); + printf(" %ssections%s: %zu\n\n", colours->label, colours->reset, dxbc_desc->section_count); + + printf(" %s#%s %stag%s %ssize%s\n", + colours->label, colours->reset, + colours->label, colours->reset, + colours->label, colours->reset); + for (i = 0; i < dxbc_desc->section_count; ++i) + { + section = &dxbc_desc->sections[i]; + printf("%s%2zu%s %08x (%.4s) 0x%08zx (%zu) bytes\n", + colours->index, i, colours->reset, + section->tag, dump_tag(tag, section->tag), + section->data.size, section->data.size); + } +} + int main(int argc, char **argv) { + struct vkd3d_shader_dxbc_desc dxbc_desc; + struct vkd3d_shader_code dxbc; struct options options; + bool close_input; + char *messages; + int fail = 1; + FILE *input; + int ret; if (!parse_command_line(argc, argv, &options)) { @@ -116,5 +322,30 @@ int main(int argc, char **argv) return 0; } - return 0; + if (!(input = open_input(options.input_filename, &close_input))) + goto done; + + if (!read_input(input, &dxbc)) + { + fprintf(stderr, "Failed to read input blob.\n"); + goto done; + } + + ret = vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, &messages); + if (messages) + fputs(messages, stderr); + vkd3d_shader_free_messages(messages); + if (ret < 0) + goto done; + + if (options.list) + dump_dxbc(&dxbc_desc, &options); + + vkd3d_shader_free_dxbc(&dxbc_desc); + vkd3d_shader_free_shader_code(&dxbc); + fail = 0; +done: + if (close_input) + fclose(input); + return fail; }

1 0

Henri Verbeet : vkd3d-dxbc: Implement listing section data.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: vkd3d Branch: master Commit: 5d75731d9776a58ef1632ac8206abc126dcb1dfb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d75731d9776a58ef1632ac8206ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 3 12:00:02 2023 +0200 vkd3d-dxbc: Implement listing section data. --- programs/vkd3d-dxbc/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index 6766016d..ea425f09 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -38,6 +38,7 @@ enum OPTION_COLOUR = CHAR_MAX + 1, OPTION_HELP, OPTION_LIST, + OPTION_LIST_DATA, OPTION_NO_COLOUR, OPTION_VERSION, }; @@ -47,12 +48,14 @@ struct options const char *input_filename; bool print_help; bool list; + bool list_data; bool print_version; struct colours { const char *reset; const char *index; + const char *offset; const char *label; } colours; }; @@ -86,6 +89,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"colour", no_argument, NULL, OPTION_COLOUR}, {"help", no_argument, NULL, OPTION_HELP}, {"list", no_argument, NULL, OPTION_LIST}, + {"list-data", no_argument, NULL, OPTION_LIST_DATA}, {"no-colour", no_argument, NULL, OPTION_NO_COLOUR}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, @@ -95,6 +99,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { .reset = "\x1b[m", .index = "\x1b[92m", + .offset = "\x1b[36m", .label = "\x1b[93m", }; @@ -102,6 +107,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { .reset = "", .index = "", + .offset = "", .label = "", }; @@ -132,6 +138,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->list = true; break; + case OPTION_LIST_DATA: + options->list_data = true; + break; + case OPTION_NO_COLOUR: options->colours = no_colours; break; @@ -160,6 +170,7 @@ static void print_usage(const char *program_name) " --colour Enable colour, even when not supported by the output.\n" " -h, --help Display this information and exit.\n" " -t, --list List the contents of the DXBC blob.\n" + " --list-data List the data contained in the DXBC sections.\n" " --no-colour Disable colour, even when supported by the output.\n" " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -259,6 +270,59 @@ static const char *dump_tag(char *out, uint32_t tag) return out; } +static void dump_line(const struct colours *colours, const char *prefix, + const uint8_t *data, size_t offset, size_t count) +{ + const uint8_t *ptr = &data[offset]; + size_t i; + + if (!count) + return; + + printf("%s%s%08zx%s ", prefix, colours->offset, offset, colours->reset); + for (i = 0; i < count; ++i) + { + printf("%02x ", ptr[i]); + if (i == 7) + printf(" "); + } + + while (i < 16) + { + printf(" "); + if (i == 7) + printf(" "); + ++i; + } + printf(" %s|%s", colours->offset, colours->reset); + + for (i = 0; i < count; ++i) + { + printf("%c", isprint(ptr[i]) ? ptr[i] : '.'); + } + printf("%s|%s\n", colours->offset, colours->reset); +} + +static void dump_data(const struct colours *colours, const char *prefix, const struct vkd3d_shader_code *data) +{ + size_t line_count, remainder, i; + const uint8_t *ptr; + + ptr = data->code; + line_count = data->size / 16; + remainder = data->size % 16; + + for (i = 0; i < line_count; ++i, ptr += 16) + { + dump_line(colours, prefix, data->code, i * 16, 16); + } + if (remainder) + { + dump_line(colours, prefix, data->code, i * 16, remainder); + } + printf("%s%s%08zx%s\n", prefix, colours->offset, data->size, colours->reset); +} + static void dump_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct options *options) { const struct colours *colours = &options->colours; @@ -288,6 +352,12 @@ static void dump_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru colours->index, i, colours->reset, section->tag, dump_tag(tag, section->tag), section->data.size, section->data.size); + + if (!options->list_data) + continue; + printf("\n"); + dump_data(colours, " ", &section->data); + printf("\n"); } } @@ -338,7 +408,7 @@ int main(int argc, char **argv) if (ret < 0) goto done; - if (options.list) + if (options.list || options.list_data) dump_dxbc(&dxbc_desc, &options); vkd3d_shader_free_dxbc(&dxbc_desc);

1 0

Jeff Smith : d3dx9_36/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: c449da64e18b70914ff0da6b3fb55530ee369faa URL: https://gitlab.winehq.org/wine/wine/-/commit/c449da64e18b70914ff0da6b3fb555… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:39:03 2023 -0500 d3dx9_36/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3dx9_36/tests/effect.c | 12 ++++++++---- dlls/d3dx9_36/tests/math.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index aed30118a44..edc35235c3e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -23,6 +23,13 @@ #include "d3dx9.h" /* helper functions */ +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) { INT x = *(INT *)&f; @@ -33,10 +40,7 @@ static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static inline INT get_int(D3DXPARAMETER_TYPE type, const void *data) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5d112bd4b92..79f02e6536e 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -24,6 +24,13 @@ #include <math.h> #include <stdint.h> +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -34,10 +41,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec2(const D3DXVECTOR2 *v1, const D3DXVECTOR2 *v2, unsigned int ulps)

1 0

Jeff Smith : d3dx10_43/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 11516e7cee7499b78c6cbc0f008fce095e17d6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/11516e7cee7499b78c6cbc0f008fce… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:39:28 2023 -0500 d3dx10_43/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3dx10_43/tests/d3dx10.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 8257ab1e919..e9c215d3c45 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1120,6 +1120,13 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -1130,10 +1137,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static char *get_str_a(const WCHAR *wstr)

1 0

Jeff Smith : d3dcompiler_43/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 0a8610f9ba926977533b2b8f6035689e7430cae5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a8610f9ba926977533b2b8f603568… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:39:59 2023 -0500 d3dcompiler_43/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 12 ++++++++---- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index ac0cf20e5ee..c853b14f13a 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -57,6 +57,13 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const return blob; } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -67,10 +74,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 1ba283f4d99..42fb3b97fc2 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -326,6 +326,13 @@ static struct vec4 get_color_vec4(IDirect3DDevice9 *device, unsigned int x, unsi return ret; } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -336,10 +343,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps)

1 0

Jeff Smith : d2d1/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 7febd8db5dbcdca8bd172a6cabfbddb32afecf85 URL: https://gitlab.winehq.org/wine/wine/-/commit/7febd8db5dbcdca8bd172a6cabfbdd… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:15:28 2023 -0500 d2d1/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d2d1/tests/d2d1.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4f53b4b7142..9480e1fc1a5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -731,10 +731,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_colour_f(const D2D1_COLOR_F *colour, float r, float g, float b, float a, unsigned int ulps)

1 0