September 2020 - Wine-Commits

Alistair Leslie-Hughes : dmstyle: Implement IDirectMusicStyle8 GetBand.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 3636779f92b1e411ac3bfb202613396174c5e387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3636779f92b1e411ac3bfb20… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 18 22:42:19 2020 +0200 dmstyle: Implement IDirectMusicStyle8 GetBand. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 6eaedb1fbd..f8a62604a9 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -134,12 +134,39 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) } /* IDirectMusicStyle8Impl IDirectMusicStyle(8) part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *pwszName, - IDirectMusicBand **ppBand) +static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *name, + IDirectMusicBand **band) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p, %p): stub\n", This, pwszName, ppBand); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + struct style_band *sband; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", This, debugstr_w(name), band); + + if (!name) + return E_POINTER; + + LIST_FOR_EACH_ENTRY(sband, &This->bands, struct style_band, entry) { + IDirectMusicObject *obj; + + hr = IDirectMusicBand_QueryInterface(sband->pBand, &IID_IDirectMusicObject, (void**)&obj); + if (SUCCEEDED(hr)) { + DMUS_OBJECTDESC desc; + + if (IDirectMusicObject_GetDescriptor(obj, &desc) == S_OK) { + if (desc.dwValidData & DMUS_OBJ_NAME && !lstrcmpW(name, desc.wszName)) { + IDirectMusicObject_Release(obj); + IDirectMusicBand_AddRef(sband->pBand); + *band = sband->pBand; + return S_OK; + } + } + + IDirectMusicObject_Release(obj); + } + } + + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex,

1 0

Alistair Leslie-Hughes : dmband: Semi-stub IDirectMusicBand CreateSegment.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 7bb9d62e7083a344d0fd03369ad69d999d11a1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb9d62e7083a344d0fd0336… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 18 22:42:17 2020 +0200 dmband: Semi-stub IDirectMusicBand CreateSegment. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/band.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 901f5a69ee..6f990afaf7 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -90,11 +90,27 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) } static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, - IDirectMusicSegment **ppSegment) + IDirectMusicSegment **segment) { - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - FIXME("(%p, %p): stub\n", This, ppSegment); - return S_OK; + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); + HRESULT hr; + DMUS_BAND_PARAM bandparam; + + FIXME("(%p, %p): semi-stub\n", This, segment); + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC, + &IID_IDirectMusicSegment, (void**)segment); + if (FAILED(hr)) + return hr; + + bandparam.mtTimePhysical = 0; + bandparam.pBand = &This->IDirectMusicBand_iface; + IDirectMusicBand_AddRef(bandparam.pBand); + hr = IDirectMusicSegment_SetParam(*segment, &GUID_BandParam, 0xffffffff, DMUS_SEG_ALLTRACKS, + 0, &bandparam); + IDirectMusicBand_Release(bandparam.pBand); + + return hr; } static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface,

1 0

Henri Verbeet : vkd3d-shader: Invert the "FRIENDLY_NAMES" output formatting flag.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: vkd3d Branch: master Commit: 4fda96190be93e88eefd1e385f9a45abf63c4deb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4fda96190be93e88eefd1e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 21 20:06:30 2020 +0330 vkd3d-shader: Invert the "FRIENDLY_NAMES" output formatting flag. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 12 ++++++------ libs/vkd3d-shader/spirv.c | 13 ++++++------- programs/vkd3d-compiler/main.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index f6dc477..3efd355 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -75,12 +75,12 @@ enum vkd3d_shader_compile_option_buffer_uav enum vkd3d_shader_compile_option_formatting_flags { - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE = 0x00000000, - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR = 0x00000001, - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT = 0x00000002, - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS = 0x00000004, - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER = 0x00000008, - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES = 0x00000010, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE = 0x00000000, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR = 0x00000001, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT = 0x00000002, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS = 0x00000004, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER = 0x00000008, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_RAW_IDS = 0x00000010, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FLAGS), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 560e857..994b5ac 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -63,11 +63,11 @@ static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_form } valuemap[] = { - {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR, SPV_BINARY_TO_TEXT_OPTION_COLOR }, - {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT, SPV_BINARY_TO_TEXT_OPTION_INDENT }, - {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS, SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET}, - {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER, SPV_BINARY_TO_TEXT_OPTION_NO_HEADER, true}, - {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES, SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES }, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR, SPV_BINARY_TO_TEXT_OPTION_COLOR }, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT, SPV_BINARY_TO_TEXT_OPTION_INDENT }, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS, SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET}, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER, SPV_BINARY_TO_TEXT_OPTION_NO_HEADER, true}, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_RAW_IDS, SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES, true}, }; for (i = 0; i < ARRAY_SIZE(valuemap); ++i) @@ -2271,8 +2271,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); - compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES - | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; for (i = 0; i < compile_info->option_count; ++i) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 2780d3e..cc3a105 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -149,8 +149,8 @@ static void print_usage(const char *program_name) " standard output.\n" " --formatting=<type> Specify the formatting options for text output.\n" " Valid values are 'none', 'print', 'colour', 'indent',\n" - " 'offsets', 'header', and 'friendly-names'.\n" - " Default is --formatting=friendly-names,indent,header.\n" + " 'offsets', 'header', and 'raw-ids'.\n" + " Default is --formatting=indent,header.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" @@ -235,12 +235,12 @@ static bool parse_formatting(uint32_t *formatting, char *arg) } opts[] = { - {"none", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE }, - {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR }, - {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT }, - {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS }, - {"header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER }, - {"friendly-names", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES }, + {"none", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE}, + {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR}, + {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT}, + {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS}, + {"header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER}, + {"raw-ids", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_RAW_IDS}, }; char *tok;

1 0

Henri Verbeet : vkd3d-compiler: Allow the --formatting option to modify individual flags.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: vkd3d Branch: master Commit: 55cfa465ea9fe0e4a2e536890c37136cd60e045e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55cfa465ea9fe0e4a2e5368… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 21 20:06:31 2020 +0330 vkd3d-compiler: Allow the --formatting option to modify individual flags. Instead of replacing all of them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index cc3a105..5f4f9db 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -147,10 +147,11 @@ static void print_usage(const char *program_name) " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" " output file is specified, output will be written to\n" " standard output.\n" - " --formatting=<type> Specify the formatting options for text output.\n" - " Valid values are 'none', 'print', 'colour', 'indent',\n" - " 'offsets', 'header', and 'raw-ids'.\n" - " Default is --formatting=indent,header.\n" + " --formatting=<flags> Specify the formatting options for text output.\n" + " <flags> is a comma separated list of formatting flags,\n" + " optionally prefixed by '+' or '-'. Valid flags are\n" + " 'colour', 'indent', 'offsets', 'header', and 'raw-ids'.\n" + " The 'indent' and 'header' flags are enabled by default.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" @@ -235,7 +236,6 @@ static bool parse_formatting(uint32_t *formatting, char *arg) } opts[] = { - {"none", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE}, {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR}, {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT}, {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS}, @@ -246,12 +246,27 @@ static bool parse_formatting(uint32_t *formatting, char *arg) for (tok = strtok(arg, ","); tok; tok = strtok(NULL, ",")) { + bool set = true; unsigned int i; + + if (*tok == '-') + { + set = false; + ++tok; + } + else if (*tok == '+') + { + ++tok; + } + for (i = 0; i < ARRAY_SIZE(opts); ++i) { if (!strcmp(tok, opts[i].name)) { - *formatting |= opts[i].value; + if (set) + *formatting |= opts[i].value; + else + *formatting &= ~opts[i].value; break; } } @@ -335,8 +350,9 @@ static bool validate_target_type( static bool parse_command_line(int argc, char **argv, struct options *options) { + enum vkd3d_shader_compile_option_formatting_flags formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; enum vkd3d_shader_compile_option_buffer_uav buffer_uav; - enum vkd3d_shader_compile_option_formatting_flags formatting = 0; int option; static struct option long_options[] = @@ -388,7 +404,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) case OPTION_TEXT_FORMATTING: if (!parse_formatting(&formatting, optarg)) return false; - add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, formatting); break; case OPTION_PRINT_SOURCE_TYPES: @@ -432,6 +447,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, formatting); if (optind < argc) options->filename = argv[argc - 1];

1 0

Henri Verbeet : include: The vkd3d_shader_log_level enumeration describes the *minimum* severity.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: vkd3d Branch: master Commit: bc5be191d95d577b8dc4f5392f52d6e1ec87106c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bc5be191d95d577b8dc4f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 21 20:06:27 2020 +0330 include: The vkd3d_shader_log_level enumeration describes the *minimum* severity. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d7fa3ed..376699f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -471,7 +471,7 @@ enum vkd3d_shader_target_type }; /** - * Describes the maximum severity of compilation messages returned by + * Describes the minimum severity of compilation messages returned by * vkd3d_shader_compile() and similar functions. */ enum vkd3d_shader_log_level

1 0

Isabella Bosia : vkd3d-shader: Pass format to shader_addline.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: vkd3d Branch: master Commit: 37791773997edd18f71a548832c192a420a0aa5a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=37791773997edd18f71a548… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 21 11:50:18 2020 +0100 vkd3d-shader: Pass format to shader_addline. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 587c85c..d7495ee 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -355,7 +355,7 @@ static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD g { if (global_flags & global_flag_info[i].flag) { - shader_addline(buffer, global_flag_info[i].name); + shader_addline(buffer, "%s", global_flag_info[i].name); global_flags &= ~global_flag_info[i].flag; if (global_flags) shader_addline(buffer, " | ");

1 0

Henri Verbeet : vkd3d-shader: Rename the "SHOW_BYTE_OFFSET" output formatting flag to just "OFFSETS".
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: vkd3d Branch: master Commit: 8cc0abfca0ed7457f63f3f977c3049756177ef5b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cc0abfca0ed7457f63f3f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 21 20:06:28 2020 +0330 vkd3d-shader: Rename the "SHOW_BYTE_OFFSET" output formatting flag to just "OFFSETS". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/spirv.c | 2 +- programs/vkd3d-compiler/main.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 376699f..624376d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -78,7 +78,7 @@ enum vkd3d_shader_compile_option_formatting_flags VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE = 0x00000000, VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR = 0x00000001, VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT = 0x00000002, - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET = 0x00000004, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS = 0x00000004, VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER = 0x00000008, VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES = 0x00000010, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa0d4e0..33356d8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -64,7 +64,7 @@ static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_form { {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR, SPV_BINARY_TO_TEXT_OPTION_COLOR }, {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT, SPV_BINARY_TO_TEXT_OPTION_INDENT }, - {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET, SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET}, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS, SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET}, {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER, SPV_BINARY_TO_TEXT_OPTION_NO_HEADER }, {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES, SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES }, }; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4812d47..cc50866 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -149,7 +149,7 @@ static void print_usage(const char *program_name) " standard output.\n" " --formatting=<type> Specify the formatting options for text output.\n" " Valid values are 'none', 'print', 'colour', 'indent',\n" - " 'show-byte-offset', 'no-header', and 'friendly-names'.\n" + " 'offsets', 'no-header', and 'friendly-names'.\n" " Default is --formatting=friendly-names,indent.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" @@ -238,7 +238,7 @@ static bool parse_formatting(uint32_t *formatting, char *arg) {"none", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE }, {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR }, {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT }, - {"show-byte-offset", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET}, + {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS }, {"no-header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER }, {"friendly-names", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES }, };

1 0

Henri Verbeet : vkd3d-shader: Invert the "NO_HEADER" output formatting flag.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: vkd3d Branch: master Commit: 7c64e827ca3ddfe0c9d456810ac0acbd10d0b6b4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c64e827ca3ddfe0c9d4568… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 21 20:06:29 2020 +0330 vkd3d-shader: Invert the "NO_HEADER" output formatting flag. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/spirv.c | 14 +++++++++----- programs/vkd3d-compiler/main.c | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 624376d..f6dc477 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -79,7 +79,7 @@ enum vkd3d_shader_compile_option_formatting_flags VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR = 0x00000001, VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT = 0x00000002, VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS = 0x00000004, - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER = 0x00000008, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER = 0x00000008, VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES = 0x00000010, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FLAGS), diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 33356d8..560e857 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -59,19 +59,22 @@ static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_form { enum vkd3d_shader_compile_option_formatting_flags vkd3d; uint32_t spv; + bool invert; } valuemap[] = { {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR, SPV_BINARY_TO_TEXT_OPTION_COLOR }, {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT, SPV_BINARY_TO_TEXT_OPTION_INDENT }, {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS, SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET}, - {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER, SPV_BINARY_TO_TEXT_OPTION_NO_HEADER }, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER, SPV_BINARY_TO_TEXT_OPTION_NO_HEADER, true}, {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES, SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES }, }; - for (i = 0; i < ARRAY_SIZE(valuemap); i++) - if (formatting & valuemap[i].vkd3d) + for (i = 0; i < ARRAY_SIZE(valuemap); ++i) + { + if (valuemap[i].invert == !(formatting & valuemap[i].vkd3d)) out |= valuemap[i].spv; + } return out; } @@ -2268,8 +2271,9 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); - compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES | - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT; + compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; for (i = 0; i < compile_info->option_count; ++i) { diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index cc50866..2780d3e 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -149,8 +149,8 @@ static void print_usage(const char *program_name) " standard output.\n" " --formatting=<type> Specify the formatting options for text output.\n" " Valid values are 'none', 'print', 'colour', 'indent',\n" - " 'offsets', 'no-header', and 'friendly-names'.\n" - " Default is --formatting=friendly-names,indent.\n" + " 'offsets', 'header', and 'friendly-names'.\n" + " Default is --formatting=friendly-names,indent,header.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" @@ -239,7 +239,7 @@ static bool parse_formatting(uint32_t *formatting, char *arg) {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR }, {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT }, {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS }, - {"no-header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER }, + {"header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER }, {"friendly-names", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES }, }; char *tok;

1 0

Pengpeng Dong : gdiplus: Initialize the dead point coordinates in "GpPointF, *ptf" to 0.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: 36e6ea9767473204b0e1635a1d54af3868fa0188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36e6ea9767473204b0e1635a… Author: Pengpeng Dong <dongpengpeng(a)uniontech.com> Date: Thu Sep 10 11:01:20 2020 +0800 gdiplus: Initialize the dead point coordinates in "GpPointF, *ptf" to 0. Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 868aea5642..1615f592d5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -323,8 +323,15 @@ static void round_points(POINT *pti, GpPointF *ptf, INT count) int i; for(i = 0; i < count; i++){ - pti[i].x = gdip_round(ptf[i].X); - pti[i].y = gdip_round(ptf[i].Y); + if(isnan(ptf[i].X)) + pti[i].x = 0; + else + pti[i].x = gdip_round(ptf[i].X); + + if(isnan(ptf[i].Y)) + pti[i].y = 0; + else + pti[i].y = gdip_round(ptf[i].Y); } }

1 0

Paul Gofman : d3d10core/tests: Add test for NULL resource parameters for _CopySubresourceRegion().
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: 1799afe9c9962769da3bbdf9ddbb574e8af30df3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1799afe9c9962769da3bbdf9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 18 13:03:30 2020 +0300 d3d10core/tests: Add test for NULL resource parameters for _CopySubresourceRegion(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index deb6144a4b..4332ce2dcf 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -9819,6 +9819,15 @@ static void test_copy_subresource_region(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + if (!is_warp_device(device)) + { + /* Broken on Win2008 Warp */ + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D10Device_CopySubresourceRegion(device, NULL, 0, + 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box); + } + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box);

1 0