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

Francois Gouget : advapi32/tests: Fix the spelling of a couple of ok() messages.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 187423060fc515aa21a6fff7f8aa44ef0ad94d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=187423060fc515aa21a6fff7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:10:51 2021 +0100 advapi32/tests: Fix the spelling of a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f43ac2431e1..a8c1a80e419 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8008,12 +8008,12 @@ static void test_GetKernelObjectSecurity(void) ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(!present, "expeced no DACL present\n"); + todo_wine ok(!present, "expected no DACL present\n"); /* the descriptor is defaulted only on Windows >= 7 */ ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); ok(ret, "got error %u\n", GetLastError()); - ok(!present, "expeced no SACL present\n"); + ok(!present, "expected no SACL present\n"); /* the descriptor is defaulted only on Windows >= 7 */ free(sd);

1 0

Jacek Caban : ntdll: Use syscall dispatcher to restore context in NtSetContextThread.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: af74bd31229e0f065448253b248ec0cb3b51af26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af74bd31229e0f065448253b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 2 18:52:44 2021 +0100 ntdll: Use syscall dispatcher to restore context in NtSetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- dlls/ntdll/unix/signal_i386.c | 21 ++++++++++++++++----- tools/winebuild/import.c | 10 +++++++++- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 397de7dad98..8418f925565 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7762,7 +7762,7 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(xs->Mask == (sizeof(void *) == 4 ? 4 : 0) || broken(sizeof(void *) == 4 && !xs->Mask) /* Win7u */, + ok(!xs->Mask || (sizeof(void *) == 4 && xs->Mask == 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); for (i = 0; i < 16 * 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index fd3c42c571c..0153f772b6d 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1258,8 +1258,6 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) xsave->xstate.mask &= ~XSTATE_MASK_GSSE; } - if (!(flags & CONTEXT_INTEGER)) frame->eax = STATUS_SUCCESS; - signal_restore_full_cpu_context(); return STATUS_SUCCESS; } @@ -2176,9 +2174,22 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct xcontext xcontext; init_handler( sigcontext ); - save_context( &xcontext, sigcontext ); - wait_suspend( &xcontext.c ); - restore_context( &xcontext, sigcontext ); + if (x86_thread_data()->syscall_frame) + { + DECLSPEC_ALIGN(64) XSTATE xs; + xcontext.c.ContextFlags = CONTEXT_FULL; + context_init_xstate( &xcontext.c, &xs ); + + NtGetContextThread( GetCurrentThread(), &xcontext.c ); + wait_suspend( &xcontext.c ); + NtSetContextThread( GetCurrentThread(), &xcontext.c ); + } + else + { + save_context( &xcontext, sigcontext ); + wait_suspend( &xcontext.c ); + restore_context( &xcontext, sigcontext ); + } } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 2905f1a4100..073ad9b10cf 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1509,10 +1509,18 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tfrstor (%%ebx)\n" ); output( "\tfwait\n" ); } - else + else if(!strcmp( variant, "_fxsave" )) { output( "\tfxrstor (%%ebx)\n" ); } + else + { + output( "\tmovl %%eax,%%ecx\n" ); + output( "\tmovl $7,%%eax\n" ); + output( "\txorl %%edx,%%edx\n" ); + output( "\txrstor (%%ebx)\n" ); + output( "\tmovl %%ecx,%%eax\n" ); + } output( "\tleal -0x30(%%ebp),%%ebx\n" ); output_cfi( ".cfi_def_cfa_register %%ebx" ); output_cfi( ".cfi_adjust_cfa_offset 0x30\n" );

1 0

Jacek Caban : ntdll: Use syscall frame for handling x86 YMM context in NtSetContextThread.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: e990bd4676d7ecef302f36ad0896ddba5efdedd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e990bd4676d7ecef302f36ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 2 18:47:05 2021 +0100 ntdll: Use syscall frame for handling x86 YMM context in NtSetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 61 ++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 129d719a96c..fd3c42c571c 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -727,40 +727,6 @@ static inline void restore_fpu( const CONTEXT *context ) } -/*********************************************************************** - * restore_xstate - * - * Restore the XState context - */ -static inline void restore_xstate( const CONTEXT *context ) -{ - XSAVE_FORMAT *xrstor_base; - XSTATE *xs; - - if (!(cpu_info.FeatureSet & CPU_FEATURE_AVX) || !(xs = xstate_from_context( context ))) - return; - - xrstor_base = (XSAVE_FORMAT *)xs - 1; - - if (!(xs->CompactionMask & ((ULONG64)1 << 63))) - { - /* Non-compacted xrstor will load Mxcsr regardless of the specified mask. Loading garbage there - * may lead to fault. FPUX state should be restored by now, so we can reuse some space in - * ExtendedRegisters. */ - XSAVE_FORMAT *fpux = (XSAVE_FORMAT *)context->ExtendedRegisters; - DWORD mxcsr, mxcsr_mask; - - mxcsr = fpux->MxCsr; - mxcsr_mask = fpux->MxCsr_Mask; - - assert( (void *)&xrstor_base->MxCsr > (void *)context->ExtendedRegisters ); - xrstor_base->MxCsr = mxcsr; - xrstor_base->MxCsr_Mask = mxcsr_mask; - } - __asm__ volatile( "xrstor %0" : : "m"(*xrstor_base), "a" (4), "d" (0) ); -} - - /*********************************************************************** * fpux_to_fpu * @@ -1009,7 +975,11 @@ void signal_restore_full_cpu_context(void) { struct syscall_xsave *xsave = get_syscall_xsave( get_syscall_frame() ); - if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) + if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) + { + __asm__ volatile( "xrstor %0" : : "m"(*xsave), "a" (7), "d" (0) ); + } + else if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) { __asm__ volatile( "fxrstor %0" : : "m"(xsave->u.xsave) ); } @@ -1196,6 +1166,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD flags = context->ContextFlags & ~CONTEXT_i386; BOOL self = (handle == GetCurrentThread()); + XSTATE *xs; /* debug registers require a server call */ if (self && (flags & CONTEXT_DEBUG_REGISTERS)) @@ -1266,8 +1237,26 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) get_syscall_xsave( frame )->u.fsave = context->FloatSave; } } + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xs = xstate_from_context( context ))) + { + struct syscall_xsave *xsave = get_syscall_xsave( frame ); + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); - restore_xstate( context ); + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) + || context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + if (xs->Mask & XSTATE_MASK_GSSE) + { + if (context_ex->XState.Length < sizeof(XSTATE)) + return STATUS_BUFFER_OVERFLOW; + + xsave->xstate.mask |= XSTATE_MASK_GSSE; + memcpy( &xsave->xstate.ymm_high, &xs->YmmContext, sizeof(xsave->xstate.ymm_high) ); + } + else if (xs->CompactionMask & XSTATE_MASK_GSSE) + xsave->xstate.mask &= ~XSTATE_MASK_GSSE; + } if (!(flags & CONTEXT_INTEGER)) frame->eax = STATUS_SUCCESS; signal_restore_full_cpu_context();

1 0

Jacek Caban : ntdll: Use syscall frame for x86 YMM context in NtGetContextThread.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 8064d9786a0b1e06d5c52cbbb321f4c3b1ec8055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8064d9786a0b1e06d5c52cbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 2 18:46:42 2021 +0100 ntdll: Use syscall frame for x86 YMM context in NtGetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 81 +++++++++++++------------------------------ 1 file changed, 25 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 68d532c6f3f..129d719a96c 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -713,56 +713,6 @@ static inline void save_fpu( CONTEXT *context ) } -/*********************************************************************** - * save_xstate - * - * Save the XState context - */ -static inline NTSTATUS save_xstate( CONTEXT *context ) -{ - CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); - DECLSPEC_ALIGN(64) struct - { - XSAVE_FORMAT xsave; - XSTATE xstate; - } - xsave_area; - XSTATE *xs; - - if (!(cpu_info.FeatureSet & CPU_FEATURE_AVX) || !(xs = xstate_from_context( context ))) - return STATUS_SUCCESS; - - if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) - || context_ex->XState.Length > sizeof(XSTATE)) - return STATUS_INVALID_PARAMETER; - - if (xstate_compaction_enabled) - { - /* xsavec doesn't use anything from the save area. */ - __asm__ volatile( "xsavec %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->CompactionMask & (1 << XSTATE_AVX))), "d" (0) ); - } - else - { - /* xsave preserves those bits in the mask which are not in EDX:EAX, so zero it. */ - xsave_area.xstate.Mask = xsave_area.xstate.CompactionMask = 0; - __asm__ volatile( "xsave %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->Mask & (1 << XSTATE_AVX))), "d" (0) ); - } - - memcpy(xs, &xsave_area.xstate, offsetof(XSTATE, YmmContext)); - if (xs->Mask & (1 << XSTATE_AVX)) - { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - - memcpy(&xs->YmmContext, &xsave_area.xstate.YmmContext, sizeof(xs->YmmContext)); - } - - return STATUS_SUCCESS; -} - - /*********************************************************************** * restore_fpu * @@ -1334,14 +1284,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret, xsave_status; struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD needed_flags = context->ContextFlags & ~CONTEXT_i386; BOOL self = (handle == GetCurrentThread()); - - /* Save xstate before any calls which can potentially change volatile ymm registers. - * E. g., debug output will clobber ymm registers. */ - xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; + NTSTATUS ret; /* debug registers require a server call */ if (needed_flags & CONTEXT_DEBUG_REGISTERS) self = FALSE; @@ -1359,6 +1305,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (self) { struct syscall_xsave *xsave = get_syscall_xsave( frame ); + XSTATE *xstate; if (needed_flags & CONTEXT_INTEGER) { context->Eax = frame->eax; @@ -1410,6 +1357,28 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) x86_thread_data()->dr6 = context->Dr6; x86_thread_data()->dr7 = context->Dr7; } + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xstate = xstate_from_context( context ))) + { + struct syscall_xsave *xsave = get_syscall_xsave( frame ); + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + unsigned int mask; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) + || context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; + xstate->Mask = xsave->xstate.mask & mask; + xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; + memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); + if (xstate->Mask) + { + if (context_ex->XState.Length < sizeof(XSTATE)) + return STATUS_BUFFER_OVERFLOW; + + memcpy( &xstate->YmmContext, xsave->xstate.ymm_high, sizeof(xsave->xstate.ymm_high) ); + } + } } if (context->ContextFlags & (CONTEXT_INTEGER & ~CONTEXT_i386)) @@ -1425,7 +1394,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) TRACE( "%p: dr0=%08x dr1=%08x dr2=%08x dr3=%08x dr6=%08x dr7=%08x\n", handle, context->Dr0, context->Dr1, context->Dr2, context->Dr3, context->Dr6, context->Dr7 ); - return xsave_status; + return STATUS_SUCCESS; }

1 0

Francois Gouget : odbccp32/tests: Fix the spelling of a comment.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 8867a0f33f634db5d90edde137dbfd9fef1e4685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8867a0f33f634db5d90edde1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:10:27 2021 +0100 odbccp32/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index f52dcee7acd..ec706f57f06 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -831,7 +831,7 @@ static void test_SQLWriteDSNToIni(void) ok(ret, "got %d\n", ret); } - /* Show that values are writen, even though an invalid driver was specified. */ + /* Show that values are written, even though an invalid driver was specified. */ ret = SQLWriteDSNToIni("wine_mis", "Missing Access Driver (*.mis)"); ok(ret, "got %d\n", ret); if(ret)

1 0

Gijs Vermeulen : wmvcore: Upgrade to IWMSyncReader2.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa74fa78e2f8fedeea6fa3c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 1 12:15:28 2021 +0100 wmvcore: Upgrade to IWMSyncReader2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50740 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 168 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fa74fa78e2f8fedeea6…

1 0

Francois Gouget : xactengine3_7: Add a trailing linefeed to ERR() messages.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: f8983ea419bcc326b54aaa0f5869c92a7070e7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8983ea419bcc326b54aaa0f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:18:31 2021 +0100 xactengine3_7: Add a trailing linefeed to ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..3fbb4875930 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -253,7 +253,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -295,7 +295,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -543,7 +543,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -585,7 +585,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -870,7 +870,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, if (!sb) { FACTSoundBank_Destroy(fsb); - ERR("Failed to allocate XACT3SoundBankImpl!"); + ERR("Failed to allocate XACT3SoundBankImpl!\n"); return E_OUTOFMEMORY; } @@ -907,7 +907,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; } @@ -955,7 +955,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; }

1 0

Dmitry Kislyuk : msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 0712b6b1a08a01ee397035372345f1ad38abe393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0712b6b1a08a01ee39703537… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Mar 1 18:31:26 2021 -0600 msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50744 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/inputprocessor.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 7cb59f94460..ac7fad67548 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -866,8 +866,14 @@ static HRESULT WINAPI InputProcessorProfileMgr_UnregisterProfile(ITfInputProcess static HRESULT WINAPI InputProcessorProfileMgr_GetActiveProfile(ITfInputProcessorProfileMgr *iface, REFGUID catid, TF_INPUTPROCESSORPROFILE *pProfile) { - InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(catid), pProfile); + static int once; + + if (!once++) + { + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(catid), pProfile); + } + return E_NOTIMPL; }

1 0

Hugh McMaster : reg/tests: Comprehensively check for elevated privileges before starting Windows 3.1 import tests.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 17023a8100a62852bbad342e5e7c705cafae9a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=17023a8100a62852bbad342e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 2 23:17:50 2021 +1100 reg/tests: Comprehensively check for elevated privileges before starting Windows 3.1 import tests. The existing check fails to adequately determine the program's elevation status on systems where the test key already exists. This can cause all Windows 3.1 import tests to fail on systems with a standard user account. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/import.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index f769e0020f5..58831625fa5 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -3468,25 +3468,34 @@ static void test_import_win31(void) { LONG err; HKEY hkey; - DWORD dispos, r; + DWORD r; /* Check if reg.exe is running with elevated privileges */ - err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); if (err == ERROR_ACCESS_DENIED) { win_skip("reg.exe is not running with elevated privileges; " "skipping Windows 3.1 import tests\n"); return; } - - if (dispos == REG_OPENED_EXISTING_KEY) - delete_value(hkey, NULL); + if (err == ERROR_FILE_NOT_FOUND) + { + if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL)) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping Windows 3.1 import tests\n"); + return; + } + RegCloseKey(hkey); + RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + } /* Test simple value */ test_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + open_key(HKEY_CLASSES_ROOT, KEY_BASE, KEY_SET_VALUE, &hkey); verify_reg(hkey, "", REG_SZ, "Value0", 7, 0); /* Test proper handling of spaces and equals signs */

1 0

Gijs Vermeulen : include: Fix IWMSyncReader2 uuid.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 6170749eab344feb469fcc13e0febf02d511aef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6170749eab344feb469fcc13… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 1 12:15:27 2021 +0100 include: Fix IWMSyncReader2 uuid. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index d1e0445470d..716abe056db 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1093,7 +1093,7 @@ interface IWMReaderAllocatorEx : IUnknown [ object, - uuid(faed3d21-1b6b-4af7-8bc6-3e189bbc187b), + uuid(faed3d21-1b6b-4af7-8cb6-3e189bbc187b), pointer_default( unique ), local ]

1 0