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

Alexandre Julliard : ntdll: Avoid importing the codepage functions from the Unix library.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 520040dc4a287fd62d7d5161c083cee990c3d6e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=520040dc4a287fd62d7d5161… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:37:16 2020 +0200 ntdll: Avoid importing the codepage functions from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 3 +- dlls/ntdll/unix/env.c | 243 +++++++++++++++++++++++++++++++++++------ dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 4 +- 5 files changed, 215 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=520040dc4a287fd62d7d…

1 0

Paul Gofman : ntdll: Fix KiUserExceptionDispatcher ABI on x86_64.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 887332f9c7bf0d75f53f88a9739b77b12463d636 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887332f9c7bf0d75f53f88a9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 30 23:34:34 2020 +0300 ntdll: Fix KiUserExceptionDispatcher ABI on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49436 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 27 ++++++++++++++++++---- dlls/ntdll/unix/signal_arm.c | 4 ++++ dlls/ntdll/unix/signal_arm64.c | 5 ++++ dlls/ntdll/unix/signal_i386.c | 4 ++++ dlls/ntdll/unix/signal_x86_64.c | 51 +++++++++++++++++++++++++---------------- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 ++ 7 files changed, 70 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3f3c449d52..b575d63857 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -530,10 +530,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } -/******************************************************************* - * KiUserExceptionDispatcher (NTDLL.@) - */ -NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { NTSTATUS status; DWORD c; @@ -581,6 +578,28 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } +/******************************************************************* + * KiUserExceptionDispatcher (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, + "mov 0x98(%rsp),%rcx\n\t" /* context->Rsp */ + "mov 0xf8(%rsp),%rdx\n\t" /* context->Rip */ + "mov %rdx,-0x8(%rcx)\n\t" + "mov %rbp,-0x10(%rcx)\n\t" + "mov %rdi,-0x18(%rcx)\n\t" + "mov %rsi,-0x20(%rcx)\n\t" + "mov %rcx,%rbp\n\t" + "mov %rsp,%rdx\n\t" /* context */ + "lea 0x4f0(%rsp),%rcx\n\t" /* rec */ + __ASM_CFI(".cfi_signal_frame\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,0\n\t") + __ASM_CFI(".cfi_rel_offset %rip,-0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,-0x10\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,-0x18\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,-0x20\n\t") + "call " __ASM_NAME("dispatch_exception") "\n\t" + "int3") + static ULONG64 get_int_reg( CONTEXT *context, int reg ) { return *(&context->Rax + reg); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 265836499d..611d1ab819 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -531,6 +531,10 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun return &stack->rec; } +void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + pKiUserExceptionDispatcher( rec, context ); +} /********************************************************************** * raise_segv_exception diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index b15f64110d..47b52f0131 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -602,6 +602,11 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * REGn_sig(18, sigcontext) = (ULONG_PTR)NtCurrentTeb(); } +void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + pKiUserExceptionDispatcher( rec, context ); +} + /********************************************************************** * segv_handler * diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index ea9bfbeb3b..730d0b1cb3 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1588,6 +1588,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * stack->context_ptr = &stack->context; } +void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + pKiUserExceptionDispatcher( rec, context ); +} /********************************************************************** * get_fpu_code diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 47f3650b42..5334a4d7cc 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -233,6 +233,7 @@ typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); struct stack_layout { CONTEXT context; + ULONG64 unknown[4]; EXCEPTION_RECORD rec; ULONG64 rsi; ULONG64 rdi; @@ -241,6 +242,8 @@ struct stack_layout ULONG64 red_zone[16]; }; +C_ASSERT( sizeof(struct stack_layout) == 0x630 ); /* Should match the size in call_user_exception_dispatcher(). */ + struct amd64_thread_data { DWORD_PTR dr0; /* debug registers */ @@ -1843,16 +1846,10 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } -extern void CDECL raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +extern void CDECL raise_func_trampoline( raise_func func ); + __ASM_GLOBAL_FUNC( raise_func_trampoline, - __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,160\n\t") /* red zone + rip + rbp + rdi + rsi */ - __ASM_CFI(".cfi_rel_offset %rip,24\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,16\n\t") - __ASM_CFI(".cfi_rel_offset %rdi,8\n\t") - __ASM_CFI(".cfi_rel_offset %rsi,0\n\t") - "call *%r8\n\t" - "int $3") + "jmpq *%r8\n\t") /*********************************************************************** * setup_exception @@ -1934,7 +1931,6 @@ static struct stack_layout *setup_exception( ucontext_t *sigcontext ) static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack ) { - ULONG64 *rsp_ptr; NTSTATUS status; if (stack->rec.ExceptionCode == EXCEPTION_SINGLE_STEP) @@ -1962,24 +1958,39 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * return; } - /* store return address and %rbp without aligning, so that the offset is fixed */ - rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; - *(--rsp_ptr) = stack->context.Rip; - *(--rsp_ptr) = stack->context.Rbp; - *(--rsp_ptr) = stack->context.Rdi; - *(--rsp_ptr) = stack->context.Rsi; - /* now modify the sigcontext to return to the raise function */ RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; - RCX_sig(sigcontext) = (ULONG_PTR)&stack->rec; - RDX_sig(sigcontext) = (ULONG_PTR)&stack->context; R8_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; - RBP_sig(sigcontext) = (ULONG_PTR)rsp_ptr; RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); } +extern void WINAPI user_exception_dispatcher_trampoline( struct stack_layout *stack, + void *pKiUserExceptionDispatcher ); + +__ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, + "movq %rcx,%rsp\n\t" + "movq 0x98(%rsp),%rcx\n\t" /* context->Rsp */ + "movq 0xa0(%rsp),%rbp\n\t" + "movq 0xa8(%rsp),%rsi\n\t" + "movq 0xb0(%rsp),%rdi\n\t" + "jmpq *%rdx") + +void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, struct stack_layout *stack) +{ + memcpy(&stack->context, context, sizeof(*context)); + memcpy(&stack->rec, rec, sizeof(*rec)); + + user_exception_dispatcher_trampoline( stack, pKiUserExceptionDispatcher ); +} + +__ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "movq 0x98(%rdx),%rsp\n\t" /* context->Rsp */ + "and $~0xf,%rsp\n\t" + "sub $0x630,%rsp\n\t" /* sizeof(struct stack_layout) */ + "movq %rsp,%r8\n\t" + "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t") /*********************************************************************** * is_privileged_instr diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 5f6841b0e8..686d3991b7 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -415,7 +415,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) NtSetContextThread( GetCurrentThread(), context ); - if (first_chance) pKiUserExceptionDispatcher( rec, context ); + if (first_chance) call_user_exception_dispatcher( rec, context ); if (rec->ExceptionFlags & EH_STACK_INVALID) ERR("Exception frame is not in stack limits => unable to dispatch exception.\n"); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 4f93aa2c54..e6c8d5764e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -241,6 +241,8 @@ extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void dbg_init(void) DECLSPEC_HIDDEN; +extern void WINAPI call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) DECLSPEC_HIDDEN; + #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400) #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC)

1 0

Alexandre Julliard : winegcc: Pass -mno-cygwin and -munix flags directly to winebuild.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: cbc35152c4c4b053d6ff48601c3eead71f083b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbc35152c4c4b053d6ff4860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:42 2020 +0200 winegcc: Pass -mno-cygwin and -munix flags directly to winebuild. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 +++++++++- tools/winegcc/winegcc.man.in | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 776d2b6473..29c1b0549d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -207,6 +207,7 @@ struct options int nostartfiles; int nodefaultlibs; int noshortwchar; + int unix_lib; int gui_app; int unicode_app; int win16_app; @@ -964,7 +965,8 @@ static strarray *get_winebuild_args(struct options *opts) for (i = 0; i < opts->prefix->size; i++) strarray_add( spec_args, strmake( "-B%s", opts->prefix->base[i] )); } - if (!opts->use_msvcrt) strarray_add( spec_args, "-munix" ); + if (opts->use_msvcrt) strarray_add( spec_args, "-mno-cygwin" ); + if (opts->unix_lib) strarray_add( spec_args, "-munix" ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; @@ -1790,6 +1792,7 @@ int main(int argc, char **argv) { opts.use_msvcrt = 1; raw_compiler_arg = 0; + strarray_add( opts.winebuild_args, opts.args->base[i] ); } else if (strcmp("-mwindows", opts.args->base[i]) == 0) { @@ -1810,6 +1813,11 @@ int main(int argc, char **argv) { raw_compiler_arg = 0; } + else if (strcmp("-munix", opts.args->base[i]) == 0) + { + opts.unix_lib = 1; + raw_compiler_arg = 0; + } else if (strcmp("-m16", opts.args->base[i]) == 0) { opts.win16_app = 1; diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 5550767299..8a14dd59fd 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,6 +59,9 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. +.B \-munix +Set when building the Unix counterpart of a builtin module. +.TP .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and

1 0

Gijs Vermeulen : amstream/tests: Add more AMVideoStream::QueryAccept() tests.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: ddcabfa2d7237ec785590ee6a6a2fe7fea3e5526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddcabfa2d7237ec785590ee6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jun 30 19:57:14 2020 -0500 amstream/tests: Add more AMVideoStream::QueryAccept() tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9a97b6be65..5db46bbca4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -27,6 +27,7 @@ #include "ks.h" #include "initguid.h" #include "ksmedia.h" +#include "dvdmedia.h" #include "wine/strmbase.h" static const WAVEFORMATEX audio_format = @@ -1859,7 +1860,11 @@ static void test_enum_media_types(void) static void test_media_types(void) { - static const VIDEOINFOHEADER req_vih = {}; + static const VIDEOINFOHEADER2 req_vih2; + static const VIDEOINFOHEADER req_vih; + static const MPEG2VIDEOINFO req_m2vi; + static const MPEG1VIDEOINFO req_m1vi; + static const WAVEFORMATEX req_wfx; static const WAVEFORMATEX expect_wfx = { .wFormatTag = WAVE_FORMAT_PCM, @@ -1879,6 +1884,23 @@ static void test_media_types(void) HRESULT hr; IPin *pin; + static const struct + { + const GUID *type; + BYTE *format; + ULONG size; + } + tests[] = + { + {&GUID_NULL, NULL, 0 }, + {&FORMAT_None, NULL, 0 }, + {&FORMAT_WaveFormatEx, (BYTE *)&req_wfx, sizeof(WAVEFORMATEX)}, + {&FORMAT_MPEG2Video, (BYTE *)&req_m2vi, sizeof(MPEG2VIDEOINFO)}, + {&FORMAT_MPEGVideo, (BYTE *)&req_m1vi, sizeof(MPEG2VIDEOINFO)}, + {&FORMAT_VideoInfo2, (BYTE *)&req_vih2, sizeof(VIDEOINFOHEADER2)}, + {&FORMAT_VideoInfo, (BYTE *)&req_vih, sizeof(VIDEOINFOHEADER)}, + }; + static const GUID *rejected_subtypes[] = { &MEDIASUBTYPE_RGB1, @@ -1918,14 +1940,15 @@ static void test_media_types(void) wine_dbgstr_guid(&pmt->formattype)); ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - - pmt->formattype = FORMAT_VideoInfo; - pmt->cbFormat = sizeof(VIDEOINFOHEADER); - pmt->pbFormat = (BYTE *)&req_vih; - hr = IPin_QueryAccept(pin, pmt); - ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + pmt->formattype = *tests[i].type; + pmt->cbFormat = tests[i].size; + pmt->pbFormat = tests[i].format; + hr = IPin_QueryAccept(pin, pmt); + todo_wine_if (i != 6) + ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + } pmt->bFixedSizeSamples = FALSE; pmt->bTemporalCompression = TRUE;

1 0

Gijs Vermeulen : amstream: Validate the format type in check_media_type().
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: fddae90d9b147b54a5edc8657e5f991cc26d8fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fddae90d9b147b54a5edc865… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jun 30 19:57:16 2020 -0500 amstream: Validate the format type in check_media_type(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 ++- dlls/amstream/tests/amstream.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index bcb752e6bd..9fcb6d37ce 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -634,7 +634,8 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA static BOOL check_media_type(const AM_MEDIA_TYPE *media_type) { - if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video)) + if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&media_type->formattype, &FORMAT_VideoInfo)) { if (IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB1) || IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB4) || diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a9a9ccfed0..1fa1f2432c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1946,8 +1946,7 @@ static void test_media_types(void) pmt->cbFormat = tests[i].size; pmt->pbFormat = tests[i].format; hr = IPin_QueryAccept(pin, pmt); - todo_wine_if (i != 6) - ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); } pmt->bFixedSizeSamples = FALSE;

1 0

Alexandre Julliard : winebuild: Support a -mno-cygwin flag.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 7933562048d4d93c419a1b9d32427c33148b67d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7933562048d4d93c419a1b9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:30 2020 +0200 winebuild: Support a -mno-cygwin flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 2 +- tools/winebuild/main.c | 2 ++ tools/winebuild/winebuild.man.in | 7 +++++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index c162888a03..d0fc3dca1b 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -363,6 +363,7 @@ extern int verbose; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; +extern int use_msvcrt; extern int unix_lib; extern int safe_seh; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 04ab433dd6..616b9842ce 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -643,7 +643,7 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) add_undef_import( p + strlen( import_func_prefix ), 0 ); else if (!strncmp( p, import_ord_prefix, strlen(import_ord_prefix) )) add_undef_import( p + strlen( import_ord_prefix ), 1 ); - else if (!unix_lib || !find_name( p, &stdc_functions )) + else if (use_msvcrt || !find_name( p, &stdc_functions )) strarray_add( &undef_symbols, xstrdup( p ), NULL ); } if ((err = pclose( f ))) warning( "%s failed with status %d\n", cmd, err ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index efb86b705e..c1858a4b4d 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -46,6 +46,7 @@ int verbose = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; +int use_msvcrt = 0; int unix_lib = 0; int safe_seh = 0; @@ -445,6 +446,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "64" )) force_pointer_size = 8; else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; + else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 63ea2a3226..109f3824f1 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -177,9 +177,12 @@ Generate respectively 16-bit, 32-bit or 64-bit code. .BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP +.B \-mno-cygwin +Build a library that uses the Windows runtime instead of the Unix C +library. +.TP .B \-munix -Build a library that imports standard functions from the Unix C -library instead of the Windows runtime. +Build the Unix counterpart of a builtin module. .TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to

1 0

Shawn M. Chapla : gdiplus: Set GDI world xform to the identity xform on acquisition.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: b0f665045245035f014c516b3143ff85146d1a54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0f665045245035f014c516b… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Jun 30 13:04:04 2020 -0400 gdiplus: Set GDI world xform to the identity xform on acquisition. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 1 + dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3c5e25ec41..6c50d2d56c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6789,6 +6789,7 @@ GpStatus gdi_transform_acquire(GpGraphics *graphics) if (graphics->gdi_transform_acquire_count == 0 && graphics->hdc) { graphics->gdi_transform_save = SaveDC(graphics->hdc); + ModifyWorldTransform(graphics->hdc, NULL, MWT_IDENTITY); SetGraphicsMode(graphics->hdc, GM_COMPATIBLE); SetMapMode(graphics->hdc, MM_TEXT); SetWindowOrgEx(graphics->hdc, 0, 0, NULL); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 39002ca570..d1f0d03ddc 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -7012,7 +7012,7 @@ static void test_gdi_interop_hdc(void) expect(0x00aa00ff, bits[6 * 100 + 6]); expect(0x00aa00ff, bits[26 * 100 + 26]); expect(0x00aa00ff, bits[36 * 100 + 36]); - todo_wine expect(0xffaa00ff, bits[86 * 100 + 86]); + expect(0xffaa00ff, bits[86 * 100 + 86]); DeleteDC(src_hdc); DeleteObject(hbm);

1 0

Alexandre Julliard : ntdll: Fix uninitialized buffer in locale initialization.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 21f1fa82a8c7bd1b077f0289141972ed619c5a5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=21f1fa82a8c7bd1b077f0289… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 13:32:09 2020 +0200 ntdll: Fix uninitialized buffer in locale initialization. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49494 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e285bbbef0..789a398405 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -836,6 +836,8 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) if (!unix_name || !unix_name[0]) return FALSE; } + if (strlen( unix_name ) >= LOCALE_NAME_MAX_LENGTH) return FALSE; + strcpy( buffer, unix_name ); if (!(p = strpbrk( buffer, sep ))) { if (!strcmp( buffer, "POSIX" ) || !strcmp( buffer, "C" )) @@ -1247,6 +1249,6 @@ USHORT * CDECL get_unix_codepage_data(void) */ void CDECL get_locales( WCHAR *sys, WCHAR *user ) { - ntdll_umbstowcs( system_locale, ARRAY_SIZE(system_locale), sys, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); - ntdll_umbstowcs( user_locale, ARRAY_SIZE(user_locale), user, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); + ntdll_umbstowcs( system_locale, strlen(system_locale) + 1, sys, LOCALE_NAME_MAX_LENGTH ); + ntdll_umbstowcs( user_locale, strlen(user_locale) + 1, user, LOCALE_NAME_MAX_LENGTH ); }

1 0

Alexandre Julliard : winebuild: Don't use a dll entry point for Unix libraries.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: e6632e0412663da0d1c1a4a453462d745160ba4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6632e0412663da0d1c1a4a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:55 2020 +0200 winebuild: Don't use a dll entry point for Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index c1858a4b4d..0e5e1627dd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -680,7 +680,7 @@ int main(int argc, char **argv) case MODE_EXE: load_resources( argv, spec ); if (spec_file_name && !parse_input_file( spec )) break; - if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec )); + if (!spec->init_func && !unix_lib) spec->init_func = xstrdup( get_default_entry_point( spec )); if (fake_module) {

1 0

Alexandre Julliard : ntdll: Get rid of DllMain in the Unix library.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 8885a51347a768d8a9125d573963d12ac67d4715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8885a51347a768d8a9125d57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:59 2020 +0200 ntdll: Get rid of DllMain in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 590d1b544a..3ea7adf9f0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1830,10 +1830,3 @@ void __wine_main( int argc, char *argv[], char *envp[] ) #endif start_main_thread(); } - - -BOOL WINAPI DECLSPEC_HIDDEN DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); - return TRUE; -}

1 0