September 2020 - Wine-Commits

Owen Rudge : winecfg: Add /v parameter to display current Windows version.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 87f41e6b408dd01055ff6a378b90d089d61ec370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f41e6b408dd01055ff6a37… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Aug 31 23:11:39 2020 +0100 winecfg: Add /v parameter to display current Windows version. This patch allows winecfg to be called with the "/v" parameter to display the current Windows version. "/v winver" will continue to allow the Windows version to be updated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49242 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 24 +++++++++++++++++++++++- programs/winecfg/main.c | 9 +++++++-- programs/winecfg/winecfg.h | 1 + 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index dd3480cd63..8068941ff8 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> +#include "wine/heap.h" #include "wine/unicode.h" #include "winecfg.h" #include "resource.h" @@ -74,6 +75,8 @@ static const struct win_version win_versions[] = #endif }; +#define DEFAULT_WIN_VERSION "win7" + static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; @@ -146,7 +149,7 @@ static void update_comboboxes(HWND dialog) return; } if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); - else winver = strdupA("win7"); + else winver = strdupA(DEFAULT_WIN_VERSION); } WINE_TRACE("winver is %s\n", winver); @@ -498,6 +501,25 @@ void print_windows_versions(void) } } +void print_current_winver(void) +{ + char *winver = get_reg_key(config_key, keypath(""), "Version", ""); + + if (!winver || !winver[0]) + { + int ver = get_registry_version(); + + if (ver == -1) + printf(DEFAULT_WIN_VERSION "\n"); + else + printf("%s\n", win_versions[ver].szVersion); + } + else + printf("%s\n", winver); + + heap_free(winver); +} + static void on_winver_change(HWND dialog) { int selection = SendDlgItemMessageW(dialog, IDC_WINVER, CB_GETCURSEL, 0, 0); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index f29e2f036f..9b30ed6e8e 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -187,9 +187,13 @@ ProcessCmdLine(LPSTR lpCmdLine) { return -1; } - if ((lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') && (lstrlenA(lpCmdLine) > 4)) + if (lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') { - return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; + if (lstrlenA(lpCmdLine) > 4) + return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; + + print_current_winver(); + return 0; } if (lpCmdLine[1] == '?') @@ -197,6 +201,7 @@ ProcessCmdLine(LPSTR lpCmdLine) printf("Usage: winecfg [options]\n\n"); printf("Options:\n"); printf(" [no option] Launch the graphical version of this program.\n"); + printf(" /v Display the current global Windows version.\n"); printf(" /v version Set global Windows version to 'version'.\n"); printf(" /? Display this information and exit.\n\n"); printf("Valid versions for 'version':\n\n"); diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 9dd39c51c3..d022cd3d68 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -91,6 +91,7 @@ INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara /* Windows version management */ BOOL set_winver_from_string(const char *version); +void print_current_winver(void); void print_windows_versions(void); /* Drive management */

1 0

Rémi Bernon : bcrypt: Return STATUS_INVALID_PARAMETER on ECC magic mismatch.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 4bc5b822f6c1ac0de4c5f18f1a7648deefdc40a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bc5b822f6c1ac0de4c5f18f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 2 09:59:46 2020 +0200 bcrypt: Return STATUS_INVALID_PARAMETER on ECC magic mismatch. Flight Simulator XAL authentication hits this condition because of buggy bcrypt private key export (see next patch). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 4 ++-- dlls/bcrypt/tests/bcrypt.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b6bb73a715..cd3b746e29 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1171,7 +1171,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) return STATUS_INVALID_PARAMETER; @@ -1211,7 +1211,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) return STATUS_INVALID_PARAMETER; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e37a33e38a..3e5d5cf17f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1730,6 +1730,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); @@ -1749,6 +1755,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status);

1 0

Nikolay Sivov : api-ms: Redirect com-private to combase.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

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 : kernelbase: Forward ConvertToAutoInheritPrivateObjectSecurity() to ntdll.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

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

Paul Gofman : ntdll: Implement saving AVX registers in NtGetContextThread().
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

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

Zebediah Figura : server: Avoid a potential NULL dereference in startup_info_dump().
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 74dc9aa33502ba89333ab4be3c7c1458015c1d56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74dc9aa33502ba89333ab4be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 1 17:22:20 2020 -0500 server: Avoid a potential NULL dereference in startup_info_dump(). info->data may be set to NULL by get_startup_info, without invalidating the object itself. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index c1bdb591f6..9bf5e447d3 100644 --- a/server/process.c +++ b/server/process.c @@ -749,8 +749,11 @@ static void startup_info_dump( struct object *obj, int verbose ) struct startup_info *info = (struct startup_info *)obj; assert( obj->ops == &startup_info_ops ); - fprintf( stderr, "Startup info in=%04x out=%04x err=%04x\n", - info->data->hstdin, info->data->hstdout, info->data->hstderr ); + fputs( "Startup info", stderr ); + if (info->data) + fprintf( stderr, " in=%04x out=%04x err=%04x", + info->data->hstdin, info->data->hstdout, info->data->hstderr ); + fputc( '\n', stderr ); } static int startup_info_signaled( struct object *obj, struct wait_queue_entry *entry )

1 0

Nikolay Sivov : combase: Move default memory stream implementation.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

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

Hans Leidekker : advapi32: Read host credentials through mountmgr.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

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 Sept. 2, 2020

Sept. 2, 2020

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

Alexandre Julliard : ntdll: Get rid of the exec_process() Unix library callback.
by Alexandre Julliard Sept. 2, 2020

Sept. 2, 2020

Module: wine Branch: master Commit: 4c45348f7808c3a1ea635e196402951f0008ab90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c45348f7808c3a1ea635e19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 15:06:05 2020 +0200 ntdll: Get rid of the exec_process() Unix library callback. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 +++++++--------- dlls/ntdll/unix/loader.c | 7 ++++--- dlls/ntdll/unix/process.c | 36 ++++++++++++++++++++++++++++-------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 +---- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e87f092784..ccaae0a5a2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3957,7 +3957,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params ) /*********************************************************************** * process_init */ -static void process_init(void) +static NTSTATUS process_init(void) { static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', @@ -4058,20 +4058,17 @@ static void process_init(void) restart_winevdm( params ); status = STATUS_INVALID_IMAGE_WIN_16; } - status = unix_funcs->exec_process( status ); - break; + return status; } case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT: restart_winevdm( params ); - status = unix_funcs->exec_process( status ); - break; + return status; case STATUS_CONFLICTING_ADDRESSES: case STATUS_NO_MEMORY: case STATUS_INVALID_IMAGE_FORMAT: - status = unix_funcs->exec_process( status ); - break; + return status; case STATUS_INVALID_IMAGE_WIN_64: ERR( "%s 64-bit application not supported in 32-bit prefix\n", debugstr_us(&params->ImagePathName) ); @@ -4109,14 +4106,15 @@ static void process_init(void) teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; + return STATUS_SUCCESS; } /*********************************************************************** * __wine_set_unix_funcs */ -void CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ) +NTSTATUS CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ) { assert( version == NTDLL_UNIXLIB_VERSION ); unix_funcs = funcs; - process_init(); + return process_init(); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6f25f4ae87..73d4ceee14 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -99,7 +99,7 @@ NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; -static void (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); +static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); @@ -1367,7 +1367,6 @@ static struct unix_funcs unix_funcs = get_unix_codepage_data, get_locales, virtual_release_address_space, - exec_process, set_show_dot_files, load_so_dll, load_builtin_dll, @@ -1387,6 +1386,7 @@ static struct unix_funcs unix_funcs = static void start_main_thread(void) { BOOL suspend; + NTSTATUS status; TEB *teb = virtual_alloc_first_teb(); signal_init_threading(); @@ -1399,7 +1399,8 @@ static void start_main_thread(void) init_cpu_info(); init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); - p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); + status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); + if (status) exec_process( status ); server_init_process_done(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index e16410d0ec..64380aba03 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -613,7 +613,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so /*********************************************************************** * exec_process */ -NTSTATUS CDECL exec_process( NTSTATUS status ) +void DECLSPEC_NORETURN exec_process( NTSTATUS status ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; pe_image_info_t pe_info; @@ -621,7 +621,7 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) char **argv; HANDLE handle; - if (startup_info_size) return status; /* started from another Win32 process */ + if (startup_info_size) goto done; /* started from another Win32 process */ switch (status) { @@ -631,10 +631,10 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) case STATUS_INVALID_IMAGE_NOT_MZ: { UNICODE_STRING image; - if (getenv( "WINEPRELOADRESERVE" )) return status; + if (getenv( "WINEPRELOADRESERVE" )) goto done; image.Buffer = get_nt_pathname( &params->ImagePathName ); image.Length = wcslen( image.Buffer ) * sizeof(WCHAR); - if ((status = get_pe_file_info( &image, &handle, &pe_info ))) return status; + if ((status = get_pe_file_info( &image, &handle, &pe_info ))) goto done; break; } case STATUS_INVALID_IMAGE_WIN_16: @@ -645,12 +645,16 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) pe_info.cpu = CPU_x86; break; default: - return status; + goto done; } unixdir = get_unix_curdir( params ); - if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) return STATUS_TOO_MANY_OPENED_FILES; + if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) + { + status = STATUS_TOO_MANY_OPENED_FILES; + goto done; + } #ifdef SO_PASSCRED else { @@ -671,7 +675,11 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) if (!status) { - if (!(argv = build_argv( &params->CommandLine, 2 ))) return STATUS_NO_MEMORY; + if (!(argv = build_argv( &params->CommandLine, 2 ))) + { + status = STATUS_NO_MEMORY; + goto done; + } fchdir( unixdir ); do { @@ -685,7 +693,19 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) free( argv ); } close( socketfd[0] ); - return status; + +done: + switch (status) + { + case STATUS_INVALID_IMAGE_FORMAT: + case STATUS_INVALID_IMAGE_NOT_MZ: + ERR( "%s not supported on this system\n", debugstr_us(&params->ImagePathName) ); + break; + default: + ERR( "failed to load %s error %x\n", debugstr_us(&params->ImagePathName), status ); + break; + } + for (;;) NtTerminateProcess( GetCurrentProcess(), status ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 54bd53c482..0a21a059b4 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,7 +117,6 @@ extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL exec_process( NTSTATUS status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; @@ -220,6 +219,7 @@ extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, void *thunk, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN exec_process( NTSTATUS status ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d4aa010ee0..d6cd4ed403 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 103 +#define NTDLL_UNIXLIB_VERSION 104 struct unix_funcs { @@ -81,9 +81,6 @@ struct unix_funcs /* virtual memory functions */ void (CDECL *virtual_release_address_space)(void); - /* thread/process functions */ - NTSTATUS (CDECL *exec_process)( NTSTATUS status ); - /* file functions */ void (CDECL *set_show_dot_files)( BOOL enable );

1 0