wine-commits September 2020

1 participants
703 discussions

Arkadiusz Hiler : gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.

by Alexandre Julliard

Module: wine Branch: master Commit: 45aee6375d0f2dcfe7bd47b5d0e4866916a345db URL: https://source.winehq.org/git/wine.git/?a=commit;h=45aee6375d0f2dcfe7bd47b5… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Sep 28 12:16:49 2020 +0300 gdi32: Limit GetGlyphOutlineW(uChar) to a WORD. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45400 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 ++ dlls/gdi32/tests/font.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a71b24423a..3c5a6e9a23 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2911,6 +2911,8 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; + uChar &= 0xffff; + dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0ada22d95d..4c8b1cbb91 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5823,6 +5823,57 @@ todo_wine ReleaseDC(NULL, hdc); } +static void test_GetGlyphOutline_character(void) +{ + HFONT hfont, hfont_old; + LOGFONTA lf; + HDC hdc; + DWORD ret; + GLYPHMETRICS gm1, gm2, gmn; + char test_chars[] = { 'A', 'D', '!', '\0' }; + char *current_char; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_old = SelectObject(hdc, hfont); + ok(hfont_old != NULL, "SelectObject failed\n"); + + ret = GetGlyphOutlineW(hdc, 'Z', GGO_METRICS, &gmn, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed to default to .notdef for character 'Z'\n"); + + for (current_char = test_chars; *current_char != '\0'; current_char++) + { + ret = GetGlyphOutlineW(hdc, *current_char, GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for '%c'\n", *current_char); + ok(memcmp(&gm1, &gmn, sizeof(gmn)) != 0, "the test character '%c' matches .notdef\n", *current_char); + + ret = GetGlyphOutlineW(hdc, 0x10000 + *current_char, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for 0x10000 + '%c'\n", *current_char); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for character 0x10000 + '%c'\n", *current_char); + } + + ret = GetGlyphOutlineW(hdc, 0x3, GGO_METRICS|GGO_GLYPH_INDEX, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for glyph index 0x3\n"); + + ret = GetGlyphOutlineW(hdc, 0xFFFF, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeded\n"); + + ret = GetGlyphOutlineW(hdc, 0x10003, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW for index 0x10003 has failed\n"); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for glyph 0x10003\n"); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_fstype_fixup(void) { HDC hdc; @@ -5945,6 +5996,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); + test_GetGlyphOutline_character(); test_fstype_fixup(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0);

3 years, 7 months

Zebediah Figura : vkd3d-compiler: Add support for specifying the entry point for HLSL shaders.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 042a2928dc9a224892f4d89455b0caeb027f24e1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=042a2928dc9a224892f4d89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 28 22:41:10 2020 -0500 vkd3d-compiler: Add support for specifying the entry point for HLSL shaders. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index dbc6469..8b9d7c2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -39,6 +39,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, OPTION_BUFFER_UAV, + OPTION_ENTRY, OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, OPTION_PRINT_TARGET_TYPES, @@ -161,6 +162,7 @@ static void print_usage(const char *program_name) " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" + " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -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" @@ -190,6 +192,7 @@ struct options { const char *filename; const char *output_filename; + const char *entry_point; const char *profile; enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; @@ -380,6 +383,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"help", no_argument, NULL, OPTION_HELP}, {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, + {"entry", required_argument, NULL, OPTION_ENTRY}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, @@ -398,7 +402,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "b:ho:p:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:e:ho:p:Vx:", long_options, NULL)) == -1) break; switch (option) @@ -420,6 +424,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV, buffer_uav); break; + case OPTION_ENTRY: + case 'e': + options->entry_point = optarg; + break; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -646,6 +655,7 @@ int main(int argc, char **argv) hlsl_source_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; hlsl_source_info.profile = options.profile; + hlsl_source_info.entry_point = options.entry_point; if (!read_shader(&info.source, input)) {

3 years, 7 months

Zebediah Figura : vkd3d-compiler: Add support for specifying the HLSL shader profile.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 7e6dd8a895800042b739115ec3678ec2c71fb3c9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7e6dd8a895800042b739115… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 28 22:41:09 2020 -0500 vkd3d-compiler: Add support for specifying the HLSL shader profile. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index dd2ce93..dbc6469 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -42,6 +42,7 @@ enum OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, OPTION_PRINT_TARGET_TYPES, + OPTION_PROFILE, OPTION_STRIP_DEBUG, OPTION_VERSION, OPTION_TEXT_FORMATTING, @@ -171,6 +172,7 @@ static void print_usage(const char *program_name) " --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" + " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Valid values are\n" @@ -188,6 +190,7 @@ struct options { const char *filename; const char *output_filename; + const char *profile; enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool print_version; @@ -381,6 +384,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, + {"profile", required_argument, NULL, OPTION_PROFILE}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, @@ -394,7 +398,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "b:ho:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:ho:p:Vx:", long_options, NULL)) == -1) break; switch (option) @@ -421,6 +425,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->output_filename = optarg; break; + case OPTION_PROFILE: + case 'p': + options->profile = optarg; + break; + case OPTION_TEXT_FORMATTING: if (!parse_formatting(&options->formatting, &options->explicit_colour, optarg)) return false; @@ -565,6 +574,7 @@ static bool has_colour(FILE *f) int main(int argc, char **argv) { + struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; @@ -626,7 +636,7 @@ int main(int argc, char **argv) add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; - info.next = NULL; + info.next = &hlsl_source_info; info.source_type = options.source_type; info.target_type = options.target_type; info.options = options.compile_options; @@ -634,6 +644,9 @@ int main(int argc, char **argv) info.log_level = VKD3D_SHADER_LOG_INFO; info.source_name = options.filename; + hlsl_source_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; + hlsl_source_info.profile = options.profile; + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n");

3 years, 7 months

Zebediah Figura : vkd3d-compiler: Add the dxbc-tpf target type.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 22fcdb761359068ad0e07d17fa65b165cf462b4b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22fcdb761359068ad0e07d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 28 22:41:08 2020 -0500 vkd3d-compiler: Add the dxbc-tpf target type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index a5aff57..dd2ce93 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -84,6 +84,10 @@ target_type_info[] = {VKD3D_SHADER_TARGET_D3D_ASM, "d3d-asm", "A shader in Direct3D assembly form.\n", false}, + {VKD3D_SHADER_TARGET_DXBC_TPF, + "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" + " This is the format used for Direct3D shader model 4 and 5 shaders.\n", + true}, }; static bool read_shader(struct vkd3d_shader_code *shader, FILE *f)

3 years, 7 months

Zebediah Figura : vkd3d-compiler: Add the HLSL source type.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 0bcb8ba3989604c40d47d93f30cb4d3283911376 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0bcb8ba3989604c40d47d93… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 28 22:41:07 2020 -0500 vkd3d-compiler: Add the HLSL source type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8480c4f..a5aff57 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -52,12 +52,17 @@ static const struct source_type_info enum vkd3d_shader_source_type type; const char *name; const char *description; + bool is_binary; } source_type_info[] = { {VKD3D_SHADER_SOURCE_DXBC_TPF, "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" - " This is the format used for Direct3D shader model 4 and 5 shaders.\n"}, + " This is the format used for Direct3D shader model 4 and 5 shaders.\n", + true}, + {VKD3D_SHADER_SOURCE_HLSL, + "hlsl", "High Level Shader Language source code.\n", + false}, }; static const struct target_type_info @@ -594,7 +599,7 @@ int main(int argc, char **argv) if (!(input = open_input(options.filename, &close_input))) goto done; - if (!options.filename && isatty(fileno(input))) + if (!options.filename && get_source_type_info(options.source_type)->is_binary && isatty(fileno(input))) { fprintf(stderr, "Input is a tty and input format is binary, exiting.\n" "If this is really what you intended, specify the input explicitly.\n");

3 years, 7 months

Zebediah Figura : vkd3d: Move hresult_from_vkd3d_result to vkd3d-common.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: ce58af9df818242e9f9d559400aa799eee34d9a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce58af9df818242e9f9d559… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 28 22:41:04 2020 -0500 vkd3d: Move hresult_from_vkd3d_result to vkd3d-common. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + include/private/vkd3d_common.h | 3 +++ libs/vkd3d-common/error.c | 43 ++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/utils.c | 23 ---------------------- 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/Makefile.am b/Makefile.am index 07426fb..6f8af57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,6 +67,7 @@ libvkd3d_common_la_SOURCES = \ include/private/vkd3d_debug.h \ libs/vkd3d-common/blob.c \ libs/vkd3d-common/debug.c \ + libs/vkd3d-common/error.c \ libs/vkd3d-common/memory.c \ libs/vkd3d-common/utf8.c diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index ac217e9..ed80f48 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -21,6 +21,7 @@ #include "config.h" #include "vkd3d_windows.h" +#include "vkd3d_types.h" #include <ctype.h> #include <limits.h> @@ -183,4 +184,6 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min *minor = atoi(version); } +HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d-common/error.c b/libs/vkd3d-common/error.c new file mode 100644 index 0000000..81c1fd9 --- /dev/null +++ b/libs/vkd3d-common/error.c @@ -0,0 +1,43 @@ +/* + * Copyright 2018 Józef Kucia 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 + */ + +#include "vkd3d_common.h" +#include "vkd3d_debug.h" + +HRESULT hresult_from_vkd3d_result(int vkd3d_result) +{ + switch (vkd3d_result) + { + case VKD3D_OK: + return S_OK; + case VKD3D_ERROR_INVALID_SHADER: + WARN("Invalid shader bytecode.\n"); + /* fall-through */ + case VKD3D_ERROR: + return E_FAIL; + case VKD3D_ERROR_OUT_OF_MEMORY: + return E_OUTOFMEMORY; + case VKD3D_ERROR_INVALID_ARGUMENT: + return E_INVALIDARG; + case VKD3D_ERROR_NOT_IMPLEMENTED: + return E_NOTIMPL; + default: + FIXME("Unhandled vkd3d result %d.\n", vkd3d_result); + return E_FAIL; + } +} diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index f9f2663..08e6af9 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -770,29 +770,6 @@ HRESULT hresult_from_vk_result(VkResult vr) } } -HRESULT hresult_from_vkd3d_result(int vkd3d_result) -{ - switch (vkd3d_result) - { - case VKD3D_OK: - return S_OK; - case VKD3D_ERROR_INVALID_SHADER: - WARN("Invalid shader bytecode.\n"); - /* fall-through */ - case VKD3D_ERROR: - return E_FAIL; - case VKD3D_ERROR_OUT_OF_MEMORY: - return E_OUTOFMEMORY; - case VKD3D_ERROR_INVALID_ARGUMENT: - return E_INVALIDARG; - case VKD3D_ERROR_NOT_IMPLEMENTED: - return E_NOTIMPL; - default: - FIXME("Unhandled vkd3d result %d.\n", vkd3d_result); - return E_FAIL; - } -} - #define LOAD_GLOBAL_PFN(name) \ if (!(procs->name = (void *)vkGetInstanceProcAddr(NULL, #name))) \ { \

3 years, 7 months

Michael Stefaniuc : oleaut32: Remove superfluous casts.

by Alexandre Julliard

Module: wine Branch: master Commit: 2ee75bf9ade3e90f10ffe4236c8c95d817402392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee75bf9ade3e90f10ffe423… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 28 21:28:08 2020 +0200 oleaut32: Remove superfluous casts. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 4201a53642..8b4060318f 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3873,7 +3873,7 @@ HRESULT WINAPI VarCySub(CY cyLeft, CY cyRight, CY* pCyOut) */ HRESULT WINAPI VarCyAbs(CY cyIn, CY* pCyOut) { - if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo) + if (cyIn.s.Hi == 0x80000000 && !cyIn.s.Lo) return DISP_E_OVERFLOW; pCyOut->int64 = cyIn.int64 < 0 ? -cyIn.int64 : cyIn.int64; @@ -3948,7 +3948,7 @@ HRESULT WINAPI VarCyInt(CY cyIn, CY* pCyOut) */ HRESULT WINAPI VarCyNeg(CY cyIn, CY* pCyOut) { - if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo) + if (cyIn.s.Hi == 0x80000000 && !cyIn.s.Lo) return DISP_E_OVERFLOW; pCyOut->int64 = -cyIn.int64;

3 years, 7 months

Michael Stefaniuc : shlwapi: Remove superfluous cast to self.

by Alexandre Julliard

Module: wine Branch: master Commit: 93da988df2a7fc7a772c3a2347fa6a46bfdca2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93da988df2a7fc7a772c3a23… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 28 21:28:07 2020 +0200 shlwapi: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index be178bba60..f4c6ca85d6 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -229,7 +229,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U break; case STRRET_OFFSET: - lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len); + lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len); break; default:

3 years, 7 months

Michael Stefaniuc : shell32: Remove superfluous cast to self.

by Alexandre Julliard

Module: wine Branch: master Commit: 1f313b7f1f0345259dbfa5667b34d89042ea7928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f313b7f1f0345259dbfa566… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 28 21:28:06 2020 +0200 shell32: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index de581dec42..b0eefa5999 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -934,7 +934,7 @@ static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 return hr; } - *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; + *link = &This->IShellLinkDual2_iface; return S_OK; }

3 years, 7 months

Michael Stefaniuc : gdiplus: Remove superfluous cast to self.

by Alexandre Julliard

Module: wine Branch: master Commit: 812eb3c41d5eae82835c5ea507bb1041edf5ba7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=812eb3c41d5eae82835c5ea5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 28 21:28:05 2020 +0200 gdiplus: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e52932da11..e9855c7226 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3482,7 +3482,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(draw->brush.Color, (GpSolidFill**)&solidfill); + stat = GdipCreateSolidFill(draw->brush.Color, &solidfill); if (stat != Ok) return InvalidParameter;

3 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020