June 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : winegstreamer: Let async command handle request token.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 457258e7df13afcbc5ff5525d5d847996f3bdf83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457258e7df13afcbc5ff5525… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 15 09:48:42 2021 +0300 winegstreamer: Let async command handle request token. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3c87bbb2146..9c554c7c415 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -170,6 +170,11 @@ static ULONG WINAPI source_async_command_Release(IUnknown *iface) { if (command->op == SOURCE_ASYNC_START) PropVariantClear(&command->u.start.position); + else if (command->op == SOURCE_ASYNC_REQUEST_SAMPLE) + { + if (command->u.request_sample.token) + IUnknown_Release(command->u.request_sample.token); + } free(command); } @@ -467,8 +472,6 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) case WG_PARSER_EVENT_EOS: stream->eos = TRUE; - if (token) - IUnknown_Release(token); IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEEndOfStream, &GUID_NULL, S_OK, &empty_var); dispatch_end_of_presentation(stream->parent_source); return;

1 0

Jacek Caban : win32u: Add stub DLL.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 1e84cc0fa78c2213aa1531ff0b19b4aee0bc272c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e84cc0fa78c2213aa1531ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 15 14:38:23 2021 +0200 win32u: Add stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/win32u/Makefile.in | 1 + dlls/win32u/win32u.spec | 1317 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1321 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e84cc0fa78c2213aa15…

1 0

Piotr Caban : msvcrt: Fix math error arguments in powf.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 9d2de96d075937ba0d3767fe147c4dc6baae6433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d2de96d075937ba0d3767fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 14 17:40:28 2021 +0200 msvcrt: Fix math error arguments in powf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3d4ce3b3108..f09330d57a1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1567,7 +1567,7 @@ float CDECL powf( float x, float y ) if (ix & 0x80000000 && powf_checkint(iy) == 1) x2 = -x2; if (iy & 0x80000000 && x2 == 0.0) - return math_error(_SING, "powf", x, 0, 1 / x2); + return math_error(_SING, "powf", x, y, 1 / x2); /* Without the barrier some versions of clang hoist the 1/x2 and thus division by zero exception can be signaled spuriously. */ return iy & 0x80000000 ? fp_barrierf(1 / x2) : x2; @@ -1577,7 +1577,7 @@ float CDECL powf( float x, float y ) /* Finite x < 0. */ int yint = powf_checkint(iy); if (yint == 0) - return math_error(_DOMAIN, "powf", x, 0, 0 / (x - x)); + return math_error(_DOMAIN, "powf", x, y, 0 / (x - x)); if (yint == 1) sign_bias = 1 << (5 + 11); ix &= 0x7fffffff; @@ -1595,9 +1595,9 @@ float CDECL powf( float x, float y ) if ((*(UINT64*)&ylogx >> 47 & 0xffff) >= 0x40af800000000000llu >> 47) { /* |y*log(x)| >= 126. */ if (ylogx > 0x1.fffffffd1d571p+6 * (1 << 5)) - return math_error(_OVERFLOW, "powf", x, 0, (sign_bias ? -1.0 : 1.0) * 0x1p1023); + return math_error(_OVERFLOW, "powf", x, y, (sign_bias ? -1.0 : 1.0) * 0x1p1023); if (ylogx <= -150.0 * (1 << 5)) - return math_error(_UNDERFLOW, "powf", x, 0, (sign_bias ? -1.0 : 1.0) / 0x1p1023); + return math_error(_UNDERFLOW, "powf", x, y, (sign_bias ? -1.0 : 1.0) / 0x1p1023); } return powf_exp2(ylogx, sign_bias); }

1 0

Alexandre Julliard : ntdll: Don't update cached registers if NtGetContextThread() fails.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: bcc587887a2003c60f9db6a03a6b6e7ee98782fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc587887a2003c60f9db6a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:55:23 2021 +0200 ntdll: Don't update cached registers if NtGetContextThread() fails. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 28 +++++++++++++--------------- dlls/ntdll/unix/signal_x86_64.c | 28 +++++++++++++--------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 446fed25eb8..1ffaa543124 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1047,7 +1047,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (self) { - XSTATE *xstate; if (needed_flags & CONTEXT_INTEGER) { context->Eax = frame->eax; @@ -1127,19 +1126,10 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; } - /* update the cached version of the debug registers */ - if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) - { - x86_thread_data()->dr0 = context->Dr0; - x86_thread_data()->dr1 = context->Dr1; - x86_thread_data()->dr2 = context->Dr2; - x86_thread_data()->dr3 = context->Dr3; - x86_thread_data()->dr6 = context->Dr6; - x86_thread_data()->dr7 = context->Dr7; - } - if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xstate = xstate_from_context( context ))) + if ((needed_flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); unsigned int mask; if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) @@ -1152,12 +1142,20 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); if (xstate->Mask) { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - + if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; xstate->YmmContext = frame->xstate.YmmContext; } } + /* update the cached version of the debug registers */ + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) + { + x86_thread_data()->dr0 = context->Dr0; + x86_thread_data()->dr1 = context->Dr1; + x86_thread_data()->dr2 = context->Dr2; + x86_thread_data()->dr3 = context->Dr3; + x86_thread_data()->dr6 = context->Dr6; + x86_thread_data()->dr7 = context->Dr7; + } } if (context->ContextFlags & (CONTEXT_INTEGER & ~CONTEXT_i386)) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4845d3dd5f4..404006d22d1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1677,7 +1677,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) DWORD needed_flags; struct syscall_frame *frame = amd64_thread_data()->syscall_frame; BOOL self = (handle == GetCurrentThread()); - XSTATE *xstate; if (!context) return STATUS_INVALID_PARAMETER; @@ -1765,19 +1764,10 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->MxCsr = context->u.FltSave.MxCsr; context->ContextFlags |= CONTEXT_FLOATING_POINT; } - /* update the cached version of the debug registers */ - if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) - { - amd64_thread_data()->dr0 = context->Dr0; - amd64_thread_data()->dr1 = context->Dr1; - amd64_thread_data()->dr2 = context->Dr2; - amd64_thread_data()->dr3 = context->Dr3; - amd64_thread_data()->dr6 = context->Dr6; - amd64_thread_data()->dr7 = context->Dr7; - } - if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xstate = xstate_from_context( context ))) + if ((needed_flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); unsigned int mask; if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) @@ -1790,12 +1780,20 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); if (xstate->Mask) { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - + if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; memcpy( &xstate->YmmContext, &frame->xstate.YmmContext, sizeof(xstate->YmmContext) ); } } + /* update the cached version of the debug registers */ + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } } return STATUS_SUCCESS;

1 0

Alexandre Julliard : ntdll: Always use the TEB that was passed to signal_start_thread().
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: a5cec4f5fbef0c586b530ea51acd6e3da2ff3f83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5cec4f5fbef0c586b530ea5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:59:05 2021 +0200 ntdll: Always use the TEB that was passed to signal_start_thread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 24 +++++++++++++----------- dlls/ntdll/unix/signal_x86_64.c | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4ce1b519da3..89f4fb4151c 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2342,7 +2342,7 @@ void signal_init_process(void) /*********************************************************************** * init_thread_context */ -static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg ) +static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg, TEB *teb ) { context->SegCs = get_cs(); context->SegDs = get_ds(); @@ -2353,7 +2353,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, context->EFlags = 0x202; context->Eax = (DWORD)entry; context->Ebx = (DWORD)arg; - context->Esp = (DWORD)NtCurrentTeb()->Tib.StackBase - 16; + context->Esp = (DWORD)teb->Tib.StackBase - 16; context->Eip = (DWORD)pRtlUserThreadStart; context->FloatSave.ControlWord = 0x27f; ((XSAVE_FORMAT *)context->ExtendedRegisters)->ControlWord = 0x27f; @@ -2369,7 +2369,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, /*********************************************************************** * get_initial_context */ -PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) +PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) { CONTEXT *ctx; @@ -2377,15 +2377,15 @@ PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void { CONTEXT context = { CONTEXT_ALL }; - init_thread_context( &context, entry, arg ); + init_thread_context( &context, entry, arg, teb ); wait_suspend( &context ); ctx = (CONTEXT *)((ULONG_PTR)context.Esp & ~15) - 1; *ctx = context; } else { - ctx = (CONTEXT *)((char *)NtCurrentTeb()->Tib.StackBase - 16) - 1; - init_thread_context( ctx, entry, arg ); + ctx = (CONTEXT *)((char *)teb->Tib.StackBase - 16) - 1; + init_thread_context( ctx, entry, arg, teb ); } pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; @@ -2409,17 +2409,19 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") /* store exit frame */ - "movl %ebp,%fs:0x1f4\n\t" /* x86_thread_data()->exit_frame */ + "movl 24(%ebp),%ecx\n\t" /* teb */ + "movl %ebp,0x1f4(%ecx)\n\t" /* x86_thread_data()->exit_frame */ /* set syscall frame */ - "cmpl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame */ + "cmpl $0,0x1f8(%ecx)\n\t" /* x86_thread_data()->syscall_frame */ "jnz 1f\n\t" "leal -0x380(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ "andl $~63,%eax\n\t" - "movl %eax,%fs:0x1f8\n" /* x86_thread_data()->syscall_frame */ + "movl %eax,0x1f8(%ecx)\n" /* x86_thread_data()->syscall_frame */ /* switch to thread stack */ - "1:\tmovl %fs:4,%eax\n\t" /* NtCurrentTeb()->StackBase */ - "leal -0x1004(%eax),%esp\n\t" + "1:\tmovl 4(%ecx),%eax\n\t" /* teb->StackBase */ + "leal -0x1000(%eax),%esp\n\t" /* attach dlls */ + "pushl %ecx\n\t" /* teb */ "pushl 16(%ebp)\n\t" /* suspend */ "pushl 12(%ebp)\n\t" /* arg */ "pushl 8(%ebp)\n\t" /* entry */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 04442a012a2..10aa2a516b0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2603,13 +2603,13 @@ void signal_init_process(void) /*********************************************************************** * init_thread_context */ -static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg ) +static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg, TEB *teb ) { __asm__( "movw %%cs,%0" : "=m" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=m" (context->SegSs) ); context->Rcx = (ULONG_PTR)entry; context->Rdx = (ULONG_PTR)arg; - context->Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; + context->Rsp = (ULONG_PTR)teb->Tib.StackBase - 0x28; context->Rip = (ULONG_PTR)pRtlUserThreadStart; context->EFlags = 0x200; context->u.FltSave.ControlWord = 0x27f; @@ -2620,7 +2620,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, /*********************************************************************** * get_initial_context */ -PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) +PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) { CONTEXT *ctx; @@ -2629,15 +2629,15 @@ PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void CONTEXT context = { 0 }; context.ContextFlags = CONTEXT_ALL; - init_thread_context( &context, entry, arg ); + init_thread_context( &context, entry, arg, teb ); wait_suspend( &context ); ctx = (CONTEXT *)((ULONG_PTR)context.Rsp & ~15) - 1; *ctx = context; } else { - ctx = (CONTEXT *)((char *)NtCurrentTeb()->Tib.StackBase - 0x30) - 1; - init_thread_context( ctx, entry, arg ); + ctx = (CONTEXT *)((char *)teb->Tib.StackBase - 0x30) - 1; + init_thread_context( ctx, entry, arg, teb ); } pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); ctx->ContextFlags = CONTEXT_FULL; @@ -2666,17 +2666,17 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "movq %r15,8(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %r15,8\n\t") /* store exit frame */ - "movq %gs:0x30,%rax\n\t" - "movq %rsp,0x320(%rax)\n\t" /* amd64_thread_data()->exit_frame */ + "movq %rsp,0x320(%r8)\n\t" /* amd64_thread_data()->exit_frame */ /* set syscall frame */ - "cmpq $0,0x328(%rax)\n\t" /* amd64_thread_data()->syscall_frame */ + "cmpq $0,0x328(%r8)\n\t" /* amd64_thread_data()->syscall_frame */ "jnz 1f\n\t" "leaq -0x400(%rsp),%r10\n\t" /* sizeof(struct syscall_frame) */ "andq $~63,%r10\n\t" - "movq %r10,0x328(%rax)\n" /* amd64_thread_data()->syscall_frame */ + "movq %r10,0x328(%r8)\n" /* amd64_thread_data()->syscall_frame */ /* switch to thread stack */ - "1:\tmovq 8(%rax),%rax\n\t" /* NtCurrentTeb()->Tib.StackBase */ + "1:\tmovq 8(%r8),%rax\n\t" /* teb->Tib.StackBase */ "movq %rcx,%rbx\n\t" /* thunk */ + "movq %r8,%rcx\n\t" /* teb */ "leaq -0x1000(%rax),%rsp\n\t" /* attach dlls */ "call " __ASM_NAME("get_initial_context") "\n\t"

1 0

Jactry Zeng : riched20: Allow to insert OLE object at specified offset.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 8c894382dde5b9da88b0e9f23a753d5e851a43d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c894382dde5b9da88b0e9f2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 8 13:45:49 2021 +0800 riched20: Allow to insert OLE object at specified offset. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 16 ++++++++++++---- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/tests/richole.c | 18 +++++++++--------- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1f4c3903a38..beac8af50a1 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -455,15 +455,23 @@ static struct re_object* create_re_object(const REOBJECT *reo) return reobj; } -void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) +void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) { ME_Run *run, *prev; const WCHAR space = ' '; struct re_object *reobj_prev = NULL; - ME_Cursor *cursor = editor->pCursors + nCursor; - ME_Style *style = style_get_insert_style( editor, cursor ); + ME_Cursor *cursor, cursor_from_ofs; + ME_Style *style; + + if (reo->cp == REO_CP_SELECTION) + cursor = editor->pCursors; + else + { + cursor_from_char_ofs( editor, reo->cp, &cursor_from_ofs ); + cursor = &cursor_from_ofs; + } + style = style_get_insert_style( editor, cursor ); - /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d4aadc325f9..cc02604767e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1172,7 +1172,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - ME_InsertOLEFromCursor(editor, &reobject, 0); + editor_insert_oleobj(editor, &reobject); hr = S_OK; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 141e9034a6a..fdf3e068fe9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -188,7 +188,7 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DEC BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SendSelChange(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) DECLSPEC_HIDDEN; +void editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ) DECLSPEC_HIDDEN; BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) DECLSPEC_HIDDEN; int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 72840a4cafa..03572511ff7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1367,7 +1367,7 @@ IRichEditOle_fnInsertObject(IRichEditOle *iface, REOBJECT *reo) if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; - ME_InsertOLEFromCursor(services->editor, reo, 0); + editor_insert_oleobj(services->editor, reo); ME_CommitUndo(services->editor); ME_UpdateRepaint(services->editor, FALSE); return S_OK; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a76f9fdaf2e..a8c48994613 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3377,15 +3377,15 @@ static void test_InsertObject(void) SendMessageW(hwnd, EM_SETSEL, 3, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); - todo_wine ok(result == SEL_OBJECT, "Got selection type: %x.\n", result); - todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); + ok(result == SEL_OBJECT, "Got selection type: %x.\n", result); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); SendMessageW(hwnd, EM_SETSEL, 2, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); - todo_wine ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %x.\n", result); + ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %x.\n", result); SendMessageW(hwnd, EM_SETSEL, 5, 6); - todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); expected_string = L"abc\xfffc""d\xfffc""efg"; gettextex.cb = sizeof(buffer); @@ -3408,7 +3408,7 @@ static void test_InsertObject(void) SendMessageA(hwnd, EM_SETSEL, 0, -1); result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); memset(bufferA, 0, sizeof(bufferA)); textrange.lpstrText = bufferA; @@ -3416,7 +3416,7 @@ static void test_InsertObject(void) textrange.chrg.cpMax = 11; result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); expected_string = L"abc\xfffc""d\xfffc""efg\r"; hr = ITextDocument_Range(doc, 0, 11, &range); @@ -3467,7 +3467,7 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#x.\n", hr); string = GlobalLock(stgmedium.hGlobal); ok(lstrlenW(string) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(string)); - todo_wine ok(!lstrcmpW(string, expected_string), "Got wrong content: %s.\n", debugstr_w(string)); + ok(!lstrcmpW(string, expected_string), "Got wrong content: %s.\n", debugstr_w(string)); GlobalUnlock(stgmedium.hGlobal); expected_string = L"abc\xfffc""d\xfffc""efg"; @@ -3491,7 +3491,7 @@ static void test_InsertObject(void) SendMessageA(hwnd, EM_SETSEL, 0, -1); result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); memset(bufferA, 0, sizeof(bufferA)); textrange.lpstrText = bufferA; @@ -3499,7 +3499,7 @@ static void test_InsertObject(void) textrange.chrg.cpMax = 11; result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); expected_string = L"abc\xfffc""d\xfffc""efg"; hr = ITextDocument_Range(doc, 0, 11, &range);

1 0

Jan Sikorski : wined3d: Don't pass a 3D texture view's depth range as layer range to Vulkan.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 25271032dfb3f126a8b0dff2adb9b96a7d09241d URL: https://source.winehq.org/git/wine.git/?a=commit;h=25271032dfb3f126a8b0dff2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jun 14 15:10:22 2021 +0200 wined3d: Don't pass a 3D texture view's depth range as layer range to Vulkan. Layer index and count fields in struct wined3d_view_desc double as the depth range of a 3D texture view. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 91d26c05fae..7900df3c246 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -773,8 +773,19 @@ static VkImageView wined3d_view_vk_create_vk_image_view(struct wined3d_context_v } create_info.subresourceRange.baseMipLevel = desc->u.texture.level_idx; create_info.subresourceRange.levelCount = desc->u.texture.level_count; - create_info.subresourceRange.baseArrayLayer = desc->u.texture.layer_idx; - create_info.subresourceRange.layerCount = desc->u.texture.layer_count; + if (create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) + { + if (desc->u.texture.layer_idx || (desc->u.texture.layer_count != texture_vk->t.resource.depth + && desc->u.texture.layer_count != ~0u)) + WARN("Partial 3D texture views are not supported.\n"); + create_info.subresourceRange.baseArrayLayer = 0; + create_info.subresourceRange.layerCount = 1; + } + else + { + create_info.subresourceRange.baseArrayLayer = desc->u.texture.layer_idx; + create_info.subresourceRange.layerCount = desc->u.texture.layer_count; + } if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &create_info, NULL, &vk_image_view))) < 0) { ERR("Failed to create Vulkan image view, vr %s.\n", wined3d_debug_vkresult(vr));

1 0

Zebediah Figura : server: Implement IOCTL_AFD_EVENT_SELECT.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 9bbf3ab96b30b79f1dd0b8723157b45f21c0d17c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bbf3ab96b30b79f1dd0b872… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:49 2021 -0500 server: Implement IOCTL_AFD_EVENT_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 11 ++++++++++ include/wine/afd.h | 19 +++++++++++++++++ server/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c1cd319ccf9..088f29f85ff 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1170,6 +1170,17 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_EVENT_SELECT: + { + const struct afd_event_select_params *params = in_buffer; + + TRACE( "event %p, mask %#x\n", params->event, params->mask ); + if (out_size) FIXME( "unexpected output size %u\n", out_size ); + + status = STATUS_BAD_DEVICE_TYPE; + break; + } + case IOCTL_AFD_RECV: { const struct afd_recv_params *params = in_buffer; diff --git a/include/wine/afd.h b/include/wine/afd.h index c4a15d6688c..2eb3e6f12a9 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -35,6 +35,7 @@ #define IOCTL_AFD_LISTEN CTL_CODE(FILE_DEVICE_BEEP, 0x802, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_RECV CTL_CODE(FILE_DEVICE_BEEP, 0x805, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_POLL CTL_CODE(FILE_DEVICE_BEEP, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_EVENT_SELECT CTL_CODE(FILE_DEVICE_BEEP, 0x821, METHOD_NEITHER, FILE_ANY_ACCESS) enum afd_poll_bit { @@ -106,6 +107,24 @@ struct afd_poll_params }; #include <poppack.h> +struct afd_event_select_params +{ + HANDLE event; + int mask; +}; + +struct afd_event_select_params_64 +{ + ULONGLONG event; + int mask; +}; + +struct afd_event_select_params_32 +{ + ULONG event; + int mask; +}; + #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index 026188e79af..3556ee21aa3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2011,6 +2011,59 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } return 1; + case IOCTL_AFD_EVENT_SELECT: + { + struct event *event = NULL; + obj_handle_t event_handle; + int mask; + + if (is_machine_64bit( current->process->machine )) + { + const struct afd_event_select_params_64 *params = get_req_data(); + + if (get_req_data_size() < sizeof(params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 1; + } + + event_handle = params->event; + mask = params->mask; + } + else + { + const struct afd_event_select_params_32 *params = get_req_data(); + + if (get_req_data_size() < sizeof(params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 1; + } + + event_handle = params->event; + mask = params->mask; + } + + if ((event_handle || mask) && + !(event = get_event_obj( current->process, event_handle, EVENT_MODIFY_STATE ))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 1; + } + + if (sock->event) release_object( sock->event ); + sock->event = event; + sock->mask = mask; + sock->window = 0; + sock->message = 0; + sock->wparam = 0; + sock->nonblocking = 1; + + sock_reselect( sock ); + + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : server: Use AFD_POLL_* flags internally.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: bbb126dc7576baaf328d6bb7e2b35f13c87f440a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb126dc7576baaf328d6bb7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:47 2021 -0500 server: Use AFD_POLL_* flags internally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 19 ++++++ server/sock.c | 168 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 129 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb126dc7576baaf328d…

1 0

Zebediah Figura : ntdll: Reserve space for the whole 64-bit YMM context in struct x86_thread_data.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 79c102d6bec81b79e10290f23e9ac3816da6b58f URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c102d6bec81b79e10290f2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 12 02:11:33 2021 -0500 ntdll: Reserve space for the whole 64-bit YMM context in struct x86_thread_data. Fixes a regression introduced by 308a5e7c4d01525184b057058949c68c0ee77dba. This was previously broken, but happened to work until the aforementioned commit put the YMM state right at the end of a page. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51262 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 53 +++++++++++++------------------------------ 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 0b2b269505f..446fed25eb8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -461,24 +461,6 @@ enum i386_trap_code #endif }; -struct syscall_xsave -{ - union - { - XSAVE_FORMAT xsave; - FLOATING_SAVE_AREA fsave; - } u; - struct - { - ULONG64 mask; - ULONG64 compaction_mask; - ULONG64 reserved[6]; - M128A ymm_high[8]; - } xstate; -}; - -C_ASSERT( sizeof(struct syscall_xsave) == 0x2c0 ); - struct syscall_frame { DWORD restore_flags; /* 000 */ @@ -504,16 +486,13 @@ struct syscall_frame XSAVE_FORMAT xsave; FLOATING_SAVE_AREA fsave; } u; - struct /* 240 */ - { - ULONG64 mask; - ULONG64 compaction_mask; - ULONG64 reserved[6]; - M128A ymm_high[8]; - } xstate; + /* Leave space for the whole set of YMM registers. They're not used in + * 32-bit mode, but some processors fault if they're not in writable memory. + */ + XSTATE xstate; /* 240 */ }; -C_ASSERT( sizeof(struct syscall_frame) == 0x300 ); +C_ASSERT( sizeof(struct syscall_frame) == 0x380 ); struct x86_thread_data { @@ -1011,7 +990,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) memcpy( &frame->u.xsave, context->ExtendedRegisters, sizeof(frame->u.xsave) ); /* reset the current interrupt status */ frame->u.xsave.StatusWord &= frame->u.xsave.ControlWord | 0xff80; - frame->xstate.mask |= XSTATE_MASK_LEGACY; + frame->xstate.Mask |= XSTATE_MASK_LEGACY; } else if (flags & CONTEXT_FLOATING_POINT) { @@ -1023,7 +1002,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { frame->u.fsave = context->FloatSave; } - frame->xstate.mask |= XSTATE_MASK_LEGACY_FLOATING_POINT; + frame->xstate.Mask |= XSTATE_MASK_LEGACY_FLOATING_POINT; } if (flags & CONTEXT_XSTATE) { @@ -1032,10 +1011,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (xs->Mask & XSTATE_MASK_GSSE) { - frame->xstate.mask |= XSTATE_MASK_GSSE; - memcpy( &frame->xstate.ymm_high, &xs->YmmContext, sizeof(frame->xstate.ymm_high) ); + frame->xstate.Mask |= XSTATE_MASK_GSSE; + frame->xstate.YmmContext = xs->YmmContext; } - else frame->xstate.mask &= ~XSTATE_MASK_GSSE; + else frame->xstate.Mask &= ~XSTATE_MASK_GSSE; } frame->restore_flags |= flags & ~CONTEXT_INTEGER; @@ -1104,7 +1083,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->FloatSave = frame->u.fsave; } else if (!xstate_compaction_enabled || - (frame->xstate.mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) + (frame->xstate.Mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) { fpux_to_fpu( &context->FloatSave, &frame->u.xsave ); } @@ -1120,7 +1099,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) XSAVE_FORMAT *xs = (XSAVE_FORMAT *)context->ExtendedRegisters; if (!xstate_compaction_enabled || - (frame->xstate.mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) + (frame->xstate.Mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) { memcpy( xs, &frame->u.xsave, FIELD_OFFSET( XSAVE_FORMAT, MxCsr )); memcpy( xs->FloatRegisters, frame->u.xsave.FloatRegisters, @@ -1133,7 +1112,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) xs->ControlWord = 0x37f; } - if (!xstate_compaction_enabled || (frame->xstate.mask & XSTATE_MASK_LEGACY_SSE)) + if (!xstate_compaction_enabled || (frame->xstate.Mask & XSTATE_MASK_LEGACY_SSE)) { memcpy( xs->XmmRegisters, frame->u.xsave.XmmRegisters, sizeof( xs->XmmRegisters )); xs->MxCsr = frame->u.xsave.MxCsr; @@ -1168,7 +1147,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) return STATUS_INVALID_PARAMETER; mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; - xstate->Mask = frame->xstate.mask & mask; + xstate->Mask = frame->xstate.Mask & mask; xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); if (xstate->Mask) @@ -1176,7 +1155,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; - memcpy( &xstate->YmmContext, frame->xstate.ymm_high, sizeof(frame->xstate.ymm_high) ); + xstate->YmmContext = frame->xstate.YmmContext; } } } @@ -2401,7 +2380,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /* set syscall frame */ "cmpl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame */ "jnz 1f\n\t" - "leal -0x300(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ + "leal -0x380(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ "andl $~63,%eax\n\t" "movl %eax,%fs:0x1f8\n" /* x86_thread_data()->syscall_frame */ /* switch to thread stack */

1 0