August 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-compiler: Support reading from standard input.
by Alexandre Julliard Aug. 13, 2020

Aug. 13, 2020

Module: vkd3d Branch: master Commit: 690a717887e9af4ff1433f73d0aefec920b04fb4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=690a717887e9af4ff1433f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 17:55:39 2020 +0430 vkd3d-compiler: Support reading from standard input. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 100 ++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 27 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 0051277..a6c935c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -68,44 +68,58 @@ target_type_info[] = " This is the format used for Vulkan shaders.\n"}, }; -static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) +static bool read_shader(struct vkd3d_shader_code *shader, FILE *f) { + size_t size = 4096; struct stat st; - void *code; - FILE *fd; + size_t pos = 0; + uint8_t *data; + size_t ret; memset(shader, 0, sizeof(*shader)); - if (stat(filename, &st) == -1) + if (fstat(fileno(f), &st) == -1) { - fprintf(stderr, "Could not stat file: '%s'.\n", filename); + fprintf(stderr, "Could not stat input.\n"); return false; } - shader->size = st.st_size; - if (!(fd = fopen(filename, "rb"))) + if (S_ISREG(st.st_mode)) + size = st.st_size; + + if (!(data = malloc(size))) { - fprintf(stderr, "Cannot open file for reading: '%s'.\n", filename); + fprintf(stderr, "Out of memory.\n"); return false; } - if (!(code = malloc(shader->size))) + for (;;) { - fprintf(stderr, "Out of memory.\n"); - fclose(fd); - return false; + 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; } - shader->code = code; - if (fread(code, 1, shader->size, fd) != shader->size) + if (!feof(f)) { - fprintf(stderr, "Could not read shader bytecode from file: '%s'.\n", filename); - free(code); - fclose(fd); + free(data); return false; } - fclose(fd); + shader->code = data; + shader->size = pos; + return true; } @@ -117,7 +131,7 @@ static bool write_shader(const struct vkd3d_shader_code *shader, FILE *f) static void print_usage(const char *program_name) { static const char usage[] = - "[options...] file\n" + "[options...] [file]\n" "Options:\n" " -h, --help Display this information and exit.\n" " -b <type> Specify the target type. Currently the only valid value\n" @@ -136,7 +150,10 @@ static void print_usage(const char *program_name) " -x <type> Specify the type of the source. Valid values are\n" " 'dxbc-tpf' and 'none'.\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); } @@ -312,10 +329,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; - if (optind >= argc) - return false; - - options->filename = argv[argc - 1]; + if (optind < argc) + options->filename = argv[argc - 1]; return true; } @@ -370,6 +385,25 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) } } +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 FILE *open_output(const char *filename, bool *close) { FILE *f; @@ -391,12 +425,12 @@ static FILE *open_output(const char *filename, bool *close) int main(int argc, char **argv) { + bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; - bool close_output = false; struct options options; + FILE *input, *output; char *messages; - FILE *output; int fail = 1; int ret; @@ -426,6 +460,16 @@ int main(int argc, char **argv) return 0; } + if (!(input = open_input(options.filename, &close_input))) + goto done; + + if (!options.filename && 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"); + goto done; + } + if (!(output = open_output(options.output_filename, &close_output))) goto done; @@ -445,7 +489,7 @@ int main(int argc, char **argv) info.log_level = VKD3D_SHADER_LOG_INFO; info.source_name = options.filename; - if (!read_shader(&info.source, options.filename)) + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n"); goto done; @@ -474,5 +518,7 @@ int main(int argc, char **argv) done: if (close_output) fclose(output); + if (close_input) + fclose(input); return fail; }

1 0

Henri Verbeet : vkd3d-compiler: Support writing to standard output.
by Alexandre Julliard Aug. 13, 2020

Aug. 13, 2020

Module: vkd3d Branch: master Commit: c27bed00233169d9a3d8c292d48a49e508b47720 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c27bed00233169d9a3d8c29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 17:55:38 2020 +0430 vkd3d-compiler: Support writing to standard output. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 75 +++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ed4b0ee..0051277 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _GNU_SOURCE #include <fcntl.h> #include <stdbool.h> #include <stdio.h> @@ -108,21 +109,9 @@ static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) return true; } -static bool write_shader(const struct vkd3d_shader_code *shader, const char *filename) +static bool write_shader(const struct vkd3d_shader_code *shader, FILE *f) { - FILE *fd; - - if (!(fd = fopen(filename, "wb"))) - { - fprintf(stderr, "Cannot open file for writing: '%s'.\n", filename); - return false; - } - - if (fwrite(shader->code, 1, shader->size, fd) != shader->size) - fprintf(stderr, "Could not write shader bytecode to file: '%s'.\n", filename); - - fclose(fd); - return true; + return fwrite(shader->code, 1, shader->size, f) == shader->size; } static void print_usage(const char *program_name) @@ -136,7 +125,9 @@ 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" - " -o, --output=<file> Write the output to <file>.\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" " --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" @@ -379,12 +370,34 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) } } +static FILE *open_output(const char *filename, bool *close) +{ + FILE *f; + + *close = false; + + if (!filename || !strcmp(filename, "-")) + return stdout; + + if (!(f = fopen(filename, "wb"))) + { + fprintf(stderr, "Unable to open '%s' for writing.\n", filename); + return NULL; + } + + *close = true; + return f; +} + int main(int argc, char **argv) { struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; + bool close_output = false; struct options options; char *messages; + FILE *output; + int fail = 1; int ret; if (!parse_command_line(argc, argv, &options)) @@ -413,6 +426,16 @@ int main(int argc, char **argv) return 0; } + if (!(output = open_output(options.output_filename, &close_output))) + goto done; + + if (!options.output_filename && isatty(fileno(output))) + { + fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" + "If this is really what you intended, specify the output explicitly.\n"); + goto done; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; @@ -424,8 +447,8 @@ int main(int argc, char **argv) if (!read_shader(&info.source, options.filename)) { - fprintf(stderr, "Failed to read DXBC shader.\n"); - return 1; + fprintf(stderr, "Failed to read input shader.\n"); + goto done; } ret = vkd3d_shader_compile(&info, &spirv, &messages); @@ -435,13 +458,21 @@ int main(int argc, char **argv) vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { - fprintf(stderr, "Failed to compile DXBC shader, ret %d.\n", ret); - return 1; + fprintf(stderr, "Failed to compile shader, ret %d.\n", ret); + goto done; } - if (options.output_filename) - write_shader(&spirv, options.output_filename); + if (!write_shader(&spirv, output)) + { + fprintf(stderr, "Failed to write output shader.\n"); + vkd3d_shader_free_shader_code(&spirv); + goto done; + } + fail = 0; vkd3d_shader_free_shader_code(&spirv); - return 0; +done: + if (close_output) + fclose(output); + return fail; }

1 0

Henri Verbeet : build: Try "vulkan-1" as the Vulkan library.
by Alexandre Julliard Aug. 13, 2020

Aug. 13, 2020

Module: vkd3d Branch: master Commit: 9a2b3bac58653337f8bfd71f7e4b5e1216a9b901 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a2b3bac58653337f8bfd71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 17:55:37 2020 +0430 build: Try "vulkan-1" as the Vulkan library. Somewhat unconventionally, the official Vulkan import library is called "vulkan-1.lib" on Windows. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 355aaab..ca9d760 100644 --- a/configure.ac +++ b/configure.ac @@ -96,10 +96,14 @@ VKD3D_CHECK_PTHREAD AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lMoltenVK" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) + [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan-1" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], + ["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared],

1 0

Henri Verbeet : vkd3d-shader: Introduce an enumeration for swizzle components.
by Alexandre Julliard Aug. 13, 2020

Aug. 13, 2020

Module: vkd3d Branch: master Commit: 2dd0d207d5dd2232c0720602e01d6bc33a3130e7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2dd0d207d5dd2232c072060… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 17:55:40 2020 +0430 vkd3d-shader: Introduce an enumeration for swizzle components. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e4d8a50..1ece69d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -731,10 +731,15 @@ struct vkd3d_shader_signature }; /* swizzle bits fields: wwzzyyxx */ -#define VKD3D_SHADER_SWIZZLE_X (0u) -#define VKD3D_SHADER_SWIZZLE_Y (1u) -#define VKD3D_SHADER_SWIZZLE_Z (2u) -#define VKD3D_SHADER_SWIZZLE_W (3u) +enum vkd3d_shader_swizzle_component +{ + VKD3D_SHADER_SWIZZLE_X = 0x0, + VKD3D_SHADER_SWIZZLE_Y = 0x1, + VKD3D_SHADER_SWIZZLE_Z = 0x2, + VKD3D_SHADER_SWIZZLE_W = 0x3, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT), +}; #define VKD3D_SHADER_SWIZZLE_MASK (0x3u) #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx))

1 0

Jacek Caban : urlmon: Remove unused flags argument from parse_host.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: e03d7ca900d9eed1a78504b96bb7a82f69a6ca05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e03d7ca900d9eed1a78504b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 14:09:42 2020 +0200 urlmon: Remove unused flags argument from parse_host. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/uri.c | 95 ++++++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e03d7ca900d9eed1a785…

1 0

Rémi Bernon : ntdll/tests: Fix w2008 debugger test results.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: f804d1ac70f0f113ddd0295dcb83707776cdbd2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f804d1ac70f0f113ddd0295d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 12 10:15:00 2020 +0200 ntdll/tests: Fix w2008 debugger test results. Changing Eip has an effect there, so offset it just a little bit so that it still falls within code. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 51 +++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7ee191469e..0efe189891 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -376,14 +376,16 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { - ok(context->Eip == (DWORD)code_mem + 0xb, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xb); + ok(context->Eip == (DWORD)code_mem + 0xb || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, + "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); } /* test if context change is preserved from vectored handler to stack handlers */ @@ -411,14 +413,16 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { - ok(context->Eip == (DWORD)code_mem + 0xb, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xb); + ok(context->Eip == (DWORD)code_mem + 0xb || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, + "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); } if(have_vectored_api) @@ -1045,8 +1049,8 @@ static void test_debugger(void) ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Eip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Eip = (UINT_PTR)code_mem_address + 0xd; ctx.Eax = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -1058,7 +1062,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Eip */ ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); - ctx.Eip = 0x12345; + ctx.Eip = (UINT_PTR)code_mem_address + 0xd; ctx.Eax = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -1071,7 +1075,8 @@ static void test_debugger(void) if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { ok((char *)ctx.Eip == (char *)code_mem_address + 0xa || - broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb), + broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) || + broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); /* need to fixup Eip for debuggee */ @@ -1079,8 +1084,10 @@ static void test_debugger(void) ctx.Eip += 1; } else - ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", - ctx.Eip, (char *)code_mem_address + 0xb); + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb || + broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, + "Eip at 0x%x instead of %p\n", + ctx.Eip, (char *)code_mem_address + 0xb); /* here we handle exception */ } } @@ -2933,8 +2940,8 @@ static void test_debugger(void) ok((char *)ctx.Rip == (char *)code_mem_address + 0xb, "Rip at %p instead of %p\n", (char *)ctx.Rip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Rip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Rip = (UINT_PTR)code_mem_address + 0xd; ctx.Rax = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -2946,8 +2953,8 @@ static void test_debugger(void) ok((char *)ctx.Rip == (char *)code_mem_address + 0xb, "Rip at %p instead of %p\n", (char *)ctx.Rip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Rip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Rip = (UINT_PTR)code_mem_address + 0xd; ctx.Rax = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -3732,8 +3739,8 @@ static void test_debugger(void) ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %x instead of %p\n", ctx.Pc, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Pc = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.R0 = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -3745,7 +3752,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Pc */ ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at 0x%x instead of %p\n", ctx.Pc, (char *)code_mem_address + 0xb); - ctx.Pc = 0x12345; + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.R0 = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -4110,8 +4117,8 @@ static void test_debugger(void) ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %p instead of %p\n", (char *)ctx.Pc, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Pc = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.X0 = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -4123,7 +4130,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Pc */ ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %p instead of %p\n", (char *)ctx.Pc, (char *)code_mem_address + 0xb); - ctx.Pc = 0x12345; + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.X0 = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */

1 0

Nikolay Sivov : combase: Move CoCreateFreeThreadedMarshaler().
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 3a413b91b9f432967306b750dd48ef520cc58212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a413b91b9f432967306b750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:29 2020 +0300 combase: Move CoCreateFreeThreadedMarshaler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 295 +++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ftmarshal.c | 312 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 297 insertions(+), 314 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a413b91b9f432967306…

1 0

Rémi Bernon : ntdll/tests: Run RtlRaiseException tests on x86_64.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 26c078a2a64e515323bfbb4fcbdaf161150942ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c078a2a64e515323bfbb4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 12 10:15:02 2020 +0200 ntdll/tests: Run RtlRaiseException tests on x86_64. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 197 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 180 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26c078a2a64e515323bf…

1 0

Esme Povirk : mscoree: Use builtin XNA implementation by default.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: f87171c6013603decfc64f405bb039b5c1f1add4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87171c6013603decfc64f40… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 11 22:15:46 2020 -0500 mscoree: Use builtin XNA implementation by default. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32877 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 7702994252..e854ec2bdf 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1502,6 +1502,10 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a return reg_entry.flags; } + if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0) + /* XNA redist is broken in Wine Mono, use FNA instead. */ + return 0; + return ASSEMBLY_SEARCH_UNDEFINED; }

1 0

Nikolay Sivov : combase: Move CoGetInterfaceAndReleaseStream().
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 4c9db7fa2281fb62660e8e54aa5f2c706d2a0b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9db7fa2281fb62660e8e54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:27 2020 +0300 combase: Move CoGetInterfaceAndReleaseStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 19 +++++++++++++++++++ dlls/ole32/marshal.c | 30 ------------------------------ dlls/ole32/ole32.spec | 2 +- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 56dc63c4f7..8c471f5ef6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -109,7 +109,7 @@ @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax @ stub CoGetModuleType diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index dfe6426db9..54151e21c8 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -21,6 +21,10 @@ #define COBJMACROS #include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + /*********************************************************************** * CoMarshalHresult (combase.@) */ @@ -36,3 +40,18 @@ HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult) { return IStream_Read(stream, phresult, sizeof(*phresult), NULL); } + +/*********************************************************************** + * CoGetInterfaceAndReleaseStream (combase.@) + */ +HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void **obj) +{ + HRESULT hr; + + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj); + + if (!stream) return E_INVALIDARG; + hr = CoUnmarshalInterface(stream, riid, obj); + IStream_Release(stream); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 90d2480595..51db5a7e69 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2124,36 +2124,6 @@ HRESULT WINAPI CoMarshalInterThreadInterfaceInStream( return hres; } -/*********************************************************************** - * CoGetInterfaceAndReleaseStream [OLE32.@] - * - * Unmarshalls an interface from a stream and then releases the stream. - * - * PARAMS - * pStm [I] Stream that contains the marshalled interface. - * riid [I] Interface identifier of the object to unmarshall. - * ppv [O] Address of pointer where the requested interface object will be stored. - * - * RETURNS - * Success: S_OK - * Failure: A COM error code - * - * SEE ALSO - * CoMarshalInterThreadInterfaceInStream() and CoUnmarshalInterface() - */ -HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID riid, - LPVOID *ppv) -{ - HRESULT hres; - - TRACE("(%p, %s, %p)\n", pStm, debugstr_guid(riid), ppv); - - if(!pStm) return E_INVALIDARG; - hres = CoUnmarshalInterface(pStm, riid, ppv); - IStream_Release(pStm); - return hres; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 001e7b7ad2..d5e5607e03 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -37,7 +37,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) combase.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stdcall CoGetObject(wstr ptr ptr ptr)

1 0