December 2018 - Wine-devel - list.winehq.org

[PATCH] secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols.
by Jacek Caban 06 Dec '18

06 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46161 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] schannel.h: Add DTLS defines.
by Jacek Caban 06 Dec '18

06 Dec '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/schannel.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH] loader: Check if the preloader overlaps the reserved range on the Mac.
by Ken Thomases 06 Dec '18

06 Dec '18

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- loader/preloader_mac.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 1d88062..83d24af 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -48,6 +48,7 @@ #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h> +#include <mach-o/ldsyms.h> #endif #include "main.h" @@ -98,6 +99,8 @@ void __stack_chk_fail(void) { return; } static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header +#define target_segment_command segment_command +#define TARGET_LC_SEGMENT LC_SEGMENT #define target_thread_state_t i386_thread_state_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__eip @@ -184,6 +187,8 @@ __ASM_GLOBAL_FUNC( start, static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header_64 +#define target_segment_command segment_command_64 +#define TARGET_LC_SEGMENT LC_SEGMENT_64 #define target_thread_state_t x86_thread_state64_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__rip @@ -376,6 +381,36 @@ static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char wld_exit(1); } +static int preloader_overlaps_range( const void *start, const void *end ) +{ + intptr_t slide = p_dyld_get_image_slide(&_mh_execute_header); + struct load_command *cmd = (struct load_command*)(&_mh_execute_header + 1); + int i; + + for (i = 0; i < _mh_execute_header.ncmds; ++i) + { + if (cmd->cmd == TARGET_LC_SEGMENT) + { + struct target_segment_command *seg = (struct target_segment_command*)cmd; + const void *seg_start = (const void*)(seg->vmaddr + slide); + const void *seg_end = (const char*)seg_start + seg->vmsize; + + if (end > seg_start && start <= seg_end) + { + char segname[sizeof(seg->segname) + 1]; + memcpy(segname, seg->segname, sizeof(seg->segname)); + segname[sizeof(segname) - 1] = 0; + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %s segment %p-%p\n", + start, end, segname, seg_start, seg_end ); + return 1; + } + } + cmd = (struct load_command*)((char*)cmd + cmd->cmdsize); + } + + return 0; +} + /* * preload_reserve * @@ -406,7 +441,8 @@ static void preload_reserve( const char *str ) else if (result) goto error; /* single value '0' is allowed */ /* sanity checks */ - if (end <= start) start = end = NULL; + if (end <= start || preloader_overlaps_range(start, end)) + start = end = NULL; /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) @@ -562,6 +598,11 @@ void *wld_start( void *stack, int *is_unix_thread ) p++; } + LOAD_POSIX_DYLD_FUNC( dlopen ); + LOAD_POSIX_DYLD_FUNC( dlsym ); + LOAD_POSIX_DYLD_FUNC( dladdr ); + LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); + /* reserve memory that Wine needs */ if (reserve) preload_reserve( reserve ); for (i = 0; preload_info[i].size; i++) @@ -576,11 +617,6 @@ void *wld_start( void *stack, int *is_unix_thread ) if (!map_region( &builtin_dlls )) builtin_dlls.size = 0; - LOAD_POSIX_DYLD_FUNC( dlopen ); - LOAD_POSIX_DYLD_FUNC( dlsym ); - LOAD_POSIX_DYLD_FUNC( dladdr ); - LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); - /* load the main binary */ if (!(mod = pdlopen( argv[1], RTLD_NOW ))) fatal_error( "%s: could not load binary\n", argv[1] ); -- 2.10.2

3 5

[PATCH 3/3] tzres: Add time zone name resource DLL and use it.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

This will fix https://bugs.winehq.org/show_bug.cgi?id=42719 after Japanese translation update. String IDs are based on SHA1 hash so that we can add another zone name without renumbering. I'm preparing a tool which generate these IDs and time zone information. I'll send it later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ntdll/tests/time.c | 4 +- dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

2 1

[PATCH 2/3] [v2] kernel32: Resolve an MUI time zone name.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

In v2, use RegLoadMUIString as suggested. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 54 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-)

1 0

[PATCH 1/3] ntdll: Use an MUI time zone name if available.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] kernel32: Resolve an indirect string in time zone names.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/kernel_private.h | 2 + dlls/kernel32/resource.c | 96 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 28 ++++++++++++ 3 files changed, 126 insertions(+)

2 4

[PATCH] wine_call_on_stack:Avoid missing semi-colon in the declaration.
by Denil Verghese 06 Dec '18

06 Dec '18

A missing semi-colon is added. Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> --- libs/wine/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index d5ce07aceb..29e9091789 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -126,7 +126,7 @@ __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void * __asm call [ecx]; __asm mov esp, esi; __asm pop esi; - __asm pop ebp + __asm pop ebp; __asm ret; } #elif defined(__x86_64__) && defined(__GNUC__) -- 2.16.2.windows.1

1 0

[PATCH 8/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in PNG encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e5a59cf9..786d8360e0 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1979,11 +1979,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GU return S_OK; } -static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICPngEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 7/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in TIFF encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 01d62d925d..95a39cdbfb 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1921,11 +1921,22 @@ static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICTiffEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0