September 2020 - Wine-commits

Akihiro Sagawa : kernelbase: Improve Get{, Dynamic}TimeZoneInformation() performance.
by Alexandre Julliard 29 Sep '20

29 Sep '20

Module: wine Branch: master Commit: d5edadf35a40cb7238c2068db28b6c6abc7da800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5edadf35a40cb7238c2068d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 25 00:07:50 2020 +0900 kernelbase: Improve Get{, Dynamic}TimeZoneInformation() performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49808 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4e7bd9937b..83dd76e3c0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4122,6 +4122,20 @@ INT WINAPI DECLSPEC_HOTPATCH GetCalendarInfoEx( const WCHAR *locale, CALID calen return GetCalendarInfoW( lcid, calendar, type, data, count, value ); } +static CRITICAL_SECTION tzname_section; +static CRITICAL_SECTION_DEBUG tzname_section_debug = +{ + 0, 0, &locale_section, + { &tzname_section_debug.ProcessLocksList, &tzname_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": tzname_section") } +}; +static CRITICAL_SECTION tzname_section = { &tzname_section_debug, -1, 0, 0, 0, 0 }; +static struct { + LCID lcid; + WCHAR key_name[128]; + WCHAR standard_name[32]; + WCHAR daylight_name[32]; +} cached_tzname; /*********************************************************************** * GetDynamicTimeZoneInformation (kernelbase.@) @@ -4134,15 +4148,34 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetDynamicTimeZoneInformation( DYNAMIC_TIME_ZONE_ if (!set_ntstatus( RtlQueryDynamicTimeZoneInformation( (RTL_DYNAMIC_TIME_ZONE_INFORMATION *)info ))) return TIME_ZONE_ID_INVALID; - if (!RegOpenKeyExW( tz_key, info->TimeZoneKeyName, 0, KEY_ALL_ACCESS, &key )) + RtlEnterCriticalSection( &tzname_section ); + if (cached_tzname.lcid == GetThreadLocale() && + !wcscmp( info->TimeZoneKeyName, cached_tzname.key_name )) + { + wcscpy( info->StandardName, cached_tzname.standard_name ); + wcscpy( info->DaylightName, cached_tzname.daylight_name ); + RtlLeaveCriticalSection( &tzname_section ); + } + else { - RegLoadMUIStringW( key, L"MUI_Std", info->StandardName, - sizeof(info->StandardName), NULL, 0, system_dir ); - RegLoadMUIStringW( key, L"MUI_Dlt", info->DaylightName, - sizeof(info->DaylightName), NULL, 0, system_dir ); - RegCloseKey( key ); + RtlLeaveCriticalSection( &tzname_section ); + if (!RegOpenKeyExW( tz_key, info->TimeZoneKeyName, 0, KEY_ALL_ACCESS, &key )) + { + RegLoadMUIStringW( key, L"MUI_Std", info->StandardName, + sizeof(info->StandardName), NULL, 0, system_dir ); + RegLoadMUIStringW( key, L"MUI_Dlt", info->DaylightName, + sizeof(info->DaylightName), NULL, 0, system_dir ); + RegCloseKey( key ); + } + else return TIME_ZONE_ID_INVALID; + + RtlEnterCriticalSection( &tzname_section ); + cached_tzname.lcid = GetThreadLocale(); + wcscpy( cached_tzname.key_name, info->TimeZoneKeyName ); + wcscpy( cached_tzname.standard_name, info->StandardName ); + wcscpy( cached_tzname.daylight_name, info->DaylightName ); + RtlLeaveCriticalSection( &tzname_section ); } - else return TIME_ZONE_ID_INVALID; NtQuerySystemTime( &now ); return get_timezone_id( (TIME_ZONE_INFORMATION *)info, now, FALSE );

1 0

Zebediah Figura : vkd3d: Move hresult_from_vkd3d_result to vkd3d-common.
by Alexandre Julliard 29 Sep '20

29 Sep '20

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))) \ { \

1 0

Zebediah Figura : vkd3d-compiler: Add the HLSL source type.
by Alexandre Julliard 29 Sep '20

29 Sep '20

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");

1 0

Zebediah Figura : vkd3d-compiler: Add the dxbc-tpf target type.
by Alexandre Julliard 29 Sep '20

29 Sep '20

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)

1 0

Zebediah Figura : vkd3d-compiler: Add support for specifying the HLSL shader profile.
by Alexandre Julliard 29 Sep '20

29 Sep '20

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");

1 0

Zebediah Figura : vkd3d-compiler: Add support for specifying the entry point for HLSL shaders.
by Alexandre Julliard 29 Sep '20

29 Sep '20

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)) {

1 0

Alexandre Julliard : ntdll: Use load_dll() to load kernel32 to support PE format.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: e5c0e8e296a114aeca41fcb67c73f55e1d37d002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c0e8e296a114aeca41fcb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:38:08 2020 +0200 ntdll: Use load_dll() to load kernel32 to support PE format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 319cdd8c8a..20bc3f977d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3987,7 +3987,7 @@ static NTSTATUS process_init(void) static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'n','t','d','l','l','.','d','l','l',0}; - static const WCHAR kernel32W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + static const WCHAR kernel32W[] = {'C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'k','e','r','n','e','l','3','2','.','d','l','l',0}; RTL_USER_PROCESS_PARAMETERS *params; @@ -4044,8 +4044,7 @@ static NTSTATUS process_init(void) status = build_builtin_module( params->DllPath.Buffer, &nt_name, meminfo.AllocationBase, 0, &wm ); assert( !status ); - RtlInitUnicodeString( &nt_name, kernel32W ); - if ((status = load_builtin_dll( params->DllPath.Buffer, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS) + if ((status = load_dll( params->DllPath.Buffer, kernel32W, NULL, 0, &wm )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status );

1 0

Alexandre Julliard : kernel32: Build with msvcrt.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 0c631ebb2354334eaf309bc0765d3283654cf902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c631ebb2354334eaf309bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:34:11 2020 +0200 kernel32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 4 +- dlls/kernel32/atom.c | 9 +-- dlls/kernel32/comm.c | 39 ++++++------ dlls/kernel32/computername.c | 4 -- dlls/kernel32/console.c | 5 +- dlls/kernel32/debugger.c | 3 +- dlls/kernel32/editline.c | 4 -- dlls/kernel32/file.c | 9 +-- dlls/kernel32/heap.c | 3 - dlls/kernel32/kernel_main.c | 4 -- dlls/kernel32/lcformat.c | 31 +++++----- dlls/kernel32/locale.c | 4 -- dlls/kernel32/lzexpand.c | 9 +-- dlls/kernel32/module.c | 14 ++--- dlls/kernel32/path.c | 9 +-- dlls/kernel32/process.c | 21 +------ dlls/kernel32/profile.c | 140 +++++++++++++++++++++---------------------- dlls/kernel32/resource.c | 6 +- dlls/kernel32/sync.c | 7 --- dlls/kernel32/tests/loader.c | 22 ++----- dlls/kernel32/thread.c | 2 - dlls/kernel32/toolhelp.c | 5 -- dlls/kernel32/version.c | 4 -- dlls/kernel32/virtual.c | 11 +--- dlls/kernel32/volume.c | 3 - 25 files changed, 128 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c631ebb2354334eaf30…

1 0

Alexandre Julliard : configure: Don't disable ntdll or kernel32 for Windows builds.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 725bb795f8f8793b6649f01eb28e3238b9099025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=725bb795f8f8793b6649f01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:34:23 2020 +0200 configure: Don't disable ntdll or kernel32 for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- 2 files changed, 4 deletions(-) diff --git a/configure b/configure index a70d60da82..296e476779 100755 --- a/configure +++ b/configure @@ -8282,8 +8282,6 @@ if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then : fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} - enable_kernel32=${enable_kernel32:-no} - enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} diff --git a/configure.ac b/configure.ac index 722e5653bd..1072f16f09 100644 --- a/configure.ac +++ b/configure.ac @@ -723,8 +723,6 @@ case $host_os in esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} - enable_kernel32=${enable_kernel32:-no} - enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no}

1 0

Esme Povirk : mscoree: Update Wine Mono to 5.1.1.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 6078375a298f4879ada0a91e84451ca24f851800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6078375a298f4879ada0a91e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Sep 28 11:58:18 2020 -0500 mscoree: Update Wine Mono to 5.1.1. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dcade07c44..346411867c 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.1.0" +#define MONO_VERSION "5.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "ae55439c7cd61d1a17f0c687967fad8ad12d9e2263972ffd5e9dde2685fd8ddd" +#define MONO_SHA "74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 096b20875b..c9edc2d68d 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.1.0" +#define WINE_MONO_VERSION "5.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0