wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Zebediah Figura : d3d11/tests: Test specifying the multisample mask via OMSetBlendState().
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 87ab21dd35cea37f676060d09f956e0ca5ce082a URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ab21dd35cea37f676060d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 00:27:39 2020 -0500 d3d11/tests: Test specifying the multisample mask via OMSetBlendState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e107d522b2..4704dad1aa 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29012,6 +29012,13 @@ static void test_sample_mask(void) (ID3D11Resource *)texture, 0, texture_desc.Format); check_texture_color(test_context.backbuffer, 0x7f7f7f7f, 1); + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, 0xb); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, black); + draw_quad(&test_context); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, + (ID3D11Resource *)texture, 0, texture_desc.Format); + todo_wine check_texture_color(test_context.backbuffer, 0x3f3f3f3f, 1); + ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); ID3D11PixelShader_Release(ps);

1 0

Paul Gofman : ntdll/tests: Add tests for capturing context with xstate.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 61f3b3dcdf759537fe83b86837e2ef341a2c8b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61f3b3dcdf759537fe83b868… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 14:30:32 2020 +0300 ntdll/tests: Add tests for capturing context with xstate. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 268 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 267 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61f3b3dcdf759537fe83…

1 0

Paul Gofman : ntdll: Implement saving AVX registers in NtGetContextThread().
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 30e5250622f40037a58dd87517267dbab88c5df3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e5250622f40037a58dd875… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 14:30:31 2020 +0300 ntdll: Implement saving AVX registers in NtGetContextThread(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 58 ++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/signal_x86_64.c | 59 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 5d4d146947..45482b819c 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -683,6 +683,56 @@ static inline void save_fpux( 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 (!(user_shared_data->XState.EnabledFeatures && (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 (user_shared_data->XState.CompactionEnabled) + { + /* 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 * @@ -1189,11 +1239,15 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret; + 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; /* FIXME: other thread. */ + /* debug registers require a server call */ if (needed_flags & CONTEXT_DEBUG_REGISTERS) self = FALSE; @@ -1265,7 +1319,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 STATUS_SUCCESS; + return xsave_status; } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index c74b8be32b..31e87cfdc2 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1473,6 +1473,56 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex } +/*********************************************************************** + * 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 (!(user_shared_data->XState.EnabledFeatures && (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 (user_shared_data->XState.CompactionEnabled) + { + /* 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_context * @@ -1772,13 +1822,17 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret; + NTSTATUS ret, xsave_status; DWORD needed_flags; struct syscall_frame *frame = amd64_thread_data()->syscall_frame; BOOL self = (handle == GetCurrentThread()); if (!context) return STATUS_INVALID_PARAMETER; + /* 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; /* FIXME: other thread. */ + needed_flags = context->ContextFlags & ~CONTEXT_AMD64; /* debug registers require a server call */ @@ -1851,7 +1905,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) amd64_thread_data()->dr7 = context->Dr7; } } - return STATUS_SUCCESS; + + return xsave_status; } extern void CDECL raise_func_trampoline( void *dispatcher );

1 0

Nikolay Sivov : kernelbase: Forward ConvertToAutoInheritPrivateObjectSecurity() to ntdll.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 1c2b14a5240cdf18576552b1a81c6b7e17ff3a91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2b14a5240cdf18576552b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 2 14:28:25 2020 +0300 kernelbase: Forward ConvertToAutoInheritPrivateObjectSecurity() to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/security.c | 3 +-- include/winternl.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index d1736e61b8..72bb5892d3 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -900,8 +900,7 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( PSECURITY_DESCRIPTOR pare GUID *type, BOOL is_dir, PGENERIC_MAPPING mapping ) { - FIXME("%p %p %p %p %d %p - stub\n", parent, current, descr, type, is_dir, mapping ); - return FALSE; + return set_ntstatus( RtlConvertToAutoInheritSecurityObject( parent, current, descr, type, is_dir, mapping )); } /****************************************************************************** diff --git a/include/winternl.h b/include/winternl.h index 6c80919397..b462182745 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3282,6 +3282,7 @@ NTSYSAPI LONG WINAPI RtlCompareUnicodeStrings(const WCHAR*,SIZE_T,const WCH NTSYSAPI NTSTATUS WINAPI RtlCompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,ULONG,PULONG,PVOID); NTSYSAPI DWORD WINAPI RtlComputeCrc32(DWORD,const BYTE*,INT); NTSYSAPI NTSTATUS WINAPI RtlConvertSidToUnicodeString(PUNICODE_STRING,PSID,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID*,BOOL,PGENERIC_MAPPING); NTSYSAPI void WINAPI RtlCopyLuid(PLUID,const LUID*); NTSYSAPI void WINAPI RtlCopyLuidAndAttributesArray(ULONG,const LUID_AND_ATTRIBUTES*,PLUID_AND_ATTRIBUTES); NTSYSAPI BOOLEAN WINAPI RtlCopySid(DWORD,PSID,PSID);

1 0

Nikolay Sivov : combase: Implement local server registration via SCM.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: adfaa93877a2981b1a3f95bf6f193c96242a2ed6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adfaa93877a2981b1a3f95bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 2 14:14:49 2020 +0300 combase: Implement local server registration via SCM. Main point of this change is to get rid of auxiliary thread that is causing issues when CoRevokeClassObject() has to wait on it, potentially deadlocking when called from DllMain. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 33 +++-- dlls/combase/combase_private.h | 4 +- dlls/combase/rpc.c | 306 +++++++++++------------------------------ dlls/ole32/compobj.c | 2 - include/wine/irpcss.idl | 17 +++ programs/rpcss/rpcss_main.c | 100 ++++++++++++++ 6 files changed, 222 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adfaa93877a2981b1a3f…

1 0

Nikolay Sivov : api-ms: Redirect com-private to combase.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 5d5329936e3683833e37722851fcad5696778924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5329936e3683833e377228… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 2 14:14:48 2020 +0300 api-ms: Redirect com-private to combase. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-private-l1-1-0.spec | 52 +++++++++++----------- tools/make_specfiles | 6 ++- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec index b0f6b64f64..155219a472 100644 --- a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec @@ -1,37 +1,37 @@ @ stub CLSIDFromOle1Class @ stub CleanupOleStateInAllTls -@ stub CleanupTlsOleState +@ stdcall CleanupTlsOleState(ptr) combase.CleanupTlsOleState @ stub ClearCleanupFlag -@ stub CoCreateErrorInfo +@ stdcall CoCreateErrorInfo(ptr) combase.CoCreateErrorInfo @ stub CoCreateObjectInContext @ stub CoDeactivateObject -@ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState +@ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState @ stub CoGetApartmentID -@ stdcall CoGetCallState(long ptr) ole32.CoGetCallState +@ stdcall CoGetCallState(long ptr) combase.CoGetCallState @ stub CoGetClassVersion -@ stub CoGetErrorInfo -@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) ole32.CoGetInstanceFromFile -@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage +@ stdcall CoGetErrorInfo(long ptr) combase.CoGetErrorInfo +@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage @ stub CoGetModuleType @ stub CoGetProcessIdentifier @ stub CoGetSystemSecurityPermissions -@ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW +@ stdcall CoInitializeWOW(long long) combase.CoInitializeWOW @ stub CoPopServiceDomain @ stub CoPushServiceDomain @ stub CoReactivateObject -@ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy -@ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy -@ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter -@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx +@ stdcall CoRegisterInitializeSpy(ptr ptr) combase.CoRegisterInitializeSpy +@ stdcall CoRegisterMallocSpy(ptr) combase.CoRegisterMallocSpy +@ stdcall CoRegisterMessageFilter(ptr ptr) combase.CoRegisterMessageFilter +@ stdcall CoRegisterSurrogateEx(ptr ptr) combase.CoRegisterSurrogateEx @ stub CoRetireServer -@ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy -@ stdcall CoRevokeMallocSpy() ole32.CoRevokeMallocSpy -@ stub CoSetErrorInfo +@ stdcall CoRevokeInitializeSpy(int64) combase.CoRevokeInitializeSpy +@ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy +@ stdcall CoSetErrorInfo(long ptr) combase.CoSetErrorInfo @ stub CoUnloadingWOW @ stub CoVrfCheckThreadState @ stub CoVrfGetThreadState @ stub CoVrfReleaseThreadState -@ stdcall DllDebugObjectRPCHook(long ptr) ole32.DllDebugObjectRPCHook +@ stdcall DllDebugObjectRPCHook(long ptr) combase.DllDebugObjectRPCHook @ stub EnableHookObject @ stub FreePropVariantArrayWorker @ stub GetCatalogHelper @@ -51,7 +51,7 @@ @ stub InternalCoIsSurrogateProcess @ stub InternalCoRegisterDisconnectCallback @ stub InternalCoRegisterSurrogatedObject -@ stub InternalCoStdMarshalObject +@ stdcall InternalCoStdMarshalObject(ptr long ptr ptr) combase.InternalCoStdMarshalObject @ stub InternalCoUnregisterDisconnectCallback @ stub InternalCompleteObjRef @ stub InternalCreateCAggId @@ -60,15 +60,15 @@ @ stub InternalFillLocalOXIDInfo @ stub InternalFreeObjRef @ stub InternalGetWindowPropInterface -@ stub InternalIrotEnumRunning -@ stub InternalIrotGetObject -@ stub InternalIrotGetTimeOfLastChange -@ stub InternalIrotIsRunning -@ stub InternalIrotNoteChangeTime -@ stub InternalIrotRegister -@ stub InternalIrotRevoke +@ stdcall InternalIrotEnumRunning(ptr) combase.InternalIrotEnumRunning +@ stdcall InternalIrotGetObject(ptr ptr ptr) combase.InternalIrotGetObject +@ stdcall InternalIrotGetTimeOfLastChange(ptr ptr) combase.InternalIrotGetTimeOfLastChange +@ stdcall InternalIrotIsRunning(ptr) combase.InternalIrotIsRunning +@ stdcall InternalIrotNoteChangeTime(long ptr) combase.InternalIrotNoteChangeTime +@ stdcall InternalIrotRegister(ptr ptr ptr ptr long ptr ptr) combase.InternalIrotRegister +@ stdcall InternalIrotRevoke(long ptr ptr ptr) combase.InternalIrotRevoke @ stub InternalIsApartmentInitialized -@ stub InternalIsProcessInitialized +@ stdcall InternalIsProcessInitialized() combase.InternalIsProcessInitialized @ stub InternalMarshalObjRef @ stub InternalNotifyDDStartOrStop @ stub InternalOleModalLoopBlockFn @@ -79,7 +79,7 @@ @ stub InternalSetAptCallCtrlOnTlsIfRequired @ stub InternalSetOleThunkWowPtr @ stub InternalStubInvoke -@ stub InternalTlsAllocData +@ stdcall InternalTlsAllocData(ptr) combase.InternalTlsAllocData @ stub InternalUnmarshalObjRef @ stub NdrExtStubInitialize @ stub NdrOleDllGetClassObject diff --git a/tools/make_specfiles b/tools/make_specfiles index 2af4606984..efb873e253 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -329,13 +329,15 @@ my @dll_groups = "api-ms-win-core-systemtopology-l1-1-0", "api-ms-win-security-grouppolicy-l1-1-0", ], + [ + "combase", + "api-ms-win-core-com-private-l1-1-0", + ], [ "ole32", "api-ms-win-downlevel-ole32-l1-1-0", "api-ms-win-core-com-l1-1-0", "api-ms-win-core-com-l1-1-1", - "api-ms-win-core-com-private-l1-1-0", - "combase", "iprop", ], [

1 0

Nikolay Sivov : combase: Move default memory stream implementation.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 1a7dbcfd420ffdffb3e65ec0d0a824077f97f58d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7dbcfd420ffdffb3e65ec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 2 14:14:47 2020 +0300 combase: Move default memory stream implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 1 + dlls/combase/combase.spec | 4 +- dlls/combase/hglobalstream.c | 455 ++++++++++++++++++++++++++++ dlls/ole32/Makefile.in | 1 - dlls/ole32/hglobalstream.c | 684 ------------------------------------------- dlls/ole32/ole32.spec | 4 +- 6 files changed, 460 insertions(+), 689 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a7dbcfd420ffdffb3e6…

1 0

Nikolay Sivov : combase: Move currently unimplemented COM API functions.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 02301d8fbc94773f87af87660ffcab8e7e74d4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02301d8fbc94773f87af8766… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 2 14:14:46 2020 +0300 combase: Move currently unimplemented COM API functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 89 ++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 20 ++++----- dlls/combase/rpc.c | 10 +++++ dlls/ole32/compobj.c | 108 ---------------------------------------------- dlls/ole32/ole2.c | 11 ----- dlls/ole32/ole32.spec | 20 ++++----- 6 files changed, 119 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02301d8fbc94773f87af…

1 0

Hans Leidekker : advapi32: Read host credentials through mountmgr.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: faef38479c8519d95d6947f920497c0f020f712b URL: https://source.winehq.org/git/wine.git/?a=commit;h=faef38479c8519d95d6947f9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 15:08:00 2020 +0200 advapi32: Read host credentials through mountmgr. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/cred.c | 154 +++++++++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 66 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 49a1c34d1c..07f4b9b03a 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -33,6 +33,9 @@ #include "winreg.h" #include "wincred.h" #include "winternl.h" +#include "winioctl.h" +#define WINE_MOUNTMGR_EXTENSIONS +#include "ddk/mountmgr.h" #include "crypt.h" @@ -1389,6 +1392,86 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA * return TRUE; } +static DWORD host_read_credential( const WCHAR *targetname, CREDENTIALW **ret_credential ) +{ + struct mountmgr_credential *cred_in, *cred_out = NULL, *tmp; + DWORD err = ERROR_OUTOFMEMORY, size_in, size_out, size_name = (strlenW( targetname ) + 1) * sizeof(WCHAR); + HANDLE mgr; + WCHAR *ptr; + BOOL ret; + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size_in = sizeof(*cred_in) + size_name; + if (!(cred_in = heap_alloc( size_in ))) + { + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; + } + cred_in->targetname_offset = sizeof(*cred_in); + cred_in->targetname_size = size_name; + ptr = (WCHAR *)(cred_in + 1); + strcpyW( ptr, targetname ); + + size_out = 256; + if (!(cred_out = heap_alloc( size_out ))) goto done; + + for (;;) + { + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_READ_CREDENTIAL, cred_in, size_in, cred_out, size_out, NULL, NULL ); + if (ret || (err = GetLastError()) != ERROR_MORE_DATA) break; + size_out *= 2; + if (!(tmp = heap_realloc( cred_out, size_out ))) goto done; + cred_out = tmp; + } + + if (ret) + { + CREDENTIALW *credential; + DWORD size = sizeof(*credential) + cred_out->targetname_size + cred_out->username_size + cred_out->comment_size + + cred_out->blob_size; + + if (!(credential = heap_alloc_zero( size ))) + { + err = ERROR_OUTOFMEMORY; + goto done; + } + ptr = (WCHAR *)(credential + 1); + + credential->Type = CRED_TYPE_DOMAIN_PASSWORD; + memcpy( ptr, (char *)cred_out + cred_out->targetname_offset, cred_out->targetname_size ); + credential->TargetName = ptr; + ptr += strlenW( ptr ) + 1; + if (cred_out->comment_size) + { + memcpy( ptr, (char *)cred_out + cred_out->comment_offset, cred_out->comment_size ); + credential->Comment = ptr; + ptr += strlenW( ptr ) + 1; + } + credential->LastWritten = cred_out->last_written; + if ((credential->CredentialBlobSize = cred_out->blob_size)) + { + memcpy( ptr, (char *)cred_out + cred_out->blob_offset, cred_out->blob_size ); + credential->CredentialBlob = (BYTE *)ptr; + ptr += cred_out->blob_size / sizeof(WCHAR); + } + credential->Persist = CRED_PERSIST_LOCAL_MACHINE; + memcpy( ptr, (char *)cred_out + cred_out->username_offset, cred_out->username_size ); + credential->UserName = ptr; + + *ret_credential = credential; + err = ERROR_SUCCESS; + } + +done: + heap_free( cred_in ); + heap_free( cred_out ); + CloseHandle( mgr ); + return err; +} + /****************************************************************************** * CredReadW [ADVAPI32.@] */ @@ -1423,77 +1506,16 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW return FALSE; } -#ifdef __APPLE__ if (Type == CRED_TYPE_DOMAIN_PASSWORD) { - int status; - SecKeychainSearchRef search; - status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); - if (status == noErr) + ret = host_read_credential( TargetName, Credential ); + if (ret != ERROR_SUCCESS && ret != ERROR_NOT_SUPPORTED) { - SecKeychainItemRef item; - while (SecKeychainSearchCopyNext(search, &item) == noErr) - { - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr }; - LPWSTR target_name; - INT str_len; - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); - len = sizeof(**Credential); - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - continue; - } - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) - { - CFRelease(item); - continue; - } - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0); - target_name = heap_alloc((str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, target_name, str_len); - /* nul terminate */ - target_name[str_len] = '\0'; - if (strcmpiW(TargetName, target_name)) - { - CFRelease(item); - heap_free(target_name); - continue; - } - heap_free(target_name); - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - ret = mac_read_credential_from_item(item, TRUE, NULL, NULL, &len); - if (ret == ERROR_SUCCESS) - { - *Credential = heap_alloc(len); - if (*Credential) - { - len = sizeof(**Credential); - ret = mac_read_credential_from_item(item, TRUE, *Credential, - (char *)(*Credential + 1), &len); - } - else - ret = ERROR_OUTOFMEMORY; - CFRelease(item); - CFRelease(search); - if (ret != ERROR_SUCCESS) - { - SetLastError(ret); - return FALSE; - } - return TRUE; - } - CFRelease(item); - } - CFRelease(search); + SetLastError(ret); + return FALSE; } + if (ret == ERROR_SUCCESS) return TRUE; } -#endif ret = open_cred_mgr_key(&hkeyMgr, FALSE); if (ret != ERROR_SUCCESS)

1 0

Hans Leidekker : mountmgr: Add ioctl to read host credentials on macOS.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 0f7cc8d9ddfd6e18a000044d47c714e28fa158cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7cc8d9ddfd6e18a000044d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 15:07:59 2020 +0200 mountmgr: Add ioctl to read host credentials on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/mountmgr.c | 246 ++++++++++++++++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 16 +++ 3 files changed, 263 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f7cc8d9ddfd6e18a000…

1 0

← Newer
1
...
63
64
65
66
67
68
69
70
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020